1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index d0ea4d059a05..3588cbb8ccd2 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -478,8 +478,14 @@ static void ice_reset_subtask(struct ice_pf *pf)
          * for the reset now), poll for reset done, rebuild and return.
          */
         if (test_bit(__ICE_RESET_OICR_RECV, pf->state)) {
-                clear_bit(__ICE_GLOBR_RECV, pf->state);
-                clear_bit(__ICE_CORER_RECV, pf->state);
+                /* Perform the largest reset requested */
+                if (test_and_clear_bit(__ICE_CORER_RECV, pf->state))
+                        reset_type = ICE_RESET_CORER;
+                if (test_and_clear_bit(__ICE_GLOBR_RECV, pf->state))
+                        reset_type = ICE_RESET_GLOBR;
+                /* return if no valid reset type requested */
+                if (reset_type == ICE_RESET_INVAL)
+                        return;
                 if (!test_bit(__ICE_PREPARED_FOR_RESET, pf->state))
                         ice_prepare_for_reset(pf);