kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ARM: pm: extract common code from MULTI_CPU/!MULTI_CPU paths

Browse source 
Very little code is different between these two paths now, so extract
the common code.

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 13:53:06 +01:00
parent 2fefbcd585
commit 3fd431bd0c
1 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
arch/arm/kernel/sleep.S
View file

@ -19,9 +19,13 @@ ENTRY(cpu_suspend)
mov r9, lr mov r9, lr
#ifdef MULTI_CPU #ifdef MULTI_CPU
ldr r10, =processor ldr r10, =processor
mov r2, sp @ current virtual SP
ldr r0, [r10, #CPU_SLEEP_SIZE] @ size of CPU sleep state ldr r0, [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
ldr r0, =cpu_suspend_size
ldr ip, =cpu_do_resume
#endif
mov r2, sp @ current virtual SP
sub sp, sp, r0 @ allocate CPU state on stack sub sp, sp, r0 @ 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
@ -36,26 +40,10 @@ ENTRY(cpu_suspend)
#else #else
str r2, [r3] @ save phys SP str r2, [r3] @ save phys SP
#endif #endif
#ifdef MULTI_CPU
mov lr, pc mov lr, pc
ldr pc, [r10, #CPU_DO_SUSPEND] @ save CPU state ldr pc, [r10, #CPU_DO_SUSPEND] @ save CPU state
#else #else
mov r2, sp @ current virtual SP
ldr r0, =cpu_suspend_size
ldr ip, =cpu_do_resume
sub sp, sp, r0 @ allocate CPU state on stack
mov r0, sp @ save pointer
add ip, ip, r1 @ convert resume fn to phys
stmfd sp!, {r1, r2, ip} @ save v:p, virt SP, phys resume fn
ldr r3, =sleep_save_sp
add r2, sp, r1 @ convert SP to phys
#ifdef CONFIG_SMP
ALT_SMP(mrc p15, 0, lr, c0, c0, 5)
ALT_UP(mov lr, #0)
and lr, lr, #15
str r2, [r3, lr, lsl #2] @ save phys SP
#else
str r2, [r3] @ save phys SP
#endif
bl cpu_do_suspend bl cpu_do_suspend
#endif #endif