Commit 0134fe85 authored by Jakub Kicinski's avatar Jakub Kicinski
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 2022-08-18 (ice)

This series contains updates to ice driver only.

Jesse and Anatolii add support for controlling FCS/CRC stripping via
ethtool.

Anirudh allows for 100M speeds on devices which support it.

Sylwester removes ucast_shared field and the associated dead code related
to it.

Mikael removes non-inclusive language from the driver.

* '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue:
  ice: remove non-inclusive language
  ice: Remove ucast_shared
  ice: Allow 100M speeds for some devices
  ice: Implement FCS/CRC and VLAN stripping co-existence policy
  ice: Implement control of FCS/CRC stripping
====================

Link: https://lore.kernel.org/r/20220818155207.996297-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents b18e04e3 5c603001

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

+1 −0
Original line number Diff line number Diff line
@@ -854,6 +854,7 @@ ice_fetch_u64_stats_per_ring(struct u64_stats_sync *syncp, 
			     struct ice_q_stats stats, u64 *pkts, u64 *bytes);

int ice_up(struct ice_vsi *vsi);

int ice_down(struct ice_vsi *vsi);

int ice_down_up(struct ice_vsi *vsi);

int ice_vsi_cfg(struct ice_vsi *vsi);

struct ice_vsi *ice_lb_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi);

int ice_vsi_determine_xdp_res(struct ice_vsi *vsi);

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

+1 −1
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ static int ice_setup_rx_ctx(struct ice_rx_ring *ring) 
	/* Strip the Ethernet CRC bytes before the packet is posted to host

	 * memory.

	 */

	rlan_ctx.crcstrip = 1;

	rlan_ctx.crcstrip = !(ring->flags & ICE_RX_FLAGS_CRC_STRIP_DIS);



	/* L2TSEL flag defines the reported L2 Tags in the receive descriptor

	 * and it needs to remain 1 for non-DVM capable configurations to not

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

+20 −0
Original line number Diff line number Diff line
@@ -2775,6 +2775,26 @@ ice_aq_set_port_params(struct ice_port_info *pi, bool double_vlan, 
	return ice_aq_send_cmd(hw, &desc, NULL, 0, cd);

}



/**

 * ice_is_100m_speed_supported

 * @hw: pointer to the HW struct

 *

 * returns true if 100M speeds are supported by the device,

 * false otherwise.

 */

bool ice_is_100m_speed_supported(struct ice_hw *hw)

{

	switch (hw->device_id) {

	case ICE_DEV_ID_E822C_SGMII:

	case ICE_DEV_ID_E822L_SGMII:

	case ICE_DEV_ID_E823L_1GBE:

	case ICE_DEV_ID_E823C_SGMII:

		return true;

	default:

		return false;

	}

}



/**

 * ice_get_link_speed_based_on_phy_type - returns link speed

 * @phy_type_low: lower part of phy_type

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

+1 −0
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ ice_aq_set_gpio(struct ice_hw *hw, u16 gpio_ctrl_handle, u8 pin_idx, bool value, 
int

ice_aq_get_gpio(struct ice_hw *hw, u16 gpio_ctrl_handle, u8 pin_idx,

		bool *value, struct ice_sq_cd *cd);

bool ice_is_100m_speed_supported(struct ice_hw *hw);

int

ice_aq_set_lldp_mib(struct ice_hw *hw, u8 mib_type, void *buf, u16 buf_size,

		    struct ice_sq_cd *cd);

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

+8 −8
Original line number Diff line number Diff line
@@ -1289,10 +1289,7 @@ static int ice_set_priv_flags(struct net_device *netdev, u32 flags) 
	}

	if (test_bit(ICE_FLAG_LEGACY_RX, change_flags)) {

		/* down and up VSI so that changes of Rx cfg are reflected. */

		if (!test_and_set_bit(ICE_VSI_DOWN, vsi->state)) {

			ice_down(vsi);

			ice_up(vsi);

		}

		ice_down_up(vsi);

	}

	/* don't allow modification of this flag when a single VF is in

	 * promiscuous mode because it's not supported
@@ -1473,20 +1470,22 @@ ice_get_ethtool_stats(struct net_device *netdev, 


/**

 * ice_mask_min_supported_speeds

 * @hw: pointer to the HW structure

 * @phy_types_high: PHY type high

 * @phy_types_low: PHY type low to apply minimum supported speeds mask

 *

 * Apply minimum supported speeds mask to PHY type low. These are the speeds

 * for ethtool supported link mode.

 */

static

void ice_mask_min_supported_speeds(u64 phy_types_high, u64 *phy_types_low)

static void

ice_mask_min_supported_speeds(struct ice_hw *hw,

			      u64 phy_types_high, u64 *phy_types_low)

{

	/* if QSFP connection with 100G speed, minimum supported speed is 25G */

	if (*phy_types_low & ICE_PHY_TYPE_LOW_MASK_100G ||

	    phy_types_high & ICE_PHY_TYPE_HIGH_MASK_100G)

		*phy_types_low &= ~ICE_PHY_TYPE_LOW_MASK_MIN_25G;

	else

	else if (!ice_is_100m_speed_supported(hw))

		*phy_types_low &= ~ICE_PHY_TYPE_LOW_MASK_MIN_1G;

}
@@ -1536,7 +1535,8 @@ ice_phy_type_to_ethtool(struct net_device *netdev, 
		phy_types_low = le64_to_cpu(pf->nvm_phy_type_lo);

		phy_types_high = le64_to_cpu(pf->nvm_phy_type_hi);



		ice_mask_min_supported_speeds(phy_types_high, &phy_types_low);

		ice_mask_min_supported_speeds(&pf->hw, phy_types_high,

					      &phy_types_low);

		/* determine advertised modes based on link override only

		 * if it's supported and if the FW doesn't abstract the

		 * driver from having to account for link overrides