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 6AA87C433EF for ; Wed, 22 Jun 2022 17:57:07 +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=PbjTrDfaZJMnL0fqBOGq4eLcEPP6dV2YGxT2VGLzjTM=; b=sdRronuFIyF01O Ss11XEJHk3UDDJacAn7IMN3mrKgzo1r91N+Po6fUv+wx28YROUf6STaHv05TPl4Qq1PiVwur/sm9V zEqho05RSjGeuXMPOlao3Bsqvht9a2/5rIklB88fzXUWRLS4z3ocWPwonb7Ps2nv/RBvkuJDqnaGB IagLyRkRSIkXf7jpG1VUcWb59eEGi/SLibLjm8fxNyHWyUtXSut/7MWTCgjN0W7bf5hR0l0PW4MUb BQYocSH3XRPX20RMUvwTyKax9/v4jdVykczPcIORnnwhFM9zf0XGzQKmB3HJedwZmAFhUSsqg2paC vFehR/isDYdPwiQH9D1w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o44a8-00Bmns-Qn; Wed, 22 Jun 2022 17:56:01 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o44XK-00BlXx-7k for linux-arm-kernel@lists.infradead.org; Wed, 22 Jun 2022 17:53: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 ams.source.kernel.org (Postfix) with ESMTPS id ECE1DB81C0A; Wed, 22 Jun 2022 17:53:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 33FA2C341C5; Wed, 22 Jun 2022 17:53:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1655920383; bh=S0/dzmEFmBhvR0UXE5Cu+0yQf0yKtAZK+ZeR3duy5Sg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gxvxrdN/PIN0FCClbRjbCfgBkDNOoxFb9yIp5kvcpvGzNZSw3aqX4VPsAaJmAkBHH LgHG018vl2j7VuNwQY28w7hyM6gZa7z9oG88aCGQi2hn/uDQ7F9MI29sAOJKubOtlZ WQznvSlh+aFdvCQ0B2RPJpPVoVnhZKeALDXEh54y3usNgcQ1xbeR6t7pkuMGbWIu2g kmMR5NcjCCh3QHDyZplGjTpoXEZr7R1I36KFVIl12KjvDzowT045vbe9QrIi/2YWmB RZa2etlSnbqVhiUe/48J32RoodKuRRawPYFK6rukREcdMaRRvIYBG6rVGvu4RPlFke XdEwKrA/GEGTw== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , Joey Gouly , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v5 09/27] arm64/sysreg: Make BHB clear feature defines match the architecture Date: Wed, 22 Jun 2022 18:43:58 +0100 Message-Id: <20220622174416.1406282-10-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220622174416.1406282-1-broonie@kernel.org> References: <20220622174416.1406282-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2240; h=from:subject; bh=S0/dzmEFmBhvR0UXE5Cu+0yQf0yKtAZK+ZeR3duy5Sg=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBis1TgD9+B0k8dss5LsZG+dWyF6MNzgE+CUZC9d9a3 lhYBhpKJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYrNU4AAKCRAk1otyXVSH0NGQB/ 9Q+XljrMy34k1N6qA+A0enNWs7zi/3Yir62RRXs1BT1KuGFL9VUPaTiyS3cghfGt9unMZxcqBkKLvj Yy3l4BCltjTzznqYbTALyIkakm51imdd2TdDGtXVpDcXcikPxG2qaF1OH4GgQhhOv9hTv+fhfnNBTB q8eru2i79i1LsuwF/0LO6vE7fub8Rj/8Mx/cI8hkeCmx9g/msuhATYcHUYJnlUd4VV2PvIVYSaTXQ8 Z7m+NlL+T0d4KxYXDgcHZ5tMum0jmHgLXVVqKcIuSjQUm0E+YNeS+v3YpMnpajoeOSG4H8N3+d6W0u 6ZqCv9P5pBMK0GGwprxuZnjNzrA6jI 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-20220622_105306_610116_F0CCA75C X-CRM114-Status: GOOD ( 14.71 ) 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 9a7e7b61d3ea..478af541410d 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 838b3dcd8473..0f9c9d8b21a2 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