diff options
| author | Wei Yang <weiyang@linux.vnet.ibm.com> | 2015-04-27 09:25:11 +0800 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-05-13 14:00:07 +1000 |
| commit | e17866d5593dc6ea7bff9ee56751fae6c3f56223 (patch) | |
| tree | edb8f720a0bfe94f11983b73a9493beb10653565 /arch/powerpc | |
| parent | 2ac3990cc36b1e42feca733b25254fb6dae15431 (diff) | |
| download | linux-e17866d5593dc6ea7bff9ee56751fae6c3f56223.tar.bz2 | |
powerpc/eeh: fix powernv_eeh_wait_state delay logic
As the comment indicates, powernv_eeh_get_state() will inform EEH core to
delay 1 second. This means the delay doesn't happen when
powernv_eeh_get_state() returns.
This patch moves the delay subtraction just before msleep(), which is the
same logic in pseries_eeh_wait_state().
Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com>
Acked-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/platforms/powernv/eeh-powernv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/powernv/eeh-powernv.c b/arch/powerpc/platforms/powernv/eeh-powernv.c index d0254710595d..622f08cf54b6 100644 --- a/arch/powerpc/platforms/powernv/eeh-powernv.c +++ b/arch/powerpc/platforms/powernv/eeh-powernv.c @@ -1000,13 +1000,13 @@ static int pnv_eeh_wait_state(struct eeh_pe *pe, int max_wait) if (ret != EEH_STATE_UNAVAILABLE) return ret; - max_wait -= mwait; if (max_wait <= 0) { pr_warn("%s: Timeout getting PE#%x's state (%d)\n", __func__, pe->addr, max_wait); return EEH_STATE_NOT_SUPPORT; } + max_wait -= mwait; msleep(mwait); } |