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

Commit 5f9116ac authored by Shannon Nelson's avatar Shannon Nelson Committed by Jeff Kirsher
Browse files

i40e: move PF ID init from PF reset to SC init 



Move PF ID initialization code from PF reset routine to earlier driver
initialization function.  There are a few operations which need the
PF ID before the first PF reset is called.

Change-Id: I7e971f7556b46a837149850ec05ce115c35db575
Signed-off-by: default avatarKamil Krawczyk <kamil.krawczyk@intel.com>
Signed-off-by: default avatarShannon Nelson <shannon.nelson@intel.com>
Tested-by: default avatarKavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent af9810ea

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

+7 −7
Original line number Diff line number Diff line
@@ -198,6 +198,13 @@ i40e_status i40e_init_shared_code(struct i40e_hw *hw) 
		break;

	}



	/* Determine the PF number based on the PCI fn */

	reg = rd32(hw, I40E_GLPCI_CAPSUP);

	if (reg & I40E_GLPCI_CAPSUP_ARI_EN_MASK)

		hw->pf_id = (u8)((hw->bus.device << 3) | hw->bus.func);

	else

		hw->pf_id = (u8)hw->bus.func;



	status = i40e_init_nvm(hw);

	return status;

}
@@ -375,13 +382,6 @@ i40e_status i40e_pf_reset(struct i40e_hw *hw) 
		return I40E_ERR_RESET_FAILED;

	}



	/* Determine the PF number based on the PCI fn */

	reg = rd32(hw, I40E_GLPCI_CAPSUP);

	if (reg & I40E_GLPCI_CAPSUP_ARI_EN_MASK)

		hw->pf_id = (u8)((hw->bus.device << 3) | hw->bus.func);

	else

		hw->pf_id = (u8)hw->bus.func;



	/* If there was a Global Reset in progress when we got here,

	 * we don't need to do the PF Reset

	 */