ice: Implement flow to reset VFs with PFR and other resets

All VF VSIs need to be reset and rebuild with the main VSIs before
replaying all VSIs, so that all existing switch filters, scheduler tree
and other configuration could be replayed at once. This fixes issues when
doing PFR and CORER reset.

Signed-off-by: Akeem G Abodunrin <akeem.g.abodunrin@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>

1 files changed, 2 insertions, 6 deletions

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 4dadf8edfd84..c75a4f4ae6e9 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -394,6 +394,7 @@ static void ice_do_reset(struct ice_pf *pf, enum ice_reset_req reset_type)
                 ice_rebuild(pf);
                 clear_bit(__ICE_PREPARED_FOR_RESET, pf->state);
                 clear_bit(__ICE_PFR_REQ, pf->state);
+                ice_reset_all_vfs(pf, true);
         }
 }
 
@@ -436,6 +437,7 @@ static void ice_reset_subtask(struct ice_pf *pf)
                         clear_bit(__ICE_PFR_REQ, pf->state);
                         clear_bit(__ICE_CORER_REQ, pf->state);
                         clear_bit(__ICE_GLOBR_REQ, pf->state);
+                        ice_reset_all_vfs(pf, true);
                 }
 
                 return;
@@ -3360,10 +3362,6 @@ static int ice_vsi_rebuild_all(struct ice_pf *pf)
                 if (!pf->vsi[i])
                         continue;
 
-                /* VF VSI rebuild isn't supported yet */
-                if (pf->vsi[i]->type == ICE_VSI_VF)
-                        continue;
-
                 err = ice_vsi_rebuild(pf->vsi[i]);
                 if (err) {
                         dev_err(&pf->pdev->dev,
@@ -3500,8 +3498,6 @@ static void ice_rebuild(struct ice_pf *pf)
                 goto err_vsi_rebuild;
         }
 
-        ice_reset_all_vfs(pf, true);
-
         ice_for_each_vsi(pf, i) {
                 bool link_up;