Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73e57098 authored by Magnus Damm's avatar Magnus Damm Committed by Simon Horman
Browse files

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: default avatarBastian Hecht <hechtb@gmail.com>
Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 8819ce4b

arch/arm/mach-shmobile/headsmp-scu.S

+2 −1
Original line number Diff line number Diff line
@@ -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