Commit 5795f533 authored by Jedrzej Jagielski's avatar Jedrzej Jagielski Committed by Tony Nguyen
Browse files

ixgbe: Refactor returning internal error codes 



Change returning codes to the kernel ones instead of
the internal ones for the entire ixgbe driver.

Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Reviewed-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarJedrzej Jagielski <jedrzej.jagielski@intel.com>
Tested-by: Sunitha Mekala <sunithax.d.mekala@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 6c1b4af8

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;

		}

	}

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

+67 −78
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ s32 ixgbe_setup_fc_generic(struct ixgbe_hw *hw) 
	 */

	if (hw->fc.strict_ieee && hw->fc.requested_mode == ixgbe_fc_rx_pause) {

		hw_dbg(hw, "ixgbe_fc_rx_pause not valid in strict IEEE mode\n");

		return IXGBE_ERR_INVALID_LINK_SETTINGS;

		return -EINVAL;

	}



	/*
@@ -215,7 +215,7 @@ s32 ixgbe_setup_fc_generic(struct ixgbe_hw *hw) 
		break;

	default:

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

		return IXGBE_ERR_CONFIG;

		return -EIO;

	}



	if (hw->mac.type != ixgbe_mac_X540) {
@@ -500,7 +500,7 @@ s32 ixgbe_read_pba_string_generic(struct ixgbe_hw *hw, u8 *pba_num, 


	if (pba_num == NULL) {

		hw_dbg(hw, "PBA string buffer was null\n");

		return IXGBE_ERR_INVALID_ARGUMENT;

		return -EINVAL;

	}



	ret_val = hw->eeprom.ops.read(hw, IXGBE_PBANUM0_PTR, &data);
@@ -526,7 +526,7 @@ s32 ixgbe_read_pba_string_generic(struct ixgbe_hw *hw, u8 *pba_num, 
		/* we will need 11 characters to store the PBA */

		if (pba_num_size < 11) {

			hw_dbg(hw, "PBA string buffer too small\n");

			return IXGBE_ERR_NO_SPACE;

			return -ENOSPC;

		}



		/* extract hex string from data and pba_ptr */
@@ -563,13 +563,13 @@ s32 ixgbe_read_pba_string_generic(struct ixgbe_hw *hw, u8 *pba_num, 


	if (length == 0xFFFF || length == 0) {

		hw_dbg(hw, "NVM PBA number section invalid length\n");

		return IXGBE_ERR_PBA_SECTION;

		return -EIO;

	}



	/* check if pba_num buffer is big enough */

	if (pba_num_size  < (((u32)length * 2) - 1)) {

		hw_dbg(hw, "PBA string buffer too small\n");

		return IXGBE_ERR_NO_SPACE;

		return -ENOSPC;

	}



	/* trim pba length from start of string */
@@ -805,7 +805,7 @@ s32 ixgbe_led_on_generic(struct ixgbe_hw *hw, u32 index) 
	u32 led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);



	if (index > 3)

		return IXGBE_ERR_PARAM;

		return -EINVAL;



	/* To turn on the LED, set mode to ON. */

	led_reg &= ~IXGBE_LED_MODE_MASK(index);
@@ -826,7 +826,7 @@ s32 ixgbe_led_off_generic(struct ixgbe_hw *hw, u32 index) 
	u32 led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);



	if (index > 3)

		return IXGBE_ERR_PARAM;

		return -EINVAL;



	/* To turn off the LED, set mode to OFF. */

	led_reg &= ~IXGBE_LED_MODE_MASK(index);
