ice: remove redundant SRIOV code

Remove redundant code from ice_get_max_valid_res_idx that has no effect.
ice_pf::irq_tracker is initialized during driver probe, there is no reason
to check it again. Also it is not possible for pf::sriov_base_vector to be
lower than the tracker length, remove WARN_ON that will never happen.

Get rid of ice_get_max_valid_res_idx helper function completely since it
can never return negative value.

Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: Piotr Raczynski <piotr.raczynski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_sriov.c b/drivers/net/ethernet/intel/ice/ice_sriov.c
index f1dca59bd8449ea91706451c3226fe4ff912cc40..65f971b74717a165f08685abf4fb8e23038fb223 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_sriov.c
+++ b/drivers/net/ethernet/intel/ice/ice_sriov.c
@@ -135,18 +135,9 @@ static void ice_dis_vf_mappings(struct ice_vf *vf)
  */
 static int ice_sriov_free_msix_res(struct ice_pf *pf)
 {
-       struct ice_res_tracker *res;
-
        if (!pf)
                return -EINVAL;
 
-       res = pf->irq_tracker;
-       if (!res)
-               return -EINVAL;
-
-       /* give back irq_tracker resources used */
-       WARN_ON(pf->sriov_base_vector < res->num_entries);
-
        pf->sriov_base_vector = 0;
 
        return 0;
@@ -409,29 +400,6 @@ int ice_calc_vf_reg_idx(struct ice_vf *vf, struct ice_q_vector *q_vector)
                q_vector->v_idx + 1;
 }
 
-/**
- * ice_get_max_valid_res_idx - Get the max valid resource index
- * @res: pointer to the resource to find the max valid index for
- *
- * Start from the end of the ice_res_tracker and return right when we find the
- * first res->list entry with the ICE_RES_VALID_BIT set. This function is only
- * valid for SR-IOV because it is the only consumer that manipulates the
- * res->end and this is always called when res->end is set to res->num_entries.
- */
-static int ice_get_max_valid_res_idx(struct ice_res_tracker *res)
-{
-       int i;
-
-       if (!res)
-               return -EINVAL;
-
-       for (i = res->num_entries - 1; i >= 0; i--)
-               if (res->list[i] & ICE_RES_VALID_BIT)
-                       return i;
-
-       return 0;
-}
-
 /**
  * ice_sriov_set_msix_res - Set any used MSIX resources
  * @pf: pointer to PF structure
@@ -490,7 +458,6 @@ static int ice_sriov_set_msix_res(struct ice_pf *pf, u16 num_msix_needed)
  */
 static int ice_set_per_vf_res(struct ice_pf *pf, u16 num_vfs)
 {
-       int max_valid_res_idx = ice_get_max_valid_res_idx(pf->irq_tracker);
        u16 num_msix_per_vf, num_txq, num_rxq, avail_qs;
        int msix_avail_per_vf, msix_avail_for_sriov;
        struct device *dev = ice_pf_to_dev(pf);
@@ -501,9 +468,6 @@ static int ice_set_per_vf_res(struct ice_pf *pf, u16 num_vfs)
        if (!num_vfs)
                return -EINVAL;
 
-       if (max_valid_res_idx < 0)
-               return -ENOSPC;
-
        /* determine MSI-X resources per VF */
        msix_avail_for_sriov = pf->hw.func_caps.common_cap.num_msix_vectors -
                pf->irq_tracker->num_entries;