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

KVM: arm64: Use INIT_SCTLR_EL2_MMU_OFF to disable the MMU on KVM teardown 



Instead of doing a RMW on SCTLR_EL2 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 45879a57

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

+1 −3
Original line number Diff line number Diff line
@@ -221,9 +221,7 @@ SYM_CODE_START(__kvm_handle_stub_hvc) 
	mov	x0, xzr

reset:

	/* Reset kvm back to the hyp stub. */

	mrs	x5, sctlr_el2

	mov_q	x6, SCTLR_ELx_FLAGS

	bic	x5, x5, x6		// Clear SCTL_M and etc

	mov_q	x5, INIT_SCTLR_EL2_MMU_OFF

	pre_disable_mmu_workaround

	msr	sctlr_el2, x5

	isb