diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-06-13 10:04:14 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-06-24 03:47:29 -0400 |
commit | 5fa94c812c0001ac7c3d8868e956ec514734a352 (patch) | |
tree | ec1196e56475336c419335251dc483aba5de5d91 /arch/arm/kernel/sleep.S | |
parent | 3fd431bd0cbc75a506b90b42619de3b04fe813a7 (diff) |
ARM: pm: preserve r4 - r11 across a suspend
Make cpu_suspend()..return function preserve r4 to r11 across a suspend
cycle. This is in preparation of relieving platform support code from
this task.
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>
Diffstat (limited to 'arch/arm/kernel/sleep.S')
-rw-r--r-- | arch/arm/kernel/sleep.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/kernel/sleep.S b/arch/arm/kernel/sleep.S index 0a778c30859b..8dbca93417ff 100644 --- a/arch/arm/kernel/sleep.S +++ b/arch/arm/kernel/sleep.S | |||
@@ -12,10 +12,11 @@ | |||
12 | * r1 = v:p offset | 12 | * r1 = v:p offset |
13 | * r3 = virtual return function | 13 | * r3 = virtual return function |
14 | * Note: sp is decremented to allocate space for CPU state on stack | 14 | * Note: sp is decremented to allocate space for CPU state on stack |
15 | * r0-r3,r9,r10,lr corrupted | 15 | * r0-r3,ip,lr corrupted |
16 | */ | 16 | */ |
17 | ENTRY(cpu_suspend) | 17 | ENTRY(cpu_suspend) |
18 | stmfd sp!, {r3} | 18 | stmfd sp!, {r3} |
19 | stmfd sp!, {r4 - r11} | ||
19 | mov r9, lr | 20 | mov r9, lr |
20 | #ifdef MULTI_CPU | 21 | #ifdef MULTI_CPU |
21 | ldr r10, =processor | 22 | ldr r10, =processor |
@@ -88,7 +89,7 @@ ENDPROC(cpu_resume_turn_mmu_on) | |||
88 | cpu_resume_after_mmu: | 89 | cpu_resume_after_mmu: |
89 | str r5, [r2, r4, lsl #2] @ restore old mapping | 90 | str r5, [r2, r4, lsl #2] @ restore old mapping |
90 | mcr p15, 0, r0, c1, c0, 0 @ turn on D-cache | 91 | mcr p15, 0, r0, c1, c0, 0 @ turn on D-cache |
91 | ldmfd sp!, {pc} | 92 | ldmfd sp!, {r4 - r11, pc} |
92 | ENDPROC(cpu_resume_after_mmu) | 93 | ENDPROC(cpu_resume_after_mmu) |
93 | 94 | ||
94 | /* | 95 | /* |