tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[PATCH] ppc64: Fix recent regression

As noted by Olof Johansson <olof@lixom.net>:

"A recent patch changed the way the LPAR bit is checked during early
boot. This resulted in a polarity change in a conditional branch
without changing the branch, causing at least some legacy machines to
not boot."

This fixes it.

Signed-off-by: Jimi Xenidis <jimix@watson.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Jimi Xenidis and committed by Linus Torvalds be201f7f 0fb74dfb

+3 -3
unified split
+3 -3
arch/ppc64/kernel/head.S
··· 1649 1649 ld r3,0(r3) 1650 1650 lwz r3,PLATFORM(r3) /* r3 = platform flags */ 1651 1651 andi. r3,r3,PLATFORM_LPAR /* Test if bit 0 is set (LPAR bit) */ 1652 - bne 98f 1652 + beq 98f /* branch if result is 0 */ 1653 1653 mfspr r3,PVR 1654 1654 srwi r3,r3,16 1655 1655 cmpwi r3,0x37 /* SStar */ ··· 1813 1813 ld r3,0(r3) 1814 1814 lwz r3,PLATFORM(r3) /* r3 = platform flags */ 1815 1815 andi. r3,r3,PLATFORM_LPAR /* Test if bit 0 is set (LPAR bit) */ 1816 - bne 98f 1816 + beq 98f /* branch if result is 0 */ 1817 1817 mfspr r3,PVR 1818 1818 srwi r3,r3,16 1819 1819 cmpwi r3,0x37 /* SStar */ ··· 1834 1834 lwz r3,PLATFORM(r3) /* r3 = platform flags */ 1835 1835 /* Test if bit 0 is set (LPAR bit) */ 1836 1836 andi. r3,r3,PLATFORM_LPAR 1837 - bne 98f 1837 + bne 98f /* branch if result is !0 */ 1838 1838 LOADADDR(r6,_SDR1) /* Only if NOT LPAR */ 1839 1839 sub r6,r6,r26 1840 1840 ld r6,0(r6) /* get the value of _SDR1 */