Commit 2400fd82 authored Jul 06, 2017 by Oliver O'Halloran Committed by Michael Ellerman Jul 11, 2017

powerpc/asm: Mark cr0 as clobbered in mftb()



The workaround for the CELL timebase bug does not correctly mark cr0 as
being clobbered. This means GCC doesn't know that the asm block changes cr0 and
might leave the result of an unrelated comparison in cr0 across the block, which
we then trash, leading to basically random behaviour.

Fixes: 859deea9 ("[POWERPC] Cell timebase bug workaround")
Cc: stable@vger.kernel.org # v2.6.19+
Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
[mpe: Tweak change log and flag for stable]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

parent 41d0c2ec

arch/powerpc/include/asm/reg.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -1303,7 +1303,7 @@ static inline void msr_check_and_clear(unsigned long bits)
		" .llong 0\n" \
		".previous" \
		: "=r" (rval) \
		: "i" (CPU_FTR_CELL_TB_BUG), "i" (SPRN_TBRL)); \
		: "i" (CPU_FTR_CELL_TB_BUG), "i" (SPRN_TBRL) : "cr0"); \
		rval;})
		#else
		#define mftb() ({unsigned long rval; \