Commit d5e6f064 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch '40GbE-Intel-Wired-LAN-Driver-Updates-2020-10-12' 



Tony Nguyen says:

====================
40GbE Intel Wired LAN Driver Updates 2020-10-12

This series contains updates to i40e and e1000 drivers.

Jaroslaw adds support for changing FEC on i40e if the firmware supports it.

Jesse fixes a kbuild-bot warning regarding ternary operator on e1000.

v2: Return -EOPNOTSUPP instead of -EINVAL when FEC settings are not
supported by firmware. Remove, unneeded, done label and return errors
directly in i40e_set_fec_param() for patch 1. Dropped, previous patch 2,
to send to net.
====================

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents a003ec1f f2bf814a

drivers/net/ethernet/intel/e1000/e1000_hw.c

+1 −9
Original line number Diff line number Diff line
@@ -4401,17 +4401,9 @@ void e1000_write_vfta(struct e1000_hw *hw, u32 offset, u32 value) 
static void e1000_clear_vfta(struct e1000_hw *hw)

{

	u32 offset;

	u32 vfta_value = 0;

	u32 vfta_offset = 0;

	u32 vfta_bit_in_reg = 0;



	for (offset = 0; offset < E1000_VLAN_FILTER_TBL_SIZE; offset++) {

		/* If the offset we want to clear is the same offset of the

		 * manageability VLAN ID, then clear all bits except that of the

		 * manageability unit

		 */

		vfta_value = (offset == vfta_offset) ? vfta_bit_in_reg : 0;

		E1000_WRITE_REG_ARRAY(hw, VFTA, offset, vfta_value);

		E1000_WRITE_REG_ARRAY(hw, VFTA, offset, 0);

		E1000_WRITE_FLUSH();

	}

}

drivers/net/ethernet/intel/i40e/i40e_adminq.c

+6 −0
Original line number Diff line number Diff line
@@ -541,6 +541,12 @@ static void i40e_set_hw_flags(struct i40e_hw *hw) 
		    (aq->api_maj_ver == 1 &&

		     aq->api_min_ver >= I40E_MINOR_VER_GET_LINK_INFO_X722))

			hw->flags |= I40E_HW_FLAG_AQ_PHY_ACCESS_CAPABLE;



		if (aq->api_maj_ver > 1 ||

		    (aq->api_maj_ver == 1 &&

		     aq->api_min_ver >= I40E_MINOR_VER_FW_REQUEST_FEC_X722))

			hw->flags |= I40E_HW_FLAG_X722_FEC_REQUEST_CAPABLE;



		fallthrough;

	default:

		break;

drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
#define I40E_MINOR_VER_GET_LINK_INFO_X722 0x0009

/* API version 1.6 for X722 devices adds ability to stop FW LLDP agent */

#define I40E_MINOR_VER_FW_LLDP_STOPPABLE_X722 0x0006

/* API version 1.10 for X722 devices adds ability to request FEC encoding */

#define I40E_MINOR_VER_FW_REQUEST_FEC_X722 0x000A



struct i40e_aq_desc {

	__le16 flags;

drivers/net/ethernet/intel/i40e/i40e_ethtool.c

+21 −12
Original line number Diff line number Diff line
@@ -891,6 +891,7 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw, 
		if (hw_link_info->requested_speeds & I40E_LINK_SPEED_10GB)

			ethtool_link_ksettings_add_link_mode(ks, advertising,

							     10000baseT_Full);

		i40e_get_settings_link_up_fec(hw_link_info->req_fec_info, ks);

		break;

	case I40E_PHY_TYPE_SGMII:

