| Message ID | 1425871052-13118-3-git-send-email-weiyang@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Benjamin Herrenschmidt |
| Headers | show |
On Mon, Mar 09, 2015 at 11:17:30AM +0800, Wei Yang wrote: >To retrieve the PCI slot state, EEH driver would set a timeout for that. >While current comment is not aligned to what the code does. > >This patch fixes those comments according to the code. > >Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com> Please repost after https://patchwork.ozlabs.org/patch/439956/ shows up in PPC next branch. The changes look good to me: Acked-by: Gavin Shan <gwshan@linux.vnet.ibm.com> Thanks, Gavin >--- > arch/powerpc/kernel/eeh_driver.c | 2 +- > arch/powerpc/platforms/powernv/eeh-powernv.c | 2 +- > arch/powerpc/platforms/pseries/eeh_pseries.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > >diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c >index d099540..cc8d1db 100644 >--- a/arch/powerpc/kernel/eeh_driver.c >+++ b/arch/powerpc/kernel/eeh_driver.c >@@ -682,7 +682,7 @@ static void eeh_handle_normal_event(struct eeh_pe *pe) > eeh_pe_dev_traverse(pe, eeh_report_error, &result); > > /* Get the current PCI slot state. This can take a long time, >- * sometimes over 3 seconds for certain systems. >+ * sometimes over 300 seconds for certain systems. > */ > rc = eeh_ops->wait_state(pe, MAX_WAIT_FOR_RECOVERY*1000); > if (rc < 0 || rc == EEH_STATE_NOT_SUPPORT) { >diff --git a/arch/powerpc/platforms/powernv/eeh-powernv.c b/arch/powerpc/platforms/powernv/eeh-powernv.c >index 7a5021b..5abb4c2 100644 >--- a/arch/powerpc/platforms/powernv/eeh-powernv.c >+++ b/arch/powerpc/platforms/powernv/eeh-powernv.c >@@ -313,7 +313,7 @@ static int powernv_eeh_reset(struct eeh_pe *pe, int option) > /** > * powernv_eeh_wait_state - Wait for PE state > * @pe: EEH PE >- * @max_wait: maximal period in microsecond >+ * @max_wait: maximal period in millisecond > * > * Wait for the state of associated PE. It might take some time > * to retrieve the PE's state. >diff --git a/arch/powerpc/platforms/pseries/eeh_pseries.c b/arch/powerpc/platforms/pseries/eeh_pseries.c >index a6c7e19..9de46c5 100644 >--- a/arch/powerpc/platforms/pseries/eeh_pseries.c >+++ b/arch/powerpc/platforms/pseries/eeh_pseries.c >@@ -538,7 +538,7 @@ static int pseries_eeh_reset(struct eeh_pe *pe, int option) > /** > * pseries_eeh_wait_state - Wait for PE state > * @pe: EEH PE >- * @max_wait: maximal period in microsecond >+ * @max_wait: maximal period in millisecond > * > * Wait for the state of associated PE. It might take some time > * to retrieve the PE's state. >-- >1.7.9.5 >
diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c index d099540..cc8d1db 100644 --- a/arch/powerpc/kernel/eeh_driver.c +++ b/arch/powerpc/kernel/eeh_driver.c @@ -682,7 +682,7 @@ static void eeh_handle_normal_event(struct eeh_pe *pe) eeh_pe_dev_traverse(pe, eeh_report_error, &result); /* Get the current PCI slot state. This can take a long time, - * sometimes over 3 seconds for certain systems. + * sometimes over 300 seconds for certain systems. */ rc = eeh_ops->wait_state(pe, MAX_WAIT_FOR_RECOVERY*1000); if (rc < 0 || rc == EEH_STATE_NOT_SUPPORT) { diff --git a/arch/powerpc/platforms/powernv/eeh-powernv.c b/arch/powerpc/platforms/powernv/eeh-powernv.c index 7a5021b..5abb4c2 100644 --- a/arch/powerpc/platforms/powernv/eeh-powernv.c +++ b/arch/powerpc/platforms/powernv/eeh-powernv.c @@ -313,7 +313,7 @@ static int powernv_eeh_reset(struct eeh_pe *pe, int option) /** * powernv_eeh_wait_state - Wait for PE state * @pe: EEH PE - * @max_wait: maximal period in microsecond + * @max_wait: maximal period in millisecond * * Wait for the state of associated PE. It might take some time * to retrieve the PE's state. diff --git a/arch/powerpc/platforms/pseries/eeh_pseries.c b/arch/powerpc/platforms/pseries/eeh_pseries.c index a6c7e19..9de46c5 100644 --- a/arch/powerpc/platforms/pseries/eeh_pseries.c +++ b/arch/powerpc/platforms/pseries/eeh_pseries.c @@ -538,7 +538,7 @@ static int pseries_eeh_reset(struct eeh_pe *pe, int option) /** * pseries_eeh_wait_state - Wait for PE state * @pe: EEH PE - * @max_wait: maximal period in microsecond + * @max_wait: maximal period in millisecond * * Wait for the state of associated PE. It might take some time * to retrieve the PE's state.
To retrieve the PCI slot state, EEH driver would set a timeout for that. While current comment is not aligned to what the code does. This patch fixes those comments according to the code. Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com> --- arch/powerpc/kernel/eeh_driver.c | 2 +- arch/powerpc/platforms/powernv/eeh-powernv.c | 2 +- arch/powerpc/platforms/pseries/eeh_pseries.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)