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

Commit 55a2a28b authored by Dawid Lukwinski's avatar Dawid Lukwinski Committed by Greg Kroah-Hartman
Browse files

i40e: Fix erroneous adapter reinitialization during recovery process 



[ Upstream commit f838a63369818faadec4ad1736cfbd20ab5da00e ]

Fix an issue when driver incorrectly detects state
of recovery process and erroneously reinitializes interrupts,
which results in a kernel error and call trace message.

The issue was caused by a combination of two factors:
1. Assuming the EMP reset issued after completing
firmware recovery means the whole recovery process is complete.
2. Erroneous reinitialization of interrupt vector after detecting
the above mentioned EMP reset.

Fixes (1) by changing how recovery state change is detected
and (2) by adjusting the conditional expression to ensure using proper
interrupt reinitialization method, depending on the situation.

Fixes: 4ff0ee1a ("i40e: Introduce recovery mode support")
Signed-off-by: default avatarDawid Lukwinski <dawid.lukwinski@intel.com>
Signed-off-by: default avatarJan Sokolowski <jan.sokolowski@intel.com>
Tested-by: default avatarKonrad Jankowski <konrad0.jankowski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Link: https://lore.kernel.org/r/20220715214542.2968762-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d88d59fa

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

+5 −8
Original line number Diff line number Diff line
@@ -10068,7 +10068,7 @@ static int i40e_reset(struct i40e_pf *pf) 
 **/

static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired)

{

	int old_recovery_mode_bit = test_bit(__I40E_RECOVERY_MODE, pf->state);

	const bool is_recovery_mode_reported = i40e_check_recovery_mode(pf);

	struct i40e_vsi *vsi = pf->vsi[pf->lan_vsi];

	struct i40e_hw *hw = &pf->hw;

	i40e_status ret;
@@ -10076,13 +10076,11 @@ static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired) 
	int v;



	if (test_bit(__I40E_EMP_RESET_INTR_RECEIVED, pf->state) &&

	    i40e_check_recovery_mode(pf)) {

	    is_recovery_mode_reported)

		i40e_set_ethtool_ops(pf->vsi[pf->lan_vsi]->netdev);

	}



	if (test_bit(__I40E_DOWN, pf->state) &&

	    !test_bit(__I40E_RECOVERY_MODE, pf->state) &&

	    !old_recovery_mode_bit)

	    !test_bit(__I40E_RECOVERY_MODE, pf->state))

		goto clear_recovery;

	dev_dbg(&pf->pdev->dev, "Rebuilding internal switch\n");
@@ -10109,13 +10107,12 @@ static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired) 
	 * accordingly with regard to resources initialization

	 * and deinitialization

	 */

	if (test_bit(__I40E_RECOVERY_MODE, pf->state) ||

	    old_recovery_mode_bit) {

	if (test_bit(__I40E_RECOVERY_MODE, pf->state)) {

		if (i40e_get_capabilities(pf,

					  i40e_aqc_opc_list_func_capabilities))

			goto end_unlock;



		if (test_bit(__I40E_RECOVERY_MODE, pf->state)) {

		if (is_recovery_mode_reported) {

			/* we're staying in recovery mode so we'll reinitialize

			 * misc vector here

			 */