lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM: pm: reallocate registers to avoid r2, r3

Browse Source 
Avoid using r2 and r3 in the suspend code, allowing these to be
passed further into the function as arguments.

Acked-by: Frank Hofmann <frank.hofmann@tomtom.com>
Tested-by: Kevin Hilman <khilman@ti.com>
Acked-by: Jean Pihet <j-pihet@ti.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King
2011-06-13 15:25:11 +01:00
parent 5fa94c812c
commit 8111eaa6d4
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
arch/arm/kernel/sleep.S
View File

@@ -20,26 +20,26 @@ ENTRY(cpu_suspend)
mov r9, lr mov r9, lr
#ifdef MULTI_CPU #ifdef MULTI_CPU
ldr r10, =processor ldr r10, =processor
ldr r0, [r10, #CPU_SLEEP_SIZE] @ size of CPU sleep state ldr r5, [r10, #CPU_SLEEP_SIZE] @ size of CPU sleep state
ldr ip, [r10, #CPU_DO_RESUME] @ virtual resume function ldr ip, [r10, #CPU_DO_RESUME] @ virtual resume function
#else #else
ldr r0, =cpu_suspend_size ldr r5, =cpu_suspend_size
ldr ip, =cpu_do_resume ldr ip, =cpu_do_resume
#endif #endif
mov r2, sp @ current virtual SP mov r6, sp @ current virtual SP
sub sp, sp, r0 @ allocate CPU state on stack sub sp, sp, r5 @ allocate CPU state on stack
mov r0, sp @ save pointer mov r0, sp @ save pointer
add ip, ip, r1 @ convert resume fn to phys add ip, ip, r1 @ convert resume fn to phys
stmfd sp!, {r1, r2, ip} @ save v:p, virt SP, phys resume fn stmfd sp!, {r1, r6, ip} @ save v:p, virt SP, phys resume fn
ldr r3, =sleep_save_sp ldr r5, =sleep_save_sp
add r2, sp, r1 @ convert SP to phys add r6, sp, r1 @ convert SP to phys
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
ALT_SMP(mrc p15, 0, lr, c0, c0, 5) ALT_SMP(mrc p15, 0, lr, c0, c0, 5)
ALT_UP(mov lr, #0) ALT_UP(mov lr, #0)
and lr, lr, #15 and lr, lr, #15
str r2, [r3, lr, lsl #2] @ save phys SP str r6, [r5, lr, lsl #2] @ save phys SP
#else #else
str r2, [r3] @ save phys SP str r6, [r5] @ save phys SP
#endif #endif
#ifdef MULTI_CPU #ifdef MULTI_CPU
mov lr, pc mov lr, pc