Commit fe2c8d19 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm64: Turn SCTLR_ELx_FLAGS into INIT_SCTLR_EL2_MMU_ON 



Only the nVHE EL2 code is using this define, so let's make it
plain that it is EL2 only, and refactor it to contain all the
bits we need when configuring the EL2 MMU, and only those.

Acked-by: default avatarWill Deacon <will@kernel.org>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent bc6ddaa6

arch/arm64/include/asm/sysreg.h

+4 −3
Original line number Diff line number Diff line
@@ -579,9 +579,6 @@ 
#define SCTLR_ELx_A	(BIT(1))

#define SCTLR_ELx_M	(BIT(0))



#define SCTLR_ELx_FLAGS	(SCTLR_ELx_M  | SCTLR_ELx_A | SCTLR_ELx_C | \

			 SCTLR_ELx_SA | SCTLR_ELx_I | SCTLR_ELx_IESB)



/* SCTLR_EL2 specific flags. */

#define SCTLR_EL2_RES1	((BIT(4))  | (BIT(5))  | (BIT(11)) | (BIT(16)) | \

			 (BIT(18)) | (BIT(22)) | (BIT(23)) | (BIT(28)) | \
@@ -593,6 +590,10 @@ 
#define ENDIAN_SET_EL2		0

#endif



#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)



#define INIT_SCTLR_EL2_MMU_OFF \

	(SCTLR_EL2_RES1 | ENDIAN_SET_EL2)

arch/arm64/kvm/hyp/nvhe/hyp-init.S

+1 −7
Original line number Diff line number Diff line
@@ -117,13 +117,7 @@ alternative_else_nop_endif 
	tlbi	alle2

	dsb	sy



	/*

	 * Preserve all the RES1 bits while setting the default flags,

	 * as well as the EE bit on BE. Drop the A flag since the compiler

	 * is allowed to generate unaligned accesses.

	 */

	mov_q	x0, (SCTLR_EL2_RES1 | (SCTLR_ELx_FLAGS & ~SCTLR_ELx_A))

CPU_BE(	orr	x0, x0, #SCTLR_ELx_EE)

	mov_q	x0, INIT_SCTLR_EL2_MMU_ON

alternative_if ARM64_HAS_ADDRESS_AUTH

	mov_q	x1, (SCTLR_ELx_ENIA | SCTLR_ELx_ENIB | \

		     SCTLR_ELx_ENDA | SCTLR_ELx_ENDB)