		ethtool_link_ksettings_add_link_mode(ks, supported, Autoneg);
@@ -1481,12 +1482,16 @@ static int i40e_set_fec_param(struct net_device *netdev, 
	struct i40e_pf *pf = np->vsi->back;

	struct i40e_hw *hw = &pf->hw;

	u8 fec_cfg = 0;

	int err = 0;



	if (hw->device_id != I40E_DEV_ID_25G_SFP28 &&

	    hw->device_id != I40E_DEV_ID_25G_B) {

		err = -EPERM;

		goto done;

	    hw->device_id != I40E_DEV_ID_25G_B &&

	    hw->device_id != I40E_DEV_ID_KX_X722)

		return -EPERM;



	if (hw->mac.type == I40E_MAC_X722 &&

	    !(hw->flags & I40E_HW_FLAG_X722_FEC_REQUEST_CAPABLE)) {

		netdev_err(netdev, "Setting FEC encoding not supported by firmware. Please update the NVM image.\n");

		return -EOPNOTSUPP;

	}



	switch (fecparam->fec) {
@@ -1508,14 +1513,10 @@ static int i40e_set_fec_param(struct net_device *netdev, 
	default:

		dev_warn(&pf->pdev->dev, "Unsupported FEC mode: %d",

			 fecparam->fec);

		err = -EINVAL;

		goto done;

		return -EINVAL;

	}



	err = i40e_set_fec_cfg(netdev, fec_cfg);



done:

	return err;

	return i40e_set_fec_cfg(netdev, fec_cfg);

}



static int i40e_nway_reset(struct net_device *netdev)
@@ -4951,8 +4952,7 @@ flags_complete: 
		}

	}



	if (((changed_flags & I40E_FLAG_RS_FEC) ||

	     (changed_flags & I40E_FLAG_BASE_R_FEC)) &&

	if (changed_flags & I40E_FLAG_RS_FEC &&

	    pf->hw.device_id != I40E_DEV_ID_25G_SFP28 &&

	    pf->hw.device_id != I40E_DEV_ID_25G_B) {

		dev_warn(&pf->pdev->dev,
@@ -4960,6 +4960,15 @@ flags_complete: 
		return -EOPNOTSUPP;

	}



	if (changed_flags & I40E_FLAG_BASE_R_FEC &&

	    pf->hw.device_id != I40E_DEV_ID_25G_SFP28 &&

	    pf->hw.device_id != I40E_DEV_ID_25G_B &&

	    pf->hw.device_id != I40E_DEV_ID_KX_X722) {

		dev_warn(&pf->pdev->dev,

			 "Device does not support changing FEC configuration\n");

		return -EOPNOTSUPP;

	}



	/* Process any additional changes needed as a result of flag changes.

	 * The changed_flags value reflects the list of bits that were

	 * changed in the code above.

drivers/net/ethernet/intel/i40e/i40e_main.c

+19 −0
Original line number Diff line number Diff line
@@ -6622,6 +6622,25 @@ void i40e_print_link_message(struct i40e_vsi *vsi, bool isup) 
			else

				req_fec = "CL74 FC-FEC/BASE-R";

		}

		netdev_info(vsi->netdev,

			    "NIC Link is Up, %sbps Full Duplex, Requested FEC: %s, Negotiated FEC: %s, Autoneg: %s, Flow Control: %s\n",

			    speed, req_fec, fec, an, fc);

	} else if (pf->hw.device_id == I40E_DEV_ID_KX_X722) {

		req_fec = "None";

		fec = "None";

		an = "False";



		if (pf->hw.phy.link_info.an_info & I40E_AQ_AN_COMPLETED)

			an = "True";



		if (pf->hw.phy.link_info.fec_info &

		    I40E_AQ_CONFIG_FEC_KR_ENA)

			fec = "CL74 FC-FEC/BASE-R";



		if (pf->hw.phy.link_info.req_fec_info &

		    I40E_AQ_REQUEST_FEC_KR)

			req_fec = "CL74 FC-FEC/BASE-R";



		netdev_info(vsi->netdev,

			    "NIC Link is Up, %sbps Full Duplex, Requested FEC: %s, Negotiated FEC: %s, Autoneg: %s, Flow Control: %s\n",

			    speed, req_fec, fec, an, fc);

CRA Git | Maintained and supported by SUSTech CRA and CCSE