Commit 45879a57 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

arm64: Use INIT_SCTLR_EL1_MMU_OFF to disable the MMU on CPU restart 



Instead of doing a RMW on SCTLR_EL1 to disable the MMU, use the
existing define that loads the right set of bits.

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 1e28eed1

arch/arm64/kernel/cpu-reset.S

+1 −4
Original line number Diff line number Diff line
@@ -30,10 +30,7 @@ 
 * flat identity mapping.

 */

SYM_CODE_START(__cpu_soft_restart)

	/* Clear sctlr_el1 flags. */

	mrs	x12, sctlr_el1

	mov_q	x13, SCTLR_ELx_FLAGS

	bic	x12, x12, x13

	mov_q	x12, INIT_SCTLR_EL1_MMU_OFF

	pre_disable_mmu_workaround

	/*

	 * either disable EL1&0 translation regime or disable EL2&0 translation