From: Mark Rutland <mark.rutland@arm.com>
To: Ard Biesheuvel <ardb+git@google.com>
Cc: linux-arm-kernel@lists.infradead.org,
Ard Biesheuvel <ardb@kernel.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>, Marc Zyngier <maz@kernel.org>
Subject: Re: [PATCH 1/2] arm64/head: Drop unnecessary pre-disable-MMU workaround
Date: Mon, 15 Apr 2024 09:29:56 +0100 [thread overview]
Message-ID: <ZhzlfAcyrNZBk9Op@FVFF77S0Q05N> (raw)
In-Reply-To: <20240415075412.2347624-5-ardb+git@google.com>
On Mon, Apr 15, 2024 at 09:54:14AM +0200, Ard Biesheuvel wrote:
> From: Ard Biesheuvel <ardb@kernel.org>
>
> The Falkor erratum that results in the need for an ISB before clearing
> the M bit in SCTLR_ELx only applies to execution at exception level x,
> and so the workaround is not needed when disabling the EL1 MMU while
> running at EL2.
>
> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Mark.
> ---
> arch/arm64/kernel/head.S | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
> index 06234c3a15f3..b8bbd72cb194 100644
> --- a/arch/arm64/kernel/head.S
> +++ b/arch/arm64/kernel/head.S
> @@ -323,13 +323,11 @@ SYM_INNER_LABEL(init_el2, SYM_L_LOCAL)
> cbz x0, 2f
>
> /* Set a sane SCTLR_EL1, the VHE way */
> - pre_disable_mmu_workaround
> msr_s SYS_SCTLR_EL12, x1
> mov x2, #BOOT_CPU_FLAG_E2H
> b 3f
>
> 2:
> - pre_disable_mmu_workaround
> msr sctlr_el1, x1
> mov x2, xzr
> 3:
> --
> 2.44.0.683.g7961c838ac-goog
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2024-04-15 8:30 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-15 7:54 [PATCH 0/2] arm64 head.S fixes Ard Biesheuvel
2024-04-15 7:54 ` [PATCH 1/2] arm64/head: Drop unnecessary pre-disable-MMU workaround Ard Biesheuvel
2024-04-15 8:20 ` Marc Zyngier
2024-04-15 8:29 ` Mark Rutland [this message]
2024-04-15 7:54 ` [PATCH 2/2] arm64/head: Disable MMU at EL2 before clearing HCR_EL2.E2H Ard Biesheuvel
2024-04-15 8:22 ` Marc Zyngier
2024-04-15 8:32 ` Mark Rutland
2024-04-18 17:02 ` [PATCH 0/2] arm64 head.S fixes Catalin Marinas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZhzlfAcyrNZBk9Op@FVFF77S0Q05N \
--to=mark.rutland@arm.com \
--cc=ardb+git@google.com \
--cc=ardb@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=maz@kernel.org \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox