ice: Remove flag to track VF interrupt status

As a result of refactoring of VF VSIs interrupts code, there is no
need to track its configuration status again with ICE_VF_STATE_CFG_INTR
flag - In fact, it is not being checked anywhere in the code right now, so
this patch removes the dead code as applicable to the flag.

Signed-off-by: Akeem G Abodunrin <akeem.g.abodunrin@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 00aa6364124a53597d43d646329869ac5a9aa86e..ce01cbe70ea4a6b1642aee0149fb85f1c6cb6b0f 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
@@ -297,13 +297,6 @@ void ice_free_vfs(struct ice_pf *pf)
                if (test_bit(ICE_VF_STATE_INIT, pf->vf[i].vf_states)) {
                        /* disable VF qp mappings */
                        ice_dis_vf_mappings(&pf->vf[i]);
-
-                       /* Set this state so that assigned VF vectors can be
-                        * reclaimed by PF for reuse in ice_vsi_release(). No
-                        * need to clear this bit since pf->vf array is being
-                        * freed anyways after this for loop
-                        */
-                       set_bit(ICE_VF_STATE_CFG_INTR, pf->vf[i].vf_states);
                        ice_free_vf_res(&pf->vf[i]);
                }
        }
@@ -551,7 +544,6 @@ static int ice_alloc_vsi_res(struct ice_vf *vf)
         * expect vector assignment to be changed unless there is a request for
         * more vectors.
         */
-       clear_bit(ICE_VF_STATE_CFG_INTR, vf->vf_states);
 ice_alloc_vsi_res_exit:
        ice_free_fltr_list(&pf->pdev->dev, &tmp_add_list);
        return status;
@@ -1283,9 +1275,6 @@ static int ice_alloc_vfs(struct ice_pf *pf, u16 num_alloc_vfs)
                /* assign default capabilities */
                set_bit(ICE_VIRTCHNL_VF_CAP_L2, &vfs[i].vf_caps);
                vfs[i].spoofchk = true;
-
-               /* Set this state so that PF driver does VF vector assignment */
-               set_bit(ICE_VF_STATE_CFG_INTR, vfs[i].vf_states);
        }
        pf->num_alloc_vfs = num_alloc_vfs;
 

diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h
index c3ca522c245a0e41aa7f3c933f7cf009a068583b..ada69120ff3874c4770c2fb7d87d9a557f9cd7d5 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h
+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h
@@ -30,11 +30,6 @@ enum ice_vf_states {
        ICE_VF_STATE_DIS,
        ICE_VF_STATE_MC_PROMISC,
        ICE_VF_STATE_UC_PROMISC,
-       /* state to indicate if PF needs to do vector assignment for VF.
-        * This needs to be set during first time VF initialization or later
-        * when VF asks for more Vectors through virtchnl OP.
-        */
-       ICE_VF_STATE_CFG_INTR,
        ICE_VF_STATES_NBITS
 };