On Mon, Nov 25, 2013 at 04:27:54PM -0600, Brian King wrote: > >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 <brk...@linux.vnet.ibm.com>
Acked-by: Gavin Shan <sha...@linux.vnet.ibm.com> >--- > > arch/powerpc/kernel/eeh.c | 2 +- > arch/powerpc/kernel/eeh_driver.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > >diff -puN arch/powerpc/kernel/eeh.c~eeh_sriov_vf_delay >arch/powerpc/kernel/eeh.c >--- linux/arch/powerpc/kernel/eeh.c~eeh_sriov_vf_delay 2013-11-25 >16:12:26.000000000 -0600 >+++ linux-bjking1/arch/powerpc/kernel/eeh.c 2013-11-25 16:12:26.000000000 >-0600 >@@ -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; >diff -puN arch/powerpc/kernel/eeh_driver.c~eeh_sriov_vf_delay >arch/powerpc/kernel/eeh_driver.c >--- linux/arch/powerpc/kernel/eeh_driver.c~eeh_sriov_vf_delay 2013-11-25 >16:12:26.000000000 -0600 >+++ linux-bjking1/arch/powerpc/kernel/eeh_driver.c 2013-11-25 >16:12:26.000000000 -0600 >@@ -468,7 +468,7 @@ static int eeh_reset_device(struct eeh_p > /* The longest amount of time to wait for a pci device > * to come back on line, in seconds. > */ >-#define MAX_WAIT_FOR_RECOVERY 150 >+#define MAX_WAIT_FOR_RECOVERY 300 > > static void eeh_handle_normal_event(struct eeh_pe *pe) > { Thanks, Gavin _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev