openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

i40e/i40evf: Use correct number of VF vectors 

Now that the 2.4 firmware reports the correct number of MSI-X vectors,
use this value correctly when communicating with the VF, and when
setting up the interrupt linked list.

The PF has always reported the correct number of MSI-X vectors, so we
should never increment the value in the vf driver.

Change-ID: Ifeefc631c321390192219ce2af9ada6180c1492f
Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com>
Tested-by: Sibai Li <sibai.li@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Mitch Williams 2014-02-11 08:26:32 +00:00 committed by Jeff Kirsher
parent c0c289759c
commit 9347eb771e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
View File

@ -69,7 +69,7 @@ static inline bool i40e_vc_isvalid_vector_id(struct i40e_vf *vf, u8 vector_id)
{ {
struct i40e_pf *pf = vf->pf; struct i40e_pf *pf = vf->pf;
return vector_id <= pf->hw.func_caps.num_msix_vectors_vf; return vector_id < pf->hw.func_caps.num_msix_vectors_vf;
} }
/***********************vf resource mgmt routines*****************/ /***********************vf resource mgmt routines*****************/
@ -126,8 +126,8 @@ static void i40e_config_irq_link_list(struct i40e_vf *vf, u16 vsi_idx,
reg_idx = I40E_VPINT_LNKLST0(vf->vf_id); reg_idx = I40E_VPINT_LNKLST0(vf->vf_id);
else else
reg_idx = I40E_VPINT_LNKLSTN( reg_idx = I40E_VPINT_LNKLSTN(
(pf->hw.func_caps.num_msix_vectors_vf ((pf->hw.func_caps.num_msix_vectors_vf - 1) * vf->vf_id) +
* vf->vf_id) + (vector_id - 1)); (vector_id - 1));
if (vecmap->rxq_map == 0 && vecmap->txq_map == 0) { if (vecmap->rxq_map == 0 && vecmap->txq_map == 0) {
/* Special case - No queues mapped on this vector */ /* Special case - No queues mapped on this vector */
@ -506,7 +506,8 @@ static void i40e_free_vf_res(struct i40e_vf *vf)
vf->lan_vsi_index = 0; vf->lan_vsi_index = 0;
vf->lan_vsi_id = 0; vf->lan_vsi_id = 0;
} }
msix_vf = pf->hw.func_caps.num_msix_vectors_vf + 1; msix_vf = pf->hw.func_caps.num_msix_vectors_vf;
/* disable interrupts so the VF starts in a known state */ /* disable interrupts so the VF starts in a known state */
for (i = 0; i < msix_vf; i++) { for (i = 0; i < msix_vf; i++) {
/* format is same for both registers */ /* format is same for both registers */

2
drivers/net/ethernet/intel/i40evf/i40evf_main.c
View File

@ -1141,7 +1141,7 @@ static int i40evf_set_interrupt_capability(struct i40evf_adapter *adapter)
* (roughly) twice the number of vectors as there are CPU's. * (roughly) twice the number of vectors as there are CPU's.
*/ */
v_budget = min(pairs, (int)(num_online_cpus() * 2)) + NONQ_VECS; v_budget = min(pairs, (int)(num_online_cpus() * 2)) + NONQ_VECS;
v_budget = min(v_budget, (int)adapter->vf_res->max_vectors + 1); v_budget = min(v_budget, (int)adapter->vf_res->max_vectors);
/* A failure in MSI-X entry allocation isn't fatal, but it does /* A failure in MSI-X entry allocation isn't fatal, but it does
* mean we disable MSI-X capabilities of the adapter. * mean we disable MSI-X capabilities of the adapter.