powerpc/pseries: Fix kexec regression caused by CPPR tracking
authorMark Nelson <markn@au1.ibm.com>
Sun, 7 Feb 2010 16:45:12 +0000 (16:45 +0000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 8 Feb 2010 04:29:19 +0000 (15:29 +1100)
commit36350e00696df148507246c817cf6f86329479fd
tree2a57c7ae1583006658eea1c35232caf5b7cef7ee
parent1a45dcfe2525e9432cb4aba461d4994fc2befe42
powerpc/pseries: Fix kexec regression caused by CPPR tracking

The code to track the CPPR values added by commit
49bd3647134ea47420067aea8d1401e722bf2aac ("powerpc/pseries: Track previous
CPPR values to correctly EOI interrupts") broke kexec on pseries because
the kexec code in xics.c calls xics_set_cpu_priority() before the IPI has
been EOI'ed. This wasn't a problem previously but it now triggers a BUG_ON
in xics_set_cpu_priority() because os_cppr->index isn't 0.

Fix this problem by setting the index on the CPPR stack to 0 before calling
xics_set_cpu_priority() in xics_teardown_cpu().

Also make it clear that we only want to set the priority when there's just
one CPPR value in the stack, and enforce it by updating the value of
os_cppr->stack[0] rather than os_cppr->stack[os_cppr->index].

While we're at it change the BUG_ON to a WARN_ON.

Reported-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Mark Nelson <markn@au1.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/platforms/pseries/xics.c