diff options
Diffstat (limited to 'drivers/net/ethernet/sfc/enum.h')
-rw-r--r-- | drivers/net/ethernet/sfc/enum.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/net/ethernet/sfc/enum.h b/drivers/net/ethernet/sfc/enum.h index 182dbe2cc6e4..ab8fb5889e55 100644 --- a/drivers/net/ethernet/sfc/enum.h +++ b/drivers/net/ethernet/sfc/enum.h | |||
@@ -137,8 +137,12 @@ enum efx_loopback_mode { | |||
137 | * Reset methods are numbered in order of increasing scope. | 137 | * Reset methods are numbered in order of increasing scope. |
138 | * | 138 | * |
139 | * @RESET_TYPE_INVISIBLE: Reset datapath and MAC (Falcon only) | 139 | * @RESET_TYPE_INVISIBLE: Reset datapath and MAC (Falcon only) |
140 | * @RESET_TYPE_RECOVER_OR_ALL: Try to recover. Apply RESET_TYPE_ALL | ||
141 | * if unsuccessful. | ||
140 | * @RESET_TYPE_ALL: Reset datapath, MAC and PHY | 142 | * @RESET_TYPE_ALL: Reset datapath, MAC and PHY |
141 | * @RESET_TYPE_WORLD: Reset as much as possible | 143 | * @RESET_TYPE_WORLD: Reset as much as possible |
144 | * @RESET_TYPE_RECOVER_OR_DISABLE: Try to recover. Apply RESET_TYPE_DISABLE if | ||
145 | * unsuccessful. | ||
142 | * @RESET_TYPE_DISABLE: Reset datapath, MAC and PHY; leave NIC disabled | 146 | * @RESET_TYPE_DISABLE: Reset datapath, MAC and PHY; leave NIC disabled |
143 | * @RESET_TYPE_TX_WATCHDOG: reset due to TX watchdog | 147 | * @RESET_TYPE_TX_WATCHDOG: reset due to TX watchdog |
144 | * @RESET_TYPE_INT_ERROR: reset due to internal error | 148 | * @RESET_TYPE_INT_ERROR: reset due to internal error |
@@ -150,9 +154,11 @@ enum efx_loopback_mode { | |||
150 | */ | 154 | */ |
151 | enum reset_type { | 155 | enum reset_type { |
152 | RESET_TYPE_INVISIBLE = 0, | 156 | RESET_TYPE_INVISIBLE = 0, |
153 | RESET_TYPE_ALL = 1, | 157 | RESET_TYPE_RECOVER_OR_ALL = 1, |
154 | RESET_TYPE_WORLD = 2, | 158 | RESET_TYPE_ALL = 2, |
155 | RESET_TYPE_DISABLE = 3, | 159 | RESET_TYPE_WORLD = 3, |
160 | RESET_TYPE_RECOVER_OR_DISABLE = 4, | ||
161 | RESET_TYPE_DISABLE = 5, | ||
156 | RESET_TYPE_MAX_METHOD, | 162 | RESET_TYPE_MAX_METHOD, |
157 | RESET_TYPE_TX_WATCHDOG, | 163 | RESET_TYPE_TX_WATCHDOG, |
158 | RESET_TYPE_INT_ERROR, | 164 | RESET_TYPE_INT_ERROR, |