a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: shmobile: Remove old SCU boot code

Browse Source 
Remove shmobile_secondary_vector_scu now when all SCU enabled
SMP platforms instead make use of shmobile_boot_scu. This
removes two inline virtual to physical address conversions.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
This commit is contained in:
Magnus Damm 2013-06-10 18:20:25 +09:00 committed by Simon Horman
parent a188bfcafa
commit 4f6da36f7e
2 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/arm/mach-shmobile/headsmp-scu.S
View File

@ -25,32 +25,12 @@
__CPUINIT __CPUINIT
/* /*
* Reset vector for secondary CPUs. * Boot code for secondary CPUs.
* *
* First we turn on L1 cache coherency for our CPU. Then we jump to * First we turn on L1 cache coherency for our CPU. Then we jump to
* shmobile_invalidate_start that invalidates the cache and hands over control * shmobile_invalidate_start that invalidates the cache and hands over control
* to the common ARM startup code. * to the common ARM startup code.
* This function will be mapped to address 0 by the SBAR register.
* A normal branch is out of range here so we need a long jump. We jump to
* the physical address as the MMU is still turned off.
*/ */
.align 12
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, 2f
ldr r1, [r1] @ SCU base address
ldr r2, [r1, #8] @ SCU Power Status Register
mov r3, #3
bic r2, r2, r3, lsl r0 @ Clear bits of our CPU (Run Mode)
str r2, [r1, #8] @ write back
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)
ENTRY(shmobile_boot_scu) ENTRY(shmobile_boot_scu)
@ r0 = SCU base address @ r0 = SCU base address
mrc p15, 0, r1, c0, c0, 5 @ read MIPDR mrc p15, 0, r1, c0, c0, 5 @ read MIPDR

1
arch/arm/mach-shmobile/include/mach/common.h
View File

@ -10,7 +10,6 @@ extern void shmobile_setup_console(void);
extern void shmobile_boot_vector(void); extern void shmobile_boot_vector(void);
extern unsigned long shmobile_boot_fn; extern unsigned long shmobile_boot_fn;
extern unsigned long shmobile_boot_arg; extern unsigned long shmobile_boot_arg;
extern void shmobile_secondary_vector_scu(void);
extern void shmobile_boot_scu(void); extern void shmobile_boot_scu(void);
struct clk; struct clk;
extern int shmobile_clk_init(void); extern int shmobile_clk_init(void);