Commit 4a3422bb authored by Michael Neuling's avatar Michael Neuling Committed by Greg Kroah-Hartman

powerpc/kdump: Fix timeout in crash_kexec_wait_realmode

commit 63f21a56 upstream.

The existing code it pretty ugly.  How about we clean it up even more
like this?

From: Anton Blanchard <anton@samba.org>

We check for timeout expiry in the outer loop, but we also need to
check it in the inner loop or we can lock up forever waiting for a
CPU to hit real mode.
Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarMichael Neuling <mikey@neuling.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 758705e2
...@@ -242,12 +242,8 @@ static void crash_kexec_wait_realmode(int cpu) ...@@ -242,12 +242,8 @@ static void crash_kexec_wait_realmode(int cpu)
while (paca[i].kexec_state < KEXEC_STATE_REAL_MODE) { while (paca[i].kexec_state < KEXEC_STATE_REAL_MODE) {
barrier(); barrier();
if (!cpu_possible(i)) { if (!cpu_possible(i) || !cpu_online(i) || (msecs <= 0))
break; break;
}
if (!cpu_online(i)) {
break;
}
msecs--; msecs--;
mdelay(1); mdelay(1);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment