Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge "arm64: Move cpu_resume into the text section"

Browse source
This commit is contained in:
Linux Build Service Account 2014-07-21 04:17:01 -07:00 committed by Gerrit - the friendly Code Review server
commit 83a1752141
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
arch/arm64/kernel/sleep.S
View file

@ -126,12 +126,12 @@ cpu_resume_after_mmu:
ret
ENDPROC(cpu_resume_after_mmu)
.data
ENTRY(cpu_resume)
bl el2_setup // if in EL2 drop to EL1 cleanly
#ifdef CONFIG_SMP
mrs x1, mpidr_el1
adr x4, mpidr_hash_ptr
adrp x4, mpidr_hash_ptr
add x4, x4, #:lo12:mpidr_hash_ptr
ldr x5, [x4]
add x8, x4, x5 // x8 = struct mpidr_hash phys address
/* retrieve mpidr_hash members to compute the hash */
@ -143,14 +143,15 @@ ENTRY(cpu_resume)
#else
mov x7, xzr
#endif
adr x0, sleep_save_sp
adrp x0, sleep_save_sp
add x0, x0, #:lo12:sleep_save_sp
ldr x0, [x0, #SLEEP_SAVE_SP_PHYS]
ldr x0, [x0, x7, lsl #3]
/* load sp from context */
ldr x2, [x0, #CPU_CTX_SP]
adr x1, sleep_idmap_phys
adrp x1, sleep_idmap_phys
/* load physical address of identity map page table in x1 */
ldr x1, [x1]
ldr x1, [x1, #:lo12:sleep_idmap_phys]
mov sp, x2
/*
* cpu_do_resume expects x0 to contain context physical address
@ -160,6 +161,7 @@ ENTRY(cpu_resume)
b cpu_resume_mmu // Resume MMU, never returns
ENDPROC(cpu_resume)
.data
.align 3
mpidr_hash_ptr:
/*