From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C0136C433FE for ; Mon, 14 Feb 2022 17:25:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Subject:Cc:To:From:Message-ID:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=0iyt5KU23AaVFlae+UsA/ZLs2bljw83FP3IaAE/hl14=; b=PsXvQq48tFcGU3 03VSgAkxClbgZ4CCtl6nDd1O9pIUVUrZLeVQGZGE+c18VftHRfovrnph29gWF1P6U90CI0ohNx85t XStkxtz9NJBLvcCeLCKLmS0wttcIH9Af25KCHznfHg5oKFpvUjpLLz30fZR/UAwlQLcWiryfnzZSx 2JfNE+6XKRb/YTWXhR1V9zVASR4rnrxU5ViKgYTwacARBXTJQdbkJKJjPP0dlVLWNjc5QgpjZugtT jXHWn64AiRngWvKx6AhFzB3+faJBhWpsTrYgg9k1xEhd3bTpwNtl+2QzrBCYZkekfrNH0mzD0eAmq QkWtuPNtGatABaI6ud4g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJf58-00GNEU-4F; Mon, 14 Feb 2022 17:24:10 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJf53-00GND9-U4 for linux-arm-kernel@lists.infradead.org; Mon, 14 Feb 2022 17:24:07 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 11C1661568; Mon, 14 Feb 2022 17:24:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 71648C340E9; Mon, 14 Feb 2022 17:24:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1644859444; bh=BzGNJ5YwKyxGBxCnAl327RSgseliUTBWZ3f0U9l7B3g=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=UEqnJLzDstg4dFYw60qYHEgMJWdQenZWeevEp/di7xW0tp6tTIwYG7MQs/WWK3Jws bNgTdvIQld6TnUhkbyXazAU6aAdtOBg5z+GAY67HJeFaHV1C5gCC8Pq8YGDdO78jsj KXSwt+m4yWqXUrkDSoiwBvyB5iWcuVjLwuRjhOSJVwtGgMc2fW6XrzOUMSwLi/MlxW ucdvbsBx22WKkHcTnXssQe3j0HPCCLEWiPyr1X0fYjMmQj5HEq3vjmBI/yWToK8zHb 9NLczQJfdo2qZHeYWdFtzSSP89Soq6+mKENDpUbOyFZFQIQ8/+FkxXjZohmXQrC9Qv FK6V1vMKIiYBA== Received: from sofa.misterjones.org ([185.219.108.64] helo=why.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nJf50-007qUS-GA; Mon, 14 Feb 2022 17:24:02 +0000 Date: Mon, 14 Feb 2022 17:24:02 +0000 Message-ID: <87h7914b0t.wl-maz@kernel.org> From: Marc Zyngier To: Joakim Tjernlund Cc: , Mark Rutland , Catalin Marinas , Will Deacon Subject: Re: [PATCH] arm64: Correct wrong label in macro __init_el2_gicv3 In-Reply-To: <20220214171157.20371-1-joakim.tjernlund@infinera.com> References: <20220214171157.20371-1-joakim.tjernlund@infinera.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/27.1 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: joakim.tjernlund@infinera.com, linux-arm-kernel@lists.infradead.org, mark.rutland@arm.com, catalin.marinas@arm.com, will@kernel.org X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220214_092406_030653_3577BFCB X-CRM114-Status: GOOD ( 20.63 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org [+ Catalin, Will] On Mon, 14 Feb 2022 17:11:57 +0000, Joakim Tjernlund 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 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 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