From patchwork Mon Feb 14 17:56:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joakim Tjernlund X-Patchwork-Id: 12745963 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 BED50C433F5 for ; Mon, 14 Feb 2022 17:58:04 +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=2kqzpyZ2EHQbwdJS/EKxXBcod1b0cUw7jKrWYXYm1DY=; b=qR3uCiTnFR5FSI Nzfr7R/E1+F4OOz1eNrcNBktiDvtriyb6juA47N9jifRy67yT13/P7/N3WbgJWA+nuG7EIPgSkcFv oJPt1kIrdVVk113KOGpG6kCqWIDTL1eVZfWrDrgeKQH71EaMAKrI0jCm2T+bb5zUz+y1DapqTCsOF mWJz0mUtQVuiDXMyArFsfAPKVAMG2DqZW0fTCxrk+lnZfZPXBHJc5W6J9WRkcGgF6uTWzC/KDUVhs +6S8n9EbM5QyGktRX3uZB8RLNXMXkez239Ino2rGD9t8VxLVCWqktVDwGr9rmxAFvl7avgNldmGtw YxAF0TWN2z1CU9ZX3h6A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJfaq-00GRYG-9z; Mon, 14 Feb 2022 17:56:56 +0000 Received: from mail-mw2nam10on2061c.outbound.protection.outlook.com ([2a01:111:f400:7e89::61c] helo=NAM10-MW2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJfam-00GRXZ-Uj for linux-arm-kernel@lists.infradead.org; Mon, 14 Feb 2022 17:56:54 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K6svdYbW3gcrfgbRiFInRjngltq0Kcds4q6jXJNZSnsRNI3feg884VLS4JdqA4O6T/VZ2VwjXzXGRJAY3vjTIlir/bRWOhW25uxqRgQ3t5T05sSz0SCSHvPyMxY2vjStAjAxWmQjjRzFz58pC1Xfr1jwxmj4QitbHlyMwZTaCwXbgBR3Hp+FFpzPO9Lg307heB6Z8QZB0uBByb2SP5UAK6FNW/JX5iocK6iLnj/0DRjuIqueo3hfFJhlxDDQsIjdvJ2JE/1BwCXU5NK2WgJBBFr1BDmekQpSdOpPFAadOYF8dRwN0z0A3xbzp3rEhlKtwD80fsusT/fYx803ngCmuw== 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=cl0zquRWw+QXt3/5+/boInSH/wbd0gRG1LoRRcT3dJc=; b=NJ6IBBETm6MTw1IJVu3WXyknnh3WF1RjB2LkpKdhJPEqkvFt2ScCi8Od5VnSm8jFd2vUQCQMn+J+B5RtuRxpLDPBQMnE/ePGbZZhked04fLfon8jCMLNPNpAaS+VZhyMi2cJgxDW+FOODcm2RX2zxJ8GZ0ECb3xAZTbS9sAGKrjkkIH/egABwHYqkZO4tSqc1UzNT6tbtQZwESl0Td2+XZO5hSB6WwGQyYqpoODmIaop1eJPF+WzI8Nlgf4VgIU1Zm0HYsSvUaqZuaIUvn1N7hEN2u5Ss0vJsOtXO+2IV+6UZ96ciCYKV+ZR3ZAWzc8dkH81xbuD7MRDIAbslW4NOA== 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=cl0zquRWw+QXt3/5+/boInSH/wbd0gRG1LoRRcT3dJc=; b=T8aInU/G/tE7eVzLnaOKRqp7ng2Ogk98zG6m+AeMLjJ0iub5Br/p93Dir1XvsnjmFSgvzN3zm9DlFpbnG0ce4Nux03kO1mqn4KB/taz4aABhfGDuYbXtoi5I9mB8IINk890X8Dg741BJy8IqEVZoYXKB33czSJwvYRwKOveaG9Y= Received: from CO2PR18CA0058.namprd18.prod.outlook.com (2603:10b6:104:2::26) by BYAPR10MB3448.namprd10.prod.outlook.com (2603:10b6:a03:88::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.17; Mon, 14 Feb 2022 17:56:48 +0000 Received: from CO1NAM11FT057.eop-nam11.prod.protection.outlook.com (2603:10b6:104:2:cafe::26) by CO2PR18CA0058.outlook.office365.com (2603:10b6:104:2::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.18 via Frontend Transport; Mon, 14 Feb 2022 17:56:48 +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 CO1NAM11FT057.mail.protection.outlook.com (10.13.174.205) 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:56:47 +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:56:46 -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:56:46 -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:56:45 -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 C46302C06D81; Mon, 14 Feb 2022 18:56:45 +0100 (CET) Received: by gentoo-jocke.infinera.com (Postfix, from userid 1001) id BF13F400B676; Mon, 14 Feb 2022 18:56:45 +0100 (CET) From: Joakim Tjernlund To: , Mark Rutland CC: Joakim Tjernlund , Subject: [PATCH v2] arm64: Correct wrong label in macro __init_el2_gicv3 Date: Mon, 14 Feb 2022 18:56:43 +0100 Message-ID: <20220214175643.21931-1-joakim.tjernlund@infinera.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-OriginalArrivalTime: 14 Feb 2022 17:56:46.0087 (UTC) FILETIME=[3B63C970:01D821CC] X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c25ac82c-b4d4-40d3-8582-08d9efe35ee3 X-MS-TrafficTypeDiagnostic: BYAPR10MB3448:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:175; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EDh+fM1AFKtmkI1Rbs4k3n4Sh2FxWu+qqND6hYu3T4afwbLCVkzQ0RWi5m5fDH3W2x4hAsZqTgLuhwlSPCFUmBh8pJllzVM9h0Gk7TnHiGy3NZKNdG89TUpHBpmDFbnyR9tNPbOyFvnA5UywG1opXw/fCo0zBN5Z1SMlKL7im8Sv3y4Mds90/vw/TkKrkGVzZ2mSTP8AWHXYICBbqO7oGPghaMWNypBIJAulYkiZcWKnHOX+0UJAWtotxqAVoMBzchkaT8Ax7InIJhR31iBGU8f2zrDFiUWmY3t7HDaItqpk9xG7SsMiTfjQ7vKrp3C59GL6Po/al4CZq/adZ8BXiMorlHkn7CVyevF+wqOnWcAQK6ebt3hUi05b2G+rcqMq8Qh/mAAlvo9yv6bFm8RC2ssnSXKXU4G2iqEZsqkxL67LDgTrq0W8vTdmYPp/J5dyiJ4/QCnTYTuTqlXrUlLGwM/33ztgz7VCN2Qf1KEEqGJwBm79LauzvvvMkm5CMtdVW7Wy+AJxX+GfQILJhpUS1/1TWezU8vurmFBtTw5Fez1IO3kNVma6wu1Ff9UJxF2fm5DELJVn3alcIYj2VLV76hNIvlvjivIQhttHI1/ormX6VR4DltGIg0DgpczCSVIAf2DCZvvbcdpJ8GhjtaXo0UZ57efsQfQKE32eRoFovzEWdrQFw5bqSoHTPiNWFaJr 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)(36860700001)(110136005)(2616005)(54906003)(8936002)(36756003)(86362001)(83380400001)(82310400004)(356005)(426003)(2906002)(107886003)(6266002)(5660300002)(508600001)(4326008)(336012)(1076003)(8676002)(47076005)(44832011)(186003)(316002)(81166007)(42186006)(26005)(70586007)(70206006)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: infinera.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2022 17:56:47.7594 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c25ac82c-b4d4-40d3-8582-08d9efe35ee3 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: CO1NAM11FT057.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB3448 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220214_095653_019117_2AC5FE20 X-CRM114-Status: GOOD ( 12.76 ) 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 In commit: 114945d84a30a5fe ("arm64: Fix labels in el2_setup macros") We renamed a label from '1' to '.Lskip_gicv3_\@', but failed to update a branch to it, which now targets a later label also called '1'. The branch is taken rarely, when GICv3 is present but SRE is disabled at EL3, causing a boot-time crash. Update the caller to the new label name. Fixes: 114945d84a30a5fe ("arm64: Fix labels in el2_setup macros") Cc: stable@vger.kernel.org Signed-off-by: Joakim Tjernlund --- - v2: fix commit msg 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