xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm64: entry: Don't assume tramp_vectors is the start of the vectors

Browse Source 
commit ed50da7764535f1e24432ded289974f2bf2b0c5a upstream.

The tramp_ventry macro uses tramp_vectors as the address of the vectors
when calculating which ventry in the 'full fat' vectors to branch to.

While there is one set of tramp_vectors, this will be true.
Adding multiple sets of vectors will break this assumption.

Move the generation of the vectors to a macro, and pass the start
of the vectors as an argument to tramp_ventry.

Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: James Morse <james.morse@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
James Morse
2021-11-24 13:40:09 +00:00
committed by Greg Kroah-Hartman
parent 5275fb5ea5
commit e550250632
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
arch/arm64/kernel/entry.S
View File

@@ -822,7 +822,7 @@ alternative_else_nop_endif
sub \dst, \dst, PAGE_SIZE sub \dst, \dst, PAGE_SIZE
.endm .endm
.macro tramp_ventry, regsize = 64 .macro tramp_ventry, vector_start, regsize
.align 7 .align 7
1: 1:
.if \regsize == 64 .if \regsize == 64
@@ -845,10 +845,10 @@ alternative_insn isb, nop, ARM64_WORKAROUND_QCOM_FALKOR_E1003
ldr x30, =vectors ldr x30, =vectors
#endif #endif
alternative_if_not ARM64_WORKAROUND_CAVIUM_TX2_219_PRFM alternative_if_not ARM64_WORKAROUND_CAVIUM_TX2_219_PRFM
prfm plil1strm, [x30, #(1b - tramp_vectors)] prfm plil1strm, [x30, #(1b - \vector_start)]
alternative_else_nop_endif alternative_else_nop_endif
msr vbar_el1, x30 msr vbar_el1, x30
add x30, x30, #(1b - tramp_vectors + 4) add x30, x30, #(1b - \vector_start + 4)
isb isb
ret ret
.org 1b + 128 // Did we overflow the ventry slot? .org 1b + 128 // Did we overflow the ventry slot?
@@ -867,19 +867,21 @@ alternative_else_nop_endif
sb sb
.endm .endm
.align 11 .macro generate_tramp_vector
SYM_CODE_START_NOALIGN(tramp_vectors) .Lvector_start\@:
.space 0x400 .space 0x400
tramp_ventry .rept 4
tramp_ventry tramp_ventry .Lvector_start\@, 64
tramp_ventry .endr
tramp_ventry .rept 4
tramp_ventry .Lvector_start\@, 32
.endr
.endm
tramp_ventry 32 .align 11
tramp_ventry 32 SYM_CODE_START_NOALIGN(tramp_vectors)
tramp_ventry 32 generate_tramp_vector
tramp_ventry 32
SYM_CODE_END(tramp_vectors) SYM_CODE_END(tramp_vectors)
SYM_CODE_START(tramp_exit_native) SYM_CODE_START(tramp_exit_native)