summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/eeh.c
diff options
context:
space:
mode:
authorBrian King <brking@linux.vnet.ibm.com>2013-11-25 16:27:54 -0600
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-12-05 16:08:20 +1100
commitfb48dc22824daaa60ff1d6a6c9e22c79112dfb8e (patch)
treebf09b49a1679b01607c34aa33b54cc25ae2a55e5 /arch/powerpc/kernel/eeh.c
parent2c77e95741e1202f993a4126f1f401459f1bcd4d (diff)
downloadlinux-fb48dc22824daaa60ff1d6a6c9e22c79112dfb8e.tar.bz2
powerpc: Increase EEH recovery timeout for SR-IOV
In order to support concurrent adapter firmware download to SR-IOV adapters on pSeries, each VF will see an EEH event where the slot will remain in the unavailable state for the duration of the adapter firmware update, which can take as long as 5 minutes. Extend the EEH recovery timeout to account for this. Signed-off-by: Brian King <brking@linux.vnet.ibm.com> Acked-by: Gavin Shan <shangw@linux.vnet.ibm.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel/eeh.c')
-rw-r--r--arch/powerpc/kernel/eeh.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c
index 4bd687d5e7aa..f4b7a227f183 100644
--- a/arch/powerpc/kernel/eeh.c
+++ b/arch/powerpc/kernel/eeh.c
@@ -84,7 +84,7 @@
#define EEH_MAX_FAILS 2100000
/* Time to wait for a PCI slot to report status, in milliseconds */
-#define PCI_BUS_RESET_WAIT_MSEC (60*1000)
+#define PCI_BUS_RESET_WAIT_MSEC (5*60*1000)
/* Platform dependent EEH operations */
struct eeh_ops *eeh_ops = NULL;