Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4988410f authored by Jayaprakash Shanmugam's avatar Jayaprakash Shanmugam Committed by Jeff Kirsher
Browse files

i40e: Retry AQC GetPhyAbilities to overcome I2CRead hangs 



- When the I2C is busy, the PHY reads are delayed.  The firmware will
  return EGAIN in these cases with an expectation that the SW will
  trigger the reads again
- This patch retries the operation for a maximum period of 500ms

Signed-off-by: default avatarJayaprakash Shanmugam <jayaprakash.shanmugam@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent b861fb76

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

+29 −13
Original line number Diff line number Diff line
@@ -1567,10 +1567,12 @@ i40e_status i40e_aq_get_phy_capabilities(struct i40e_hw *hw, 
	struct i40e_aq_desc desc;

	i40e_status status;

	u16 abilities_size = sizeof(struct i40e_aq_get_phy_abilities_resp);

	u16 max_delay = I40E_MAX_PHY_TIMEOUT, total_delay = 0;



	if (!abilities)

		return I40E_ERR_PARAM;



	do {

		i40e_fill_default_direct_cmd_desc(&desc,

					       i40e_aqc_opc_get_phy_abilities);
@@ -1586,11 +1588,25 @@ i40e_status i40e_aq_get_phy_capabilities(struct i40e_hw *hw, 
			desc.params.external.param0 |=

			cpu_to_le32(I40E_AQ_PHY_REPORT_INITIAL_VALUES);



	status = i40e_asq_send_command(hw, &desc, abilities, abilities_size,

				       cmd_details);

		status = i40e_asq_send_command(hw, &desc, abilities,

					       abilities_size, cmd_details);



		if (status)

			break;



	if (hw->aq.asq_last_status == I40E_AQ_RC_EIO)

		if (hw->aq.asq_last_status == I40E_AQ_RC_EIO) {

			status = I40E_ERR_UNKNOWN_PHY;

			break;

		} else if (hw->aq.asq_last_status == I40E_AQ_RC_EAGAIN) {

			usleep_range(1000, 2000);

			total_delay++;

			status = I40E_ERR_TIMEOUT;

		}

	} while ((hw->aq.asq_last_status != I40E_AQ_RC_OK) &&

		 (total_delay < max_delay));



	if (status)

		return status;



	if (report_init) {

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

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

+3 −0
Original line number Diff line number Diff line
@@ -46,6 +46,9 @@ 
/* Max default timeout in ms, */

#define I40E_MAX_NVM_TIMEOUT		18000



/* Max timeout in ms for the phy to respond */

#define I40E_MAX_PHY_TIMEOUT		500



/* Switch from ms to the 1usec global time (this is the GTIME resolution) */

#define I40E_MS_TO_GTIME(time)		((time) * 1000)

drivers/net/ethernet/intel/i40evf/i40e_type.h

+3 −0
Original line number Diff line number Diff line
@@ -46,6 +46,9 @@ 
/* Max default timeout in ms, */

#define I40E_MAX_NVM_TIMEOUT		18000



/* Max timeout in ms for the phy to respond */

#define I40E_MAX_PHY_TIMEOUT		500



/* Switch from ms to the 1usec global time (this is the GTIME resolution) */

#define I40E_MS_TO_GTIME(time)		((time) * 1000)