summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorVictor Kamensky <victor.kamensky@linaro.org>2013-11-07 08:42:40 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-11-14 11:03:01 +0000
commit10593b2e49327f7cd193fc2ba30fa3da322bda6a (patch)
tree82ea3d6b87c7069a1f74882724f90fc759e9d0f1 /arch
parent83651bb988b169deae16608262e996eb718c6ab4 (diff)
downloadlinux-stable-10593b2e49327f7cd193fc2ba30fa3da322bda6a.tar.gz
linux-stable-10593b2e49327f7cd193fc2ba30fa3da322bda6a.tar.bz2
linux-stable-10593b2e49327f7cd193fc2ba30fa3da322bda6a.zip
ARM: 7881/1: __fixup_smp read of SCU config should do byteswap in BE case
Commit "bc41b8724f24b9a27d1dcc6c974b8f686b38d554 ARM: 7846/1: Update SMP_ON_UP code to detect A9MPCore with 1 CPU devices" added read of SCU config register into __fixup_smp function. Such read should be followed by byteswap, if kernel runs in BE mode. Signed-off-by: Victor Kamensky <victor.kamensky@linaro.org> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/kernel/head.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index 7801866e626a..cd788d5b6682 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -508,6 +508,7 @@ __fixup_smp:
teq r0, #0x0 @ '0' on actual UP A9 hardware
beq __fixup_smp_on_up @ So its an A9 UP
ldr r0, [r0, #4] @ read SCU Config
+ARM_BE8(rev r0, r0) @ byteswap if big endian
and r0, r0, #0x3 @ number of CPUs
teq r0, #0x0 @ is 1?
movne pc, lr