Commit c3684fbb authored by Laura Abbott's avatar Laura Abbott Committed by Will Deacon

arm64: Move cpu_resume into the text section

The function cpu_resume currently lives in the .data section.
There's no reason for it to be there since we can use relative
instructions without a problem. Move a few cpu_resume data
structures out of the assembly file so the .data annotation
can be dropped completely and cpu_resume ends up in the read
only text section.
Reviewed-by: default avatarKees Cook <>
Reviewed-by: default avatarMark Rutland <>
Reviewed-by: default avatarLorenzo Pieralisi <>
Tested-by: default avatarMark Rutland <>
Tested-by: default avatarLorenzo Pieralisi <>
Tested-by: default avatarKees Cook <>
Acked-by: default avatarArd Biesheuvel <>
Signed-off-by: default avatarLaura Abbott <>
Signed-off-by: default avatarWill Deacon <>
parent ac2dec5f
......@@ -147,14 +147,12 @@ cpu_resume_after_mmu:
bl el2_setup // if in EL2 drop to EL1 cleanly
mrs x1, mpidr_el1
adr x4, mpidr_hash_ptr
ldr x5, [x4]
add x8, x4, x5 // x8 = struct mpidr_hash phys address
adrp x8, mpidr_hash
add x8, x8, #:lo12:mpidr_hash // x8 = struct mpidr_hash phys address
/* retrieve mpidr_hash members to compute the hash */
ldr x2, [x8, #MPIDR_HASH_MASK]
ldp w3, w4, [x8, #MPIDR_HASH_SHIFTS]
......@@ -164,14 +162,15 @@ ENTRY(cpu_resume)
mov x7, xzr
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
......@@ -180,26 +179,3 @@ ENTRY(cpu_resume)
bl cpu_do_resume // PC relative jump, MMU off
b cpu_resume_mmu // Resume MMU, never returns
.align 3
* offset of mpidr_hash symbol from current location
* used to obtain run-time mpidr_hash address with MMU off
.quad mpidr_hash - .
* physical address of identity mapped page tables
.type sleep_idmap_phys, #object
.quad 0
* struct sleep_save_sp {
* phys_addr_t *save_ptr_stash;
* phys_addr_t save_ptr_stash_phys;
* };
.type sleep_save_sp, #object
.space SLEEP_SAVE_SP_SZ // struct sleep_save_sp
......@@ -126,8 +126,8 @@ int __cpu_suspend(unsigned long arg, int (*fn)(unsigned long))
return ret;
extern struct sleep_save_sp sleep_save_sp;
extern phys_addr_t sleep_idmap_phys;
struct sleep_save_sp sleep_save_sp;
phys_addr_t sleep_idmap_phys;
static int __init cpu_suspend_init(void)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment