iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: pm: get rid of cpu_resume_turn_mmu_on

Browse Source 
We don't require cpu_resume_turn_mmu_on as we can combine the ldr
instruction with the following code provided we ensure that
cpu_resume_mmu is aligned for older CPUs.  Note that we also align
to a 32-byte boundary to ensure that the code can't cross a section
boundary.

Tested-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Tested-by: Shawn Guo <shawn.guo@linaro.org>
Tested-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2011-08-31 23:26:18 +01:00
parent 1aede681ac
commit 62b2d07c0e
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,19 +72,15 @@ ENDPROC(cpu_suspend_abort)
/* /*
* r0 = control register value * r0 = control register value
*/ */
.align 5
ENTRY(cpu_resume_mmu) ENTRY(cpu_resume_mmu)
ldr r3, =cpu_resume_after_mmu ldr r3, =cpu_resume_after_mmu
b cpu_resume_turn_mmu_on
ENDPROC(cpu_resume_mmu)
.ltorg
.align 5
ENTRY(cpu_resume_turn_mmu_on)
mcr p15, 0, r0, c1, c0, 0 @ turn on MMU, I-cache, etc mcr p15, 0, r0, c1, c0, 0 @ turn on MMU, I-cache, etc
mrc p15, 0, r0, c0, c0, 0 @ read id reg mrc p15, 0, r0, c0, c0, 0 @ read id reg
mov r0, r0 mov r0, r0
mov r0, r0 mov r0, r0
mov pc, r3 @ jump to virtual address mov pc, r3 @ jump to virtual address
ENDPROC(cpu_resume_turn_mmu_on) ENDPROC(cpu_resume_mmu)
cpu_resume_after_mmu: cpu_resume_after_mmu:
bl cpu_init @ restore the und/abt/irq banked regs bl cpu_init @ restore the und/abt/irq banked regs
mov r0, #0 @ return zero on success mov r0, #0 @ return zero on success

4
arch/arm/kernel/suspend.c
View File

@ -9,7 +9,7 @@
static pgd_t *suspend_pgd; static pgd_t *suspend_pgd;
extern int __cpu_suspend(int, long, unsigned long, int (*)(unsigned long)); extern int __cpu_suspend(int, long, unsigned long, int (*)(unsigned long));
extern void cpu_resume_turn_mmu_on(void); extern void cpu_resume_mmu(void);
/* /*
* Hide the first two arguments to __cpu_suspend - these are an implementation * Hide the first two arguments to __cpu_suspend - these are an implementation
@ -43,7 +43,7 @@ static int __init cpu_suspend_init(void)
{ {
suspend_pgd = pgd_alloc(&init_mm); suspend_pgd = pgd_alloc(&init_mm);
if (suspend_pgd) { if (suspend_pgd) {
unsigned long addr = virt_to_phys(cpu_resume_turn_mmu_on); unsigned long addr = virt_to_phys(cpu_resume_mmu);
identity_mapping_add(suspend_pgd, addr, addr + SECTION_SIZE); identity_mapping_add(suspend_pgd, addr, addr + SECTION_SIZE);
} }
return suspend_pgd ? 0 : -ENOMEM; return suspend_pgd ? 0 : -ENOMEM;