diff options
| author |   Christopher Pau <christopher.pau@intel.com> | 2013-11-16 10:00:33 +0000 |
|---|---|---|
| committer |   Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2013-12-05 23:12:57 -0800 |
| commit | 71bd4b8ec0bf5fbeea54270b390bebe8e108fbf8 (patch) | |
| tree | ff863e06d50af337606e732c55f261e961926d52 /drivers | |
| parent | macvlan: Support creating macvtaps from macvlans (diff) | |
| download | linux-dev-71bd4b8ec0bf5fbeea54270b390bebe8e108fbf8.tar.xz linux-dev-71bd4b8ec0bf5fbeea54270b390bebe8e108fbf8.zip | |
i40e: set pf_id based on device and function numbers
pf_id needs to be encoded for cards with ARI enabled, which
allows for larger function numbers than 8.
Commit-Id: I23fa7df9dabf3878cc08c9b2151729c8539f5f17
Signed-off-by: Christopher Pau <christopher.pau@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_common.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c index 1e4ea134975a..9e868eac8e1e 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_common.c +++ b/drivers/net/ethernet/intel/i40e/i40e_common.c @@ -297,7 +297,11 @@ i40e_status i40e_pf_reset(struct i40e_hw *hw) } /* Determine the PF number based on the PCI fn */ - hw->pf_id = (u8)hw->bus.func; + 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 |