ice: Align ice_reset_req enum values to hardware reset values

Currently the ice_reset_req enum values have to be translated into
a different set of values that the hardware understands for the same
reset types. Avoid this translation by aligning ice_reset_req enum
values to the ones that the hardware understands.

Also add and else if block to check for ICE_RESET_EMPR and put a dev_dbg
message in the else case.

Signed-off-by: Brett Creeley <brett.creeley@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>

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index bb76a0bf2fd15b31091b172e473f16fe6bcf4e87..f51857ead0f3c98d844731ddbcd7b1a680d55437 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -1241,8 +1241,11 @@ static irqreturn_t ice_misc_intr(int __always_unused irq, void *data)
                        pf->corer_count++;
                else if (reset == ICE_RESET_GLOBR)
                        pf->globr_count++;
-               else
+               else if (reset == ICE_RESET_EMPR)
                        pf->empr_count++;
+               else
+                       dev_dbg(&pf->pdev->dev, "Invalid reset type %d\n",
+                               reset);
 
                /* If a reset cycle isn't already in progress, we set a bit in
                 * pf->state so that the service task can start a reset/rebuild.

diff --git a/drivers/net/ethernet/intel/ice/ice_type.h b/drivers/net/ethernet/intel/ice/ice_type.h
index 4a64421b77a7bf4d5644865d039840158d4d286f..87930f68d3fb11fc4456a1111c09ea08f201b69b 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_type.h
+++ b/drivers/net/ethernet/intel/ice/ice_type.h
@@ -150,12 +150,18 @@ struct ice_mac_info {
        u8 perm_addr[ETH_ALEN];
 };
 
-/* Various RESET request, These are not tied with HW reset types */
+/* Reset types used to determine which kind of reset was requested. These
+ * defines match what the RESET_TYPE field of the GLGEN_RSTAT register.
+ * ICE_RESET_PFR does not match any RESET_TYPE field in the GLGEN_RSTAT register
+ * because its reset source is different than the other types listed.
+ */
 enum ice_reset_req {
+       ICE_RESET_POR   = 0,
        ICE_RESET_INVAL = 0,
-       ICE_RESET_PFR   = 1,
-       ICE_RESET_CORER = 2,
-       ICE_RESET_GLOBR = 3,
+       ICE_RESET_CORER = 1,
+       ICE_RESET_GLOBR = 2,
+       ICE_RESET_EMPR  = 3,
+       ICE_RESET_PFR   = 4,
 };
 
 /* Bus parameters */