ice: Change pf state behavior to protect reset path

Currently, there is no bit, or set of bits, that protect the entirety
of the reset path.

If the reset is originated by the driver, then the relevant
one of the following bits will be set when the reset is scheduled:
__ICE_PFR_REQ
__ICE_CORER_REQ
__ICE_GLOBR_REQ
This bit will not be cleared until after the rebuild has completed.

If the reset is originated by the FW, then the first the driver knows of
it will be the reception of the OICR interrupt.  The __ICE_RESET_OICR_RECV
bit will be set in the interrupt handler.  This will also be the indicator
in a SW originated reset that we have completed the pre-OICR tasks and
have informed the FW that a reset was requested.

To utilize these bits, change the function:
ice_is_reset_recovery_pending()
	to be:
ice_is_reset_in_progress()

The new function will check all of the above bits in the pf->state and
will return a true if one or more of these bits are set.

Signed-off-by: Dave Ertman <david.m.ertman@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, 8 insertions, 5 deletions

diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c
index 21e3a3e70329..95588fe0e22f 100644
--- a/drivers/net/ethernet/intel/ice/ice_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_lib.c
@@ -2250,7 +2250,7 @@ int ice_vsi_release(struct ice_vsi *vsi)
          * currently. This is done to avoid check_flush_dependency() warning
          * on this wq
          */
-        if (vsi->netdev && !ice_is_reset_recovery_pending(pf->state)) {
+        if (vsi->netdev && !ice_is_reset_in_progress(pf->state)) {
                 unregister_netdev(vsi->netdev);
                 free_netdev(vsi->netdev);
                 vsi->netdev = NULL;
@@ -2280,7 +2280,7 @@ int ice_vsi_release(struct ice_vsi *vsi)
          * free VSI netdev when PF is not in reset recovery pending state,\
          * for ex: during rmmod.
          */
-        if (!ice_is_reset_recovery_pending(pf->state))
+        if (!ice_is_reset_in_progress(pf->state))
                 ice_vsi_clear(vsi);
 
         return 0;
@@ -2367,10 +2367,13 @@ err_vsi:
 }
 
 /**
- * ice_is_reset_recovery_pending - schedule a reset
+ * ice_is_reset_in_progress - check for a reset in progress
  * @state: pf state field
  */
-bool ice_is_reset_recovery_pending(unsigned long *state)
+bool ice_is_reset_in_progress(unsigned long *state)
 {
-        return test_bit(__ICE_RESET_RECOVERY_PENDING, state);
+        return test_bit(__ICE_RESET_OICR_RECV, state) ||
+               test_bit(__ICE_PFR_REQ, state) ||
+               test_bit(__ICE_CORER_REQ, state) ||
+               test_bit(__ICE_GLOBR_REQ, state);
 }