diff options
| author | Shannon Nelson <shannon.nelson@intel.com> | 2013-12-11 08:17:13 +0000 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2014-01-07 21:49:47 -0800 |
| commit | 5f9116ac4e6dc29e147643e0dd27dee3190c34e7 (patch) | |
| tree | d60db032925460e72a9b2eb073f00bf6f435a662 | |
| parent | af9810ea90d09336d9cc1328264d9f74e05c76a6 (diff) | |
| download | talos-obmc-linux-5f9116ac4e6dc29e147643e0dd27dee3190c34e7.tar.gz talos-obmc-linux-5f9116ac4e6dc29e147643e0dd27dee3190c34e7.zip | |
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: Kamil Krawczyk <kamil.krawczyk@intel.com>
Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| -rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_common.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c index 96c8f150009e..02ad529e7b19 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_common.c +++ b/drivers/net/ethernet/intel/i40e/i40e_common.c @@ -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 */ |
