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

Commit 94075bb1 authored by Filip Sadowski's avatar Filip Sadowski Committed by Jeff Kirsher
Browse files

i40e: Fix FLR reset timeout issue 



This patch allows detection of upcoming core reset in case NIC gets
stuck while performing FLR reset. The i40e_pf_reset() function returns
I40E_ERR_NOT_READY when global reset was detected.

Signed-off-by: default avatarFilip Sadowski <filip.sadowski@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent e56afa59

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

+7 −0
Original line number Diff line number Diff line
@@ -1269,6 +1269,7 @@ i40e_status i40e_pf_reset(struct i40e_hw *hw) 
	 * we don't need to do the PF Reset

	 */

	if (!cnt) {

		u32 reg2 = 0;

		if (hw->revision_id == 0)

			cnt = I40E_PF_RESET_WAIT_COUNT_A0;

		else
@@ -1280,6 +1281,12 @@ i40e_status i40e_pf_reset(struct i40e_hw *hw) 
			reg = rd32(hw, I40E_PFGEN_CTRL);

			if (!(reg & I40E_PFGEN_CTRL_PFSWR_MASK))

				break;

			reg2 = rd32(hw, I40E_GLGEN_RSTAT);

			if (reg2 & I40E_GLGEN_RSTAT_DEVSTATE_MASK) {

				hw_dbg(hw, "Core reset upcoming. Skipping PF reset request.\n");

				hw_dbg(hw, "I40E_GLGEN_RSTAT = 0x%x\n", reg2);

				return I40E_ERR_NOT_READY;

			}

			usleep_range(1000, 2000);

		}

		if (reg & I40E_PFGEN_CTRL_PFSWR_MASK) {