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 3BD3EC43334 for ; Mon, 6 Jun 2022 20:20:01 +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: 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: List-Owner; bh=3Qh6BeGZCu/3nzA/Os8AHPKDX1B7ES89Lbs/KsQcTAQ=; b=KsmUpS1zzHm8bj UVlGIQmK+1IDX3LNGZhRJ6MbaMgfGflbkanvrXGTgLsmlYrwp2/P+NRFct+wiFThhadcRlvW/EtV2 vPy2rPFquXGyzIXmqsnxXK//ynpxVvCPV9MeHy+Lmb+i7hrM4m+RYbADJy+FrTrjAAE10nXtu3c+v pOHhmw8bi4jA0SwT0bsioObSWVAXTM3U4L4n9obMrS/f5ZH12uRzB5qfDcYju4+9FILRkf6OC9bzV ykJBegULQ6YGcBE2gYt+BviLejDrNdmsCJ0+QHXZtm4Sogcht3lmTbCKp5qTFpZjrLic9ufnABDmb AD5wpPwcwQDMjpupGh+g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nyJBU-002ZW8-9c; Mon, 06 Jun 2022 20:18:44 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nyJ9t-002YnY-Ac for linux-arm-kernel@lists.infradead.org; Mon, 06 Jun 2022 20:17:06 +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 DB55A61531; Mon, 6 Jun 2022 20:17:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 15C58C3411E; Mon, 6 Jun 2022 20:17:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654546624; bh=fBuqdj1bIbgWp/zN3BOym5LxbLhf4WBz2nGT4lc1G2o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gxxIfQIIfAoZ8AdhgXdHY31iJNNIbrtPd7xv6C5FgoVMuBnFsq0aeEYzzFIIWmd1c t5koJHi5cePVEazzeAIFAOW187lIv6Gkx23++DUI/gqRNse0oGc/exk7yZp0btWGa0 rvp76ERXP35a68LIt2EqijkLQD721NT9Cb6aW6qoPSSczYi8DR83UMoScqkMR5ihjS EkLmFN/E0wpPJh8pk76aLmRDPc5xNlxuZRykg+6xr16OmpuUQwk8kE3k9RXXnCXBjJ dN4oTif3sP3pgsL2JJ7MtTNi6KGN3IEvBD+5wQeaCgQGiJGWbJYTgeEuRGMOj/M7eB q5sdlkYRLRX2A== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v1 08/17] arm64/sysreg: Make BHB clear feature defines match the architecture Date: Mon, 6 Jun 2022 21:12:45 +0100 Message-Id: <20220606201254.104659-9-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220606201254.104659-1-broonie@kernel.org> References: <20220606201254.104659-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2240; h=from:subject; bh=fBuqdj1bIbgWp/zN3BOym5LxbLhf4WBz2nGT4lc1G2o=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBinl+9nX96CBo/XPuUqz/b0Nqc1GPsoYlHpQEMrnz+ fFYyg36JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYp5fvQAKCRAk1otyXVSH0DeZB/ 9+ucwIKw5UXAGlzdXdoAHjEgFaHQA8o/XFFf9yEA6XfeMUyKqtmmpyKYfqm7Wo+fRj0LWIDar2fQSN nbxX8Euext+3viOMW3U/sJSFz0gsGJpNvI+hEQLjkCHvu4vMsOoKz9ldulrM/gRRJx0SpHwCAS2Cvp AnzTsFIrMCLPTNAT1WagFBJnB+OPdpY8gEdH9vYPGjgbu0pmHXViGjFy3hbr46IllpSP4PJE3LcpRE SLA0Ce5FSOLwBLgW/hqwV7MWBSSO2wNYb5dtDTign2MfKzFvlr2ENLC3E6i0xEcCtL2WrZ8dTWyjw2 ZrJ4x9AGs+vKzscE+XjnvHo/JV7i9v X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220606_131705_504484_DDA749FF X-CRM114-Status: GOOD ( 14.95 ) 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 The architecture refers to the field identifying support for BHB clear as BC but the kernel has called it CLEARBHB. In preparation for generation of defines for ID_AA64ISAR2_EL1 rename to use the architecture's naming. No functional changes. Signed-off-by: Mark Brown --- arch/arm64/include/asm/cpufeature.h | 2 +- arch/arm64/include/asm/sysreg.h | 2 +- arch/arm64/kernel/cpufeature.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h index 14a8f3d93add..6472f2badc97 100644 --- a/arch/arm64/include/asm/cpufeature.h +++ b/arch/arm64/include/asm/cpufeature.h @@ -673,7 +673,7 @@ static inline bool supports_clearbhb(int scope) isar2 = read_sanitised_ftr_reg(SYS_ID_AA64ISAR2_EL1); return cpuid_feature_extract_unsigned_field(isar2, - ID_AA64ISAR2_CLEARBHB_SHIFT); + ID_AA64ISAR2_BC_SHIFT); } const struct cpumask *system_32bit_el0_cpumask(void); diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 2fa05788fd3d..0ded90098724 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -738,7 +738,7 @@ #define ID_AA64ISAR1_GPI_IMP 0x1 /* id_aa64isar2 */ -#define ID_AA64ISAR2_CLEARBHB_SHIFT 28 +#define ID_AA64ISAR2_BC_SHIFT 28 #define ID_AA64ISAR2_APA3_SHIFT 12 #define ID_AA64ISAR2_GPA3_SHIFT 8 #define ID_AA64ISAR2_RPRES_SHIFT 4 diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 6fbdb576863f..3416a768881e 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -231,7 +231,7 @@ static const struct arm64_ftr_bits ftr_id_aa64isar1[] = { }; static const struct arm64_ftr_bits ftr_id_aa64isar2[] = { - ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_HIGHER_SAFE, ID_AA64ISAR2_CLEARBHB_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_HIGHER_SAFE, ID_AA64ISAR2_BC_SHIFT, 4, 0), ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_PTR_AUTH), FTR_STRICT, FTR_EXACT, ID_AA64ISAR2_APA3_SHIFT, 4, 0), ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_PTR_AUTH), -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel