ice: update GLINT_DYN_CTL and GLINT_VECT2FUNC register access

Register access for GLINT_DYN_CTL and GLINT_VECT2FUNC should be within
the PF space and not the absolute device space.

Signed-off-by: Paul Greenwalt <paul.greenwalt@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 93b835a24bb1586588b5319ae252e6f93feb52e2..54b0e88af4ca8ffa221683b0d9ffee07c6623e75 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
@@ -474,19 +474,20 @@ ice_vf_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi, u16 vf_id)
 }
 
 /**
- * ice_calc_vf_first_vector_idx - Calculate absolute MSIX vector index in HW
+ * ice_calc_vf_first_vector_idx - Calculate MSIX vector index in the PF space
  * @pf: pointer to PF structure
  * @vf: pointer to VF that the first MSIX vector index is being calculated for
  *
- * This returns the first MSIX vector index in HW that is used by this VF and
- * this will always be the OICR index in the AVF driver so any functionality
+ * This returns the first MSIX vector index in PF space that is used by this VF.
+ * This index is used when accessing PF relative registers such as
+ * GLINT_VECT2FUNC and GLINT_DYN_CTL.
+ * This will always be the OICR index in the AVF driver so any functionality
  * using vf->first_vector_idx for queue configuration will have to increment by
  * 1 to avoid meddling with the OICR index.
  */
 static int ice_calc_vf_first_vector_idx(struct ice_pf *pf, struct ice_vf *vf)
 {
-       return pf->hw.func_caps.common_cap.msix_vector_first_id +
-               pf->sriov_base_vector + vf->vf_id * pf->num_vf_msix;
+       return pf->sriov_base_vector + vf->vf_id * pf->num_vf_msix;
 }
 
 /**
@@ -597,27 +598,30 @@ ice_alloc_vf_res_exit:
  */
 static void ice_ena_vf_mappings(struct ice_vf *vf)
 {
+       int abs_vf_id, abs_first, abs_last;
        struct ice_pf *pf = vf->pf;
        struct ice_vsi *vsi;
        int first, last, v;
        struct ice_hw *hw;
-       int abs_vf_id;
        u32 reg;
 
        hw = &pf->hw;
        vsi = pf->vsi[vf->lan_vsi_idx];
        first = vf->first_vector_idx;
        last = (first + pf->num_vf_msix) - 1;
+       abs_first = first + pf->hw.func_caps.common_cap.msix_vector_first_id;
+       abs_last = (abs_first + pf->num_vf_msix) - 1;
        abs_vf_id = vf->vf_id + hw->func_caps.vf_base_id;
 
        /* VF Vector allocation */
-       reg = (((first << VPINT_ALLOC_FIRST_S) & VPINT_ALLOC_FIRST_M) |
-              ((last << VPINT_ALLOC_LAST_S) & VPINT_ALLOC_LAST_M) |
+       reg = (((abs_first << VPINT_ALLOC_FIRST_S) & VPINT_ALLOC_FIRST_M) |
+              ((abs_last << VPINT_ALLOC_LAST_S) & VPINT_ALLOC_LAST_M) |
               VPINT_ALLOC_VALID_M);
        wr32(hw, VPINT_ALLOC(vf->vf_id), reg);
 
-       reg = (((first << VPINT_ALLOC_PCI_FIRST_S) & VPINT_ALLOC_PCI_FIRST_M) |
-              ((last << VPINT_ALLOC_PCI_LAST_S) & VPINT_ALLOC_PCI_LAST_M) |
+       reg = (((abs_first << VPINT_ALLOC_PCI_FIRST_S)
+                & VPINT_ALLOC_PCI_FIRST_M) |
+              ((abs_last << VPINT_ALLOC_PCI_LAST_S) & VPINT_ALLOC_PCI_LAST_M) |
               VPINT_ALLOC_PCI_VALID_M);
        wr32(hw, VPINT_ALLOC_PCI(vf->vf_id), reg);
        /* map the interrupts to its functions */

diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h
index ada69120ff3874c4770c2fb7d87d9a557f9cd7d5..424bc05389562e30dd0af879e9b2ae8c874b9d3c 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h
+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h
@@ -45,7 +45,8 @@ struct ice_vf {
 
        s16 vf_id;                      /* VF ID in the PF space */
        u16 lan_vsi_idx;                /* index into PF struct */
-       int first_vector_idx;           /* first vector index of this VF */
+       /* first vector index of this VF in the PF space */
+       int first_vector_idx;
        struct ice_sw *vf_sw_id;        /* switch ID the VF VSIs connect to */
        struct virtchnl_version_info vf_ver;
        u32 driver_caps;                /* reported by VF driver */