ice: move VFLR acknowledge during ice_free_vfs

After removing all VFs, the driver clears the VFLR indication for VFs.
This has been in ice since the beginning of SR-IOV support in the ice
driver.

The implementation was copied from i40e, and the motivation for the VFLR
indication clearing is described in the commit f7414531a0cf ("i40e:
acknowledge VFLR when disabling SR-IOV")

The commit explains that we need to clear the VFLR indication because
the virtual function undergoes a VFLR event. If we don't indicate that
it is complete it can cause an issue when VFs are re-enabled due to
a "phantom" VFLR.

The register block read was added under a pci_vfs_assigned check
originally. This was done because we added the check after calling
pci_disable_sriov. This was later moved to disable SRIOV earlier in the
flow so that the VF drivers could be torn down before we removed
functionality.

Move the VFLR acknowledge into the main loop that tears down VF
resources. This avoids using the tmp value for iterating over VFs
multiple times. The result will make it easier to refactor the VF array
in a future change.

It's possible we might want to modify this flow to also stop checking
pci_vfs_assigned. However, it seems reasonable to keep this change: we
should only clear the VFLR if we actually disabled SR-IOV.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Konrad Jankowski <konrad0.jankowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@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 d46f7579c6507c6130b06f74718ce55fc367040b..885de0675d2a21c98b2266b22ba26267d98a87a8 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
@@ -536,6 +536,14 @@ void ice_free_vfs(struct ice_pf *pf)
                        ice_free_vf_res(vf);
                }
 
+               if (!pci_vfs_assigned(pf->pdev)) {
+                       u32 reg_idx, bit_idx;
+
+                       reg_idx = (hw->func_caps.vf_base_id + vf->vf_id) / 32;
+                       bit_idx = (hw->func_caps.vf_base_id + vf->vf_id) % 32;
+                       wr32(hw, GLGEN_VFLRSTAT(reg_idx), BIT(bit_idx));
+               }
+
                /* clear malicious info since the VF is getting released */
                if (ice_mbx_clear_malvf(&hw->mbx_snapshot, pf->malvfs,
                                        ICE_MAX_VF_COUNT, vf->vf_id))
@@ -553,25 +561,6 @@ void ice_free_vfs(struct ice_pf *pf)
        devm_kfree(dev, pf->vf);
        pf->vf = NULL;
 
-       /* This check is for when the driver is unloaded while VFs are
-        * assigned. Setting the number of VFs to 0 through sysfs is caught
-        * before this function ever gets called.
-        */
-       if (!pci_vfs_assigned(pf->pdev)) {
-               unsigned int vf_id;
-
-               /* Acknowledge VFLR for all VFs. Without this, VFs will fail to
-                * work correctly when SR-IOV gets re-enabled.
-                */
-               for (vf_id = 0; vf_id < tmp; vf_id++) {
-                       u32 reg_idx, bit_idx;
-
-                       reg_idx = (hw->func_caps.vf_base_id + vf_id) / 32;
-                       bit_idx = (hw->func_caps.vf_base_id + vf_id) % 32;
-                       wr32(hw, GLGEN_VFLRSTAT(reg_idx), BIT(bit_idx));
-               }
-       }
-
        clear_bit(ICE_VF_DIS, pf->state);
        clear_bit(ICE_FLAG_SRIOV_ENA, pf->flags);
 }