Commit c8a4b35f authored Mar 10, 2021 by Marc Zyngier

KVM: arm64: Force SCTLR_EL2.WXN when running nVHE



As the EL2 nVHE object is nicely split into sections and that
we already use differenciating permissions for data and code,
we can enable SCTLR_EL2.WXN so that we don't have to worry
about misconfiguration of the page tables.

Flip the WXN bit and get the ball running!

Acked-by: Will Deacon <will@kernel.org>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>

parent fe2c8d19

arch/arm64/include/asm/sysreg.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -592,7 +592,7 @@

		#define INIT_SCTLR_EL2_MMU_ON \
		(SCTLR_ELx_M \| SCTLR_ELx_C \| SCTLR_ELx_SA \| SCTLR_ELx_I \| \
		SCTLR_ELx_IESB \| ENDIAN_SET_EL2 \| SCTLR_EL2_RES1)
		SCTLR_ELx_IESB \| SCTLR_ELx_WXN \| ENDIAN_SET_EL2 \| SCTLR_EL2_RES1)

		#define INIT_SCTLR_EL2_MMU_OFF \
		(SCTLR_EL2_RES1 \| ENDIAN_SET_EL2)