Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fabab833 authored by James Morse's avatar James Morse Committed by Gerrit - the friendly Code Review server
Browse files

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



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 a 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.

Change-Id: Ia9607bea454f9822be63c8be7bfbf55d3dabedd0
Reviewed-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarJames Morse <james.morse@arm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Git-commit: af484e69
Git-repo: https://android.googlesource.com/kernel/common/


Signed-off-by: default avatarKishor Krishna Bhat <quic_kishkris@quicinc.com>
parent 2f54d35a

arch/arm64/kernel/entry.S

+15 −13
Original line number Diff line number Diff line
@@ -1008,7 +1008,7 @@ alternative_else_nop_endif 
	sub	\dst, \dst, PAGE_SIZE

	.endm



	.macro tramp_ventry, regsize = 64

	.macro tramp_ventry, vector_start, regsize

	.align	7

1:

	.if	\regsize == 64
@@ -1030,9 +1030,9 @@ alternative_insn isb, nop, ARM64_WORKAROUND_QCOM_FALKOR_E1003 
#else

	ldr	x30, =vectors

#endif

	prfm	plil1strm, [x30, #(1b - tramp_vectors)]

	prfm	plil1strm, [x30, #(1b - \vector_start)]

	msr	vbar_el1, x30

	add	x30, x30, #(1b - tramp_vectors + 4)

	add	x30, x30, #(1b - \vector_start + 4)

	isb

	ret

.org 1b + 128	// Did we overflow the ventry slot?
@@ -1050,19 +1050,21 @@ alternative_insn isb, nop, ARM64_WORKAROUND_QCOM_FALKOR_E1003 
	eret

	.endm



	.align	11

ENTRY(tramp_vectors)

	.macro	generate_tramp_vector

.Lvector_start\@:

	.space	0x400



	tramp_ventry

	tramp_ventry

	tramp_ventry

	tramp_ventry

	.rept	4

	tramp_ventry	.Lvector_start\@, 64

	.endr

	.rept	4

	tramp_ventry	.Lvector_start\@, 32

	.endr

	.endm



	tramp_ventry	32

	tramp_ventry	32

	tramp_ventry	32

	tramp_ventry	32

	.align	11

ENTRY(tramp_vectors)

	generate_tramp_vector

END(tramp_vectors)



ENTRY(tramp_exit_native)