From: Marc Zyngier <maz@kernel.org>
To: Joakim Tjernlund <joakim.tjernlund@infinera.com>
Cc: <linux-arm-kernel@lists.infradead.org>,
Mark Rutland <mark.rutland@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>
Subject: Re: [PATCH] arm64: Correct wrong label in macro __init_el2_gicv3
Date: Mon, 14 Feb 2022 17:24:02 +0000 [thread overview]
Message-ID: <87h7914b0t.wl-maz@kernel.org> (raw)
In-Reply-To: <20220214171157.20371-1-joakim.tjernlund@infinera.com>
[+ Catalin, Will]
On Mon, 14 Feb 2022 17:11:57 +0000,
Joakim Tjernlund <joakim.tjernlund@infinera.com> wrote:
>
> If GICv3 init fails, CPU branched to the wrong label causing
> a crash much later.
>
> Fixes: 114945d84a30a5fe ("arm64: Fix labels in el2_setup macros")
> Signed-off-by: Joakim Tjernlund <joakim.tjernlund@infinera.com>
This deserves a
Cc: stable@vger.kernel.org
> ---
> arch/arm64/include/asm/el2_setup.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm64/include/asm/el2_setup.h b/arch/arm64/include/asm/el2_setup.h
> index 3198acb2aad8..7f3c87f7a0ce 100644
> --- a/arch/arm64/include/asm/el2_setup.h
> +++ b/arch/arm64/include/asm/el2_setup.h
> @@ -106,7 +106,7 @@
> msr_s SYS_ICC_SRE_EL2, x0
> isb // Make sure SRE is now set
> mrs_s x0, SYS_ICC_SRE_EL2 // Read SRE back,
> - tbz x0, #0, 1f // and check that it sticks
> + tbz x0, #0, .Lskip_gicv3_\@ // and check that it sticks
> msr_s SYS_ICH_HCR_EL2, xzr // Reset ICC_HCR_EL2 to defaults
> .Lskip_gicv3_\@:
> .endm
Nice catch!
Reviewed-by: Marc Zyngier <maz@kernel.org>
Thanks,
M.
--
Without deviation from the norm, progress is not possible.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
prev parent reply other threads:[~2022-02-14 17:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-14 17:11 [PATCH] arm64: Correct wrong label in macro __init_el2_gicv3 Joakim Tjernlund
2022-02-14 17:20 ` Mark Rutland
2022-02-14 17:24 ` Marc Zyngier [this message]
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=87h7914b0t.wl-maz@kernel.org \
--to=maz@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=joakim.tjernlund@infinera.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=mark.rutland@arm.com \
--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;
as well as URLs for NNTP newsgroup(s).