Commit 19e87e13 authored by Marc Zyngier's avatar Marc Zyngier Committed by Will Deacon
Browse files

arm64: Move VHE-specific SPE setup to mutate_to_vhe() 



There isn't much that a VHE kernel needs on top of whatever has
been done for nVHE, so let's move the little we need to the
VHE stub (the SPE setup), and drop the init_el2_state macro.

No expected functional change.

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Acked-by: default avatarDavid Brazdil <dbrazdil@google.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Link: https://lore.kernel.org/r/20210208095732.3267263-8-maz@kernel.org


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent c6f8c92f

arch/arm64/kernel/hyp-stub.S

+5 −3
Original line number Diff line number Diff line
@@ -92,9 +92,6 @@ SYM_CODE_START_LOCAL(mutate_to_vhe) 
	msr	hcr_el2, x0

	isb



	// Doesn't do much on VHE, but still, worth a shot

	init_el2_state vhe



	// Use the EL1 allocated stack, per-cpu offset

	mrs	x0, sp_el1

	mov	sp, x0
@@ -107,6 +104,11 @@ SYM_CODE_START_LOCAL(mutate_to_vhe) 
	mrs_s	x0, SYS_VBAR_EL12

	msr	vbar_el1, x0



	// Use EL2 translations for SPE and disable access from EL1

	mrs	x0, mdcr_el2

	bic	x0, x0, #(MDCR_EL2_E2PB_MASK << MDCR_EL2_E2PB_SHIFT)

	msr	mdcr_el2, x0



	// Transfer the MM state from EL1 to EL2

	mrs_s	x0, SYS_TCR_EL12

	msr	tcr_el1, x0