ARM: 7881/1: __fixup_smp read of SCU config should do byteswap in BE case

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=10593b2e49327f7cd193fc2ba30fa3da322bda6a
Commit:     10593b2e49327f7cd193fc2ba30fa3da322bda6a
Parent:     83651bb988b169deae16608262e996eb718c6ab4
Author:     Victor Kamensky <victor.kamensky at linaro.org>
AuthorDate: Thu Nov 7 08:42:40 2013 +0100
Committer:  Russell King <rmk+kernel at arm.linux.org.uk>
CommitDate: Thu Nov 14 11:03:01 2013 +0000

    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 at linaro.org>
    Acked-by: Santosh Shilimkar <santosh.shilimkar at ti.com>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
---
 arch/arm/kernel/head.S | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index 7801866..cd788d5 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