Commit e17866d5 authored Apr 27, 2015 by Wei Yang Committed by Michael Ellerman May 13, 2015

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>

parent 2ac3990c

arch/powerpc/platforms/powernv/eeh-powernv.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}