@@ -903,11 +903,8 @@ s32 ixgbe_write_eeprom_buffer_bit_bang_generic(struct ixgbe_hw *hw, u16 offset, 


	hw->eeprom.ops.init_params(hw);



	if (words == 0)

		return IXGBE_ERR_INVALID_ARGUMENT;



	if (offset + words > hw->eeprom.word_size)

		return IXGBE_ERR_EEPROM;

	if (words == 0 || (offset + words > hw->eeprom.word_size))

		return -EINVAL;



	/*

	 * The EEPROM page size cannot be queried from the chip. We do lazy
@@ -961,7 +958,7 @@ static s32 ixgbe_write_eeprom_buffer_bit_bang(struct ixgbe_hw *hw, u16 offset, 


	if (ixgbe_ready_eeprom(hw) != 0) {

		ixgbe_release_eeprom(hw);

		return IXGBE_ERR_EEPROM;

		return -EIO;

	}



	for (i = 0; i < words; i++) {
@@ -1027,7 +1024,7 @@ s32 ixgbe_write_eeprom_generic(struct ixgbe_hw *hw, u16 offset, u16 data) 
	hw->eeprom.ops.init_params(hw);



	if (offset >= hw->eeprom.word_size)

		return IXGBE_ERR_EEPROM;

		return -EINVAL;



	return ixgbe_write_eeprom_buffer_bit_bang(hw, offset, 1, &data);

}
@@ -1049,11 +1046,8 @@ s32 ixgbe_read_eeprom_buffer_bit_bang_generic(struct ixgbe_hw *hw, u16 offset, 


	hw->eeprom.ops.init_params(hw);



	if (words == 0)

		return IXGBE_ERR_INVALID_ARGUMENT;



	if (offset + words > hw->eeprom.word_size)

		return IXGBE_ERR_EEPROM;

	if (words == 0 || (offset + words > hw->eeprom.word_size))

		return -EINVAL;



	/*

	 * We cannot hold synchronization semaphores for too long
@@ -1098,7 +1092,7 @@ static s32 ixgbe_read_eeprom_buffer_bit_bang(struct ixgbe_hw *hw, u16 offset, 


	if (ixgbe_ready_eeprom(hw) != 0) {

		ixgbe_release_eeprom(hw);

		return IXGBE_ERR_EEPROM;

		return -EIO;

	}



	for (i = 0; i < words; i++) {
@@ -1141,7 +1135,7 @@ s32 ixgbe_read_eeprom_bit_bang_generic(struct ixgbe_hw *hw, u16 offset, 
	hw->eeprom.ops.init_params(hw);



	if (offset >= hw->eeprom.word_size)

		return IXGBE_ERR_EEPROM;

		return -EINVAL;



	return ixgbe_read_eeprom_buffer_bit_bang(hw, offset, 1, data);

}
@@ -1164,11 +1158,8 @@ s32 ixgbe_read_eerd_buffer_generic(struct ixgbe_hw *hw, u16 offset, 


	hw->eeprom.ops.init_params(hw);



	if (words == 0)

		return IXGBE_ERR_INVALID_ARGUMENT;



	if (offset >= hw->eeprom.word_size)

		return IXGBE_ERR_EEPROM;

	if (words == 0 || offset >= hw->eeprom.word_size)

		return -EINVAL;



	for (i = 0; i < words; i++) {

		eerd = ((offset + i) << IXGBE_EEPROM_RW_ADDR_SHIFT) |
@@ -1261,11 +1252,8 @@ s32 ixgbe_write_eewr_buffer_generic(struct ixgbe_hw *hw, u16 offset, 


	hw->eeprom.ops.init_params(hw);



	if (words == 0)

		return IXGBE_ERR_INVALID_ARGUMENT;



	if (offset >= hw->eeprom.word_size)

		return IXGBE_ERR_EEPROM;

	if (words == 0 || offset >= hw->eeprom.word_size)

		return -EINVAL;



	for (i = 0; i < words; i++) {

		eewr = ((offset + i) << IXGBE_EEPROM_RW_ADDR_SHIFT) |
@@ -1327,7 +1315,7 @@ static s32 ixgbe_poll_eerd_eewr_done(struct ixgbe_hw *hw, u32 ee_reg) 
		}

		udelay(5);

	}

	return IXGBE_ERR_EEPROM;

	return -EIO;

}



/**
@@ -1343,7 +1331,7 @@ static s32 ixgbe_acquire_eeprom(struct ixgbe_hw *hw) 
	u32 i;



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

		return IXGBE_ERR_SWFW_SYNC;

		return -EBUSY;



	eec = IXGBE_READ_REG(hw, IXGBE_EEC(hw));
@@ -1365,7 +1353,7 @@ static s32 ixgbe_acquire_eeprom(struct ixgbe_hw *hw) 
		hw_dbg(hw, "Could not acquire EEPROM grant\n");



		hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);

		return IXGBE_ERR_EEPROM;

		return -EIO;

	}



	/* Setup EEPROM for Read/Write */
@@ -1418,7 +1406,7 @@ static s32 ixgbe_get_eeprom_semaphore(struct ixgbe_hw *hw) 
		swsm = IXGBE_READ_REG(hw, IXGBE_SWSM(hw));

		if (swsm & IXGBE_SWSM_SMBI) {

			hw_dbg(hw, "Software semaphore SMBI between device drivers not granted.\n");

			return IXGBE_ERR_EEPROM;

			return -EIO;

		}

	}
@@ -1446,7 +1434,7 @@ static s32 ixgbe_get_eeprom_semaphore(struct ixgbe_hw *hw) 
	if (i >= timeout) {

		hw_dbg(hw, "SWESMBI Software EEPROM semaphore not granted.\n");

		ixgbe_release_eeprom_semaphore(hw);

		return IXGBE_ERR_EEPROM;

		return -EIO;

	}



	return 0;
@@ -1502,7 +1490,7 @@ static s32 ixgbe_ready_eeprom(struct ixgbe_hw *hw) 
	 */

	if (i >= IXGBE_EEPROM_MAX_RETRY_SPI) {

		hw_dbg(hw, "SPI EEPROM Status error\n");

		return IXGBE_ERR_EEPROM;

		return -EIO;

	}



	return 0;
@@ -1714,7 +1702,7 @@ s32 ixgbe_calc_eeprom_checksum_generic(struct ixgbe_hw *hw) 
	for (i = IXGBE_PCIE_ANALOG_PTR; i < IXGBE_FW_PTR; i++) {

		if (hw->eeprom.ops.read(hw, i, &pointer)) {

			hw_dbg(hw, "EEPROM read failed\n");

			return IXGBE_ERR_EEPROM;

			return -EIO;

		}



		/* If the pointer seems invalid */
@@ -1723,7 +1711,7 @@ s32 ixgbe_calc_eeprom_checksum_generic(struct ixgbe_hw *hw) 


		if (hw->eeprom.ops.read(hw, pointer, &length)) {

			hw_dbg(hw, "EEPROM read failed\n");

			return IXGBE_ERR_EEPROM;

			return -EIO;

		}



		if (length == 0xFFFF || length == 0)
@@ -1732,7 +1720,7 @@ s32 ixgbe_calc_eeprom_checksum_generic(struct ixgbe_hw *hw) 
		for (j = pointer + 1; j <= pointer + length; j++) {

			if (hw->eeprom.ops.read(hw, j, &word)) {

				hw_dbg(hw, "EEPROM read failed\n");

				return IXGBE_ERR_EEPROM;

				return -EIO;

			}

			checksum += word;

		}
@@ -1785,7 +1773,7 @@ s32 ixgbe_validate_eeprom_checksum_generic(struct ixgbe_hw *hw, 
	 * calculated checksum

	 */

	if (read_checksum != checksum)

		status = IXGBE_ERR_EEPROM_CHECKSUM;

		status = -EIO;



	/* If the user cares, return the calculated checksum */

	if (checksum_val)
@@ -1844,7 +1832,7 @@ s32 ixgbe_set_rar_generic(struct ixgbe_hw *hw, u32 index, u8 *addr, u32 vmdq, 
	/* Make sure we are using a valid rar index range */

	if (index >= rar_entries) {

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

		return IXGBE_ERR_INVALID_ARGUMENT;

		return -EINVAL;

	}



	/* setup VMDq pool selection before this RAR gets enabled */
@@ -1896,7 +1884,7 @@ s32 ixgbe_clear_rar_generic(struct ixgbe_hw *hw, u32 index) 
	/* Make sure we are using a valid rar index range */

	if (index >= rar_entries) {

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

		return IXGBE_ERR_INVALID_ARGUMENT;

		return -EINVAL;

	}



	/*
@@ -2145,7 +2133,7 @@ s32 ixgbe_fc_enable_generic(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++) {
@@ -2154,7 +2142,7 @@ s32 ixgbe_fc_enable_generic(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;

			}

		}

	}
@@ -2211,7 +2199,7 @@ s32 ixgbe_fc_enable_generic(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. */
@@ -2268,7 +2256,7 @@ s32 ixgbe_negotiate_fc(struct ixgbe_hw *hw, u32 adv_reg, u32 lp_reg, 
		       u32 adv_sym, u32 adv_asm, u32 lp_sym, u32 lp_asm)

{

	if ((!(adv_reg)) ||  (!(lp_reg)))

		return IXGBE_ERR_FC_NOT_NEGOTIATED;

		return -EINVAL;



	if ((adv_reg & adv_sym) && (lp_reg & lp_sym)) {

		/*
@@ -2320,7 +2308,7 @@ static s32 ixgbe_fc_autoneg_fiber(struct ixgbe_hw *hw) 
	linkstat = IXGBE_READ_REG(hw, IXGBE_PCS1GLSTA);

	if ((!!(linkstat & IXGBE_PCS1GLSTA_AN_COMPLETE) == 0) ||

	    (!!(linkstat & IXGBE_PCS1GLSTA_AN_TIMED_OUT) == 1))

		return IXGBE_ERR_FC_NOT_NEGOTIATED;

		return -EIO;



	pcs_anadv_reg = IXGBE_READ_REG(hw, IXGBE_PCS1GANA);

	pcs_lpab_reg = IXGBE_READ_REG(hw, IXGBE_PCS1GANLP);
@@ -2352,12 +2340,12 @@ static s32 ixgbe_fc_autoneg_backplane(struct ixgbe_hw *hw) 
	 */

	links = IXGBE_READ_REG(hw, IXGBE_LINKS);

	if ((links & IXGBE_LINKS_KX_AN_COMP) == 0)

		return IXGBE_ERR_FC_NOT_NEGOTIATED;

		return -EIO;



	if (hw->mac.type == ixgbe_mac_82599EB) {

		links2 = IXGBE_READ_REG(hw, IXGBE_LINKS2);

		if ((links2 & IXGBE_LINKS2_AN_SUPPORTED) == 0)

			return IXGBE_ERR_FC_NOT_NEGOTIATED;

			return -EIO;

	}

	/*

	 * Read the 10g AN autoc and LP ability registers and resolve
@@ -2406,8 +2394,8 @@ static s32 ixgbe_fc_autoneg_copper(struct ixgbe_hw *hw) 
 **/

void ixgbe_fc_autoneg(struct ixgbe_hw *hw)

{

	s32 ret_val = IXGBE_ERR_FC_NOT_NEGOTIATED;

	ixgbe_link_speed speed;

	s32 ret_val = -EIO;

	bool link_up;



	/*
@@ -2509,7 +2497,7 @@ static u32 ixgbe_pcie_timeout_poll(struct ixgbe_hw *hw) 
 *  @hw: pointer to hardware structure

 *

 *  Disables PCI-Express primary access and verifies there are no pending

 *  requests. IXGBE_ERR_PRIMARY_REQUESTS_PENDING is returned if primary disable

 *  requests. -EALREADY is returned if primary disable

 *  bit hasn't caused the primary requests to be disabled, else 0

 *  is returned signifying primary requests disabled.

 **/
@@ -2574,7 +2562,7 @@ static s32 ixgbe_disable_pcie_primary(struct ixgbe_hw *hw) 
	}



	hw_dbg(hw, "PCIe transaction pending bit also did not clear.\n");

	return IXGBE_ERR_PRIMARY_REQUESTS_PENDING;

	return -EALREADY;

}



/**
@@ -2599,7 +2587,7 @@ s32 ixgbe_acquire_swfw_sync(struct ixgbe_hw *hw, u32 mask) 
		 * SW_FW_SYNC bits (not just NVM)

		 */

		if (ixgbe_get_eeprom_semaphore(hw))

			return IXGBE_ERR_SWFW_SYNC;

			return -EBUSY;



		gssr = IXGBE_READ_REG(hw, IXGBE_GSSR);

		if (!(gssr & (fwmask | swmask))) {
@@ -2619,7 +2607,7 @@ s32 ixgbe_acquire_swfw_sync(struct ixgbe_hw *hw, u32 mask) 
		ixgbe_release_swfw_sync(hw, gssr & (fwmask | swmask));



	usleep_range(5000, 10000);

	return IXGBE_ERR_SWFW_SYNC;

	return -EBUSY;

}



/**
@@ -2756,7 +2744,7 @@ s32 ixgbe_blink_led_start_generic(struct ixgbe_hw *hw, u32 index) 
	s32 ret_val;



	if (index > 3)

		return IXGBE_ERR_PARAM;

		return -EINVAL;



	/*

	 * Link must be up to auto-blink the LEDs;
@@ -2802,7 +2790,7 @@ s32 ixgbe_blink_led_stop_generic(struct ixgbe_hw *hw, u32 index) 
	s32 ret_val;



	if (index > 3)

		return IXGBE_ERR_PARAM;

		return -EINVAL;



	ret_val = hw->mac.ops.prot_autoc_read(hw, &locked, &autoc_reg);

	if (ret_val)
@@ -2962,7 +2950,7 @@ s32 ixgbe_clear_vmdq_generic(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;

	}



	mpsar_lo = IXGBE_READ_REG(hw, IXGBE_MPSAR_LO(rar));
@@ -3013,7 +3001,7 @@ s32 ixgbe_set_vmdq_generic(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;

	}



	if (vmdq < 32) {
@@ -3090,7 +3078,7 @@ static s32 ixgbe_find_vlvf_slot(struct ixgbe_hw *hw, u32 vlan, bool vlvf_bypass) 
	 * will simply bypass the VLVF if there are no entries present in the

	 * VLVF that contain our VLAN

	 */

	first_empty_slot = vlvf_bypass ? IXGBE_ERR_NO_SPACE : 0;

	first_empty_slot = vlvf_bypass ? -ENOSPC : 0;



	/* add VLAN enable bit for comparison */

	vlan |= IXGBE_VLVF_VIEN;
@@ -3114,7 +3102,7 @@ static s32 ixgbe_find_vlvf_slot(struct ixgbe_hw *hw, u32 vlan, bool vlvf_bypass) 
	if (!first_empty_slot)

		hw_dbg(hw, "No space in VLVF.\n");



	return first_empty_slot ? : IXGBE_ERR_NO_SPACE;

	return first_empty_slot ? : -ENOSPC;

}



/**
@@ -3134,7 +3122,7 @@ s32 ixgbe_set_vfta_generic(struct ixgbe_hw *hw, u32 vlan, u32 vind, 
	s32 vlvf_index;



	if ((vlan > 4095) || (vind > 63))

		return IXGBE_ERR_PARAM;

		return -EINVAL;



	/*

	 * this is a 2 part operation - first the VFTA, then the
@@ -3610,7 +3598,8 @@ u8 ixgbe_calculate_checksum(u8 *buffer, u32 length) 
 *

 *  Communicates with the manageability block. On success return 0

 *  else returns semaphore error when encountering an error acquiring

 *  semaphore or IXGBE_ERR_HOST_INTERFACE_COMMAND when command fails.

 *  semaphore, -EINVAL when incorrect parameters passed or -EIO when

 *  command fails.

 *

 *  This function assumes that the IXGBE_GSSR_SW_MNG_SM semaphore is held

 *  by the caller.
@@ -3623,7 +3612,7 @@ s32 ixgbe_hic_unlocked(struct ixgbe_hw *hw, u32 *buffer, u32 length, 


	if (!length || length > IXGBE_HI_MAX_BLOCK_BYTE_LENGTH) {

		hw_dbg(hw, "Buffer length failure buffersize-%d.\n", length);

		return IXGBE_ERR_HOST_INTERFACE_COMMAND;

		return -EINVAL;

	}



	/* Set bit 9 of FWSTS clearing FW reset indication */
@@ -3634,13 +3623,13 @@ s32 ixgbe_hic_unlocked(struct ixgbe_hw *hw, u32 *buffer, u32 length, 
	hicr = IXGBE_READ_REG(hw, IXGBE_HICR);

	if (!(hicr & IXGBE_HICR_EN)) {

		hw_dbg(hw, "IXGBE_HOST_EN bit disabled.\n");

		return IXGBE_ERR_HOST_INTERFACE_COMMAND;

		return -EIO;

	}



	/* Calculate length in DWORDs. We must be DWORD aligned */

	if (length % sizeof(u32)) {

		hw_dbg(hw, "Buffer length failure, not aligned to dword");

		return IXGBE_ERR_INVALID_ARGUMENT;

		return -EINVAL;

	}



	dword_len = length >> 2;
@@ -3665,7 +3654,7 @@ s32 ixgbe_hic_unlocked(struct ixgbe_hw *hw, u32 *buffer, u32 length, 
	/* Check command successful completion. */

	if ((timeout && i == timeout) ||

	    !(IXGBE_READ_REG(hw, IXGBE_HICR) & IXGBE_HICR_SV))

		return IXGBE_ERR_HOST_INTERFACE_COMMAND;

		return -EIO;



	return 0;

}
@@ -3685,7 +3674,7 @@ s32 ixgbe_hic_unlocked(struct ixgbe_hw *hw, u32 *buffer, u32 length, 
 *  in these cases.

 *

 *  Communicates with the manageability block.  On success return 0

 *  else return IXGBE_ERR_HOST_INTERFACE_COMMAND.

 *  else return -EIO or -EINVAL.

 **/

s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, void *buffer,

				 u32 length, u32 timeout,
@@ -3700,7 +3689,7 @@ s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, void *buffer, 


	if (!length || length > IXGBE_HI_MAX_BLOCK_BYTE_LENGTH) {

		hw_dbg(hw, "Buffer length failure buffersize-%d.\n", length);

		return IXGBE_ERR_HOST_INTERFACE_COMMAND;

		return -EINVAL;

	}

	/* Take management host interface semaphore */

	status = hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_SW_MNG_SM);
@@ -3730,7 +3719,7 @@ s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, void *buffer, 


	if (length < round_up(buf_len, 4) + hdr_size) {

		hw_dbg(hw, "Buffer not large enough for reply message.\n");

		status = IXGBE_ERR_HOST_INTERFACE_COMMAND;

		status = -EIO;

		goto rel_out;

	}
@@ -3761,8 +3750,8 @@ s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, void *buffer, 
 *

 *  Sends driver version number to firmware through the manageability

 *  block.  On success return 0

 *  else returns IXGBE_ERR_SWFW_SYNC when encountering an error acquiring

 *  semaphore or IXGBE_ERR_HOST_INTERFACE_COMMAND when command fails.

 *  else returns -EBUSY when encountering an error acquiring

 *  semaphore or -EIO when command fails.

 **/

s32 ixgbe_set_fw_drv_ver_generic(struct ixgbe_hw *hw, u8 maj, u8 min,

				 u8 build, u8 sub, __always_unused u16 len,
@@ -3798,7 +3787,7 @@ s32 ixgbe_set_fw_drv_ver_generic(struct ixgbe_hw *hw, u8 maj, u8 min, 
		    FW_CEM_RESP_STATUS_SUCCESS)

			ret_val = 0;

		else

			ret_val = IXGBE_ERR_HOST_INTERFACE_COMMAND;

			ret_val = -EIO;



		break;

	}
@@ -3896,14 +3885,14 @@ static s32 ixgbe_get_ets_data(struct ixgbe_hw *hw, u16 *ets_cfg, 
		return status;



	if ((*ets_offset == 0x0000) || (*ets_offset == 0xFFFF))

		return IXGBE_NOT_IMPLEMENTED;

		return -EOPNOTSUPP;



	status = hw->eeprom.ops.read(hw, *ets_offset, ets_cfg);

	if (status)

		return status;



	if ((*ets_cfg & IXGBE_ETS_TYPE_MASK) != IXGBE_ETS_TYPE_EMC_SHIFTED)

		return IXGBE_NOT_IMPLEMENTED;

		return -EOPNOTSUPP;



	return 0;

}
@@ -3926,7 +3915,7 @@ s32 ixgbe_get_thermal_sensor_data_generic(struct ixgbe_hw *hw) 


	/* Only support thermal sensors attached to physical port 0 */

	if ((IXGBE_READ_REG(hw, IXGBE_STATUS) & IXGBE_STATUS_LAN_ID_1))

		return IXGBE_NOT_IMPLEMENTED;

		return -EOPNOTSUPP;



	status = ixgbe_get_ets_data(hw, &ets_cfg, &ets_offset);

	if (status)
@@ -3986,7 +3975,7 @@ s32 ixgbe_init_thermal_sensor_thresh_generic(struct ixgbe_hw *hw) 


	/* Only support thermal sensors attached to physical port 0 */

	if ((IXGBE_READ_REG(hw, IXGBE_STATUS) & IXGBE_STATUS_LAN_ID_1))

		return IXGBE_NOT_IMPLEMENTED;

		return -EOPNOTSUPP;



	status = ixgbe_get_ets_data(hw, &ets_cfg, &ets_offset);

	if (status)

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

+1 −1
Original line number Diff line number Diff line
@@ -3372,7 +3372,7 @@ static int ixgbe_get_module_eeprom(struct net_device *dev, 
{

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	struct ixgbe_hw *hw = &adapter->hw;

	s32 status = IXGBE_ERR_PHY_ADDR_INVALID;

	s32 status = -EFAULT;

	u8 databyte = 0xFF;

	int i = 0;

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

+13 −13
Original line number Diff line number Diff line
@@ -5510,7 +5510,7 @@ static int ixgbe_non_sfp_link_config(struct ixgbe_hw *hw) 
{

	u32 speed;

	bool autoneg, link_up = false;

	int ret = IXGBE_ERR_LINK_SETUP;

	int ret = -EIO;



	if (hw->mac.ops.check_link)

		ret = hw->mac.ops.check_link(hw, &speed, &link_up, false);
@@ -5981,13 +5981,13 @@ void ixgbe_reset(struct ixgbe_adapter *adapter) 
	err = hw->mac.ops.init_hw(hw);

	switch (err) {

	case 0:

	case IXGBE_ERR_SFP_NOT_PRESENT:

	case IXGBE_ERR_SFP_NOT_SUPPORTED:

	case -ENOENT:

	case -EOPNOTSUPP:

		break;

	case IXGBE_ERR_PRIMARY_REQUESTS_PENDING:

	case -EALREADY:

		e_dev_err("primary disable timed out\n");

		break;

	case IXGBE_ERR_EEPROM_VERSION:

	case -EACCES:

		/* We are running on a pre-production device, log a warning */

		e_dev_warn("This device is a pre-production adapter/LOM. "

			   "Please be aware there may be issues associated with "
@@ -7827,10 +7827,10 @@ static void ixgbe_sfp_detection_subtask(struct ixgbe_adapter *adapter) 
	adapter->sfp_poll_time = jiffies + IXGBE_SFP_POLL_JIFFIES - 1;



	err = hw->phy.ops.identify_sfp(hw);

	if (err == IXGBE_ERR_SFP_NOT_SUPPORTED)

	if (err == -EOPNOTSUPP)

		goto sfp_out;



	if (err == IXGBE_ERR_SFP_NOT_PRESENT) {

	if (err == -ENOENT) {

		/* If no cable is present, then we need to reset

		 * the next time we find a good cable. */

		adapter->flags2 |= IXGBE_FLAG2_SFP_NEEDS_RESET;
@@ -7856,7 +7856,7 @@ static void ixgbe_sfp_detection_subtask(struct ixgbe_adapter *adapter) 
	else

		err = hw->mac.ops.setup_sfp(hw);



	if (err == IXGBE_ERR_SFP_NOT_SUPPORTED)

	if (err == -EOPNOTSUPP)

		goto sfp_out;



	adapter->flags |= IXGBE_FLAG_NEED_LINK_CONFIG;
@@ -7865,8 +7865,8 @@ static void ixgbe_sfp_detection_subtask(struct ixgbe_adapter *adapter) 
sfp_out:

	clear_bit(__IXGBE_IN_SFP_INIT, &adapter->state);



	if ((err == IXGBE_ERR_SFP_NOT_SUPPORTED) &&

	    (adapter->netdev->reg_state == NETREG_REGISTERED)) {

	if (err == -EOPNOTSUPP &&

	    adapter->netdev->reg_state == NETREG_REGISTERED) {

		e_dev_err("failed to initialize because an unsupported "

			  "SFP+ module type was detected.\n");

		e_dev_err("Reload the driver after installing a "
@@ -10918,9 +10918,9 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	err = hw->mac.ops.reset_hw(hw);

	hw->phy.reset_if_overtemp = false;

	ixgbe_set_eee_capable(adapter);

	if (err == IXGBE_ERR_SFP_NOT_PRESENT) {

	if (err == -ENOENT) {

		err = 0;

	} else if (err == IXGBE_ERR_SFP_NOT_SUPPORTED) {

	} else if (err == -EOPNOTSUPP) {

		e_dev_err("failed to load because an unsupported SFP+ or QSFP module type was detected.\n");

		e_dev_err("Reload the driver after installing a supported module.\n");

		goto err_sw_init;
@@ -11139,7 +11139,7 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	/* reset the hardware with the new settings */

	err = hw->mac.ops.start_hw(hw);

	if (err == IXGBE_ERR_EEPROM_VERSION) {

	if (err == -EACCES) {

		/* We are running on a pre-production device, log a warning */

		e_dev_warn("This device is a pre-production adapter/LOM. "

			   "Please be aware there may be issues associated "