Commit 66857b3a authored Sep 23, 2011 by Jimi Xenidis Committed by Benjamin Herrenschmidt Sep 29, 2011

powerpc: Fix xmon for systems without MSR[RI]



Based on patch by David Gibson <dwg@au1.ibm.com>

xmon has a longstanding bug on systems which are SMP-capable but lack
the MSR[RI] bit.  In these cases, xmon invoked by IPI on secondary
CPUs will not properly keep quiet, but will print stuff, thereby
garbling the primary xmon's output.  This patch fixes it, by ignoring
the RI bit if the processor does not support it.

There's already a version of this for 4xx upstream, which we'll need
to extend to other RI-lacking CPUs at some point.  For now this adds
Book3e processors to the mix.

Signed-off-by: Jimi Xenidis <jimix@pobox.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

parent bb36c445

arch/powerpc/xmon/xmon.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -340,8 +340,8 @@ int cpus_are_in_xmon(void)

		static inline int unrecoverable_excp(struct pt_regs *regs)
		{
		#ifdef CONFIG_4xx
		/* We have no MSR_RI bit on 4xx, so we simply return false */
		#if defined(CONFIG_4xx) \|\| defined(CONFIG_BOOK3E)
		/* We have no MSR_RI bit on 4xx or Book3e, so we simply return false */
		return 0;
		#else
		return ((regs->msr & MSR_RI) == 0);

Admin message