Commit fb4903b3 authored by Jakub Staniszewski's avatar Jakub Staniszewski Committed by Tony Nguyen
Browse files

ice: fix retry for AQ command 0x06EE 



Executing ethtool -m can fail reporting a netlink I/O error while firmware
link management holds the i2c bus used to communicate with the module.

According to Intel(R) Ethernet Controller E810 Datasheet Rev 2.8 [1]
Section 3.3.10.4 Read/Write SFF EEPROM (0x06EE)
request should to be retried upon receiving EBUSY from firmware.

Commit e9c9692c ("ice: Reimplement module reads used by ethtool")
implemented it only for part of ice_get_module_eeprom(), leaving all other
calls to ice_aq_sff_eeprom() vulnerable to returning early on getting
EBUSY without retrying.

Remove the retry loop from ice_get_module_eeprom() and add Admin Queue
(AQ) command with opcode 0x06EE to the list of commands that should be
retried on receiving EBUSY from firmware.

Cc: stable@vger.kernel.org
Fixes: e9c9692c ("ice: Reimplement module reads used by ethtool")
Signed-off-by: default avatarJakub Staniszewski <jakub.staniszewski@linux.intel.com>
Co-developed-by: default avatarDawid Osuchowski <dawid.osuchowski@linux.intel.com>
Signed-off-by: default avatarDawid Osuchowski <dawid.osuchowski@linux.intel.com>
Reviewed-by: default avatarAleksandr Loktionov <aleksandr.loktionov@intel.com>
Reviewed-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Link: https://www.intel.com/content/www/us/en/content-details/613875/intel-ethernet-controller-e810-datasheet.html

 [1]
Reviewed-by: default avatarPaul Menzel <pmenzel@molgen.mpg.de>
Tested-by: Rinitha S <sx.rinitha@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 326256c0

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

+1 −0
Original line number Diff line number Diff line
@@ -1816,6 +1816,7 @@ static bool ice_should_retry_sq_send_cmd(u16 opcode) 
	case ice_aqc_opc_lldp_stop:

	case ice_aqc_opc_lldp_start:

	case ice_aqc_opc_lldp_filter_ctrl:

	case ice_aqc_opc_sff_eeprom:

		return true;

	}

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

+14 −21
Original line number Diff line number Diff line
@@ -4509,7 +4509,7 @@ ice_get_module_eeprom(struct net_device *netdev, 
	u8 addr = ICE_I2C_EEPROM_DEV_ADDR;

	struct ice_hw *hw = &pf->hw;

	bool is_sfp = false;

	unsigned int i, j;

	unsigned int i;

	u16 offset = 0;

	u8 page = 0;

	int status;
@@ -4551,26 +4551,19 @@ ice_get_module_eeprom(struct net_device *netdev, 
		if (page == 0 || !(data[0x2] & 0x4)) {

			u32 copy_len;



			/* If i2c bus is busy due to slow page change or

			 * link management access, call can fail. This is normal.

			 * So we retry this a few times.

			 */

			for (j = 0; j < 4; j++) {

			status = ice_aq_sff_eeprom(hw, 0, addr, offset, page,

						   !is_sfp, value,

						   SFF_READ_BLOCK_SIZE,

						   0, NULL);

				netdev_dbg(netdev, "SFF %02X %02X %02X %X = %02X%02X%02X%02X.%02X%02X%02X%02X (%X)\n",

			netdev_dbg(netdev, "SFF %02X %02X %02X %X = %02X%02X%02X%02X.%02X%02X%02X%02X (%pe)\n",

				   addr, offset, page, is_sfp,

				   value[0], value[1], value[2], value[3],

				   value[4], value[5], value[6], value[7],

					   status);

				   ERR_PTR(status));

			if (status) {

					usleep_range(1500, 2500);

					memset(value, 0, SFF_READ_BLOCK_SIZE);

					continue;

				}

				break;

				netdev_err(netdev, "%s: error reading module EEPROM: status %pe\n",

					   __func__, ERR_PTR(status));

				return status;

			}



			/* Make sure we have enough room for the new block */