1 files changed, 16 insertions, 7 deletions

diff --git a/drivers/net/ethernet/sfc/enum.h b/drivers/net/ethernet/sfc/enum.h
index 75ef7ef6450b..d1dbb5fb31bb 100644
--- a/drivers/net/ethernet/sfc/enum.h
+++ b/drivers/net/ethernet/sfc/enum.h
@@ -143,6 +143,7 @@ enum efx_loopback_mode {
  * @RESET_TYPE_WORLD: Reset as much as possible
  * @RESET_TYPE_RECOVER_OR_DISABLE: Try to recover. Apply RESET_TYPE_DISABLE if
  * unsuccessful.
+ * @RESET_TYPE_MC_BIST: MC entering BIST mode.
  * @RESET_TYPE_DISABLE: Reset datapath, MAC and PHY; leave NIC disabled
  * @RESET_TYPE_TX_WATCHDOG: reset due to TX watchdog
  * @RESET_TYPE_INT_ERROR: reset due to internal error
@@ -150,14 +151,16 @@ enum efx_loopback_mode {
  * @RESET_TYPE_DMA_ERROR: DMA error
  * @RESET_TYPE_TX_SKIP: hardware completed empty tx descriptors
  * @RESET_TYPE_MC_FAILURE: MC reboot/assertion
+ * @RESET_TYPE_MCDI_TIMEOUT: MCDI timeout.
  */
 enum reset_type {
-        RESET_TYPE_INVISIBLE = 0,
-        RESET_TYPE_RECOVER_OR_ALL = 1,
-        RESET_TYPE_ALL = 2,
-        RESET_TYPE_WORLD = 3,
-        RESET_TYPE_RECOVER_OR_DISABLE = 4,
-        RESET_TYPE_DISABLE = 5,
+        RESET_TYPE_INVISIBLE,
+        RESET_TYPE_RECOVER_OR_ALL,
+        RESET_TYPE_ALL,
+        RESET_TYPE_WORLD,
+        RESET_TYPE_RECOVER_OR_DISABLE,
+        RESET_TYPE_MC_BIST,
+        RESET_TYPE_DISABLE,
         RESET_TYPE_MAX_METHOD,
         RESET_TYPE_TX_WATCHDOG,
         RESET_TYPE_INT_ERROR,
@@ -165,7 +168,13 @@ enum reset_type {
         RESET_TYPE_DMA_ERROR,
         RESET_TYPE_TX_SKIP,
         RESET_TYPE_MC_FAILURE,
-        RESET_TYPE_MC_BIST,
+        /* RESET_TYPE_MCDI_TIMEOUT is actually a method, not just a reason, but
+         * it doesn't fit the scope hierarchy (not well-ordered by inclusion).
+         * We encode this by having its enum value be greater than
+         * RESET_TYPE_MAX_METHOD. This also prevents issuing it with
+         * efx_ioctl_reset.
+         */
+        RESET_TYPE_MCDI_TIMEOUT,
         RESET_TYPE_MAX,
 };