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

arm64: Switch to adrp for loading the stub vectors

The hyp stub vectors are currently loaded using adr. This
instruction has a +/- 1MB range for the loading address. If
the alignment for sections is changed the address may be more
than 1MB away, resulting in reclocation errors. Switch to using
adrp for getting the address to ensure we aren't affected by the
location of the __hyp_stub_vectors.
Acked-by: default avatarArd Biesheuvel <>
Acked-by: default avatarMarc Zyngier <>
Tested-by: default avatarMark Rutland <>
Tested-by: default avatarKees Cook <>
Signed-off-by: default avatarLaura Abbott <>
Signed-off-by: default avatarWill Deacon <>
parent fcff5886
......@@ -341,7 +341,8 @@ CPU_LE( movk x0, #0x30d0, lsl #16 ) // Clear EE and E0E on LE systems
msr vttbr_el2, xzr
/* Hypervisor stub */
adr x0, __hyp_stub_vectors
adrp x0, __hyp_stub_vectors
add x0, x0, #:lo12:__hyp_stub_vectors
msr vbar_el2, x0
/* spsr */
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