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

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

Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2024-01-02 (ixgbe, i40e)

This series contains updates to ixgbe and i40e drivers.

Ovidiu Panait adds reporting of VF link state to ixgbe.

Jedrzej removes uses of IXGBE_ERR* codes to instead use standard error
codes.

Andrii modifies behavior of VF disable to properly shut down queues on
i40e.

Simon Horman removes, undesired, use of comma operator for i40e.

* '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue:
  i40e: Avoid unnecessary use of comma operator
  i40e: Fix VF disable behavior to block all traffic
  ixgbe: Refactor returning internal error codes
  ixgbe: Refactor overtemp event handling
  ixgbe: report link state for VF devices
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 09f9d7a8 55f96e8b

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

+1 −1
Original line number Diff line number Diff line
@@ -1911,7 +1911,7 @@ static int i40e_get_eeprom(struct net_device *netdev, 
			len = eeprom->len - (I40E_NVM_SECTOR_SIZE * i);

			last = true;

		}

		offset = eeprom->offset + (I40E_NVM_SECTOR_SIZE * i),

		offset = eeprom->offset + (I40E_NVM_SECTOR_SIZE * i);

		ret_val = i40e_aq_read_nvm(hw, 0x0, offset, len,

				(u8 *)eeprom_buff + (I40E_NVM_SECTOR_SIZE * i),

				last, NULL);

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

+32 −0
Original line number Diff line number Diff line
@@ -2579,6 +2579,14 @@ static int i40e_vc_enable_queues_msg(struct i40e_vf *vf, u8 *msg) 
	int aq_ret = 0;

	int i;



	if (vf->is_disabled_from_host) {

		aq_ret = -EPERM;

		dev_info(&pf->pdev->dev,

			 "Admin has disabled VF %d, will not enable queues\n",

			 vf->vf_id);

		goto error_param;

	}



	if (!test_bit(I40E_VF_STATE_ACTIVE, &vf->vf_states)) {

		aq_ret = -EINVAL;

		goto error_param;
@@ -4705,9 +4713,12 @@ int i40e_ndo_set_vf_link_state(struct net_device *netdev, int vf_id, int link) 
	struct i40e_link_status *ls = &pf->hw.phy.link_info;

	struct virtchnl_pf_event pfe;

	struct i40e_hw *hw = &pf->hw;

	struct i40e_vsi *vsi;

	unsigned long q_map;

	struct i40e_vf *vf;

	int abs_vf_id;

	int ret = 0;

	int tmp;



	if (test_and_set_bit(__I40E_VIRTCHNL_OP_PENDING, pf->state)) {

		dev_warn(&pf->pdev->dev, "Unable to configure VFs, other operation is pending.\n");
@@ -4730,17 +4741,38 @@ int i40e_ndo_set_vf_link_state(struct net_device *netdev, int vf_id, int link) 
	switch (link) {

	case IFLA_VF_LINK_STATE_AUTO:

		vf->link_forced = false;

		vf->is_disabled_from_host = false;

		/* reset needed to reinit VF resources */

		i40e_vc_reset_vf(vf, true);

		i40e_set_vf_link_state(vf, &pfe, ls);

		break;

	case IFLA_VF_LINK_STATE_ENABLE:

		vf->link_forced = true;

		vf->link_up = true;

		vf->is_disabled_from_host = false;

		/* reset needed to reinit VF resources */

		i40e_vc_reset_vf(vf, true);

		i40e_set_vf_link_state(vf, &pfe, ls);

		break;

	case IFLA_VF_LINK_STATE_DISABLE:

		vf->link_forced = true;

		vf->link_up = false;

		i40e_set_vf_link_state(vf, &pfe, ls);



		vsi = pf->vsi[vf->lan_vsi_idx];

		q_map = BIT(vsi->num_queue_pairs) - 1;



		vf->is_disabled_from_host = true;



		/* Try to stop both Tx&Rx rings even if one of the calls fails

		 * to ensure we stop the rings even in case of errors.

		 * If any of them returns with an error then the first

		 * error that occurred will be returned.

		 */

		tmp = i40e_ctrl_vf_tx_rings(vsi, q_map, false);

		ret = i40e_ctrl_vf_rx_rings(vsi, q_map, false);



		ret = tmp ? tmp : ret;

		break;

	default:

		ret = -EINVAL;

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

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ struct i40e_vf { 
	bool link_forced;

	bool link_up;		/* only valid if VF link is forced */

	bool spoofchk;

	bool is_disabled_from_host; /* PF ctrl of VF enable/disable */

	u16 num_vlan;



	/* ADq related variables */

drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c

+18 −18
Original line number Diff line number Diff line
@@ -123,14 +123,14 @@ static s32 ixgbe_init_phy_ops_82598(struct ixgbe_hw *hw) 
		if (ret_val)

			return ret_val;

		if (hw->phy.sfp_type == ixgbe_sfp_type_unknown)

			return IXGBE_ERR_SFP_NOT_SUPPORTED;

			return -EOPNOTSUPP;



		/* Check to see if SFP+ module is supported */

		ret_val = ixgbe_get_sfp_init_sequence_offsets(hw,

							    &list_offset,

							    &data_offset);

		if (ret_val)

			return IXGBE_ERR_SFP_NOT_SUPPORTED;

			return -EOPNOTSUPP;

		break;

	default:

		break;
@@ -213,7 +213,7 @@ static s32 ixgbe_get_link_capabilities_82598(struct ixgbe_hw *hw, 
		break;



	default:

		return IXGBE_ERR_LINK_SETUP;

		return -EIO;

	}



	return 0;
@@ -283,7 +283,7 @@ static s32 ixgbe_fc_enable_82598(struct ixgbe_hw *hw) 


	/* Validate the water mark configuration */

	if (!hw->fc.pause_time)

		return IXGBE_ERR_INVALID_LINK_SETTINGS;

		return -EINVAL;



	/* Low water mark of zero causes XOFF floods */

	for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
@@ -292,7 +292,7 @@ static s32 ixgbe_fc_enable_82598(struct ixgbe_hw *hw) 
			if (!hw->fc.low_water[i] ||

			    hw->fc.low_water[i] >= hw->fc.high_water[i]) {

				hw_dbg(hw, "Invalid water mark configuration\n");

				return IXGBE_ERR_INVALID_LINK_SETTINGS;

				return -EINVAL;

			}

		}

	}
@@ -369,7 +369,7 @@ static s32 ixgbe_fc_enable_82598(struct ixgbe_hw *hw) 
		break;

	default:

		hw_dbg(hw, "Flow control param set incorrectly\n");

		return IXGBE_ERR_CONFIG;

		return -EIO;

	}



	/* Set 802.3x based flow control settings. */
@@ -438,7 +438,7 @@ static s32 ixgbe_start_mac_link_82598(struct ixgbe_hw *hw, 
				msleep(100);

			}

			if (!(links_reg & IXGBE_LINKS_KX_AN_COMP)) {

				status = IXGBE_ERR_AUTONEG_NOT_COMPLETE;

				status = -EIO;

				hw_dbg(hw, "Autonegotiation did not complete.\n");

			}

		}
@@ -478,7 +478,7 @@ static s32 ixgbe_validate_link_ready(struct ixgbe_hw *hw) 


	if (timeout == IXGBE_VALIDATE_LINK_READY_TIMEOUT) {

		hw_dbg(hw, "Link was indicated but link is down\n");

		return IXGBE_ERR_LINK_SETUP;

		return -EIO;

	}



	return 0;
@@ -594,7 +594,7 @@ static s32 ixgbe_setup_mac_link_82598(struct ixgbe_hw *hw, 
	speed &= link_capabilities;



	if (speed == IXGBE_LINK_SPEED_UNKNOWN)

		return IXGBE_ERR_LINK_SETUP;

		return -EINVAL;



	/* Set KX4/KX support according to speed requested */

	else if (link_mode == IXGBE_AUTOC_LMS_KX4_AN ||
@@ -701,9 +701,9 @@ static s32 ixgbe_reset_hw_82598(struct ixgbe_hw *hw) 


		/* Init PHY and function pointers, perform SFP setup */

		phy_status = hw->phy.ops.init(hw);

		if (phy_status == IXGBE_ERR_SFP_NOT_SUPPORTED)

		if (phy_status == -EOPNOTSUPP)

			return phy_status;

		if (phy_status == IXGBE_ERR_SFP_NOT_PRESENT)

		if (phy_status == -ENOENT)

			goto mac_reset_top;



		hw->phy.ops.reset(hw);
@@ -727,7 +727,7 @@ static s32 ixgbe_reset_hw_82598(struct ixgbe_hw *hw) 
		udelay(1);

	}

	if (ctrl & IXGBE_CTRL_RST) {

		status = IXGBE_ERR_RESET_FAILED;

		status = -EIO;

		hw_dbg(hw, "Reset polling failed to complete.\n");

	}
@@ -789,7 +789,7 @@ static s32 ixgbe_set_vmdq_82598(struct ixgbe_hw *hw, u32 rar, u32 vmdq) 
	/* Make sure we are using a valid rar index range */

	if (rar >= rar_entries) {

		hw_dbg(hw, "RAR index %d is out of range.\n", rar);

		return IXGBE_ERR_INVALID_ARGUMENT;

		return -EINVAL;

	}



	rar_high = IXGBE_READ_REG(hw, IXGBE_RAH(rar));
@@ -814,7 +814,7 @@ static s32 ixgbe_clear_vmdq_82598(struct ixgbe_hw *hw, u32 rar, u32 vmdq) 
	/* Make sure we are using a valid rar index range */

	if (rar >= rar_entries) {

		hw_dbg(hw, "RAR index %d is out of range.\n", rar);

		return IXGBE_ERR_INVALID_ARGUMENT;

		return -EINVAL;

	}



	rar_high = IXGBE_READ_REG(hw, IXGBE_RAH(rar));
@@ -845,7 +845,7 @@ static s32 ixgbe_set_vfta_82598(struct ixgbe_hw *hw, u32 vlan, u32 vind, 
	u32 vftabyte;



	if (vlan > 4095)

		return IXGBE_ERR_PARAM;

		return -EINVAL;



	/* Determine 32-bit word position in array */

	regindex = (vlan >> 5) & 0x7F;   /* upper seven bits */
@@ -964,7 +964,7 @@ static s32 ixgbe_read_i2c_phy_82598(struct ixgbe_hw *hw, u8 dev_addr, 
		gssr = IXGBE_GSSR_PHY0_SM;



	if (hw->mac.ops.acquire_swfw_sync(hw, gssr) != 0)

		return IXGBE_ERR_SWFW_SYNC;

		return -EBUSY;



	if (hw->phy.type == ixgbe_phy_nl) {

		/*
@@ -993,7 +993,7 @@ static s32 ixgbe_read_i2c_phy_82598(struct ixgbe_hw *hw, u8 dev_addr, 


		if (sfp_stat != IXGBE_I2C_EEPROM_STATUS_PASS) {

			hw_dbg(hw, "EEPROM read did not pass.\n");

			status = IXGBE_ERR_SFP_NOT_PRESENT;

			status = -ENOENT;

			goto out;

		}
@@ -1003,7 +1003,7 @@ static s32 ixgbe_read_i2c_phy_82598(struct ixgbe_hw *hw, u8 dev_addr, 


		*eeprom_data = (u8)(sfp_data >> 8);

	} else {

		status = IXGBE_ERR_PHY;

		status = -EIO;

	}



out:

drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c

+30 −31
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static s32 ixgbe_setup_sfp_modules_82599(struct ixgbe_hw *hw) 
		ret_val = hw->mac.ops.acquire_swfw_sync(hw,

							IXGBE_GSSR_MAC_CSR_SM);

		if (ret_val)

			return IXGBE_ERR_SWFW_SYNC;

			return -EBUSY;



		if (hw->eeprom.ops.read(hw, ++data_offset, &data_value))

			goto setup_sfp_err;
@@ -144,7 +144,7 @@ static s32 ixgbe_setup_sfp_modules_82599(struct ixgbe_hw *hw) 


		if (ret_val) {

			hw_dbg(hw, " sfp module setup not complete\n");

			return IXGBE_ERR_SFP_SETUP_NOT_COMPLETE;

			return -EIO;

		}

	}
@@ -159,7 +159,7 @@ static s32 ixgbe_setup_sfp_modules_82599(struct ixgbe_hw *hw) 
	usleep_range(hw->eeprom.semaphore_delay * 1000,

		     hw->eeprom.semaphore_delay * 2000);

	hw_err(hw, "eeprom read at offset %d failed\n", data_offset);

	return IXGBE_ERR_SFP_SETUP_NOT_COMPLETE;

	return -EIO;

}



/**
@@ -184,7 +184,7 @@ static s32 prot_autoc_read_82599(struct ixgbe_hw *hw, bool *locked, 
		ret_val = hw->mac.ops.acquire_swfw_sync(hw,

					IXGBE_GSSR_MAC_CSR_SM);

		if (ret_val)

			return IXGBE_ERR_SWFW_SYNC;

			return -EBUSY;



		*locked = true;

	}
@@ -219,7 +219,7 @@ static s32 prot_autoc_write_82599(struct ixgbe_hw *hw, u32 autoc, bool locked) 
		ret_val = hw->mac.ops.acquire_swfw_sync(hw,

					IXGBE_GSSR_MAC_CSR_SM);

		if (ret_val)

			return IXGBE_ERR_SWFW_SYNC;

			return -EBUSY;



		locked = true;

	}
@@ -400,7 +400,7 @@ static s32 ixgbe_get_link_capabilities_82599(struct ixgbe_hw *hw, 
		break;



	default:

		return IXGBE_ERR_LINK_SETUP;

		return -EIO;

	}



	if (hw->phy.multispeed_fiber) {
@@ -541,7 +541,7 @@ static s32 ixgbe_start_mac_link_82599(struct ixgbe_hw *hw, 
				msleep(100);

			}

			if (!(links_reg & IXGBE_LINKS_KX_AN_COMP)) {

				status = IXGBE_ERR_AUTONEG_NOT_COMPLETE;

				status = -EIO;

				hw_dbg(hw, "Autoneg did not complete.\n");

			}

		}
@@ -794,7 +794,7 @@ static s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw, 
	speed &= link_capabilities;



	if (speed == IXGBE_LINK_SPEED_UNKNOWN)

		return IXGBE_ERR_LINK_SETUP;

		return -EINVAL;



	/* Use stored value (EEPROM defaults) of AUTOC to find KR/KX4 support*/

	if (hw->mac.orig_link_settings_stored)
@@ -861,8 +861,7 @@ static s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw, 
					msleep(100);

				}

				if (!(links_reg & IXGBE_LINKS_KX_AN_COMP)) {

					status =

						IXGBE_ERR_AUTONEG_NOT_COMPLETE;

					status = -EIO;

					hw_dbg(hw, "Autoneg did not complete.\n");

				}

			}
@@ -927,7 +926,7 @@ static s32 ixgbe_reset_hw_82599(struct ixgbe_hw *hw) 
	/* Identify PHY and related function pointers */

	status = hw->phy.ops.init(hw);



	if (status == IXGBE_ERR_SFP_NOT_SUPPORTED)

	if (status == -EOPNOTSUPP)

		return status;



	/* Setup SFP module if there is one present. */
@@ -936,7 +935,7 @@ static s32 ixgbe_reset_hw_82599(struct ixgbe_hw *hw) 
		hw->phy.sfp_setup_needed = false;

	}



	if (status == IXGBE_ERR_SFP_NOT_SUPPORTED)

	if (status == -EOPNOTSUPP)

		return status;



	/* Reset PHY */
@@ -974,7 +973,7 @@ static s32 ixgbe_reset_hw_82599(struct ixgbe_hw *hw) 
	}



	if (ctrl & IXGBE_CTRL_RST_MASK) {

		status = IXGBE_ERR_RESET_FAILED;

		status = -EIO;

		hw_dbg(hw, "Reset polling failed to complete.\n");

	}
@@ -1093,7 +1092,7 @@ static s32 ixgbe_fdir_check_cmd_complete(struct ixgbe_hw *hw, u32 *fdircmd) 
		udelay(10);

	}



	return IXGBE_ERR_FDIR_CMD_INCOMPLETE;

	return -EIO;

}



/**
@@ -1155,7 +1154,7 @@ s32 ixgbe_reinit_fdir_tables_82599(struct ixgbe_hw *hw) 
	}

	if (i >= IXGBE_FDIR_INIT_DONE_POLL) {

		hw_dbg(hw, "Flow Director Signature poll time exceeded!\n");

		return IXGBE_ERR_FDIR_REINIT_FAILED;

		return -EIO;

	}



	/* Clear FDIR statistics registers (read to clear) */
@@ -1387,7 +1386,7 @@ s32 ixgbe_fdir_add_signature_filter_82599(struct ixgbe_hw *hw, 
		break;

	default:

		hw_dbg(hw, " Error on flow type input\n");

		return IXGBE_ERR_CONFIG;

		return -EIO;

	}



	/* configure FDIRCMD register */
@@ -1546,7 +1545,7 @@ s32 ixgbe_fdir_set_input_mask_82599(struct ixgbe_hw *hw, 
		break;

	default:

		hw_dbg(hw, " Error on vm pool mask\n");

		return IXGBE_ERR_CONFIG;

		return -EIO;

	}



	switch (input_mask->formatted.flow_type & IXGBE_ATR_L4TYPE_MASK) {
@@ -1555,14 +1554,14 @@ s32 ixgbe_fdir_set_input_mask_82599(struct ixgbe_hw *hw, 
		if (input_mask->formatted.dst_port ||

		    input_mask->formatted.src_port) {

			hw_dbg(hw, " Error on src/dst port mask\n");

			return IXGBE_ERR_CONFIG;

			return -EIO;

		}

		break;

	case IXGBE_ATR_L4TYPE_MASK:

		break;

	default:

		hw_dbg(hw, " Error on flow type mask\n");

		return IXGBE_ERR_CONFIG;

		return -EIO;

	}



	switch (ntohs(input_mask->formatted.vlan_id) & 0xEFFF) {
@@ -1583,7 +1582,7 @@ s32 ixgbe_fdir_set_input_mask_82599(struct ixgbe_hw *hw, 
		break;

	default:

		hw_dbg(hw, " Error on VLAN mask\n");

		return IXGBE_ERR_CONFIG;

		return -EIO;

	}



	switch ((__force u16)input_mask->formatted.flex_bytes & 0xFFFF) {
@@ -1595,7 +1594,7 @@ s32 ixgbe_fdir_set_input_mask_82599(struct ixgbe_hw *hw, 
		break;

	default:

		hw_dbg(hw, " Error on flexible byte mask\n");

		return IXGBE_ERR_CONFIG;

		return -EIO;

	}



	/* Now mask VM pool and destination IPv6 - bits 5 and 2 */
@@ -1824,7 +1823,7 @@ static s32 ixgbe_identify_phy_82599(struct ixgbe_hw *hw) 


	/* Return error if SFP module has been detected but is not supported */

	if (hw->phy.type == ixgbe_phy_sfp_unsupported)

		return IXGBE_ERR_SFP_NOT_SUPPORTED;

		return -EOPNOTSUPP;



	return status;

}
@@ -1863,13 +1862,13 @@ static s32 ixgbe_enable_rx_dma_82599(struct ixgbe_hw *hw, u32 regval) 
 *  Verifies that installed the firmware version is 0.6 or higher

 *  for SFI devices. All 82599 SFI devices should have version 0.6 or higher.

 *

 *  Returns IXGBE_ERR_EEPROM_VERSION if the FW is not present or

 *  if the FW version is not supported.

 *  Return: -EACCES if the FW is not present or if the FW version is

 *  not supported.

 **/

static s32 ixgbe_verify_fw_version_82599(struct ixgbe_hw *hw)

{

	s32 status = IXGBE_ERR_EEPROM_VERSION;

	u16 fw_offset, fw_ptp_cfg_offset;

	s32 status = -EACCES;

	u16 offset;

	u16 fw_version = 0;
@@ -1883,7 +1882,7 @@ static s32 ixgbe_verify_fw_version_82599(struct ixgbe_hw *hw) 
		goto fw_version_err;



	if (fw_offset == 0 || fw_offset == 0xFFFF)

		return IXGBE_ERR_EEPROM_VERSION;

		return -EACCES;



	/* get the offset to the Pass Through Patch Configuration block */

	offset = fw_offset + IXGBE_FW_PASSTHROUGH_PATCH_CONFIG_PTR;
@@ -1891,7 +1890,7 @@ static s32 ixgbe_verify_fw_version_82599(struct ixgbe_hw *hw) 
		goto fw_version_err;



	if (fw_ptp_cfg_offset == 0 || fw_ptp_cfg_offset == 0xFFFF)

		return IXGBE_ERR_EEPROM_VERSION;

		return -EACCES;



	/* get the firmware version */

	offset = fw_ptp_cfg_offset + IXGBE_FW_PATCH_VERSION_4;
@@ -1905,7 +1904,7 @@ static s32 ixgbe_verify_fw_version_82599(struct ixgbe_hw *hw) 


fw_version_err:

	hw_err(hw, "eeprom read at offset %d failed\n", offset);

	return IXGBE_ERR_EEPROM_VERSION;

	return -EACCES;

}



/**
@@ -2038,7 +2037,7 @@ static s32 ixgbe_reset_pipeline_82599(struct ixgbe_hw *hw) 


	if (!(anlp1_reg & IXGBE_ANLP1_AN_STATE_MASK)) {

		hw_dbg(hw, "auto negotiation not completed\n");

		ret_val = IXGBE_ERR_RESET_FAILED;

		ret_val = -EIO;

		goto reset_pipeline_out;

	}
@@ -2087,7 +2086,7 @@ static s32 ixgbe_read_i2c_byte_82599(struct ixgbe_hw *hw, u8 byte_offset, 


		if (!timeout) {

			hw_dbg(hw, "Driver can't access resource, acquiring I2C bus timeout.\n");

			status = IXGBE_ERR_I2C;

			status = -EIO;

			goto release_i2c_access;

		}

	}
@@ -2141,7 +2140,7 @@ static s32 ixgbe_write_i2c_byte_82599(struct ixgbe_hw *hw, u8 byte_offset, 


		if (!timeout) {

			hw_dbg(hw, "Driver can't access resource, acquiring I2C bus timeout.\n");

			status = IXGBE_ERR_I2C;

			status = -EIO;

			goto release_i2c_access;

		}

	}