Commit 6b776d38 authored by Joey Gouly's avatar Joey Gouly Committed by Catalin Marinas
Browse files

arm64: transfer permission indirection settings to EL2 



Copy the EL1 registers: TCR2_EL1, PIR_EL1, PIRE0_EL1, such that PIE
is also enabled for EL2.

Signed-off-by: default avatarJoey Gouly <joey.gouly@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Oliver Upton <oliver.upton@linux.dev>
Reviewed-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Link: https://lore.kernel.org/r/20230606145859.697944-18-joey.gouly@arm.com


Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 9e9bb6ed

arch/arm64/kernel/hyp-stub.S

+18 −0
Original line number Diff line number Diff line
@@ -119,6 +119,24 @@ SYM_CODE_START_LOCAL(__finalise_el2) 
	msr	ttbr1_el1, x0

	mrs_s	x0, SYS_MAIR_EL12

	msr	mair_el1, x0

	mrs	x1, REG_ID_AA64MMFR3_EL1

	ubfx	x1, x1, #ID_AA64MMFR3_EL1_TCRX_SHIFT, #4

	cbz	x1, .Lskip_tcr2

	mrs	x0, REG_TCR2_EL12

	msr	REG_TCR2_EL1, x0



	// Transfer permission indirection state

	mrs	x1, REG_ID_AA64MMFR3_EL1

	ubfx	x1, x1, #ID_AA64MMFR3_EL1_S1PIE_SHIFT, #4

	cbz	x1, .Lskip_indirection

	mrs	x0, REG_PIRE0_EL12

	msr	REG_PIRE0_EL1, x0

	mrs	x0, REG_PIR_EL12

	msr	REG_PIR_EL1, x0



.Lskip_indirection:

.Lskip_tcr2:



	isb



	// Hack the exception return to stay at EL2