Commit 4e8f6e44 authored Apr 25, 2023 by Neeraj Upadhyay Committed by Will Deacon Apr 26, 2023

arm64: Fix label placement in record_mmu_state()



Fix label so that pre_disable_mmu_workaround() is called
before clearing sctlr_el1.M.

Fixes: 2ced0f30 ("arm64: head: Switch endianness before populating the ID map")
Signed-off-by: Neeraj Upadhyay <quic_neeraju@quicinc.com>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20230425095700.22005-1-quic_neeraju@quicinc.com


Signed-off-by: Will Deacon <will@kernel.org>

parent eeb3557c

arch/arm64/kernel/head.S

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -150,8 +150,8 @@ CPU_BE( tbz x19, #SCTLR_ELx_EE_SHIFT, 1f )
	pre_disable_mmu_workaround		pre_disable_mmu_workaround
	msr sctlr_el2, x19		msr sctlr_el2, x19
	b 3f		b 3f
	pre_disable_mmu_workaround		2: pre_disable_mmu_workaround
	2: msr sctlr_el1, x19		msr sctlr_el1, x19
	3: isb		3: isb
	mov x19, xzr		mov x19, xzr
	ret		ret