diff options
| author | Neeraj Upadhyay <quic_neeraju@quicinc.com> | 2023-04-25 15:27:00 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-05-17 14:01:36 +0200 |
| commit | 2da41c8e1c98b14b773b5a7796e0a83aaa66d547 (patch) | |
| tree | 9907106a93bd3f8722702454f4d071d092c4c088 /arch | |
| parent | 124027cd1a624ce0347adcd59241a9966a726b22 (diff) | |
| download | linux-stable-2da41c8e1c98b14b773b5a7796e0a83aaa66d547.tar.gz linux-stable-2da41c8e1c98b14b773b5a7796e0a83aaa66d547.tar.bz2 linux-stable-2da41c8e1c98b14b773b5a7796e0a83aaa66d547.zip | |
arm64: Fix label placement in record_mmu_state()
[ Upstream commit 4e8f6e44bce8da3b0e2df37b12839f4bc9c9cabe ]
Fix label so that pre_disable_mmu_workaround() is called
before clearing sctlr_el1.M.
Fixes: 2ced0f30a426 ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/kernel/head.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index b98970907226..e92caebff46a 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -150,8 +150,8 @@ CPU_BE( tbz x19, #SCTLR_ELx_EE_SHIFT, 1f ) pre_disable_mmu_workaround msr sctlr_el2, x19 b 3f - pre_disable_mmu_workaround -2: msr sctlr_el1, x19 +2: pre_disable_mmu_workaround + msr sctlr_el1, x19 3: isb mov x19, xzr ret |