Commit b53e8464 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue 



Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2024-02-12 (ice)

This series contains updates to ice driver only.

Grzegorz adds support for E825-C devices.

Wojciech reworks devlink reload to fulfill expected conditions (remove
and readd).
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e1a00373 500d0df5

drivers/net/ethernet/intel/ice/ice.h

+3 −0
Original line number Diff line number Diff line
@@ -896,6 +896,7 @@ static inline bool ice_is_adq_active(struct ice_pf *pf) 
}



void ice_debugfs_fwlog_init(struct ice_pf *pf);

void ice_debugfs_pf_deinit(struct ice_pf *pf);

void ice_debugfs_init(void);

void ice_debugfs_exit(void);

void ice_pf_fwlog_update_module(struct ice_pf *pf, int log_level, int module);
@@ -983,6 +984,8 @@ void ice_service_task_schedule(struct ice_pf *pf); 
int ice_load(struct ice_pf *pf);

void ice_unload(struct ice_pf *pf);

void ice_adv_lnk_speed_maps_init(void);

int ice_init_dev(struct ice_pf *pf);

void ice_deinit_dev(struct ice_pf *pf);



/**

 * ice_set_rdma_cap - enable RDMA support

drivers/net/ethernet/intel/ice/ice_common.c

+37 −0
Original line number Diff line number Diff line
@@ -154,6 +154,12 @@ static int ice_set_mac_type(struct ice_hw *hw) 
	case ICE_DEV_ID_E823L_SFP:

		hw->mac_type = ICE_MAC_GENERIC;

		break;

	case ICE_DEV_ID_E825C_BACKPLANE:

	case ICE_DEV_ID_E825C_QSFP:

	case ICE_DEV_ID_E825C_SFP:

	case ICE_DEV_ID_E825C_SGMII:

		hw->mac_type = ICE_MAC_GENERIC_3K_E825;

		break;

	case ICE_DEV_ID_E830_BACKPLANE:

	case ICE_DEV_ID_E830_QSFP56:

	case ICE_DEV_ID_E830_SFP:
@@ -169,6 +175,18 @@ static int ice_set_mac_type(struct ice_hw *hw) 
	return 0;

}



/**

 * ice_is_generic_mac - check if device's mac_type is generic

 * @hw: pointer to the hardware structure

 *

 * Return: true if mac_type is generic (with SBQ support), false if not

 */

bool ice_is_generic_mac(struct ice_hw *hw)

{

	return (hw->mac_type == ICE_MAC_GENERIC ||

		hw->mac_type == ICE_MAC_GENERIC_3K_E825);

}



/**

 * ice_is_e810

 * @hw: pointer to the hardware structure
@@ -240,6 +258,25 @@ bool ice_is_e823(struct ice_hw *hw) 
	}

}



/**

 * ice_is_e825c - Check if a device is E825C family device

 * @hw: pointer to the hardware structure

 *

 * Return: true if the device is E825-C based, false if not.

 */

bool ice_is_e825c(struct ice_hw *hw)

{

	switch (hw->device_id) {

	case ICE_DEV_ID_E825C_BACKPLANE:

	case ICE_DEV_ID_E825C_QSFP:

	case ICE_DEV_ID_E825C_SFP:

	case ICE_DEV_ID_E825C_SGMII:

		return true;

	default:

		return false;

	}

}



/**

 * ice_clear_pf_cfg - Clear PF configuration

 * @hw: pointer to the hardware structure

drivers/net/ethernet/intel/ice/ice_common.h

+2 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ ice_update_phy_type(u64 *phy_type_low, u64 *phy_type_high, 
int

ice_aq_manage_mac_write(struct ice_hw *hw, const u8 *mac_addr, u8 flags,

			struct ice_sq_cd *cd);

bool ice_is_generic_mac(struct ice_hw *hw);

bool ice_is_e810(struct ice_hw *hw);

int ice_clear_pf_cfg(struct ice_hw *hw);

int
@@ -251,6 +252,7 @@ ice_stat_update32(struct ice_hw *hw, u32 reg, bool prev_stat_loaded, 
		  u64 *prev_stat, u64 *cur_stat);

bool ice_is_e810t(struct ice_hw *hw);

bool ice_is_e823(struct ice_hw *hw);

bool ice_is_e825c(struct ice_hw *hw);

int

ice_sched_query_elem(struct ice_hw *hw, u32 node_teid,

		     struct ice_aqc_txsched_elem_data *buf);

drivers/net/ethernet/intel/ice/ice_controlq.c

+1 −1
Original line number Diff line number Diff line
@@ -666,7 +666,7 @@ bool ice_is_sbq_supported(struct ice_hw *hw) 
	/* The device sideband queue is only supported on devices with the

	 * generic MAC type.

	 */

	return hw->mac_type == ICE_MAC_GENERIC;

	return ice_is_generic_mac(hw);

}



/**

drivers/net/ethernet/intel/ice/ice_ddp.c

+4 −0
Original line number Diff line number Diff line
@@ -1825,6 +1825,7 @@ static u32 ice_get_pkg_segment_id(enum ice_mac_type mac_type) 
		seg_id = SEGMENT_TYPE_ICE_E830;

		break;

	case ICE_MAC_GENERIC:

	case ICE_MAC_GENERIC_3K_E825:

	default:

		seg_id = SEGMENT_TYPE_ICE_E810;

		break;
@@ -1845,6 +1846,9 @@ static u32 ice_get_pkg_sign_type(enum ice_mac_type mac_type) 
	case ICE_MAC_E830:

		sign_type = SEGMENT_SIGN_TYPE_RSA3K_SBB;

		break;

	case ICE_MAC_GENERIC_3K_E825:

		sign_type = SEGMENT_SIGN_TYPE_RSA3K_E825;

		break;

	case ICE_MAC_GENERIC:

	default:

		sign_type = SEGMENT_SIGN_TYPE_RSA2K;