aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/sfc
diff options
context:
space:
mode:
authorDaniel Pieczko <dpieczko@solarflare.com>2013-09-20 16:45:10 +0100
committerBen Hutchings <bhutchings@solarflare.com>2013-09-20 17:24:35 +0100
commitb2d32f03e67cc9b0ad16fc1fff87edf90f059883 (patch)
tree5264dd295ecf80689fb42ad043c740ebdf8a66d7 /drivers/net/ethernet/sfc
parentsfc: Wait for MC reboot to complete before scheduling driver reset (diff)
downloadlinux-dev-b2d32f03e67cc9b0ad16fc1fff87edf90f059883.tar.xz
linux-dev-b2d32f03e67cc9b0ad16fc1fff87edf90f059883.zip
sfc: Increase MCDI status timeout to 250ms
The SFC9120 MC firmware often takes longer than 20ms to reboot and update the warm boot count in BIU_MC_SFT_STATUS_REG. A timeout of 250ms is very generous for an MC reboot. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Diffstat (limited to 'drivers/net/ethernet/sfc')
-rw-r--r--drivers/net/ethernet/sfc/mcdi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/sfc/mcdi.c b/drivers/net/ethernet/sfc/mcdi.c
index 73143ece4832..c082562dbf4e 100644
--- a/drivers/net/ethernet/sfc/mcdi.c
+++ b/drivers/net/ethernet/sfc/mcdi.c
@@ -27,10 +27,10 @@
/* A reboot/assertion causes the MCDI status word to be set after the
* command word is set or a REBOOT event is sent. If we notice a reboot
- * via these mechanisms then wait 20ms for the status word to be set.
+ * via these mechanisms then wait 250ms for the status word to be set.
*/
#define MCDI_STATUS_DELAY_US 100
-#define MCDI_STATUS_DELAY_COUNT 200
+#define MCDI_STATUS_DELAY_COUNT 2500
#define MCDI_STATUS_SLEEP_MS \
(MCDI_STATUS_DELAY_US * MCDI_STATUS_DELAY_COUNT / 1000)