ice: use absolute vector ID for VFs

When the PF driver sets up the VF MSI-X vector allocation, it needs to
use the hardware absolute vector ID, not the per-PF vector ID. Without
this change we see (apparent) TX hangs when using VFs on multiple PFs.

Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
index 458e179ea8639f9eac0ce095458029f035cae225..57155b4a59dc1f54e2756104ddbf524750fe91d2 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
@@ -173,7 +173,8 @@ static void ice_dis_vf_mappings(struct ice_vf *vf)
        wr32(hw, VPINT_ALLOC(vf->vf_id), 0);
        wr32(hw, VPINT_ALLOC_PCI(vf->vf_id), 0);
 
-       first = vf->first_vector_idx;
+       first = vf->first_vector_idx +
+               hw->func_caps.common_cap.msix_vector_first_id;
        last = first + pf->num_vf_msix - 1;
        for (v = first; v <= last; v++) {
                u32 reg;
@@ -523,7 +524,8 @@ static void ice_ena_vf_mappings(struct ice_vf *vf)
 
        hw = &pf->hw;
        vsi = pf->vsi[vf->lan_vsi_idx];
-       first = vf->first_vector_idx;
+       first = vf->first_vector_idx +
+               hw->func_caps.common_cap.msix_vector_first_id;
        last = (first + pf->num_vf_msix) - 1;
        abs_vf_id = vf->vf_id + hw->func_caps.vf_base_id;