summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/headsmp-scu.S
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2013-02-18 22:46:57 +0900
committerSimon Horman <horms+renesas@verge.net.au>2013-03-13 02:13:20 +0900
commit73e5709875e8b28c63ef8261d61c9eb06b499964 (patch)
treec8441fa6e73a126a17424b768d692526b38e624c /arch/arm/mach-shmobile/headsmp-scu.S
parent8819ce4b8874ac1db7b52f7eac7cf9d8e3989102 (diff)
downloadblackbird-op-linux-73e5709875e8b28c63ef8261d61c9eb06b499964.tar.gz
blackbird-op-linux-73e5709875e8b28c63ef8261d61c9eb06b499964.zip
ARM: shmobile: Fix base address readout in headsmp-scu.S
Rework the early SCU setup code in headsmp-scu.S to read the base address in the same way as we use to fetch the address of the invalidation function. Reported-by: Bastian Hecht <hechtb@gmail.com> Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile/headsmp-scu.S')
-rw-r--r--arch/arm/mach-shmobile/headsmp-scu.S3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/headsmp-scu.S b/arch/arm/mach-shmobile/headsmp-scu.S
index 0b9317062b2a..7d113f898e7f 100644
--- a/arch/arm/mach-shmobile/headsmp-scu.S
+++ b/arch/arm/mach-shmobile/headsmp-scu.S
@@ -39,7 +39,7 @@ ENTRY(shmobile_secondary_vector_scu)
mrc p15, 0, r0, c0, c0, 5 @ read MIPDR
and r0, r0, #3 @ mask out cpu ID
lsl r0, r0, #3 @ we will shift by cpu_id * 8 bits
- ldr r1, =shmobile_scu_base
+ ldr r1, 2f
ldr r1, [r1] @ SCU base address
ldr r2, [r1, #8] @ SCU Power Status Register
mov r3, #3
@@ -48,6 +48,7 @@ ENTRY(shmobile_secondary_vector_scu)
ldr pc, 1f
1: .long shmobile_invalidate_start - PAGE_OFFSET + PLAT_PHYS_OFFSET
+2: .long shmobile_scu_base - PAGE_OFFSET + PLAT_PHYS_OFFSET
ENDPROC(shmobile_secondary_vector_scu)
.text
OpenPOWER on IntegriCloud