From patchwork Mon Feb 14 17:11:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joakim Tjernlund X-Patchwork-Id: 12745919 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 2AE96C433F5 for ; Mon, 14 Feb 2022 17:13:35 +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:Message-ID:Date:Subject:CC :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=glYnYf6YXSfZ3vmdCXXHJmN3BzIoAumJxbxTEZ1P8Tk=; b=4LwIh9g8LkWW7r Qh8b9L5gz79byiHR9fiiQ7CxfM7EEcDcN0cZ8oi+ARwrvdtqvacop+IRjPvRyQbm6CQGdEEhoPITE f2ev5IVbe6RlLNzRkV7F9B/lrsf1yfoQXDHm8emZNwGi3NKQxWOSH0fqem68YJ94vhkvAfKg+3I3f Dzq2Iow69Hoi5t6mMHR0JeExRpZNwy7UQDHls56KT5uFjETJaelyl4Txgou6Zz41zgdhIcyXh7R2R VPgonhvDBqjSecl9556KnQ0zFYFKmbcsMa8iiB86/Mgj4nMbM9dRngMEepmzl5X67rbfuHdWLqU1i ELBlqZd5yHI7Xt/lRJUA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJetX-00GJlu-Er; Mon, 14 Feb 2022 17:12:11 +0000 Received: from mail-bn8nam11on2062d.outbound.protection.outlook.com ([2a01:111:f400:7eae::62d] helo=NAM11-BN8-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJetT-00GJkK-BL for linux-arm-kernel@lists.infradead.org; Mon, 14 Feb 2022 17:12:09 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Kz5t2zH2q5rBLVcy9lJ9gobFPtKt2teBMCRUULfBHku5QqZwsu9BU0Z8V0SfxTsLLN55WAaEvytdbnU2Wies/OKs1BQ7dGNQYmgz/4TaBnoWhidYyCl8CG7eMtZ6w0+YcuxQEgrseHzPtcNKuFjnUDZ1+xOKemOvzU7117AJbX3gao2mqZw78oQgt2m1d9d5K6pVtQRUYmLMmv1KVpMjBoq+KKsBB4e9yFS7yO5rPfsuQGM8ktNmD1TgdUfMM8rPrcvNDQcX52yuVitEtnArk/KaaPNcLz7tzxVUXUbgfbSCr78M56teQ1XikZwN0152RntbaeOTW46G0Axn/4d73g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=AkBp171DAg24JYHYxEoj7ckz99fY0i+aqDhYxZC0cAM=; b=D2O39fIlUbsRPI2wJrz6pqiXcvzruzzUbeclD7iuZGY7vXc1UZpNnKea3WFIxJK7V9R2j49M5Iq8Hcf418bppTK2I4MgE6WJkd1pEiN79t0RGdnCqWVhU70gP0alGUkDfdJ5cWL6+bA3t09IKIyT3IFOqbP2G9cu8FEJtIj9qPuHY4jUZ6MWjBFmOmFeohJU9nBKAwB8/UTpdqFEMbF0lKaD+EVO7bamr6aMkIHJX38ZDaowaGBCQ+701v+YFnWQ9RCSwa/hyzuXIYcM+NDarz2K/ntGUxhYmUk9TTvKYSm22YWyR+R0XyFvnfKngtTFydOfRZXxepk3ftjXM7/HRw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 8.4.225.30) smtp.rcpttodomain=lists.infradead.org smtp.mailfrom=infinera.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=infinera.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=infinera.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=AkBp171DAg24JYHYxEoj7ckz99fY0i+aqDhYxZC0cAM=; b=L4s1oiQ73QYEstpF1MOCRnZtPjcuFlNtXTwEUaLD/GWcqcchuwRZ2EBhqkCdnnaSibeukCM02Q7m/boI7VWTHJYBFSljDkFyoj2EoRDKVCmmMji6Io7mplQhZj9yJaT7c5SS991oe5SizdnvxVV465TRxtp7JFP/D3pjEB/Lxk4= Received: from DM3PR11CA0015.namprd11.prod.outlook.com (2603:10b6:0:54::25) by BYAPR10MB3430.namprd10.prod.outlook.com (2603:10b6:a03:8f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.12; Mon, 14 Feb 2022 17:12:03 +0000 Received: from DM6NAM11FT035.eop-nam11.prod.protection.outlook.com (2603:10b6:0:54:cafe::49) by DM3PR11CA0015.outlook.office365.com (2603:10b6:0:54::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.13 via Frontend Transport; Mon, 14 Feb 2022 17:12:03 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 8.4.225.30) smtp.mailfrom=infinera.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=infinera.com; Received-SPF: Pass (protection.outlook.com: domain of infinera.com designates 8.4.225.30 as permitted sender) receiver=protection.outlook.com; client-ip=8.4.225.30; helo=owa.infinera.com; Received: from owa.infinera.com (8.4.225.30) by DM6NAM11FT035.mail.protection.outlook.com (10.13.172.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4975.11 via Frontend Transport; Mon, 14 Feb 2022 17:12:03 +0000 Received: from sv-ex16-prd.infinera.com (10.100.96.229) by sv-ex16-prd.infinera.com (10.100.96.229) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Mon, 14 Feb 2022 09:12:02 -0800 Received: from sv-smtp-prod2.infinera.com (10.100.98.82) by sv-ex16-prd.infinera.com (10.100.96.229) with Microsoft SMTP Server id 15.1.2176.14 via Frontend Transport; Mon, 14 Feb 2022 09:12:02 -0800 Received: from se-metroit-prd1.infinera.com ([10.210.32.58]) by sv-smtp-prod2.infinera.com with Microsoft SMTPSVC(7.5.7601.17514); Mon, 14 Feb 2022 09:12:01 -0800 Received: from gentoo-jocke.infinera.com (gentoo-jocke.infinera.com [10.210.71.2]) by se-metroit-prd1.infinera.com (Postfix) with ESMTP id C4E842C06D81; Mon, 14 Feb 2022 18:12:01 +0100 (CET) Received: by gentoo-jocke.infinera.com (Postfix, from userid 1001) id C0D3D4011984; Mon, 14 Feb 2022 18:12:01 +0100 (CET) From: Joakim Tjernlund To: , Mark Rutland CC: Joakim Tjernlund Subject: [PATCH] arm64: Correct wrong label in macro __init_el2_gicv3 Date: Mon, 14 Feb 2022 18:11:57 +0100 Message-ID: <20220214171157.20371-1-joakim.tjernlund@infinera.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-OriginalArrivalTime: 14 Feb 2022 17:12:02.0154 (UTC) FILETIME=[FBA41CA0:01D821C5] X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 795715da-0b26-4a51-681b-08d9efdd1edc X-MS-TrafficTypeDiagnostic: BYAPR10MB3430:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:378; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QL/w9PyNAweobCUnGH19aoPij6FyahQdt5IEQDNy7Wz16kuf59CdyPzQpNHwv0Rpr+3bELSvEE5BkOhvym3GA56fKdD8VWaCTGyFoN9YHxomiqOZaRE7Jzmpz70dClU+2EhUcXMwBRDhivTeVfGzd/B11IMKuwW0JUKiUcgD9Q7RdeNi6YanlViQCTFzML5D94c3QiAT3lU69h5C0wMXOue6Fy9iSHCHOpVgMzv2XVC4N1G9v5xILpJRy3VIv8/s5zMfeYRHoM6QpoNQpXGqWSTudp89Vh/s9cy7qcW1vewBrjJNnpCHMTXCev0ZW/ZF7RlWtLu6kPA+i7J5tDdmn8N88dSAlhVKqIedOwJevDbzdIoxZODPpDP44iC9vqj/UsPbbaL8IN0xfcoY+6Zobc6CweG8LPN8GcG+32H3tA4zInJgLIYPt6PX/aaBDxWrWKqG7EG35+Q6txJI3vGrf8UO0XyNoTB7QVhFWY+//B1uhHq4FrCIVIG5yMlSYB0bWYlwFNjPiti14pAo0dDR2jb88aIbZuf1b/oOCd265jIwaxdZWCAO6KgYMOYUYixZmileW+b/+ue69QlnO4NPiNsjlbUOE3jCc4sQCl2o5kNjV30Uvc1XDKGGtDU41/Xy2G1GFYHpEHyfR0vlEoJ9EjtlKxF3hZUOZap6fadhd7QKi8Ez4eRYCWAYQW2iVjOn X-Forefront-Antispam-Report: CIP:8.4.225.30; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:owa.infinera.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230001)(4636009)(46966006)(36840700001)(83380400001)(44832011)(47076005)(36756003)(5660300002)(508600001)(1076003)(36860700001)(4744005)(6666004)(2906002)(186003)(110136005)(356005)(107886003)(82310400004)(70586007)(70206006)(6266002)(8936002)(336012)(426003)(26005)(86362001)(2616005)(316002)(81166007)(42186006)(8676002)(4326008)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: infinera.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2022 17:12:03.3270 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 795715da-0b26-4a51-681b-08d9efdd1edc X-MS-Exchange-CrossTenant-Id: 285643de-5f5b-4b03-a153-0ae2dc8aaf77 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=285643de-5f5b-4b03-a153-0ae2dc8aaf77; Ip=[8.4.225.30]; Helo=[owa.infinera.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT035.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB3430 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220214_091207_535900_39367B85 X-CRM114-Status: GOOD ( 12.24 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 Reviewed-by: Mark Rutland Reviewed-by: Marc Zyngier --- 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