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 A6A1BC43334 for ; Thu, 7 Jul 2022 18:14:16 +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=yqbOCwofTqnDMk1QGG3RugJzU91oZXRAyjNHkcQ791M=; b=ru7x+KCP9qg7dr ZYBua9Qda8YKw3A7/sBg1q0jtQpuNkJWiNT5ZI293+wTekdwkVmkym92i1UO3aBeyPY+i+XhlRsKX iPEB3u+Lru+LNPUKeqTBBQC6Ed0A/DD3ghmc/puir3AI6nHOfhgyFHEeKZGLwYO/R5YQiH2invdiC ktxIxXioADxN+ECTf6QKh0sCn543Z/RB1SNPQO+bfUYiyxSTmp9a+XtA7Y28wmlwOIdq1kftk21Mg YiBLC2EFwScE95yH90qZA1raZTXgWIHbUgnv3lQGbwrlCLv6SlIru20SzksrMOKHeXW0W8Pt5CVEg y1ZHFPJONGcP16vNYfxg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o9W09-00HK3Y-Bu; Thu, 07 Jul 2022 18:13:21 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o9VzS-00HJYf-PC for linux-arm-kernel@lists.infradead.org; Thu, 07 Jul 2022 18:12:40 +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 829DCB822A7; Thu, 7 Jul 2022 18:12:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17290C341C6; Thu, 7 Jul 2022 18:12:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1657217556; bh=z1l0BwZLcNmyiJ/umaZStmXJxMb4bPLRT5455w/V20o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mAtlXZAeN3WzXx0eQqro/CKjoLWMQQB3FirkbuUK5SzUtcjQ1LsTiZHxSSQHLaVnF wURxPrIj04d+kVbgs3OPJrZ4xRpbGP4LbraQ/FqKp4TpiZ1N0ZsuqxTjEqWC6ynM6s YdhPfBWDV64TJSY5eKLeX3KIhI3AT9LjYpzpbZudjMbotUcMTCWhxj+HbanwYBrjPt foJRc5Keo/VKFhy7JgH6i7R/3nsxgivAOkFHlQQS2yNGNZpL18YHKTGPChy0rZBRiy ohVaKq531IjA+7D7H7FD0Ao83Lze97AzVBcYTV0HqGKEfZ+zJa2fzhk9eYWk2FVu4A YRwoZjXiYbMxQ== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v1 5/9] arm64/sysreg: Standardise naming of ID_AA64PFR1_EL1 fractional version fields Date: Thu, 7 Jul 2022 19:12:16 +0100 Message-Id: <20220707181220.3373540-6-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220707181220.3373540-1-broonie@kernel.org> References: <20220707181220.3373540-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2223; h=from:subject; bh=z1l0BwZLcNmyiJ/umaZStmXJxMb4bPLRT5455w/V20o=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBixyIAihsoDjzTXLqbmpPSaChB+2b3tIzAHEwfMTAA lBzMwVCJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYsciAAAKCRAk1otyXVSH0Hn5B/ 46LjQdDWlLANGSo5qdpkd8VY37KAjaDUu/cJi3Ds3AEu74c1qVMbqAGCy2Y/wnB7ShsrP8YeoM5i1x Tklhnq2cDrvzI2MxCstF4KlI4cQYGgT/fd+ip+8r2187284JsHukUD9opIxKWQQkq3HcIuTZ6pRWYO Fm7ZojlPtmQD0DwayHtKFZtxZ3BdYuTtYfGA7DSu+YbfUFwL2GLklWibFk4Q5DH4QA42S8ca1M8YFy uTI0Y3DxiMldYz5RPaSqnxnLoYlC9Mzjv6rfiuygdfdw8ZknTMfxcj1877UvIRmGeVWPQsRyY7CULk mpeM1nZdrDfxKaIOTr6XZNQ0XVT3tS 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-20220707_111239_157705_FB0FA20D X-CRM114-Status: GOOD ( 14.27 ) 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 naming for fractional versions fields in ID_AA64PFR1_EL1 does not align with that in the architecture, lacking underscores and using upper case where the architecture uses lower case. In preparation for automatic generation of defines bring the code in sync with the architecture, no functional change. Signed-off-by: Mark Brown --- arch/arm64/include/asm/sysreg.h | 4 ++-- arch/arm64/kernel/cpufeature.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 624659fd2acd..5527743b3f2b 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -715,8 +715,8 @@ /* id_aa64pfr1 */ #define ID_AA64PFR1_EL1_SME_SHIFT 24 -#define ID_AA64PFR1_EL1_MPAMFRAC_SHIFT 16 -#define ID_AA64PFR1_EL1_RASFRAC_SHIFT 12 +#define ID_AA64PFR1_EL1_MPAM_frac_SHIFT 16 +#define ID_AA64PFR1_EL1_RAS_frac_SHIFT 12 #define ID_AA64PFR1_EL1_MTE_SHIFT 8 #define ID_AA64PFR1_EL1_SSBS_SHIFT 4 #define ID_AA64PFR1_EL1_BT_SHIFT 0 diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 561df2540a58..2fef18e75475 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -264,8 +264,8 @@ static const struct arm64_ftr_bits ftr_id_aa64pfr0[] = { static const struct arm64_ftr_bits ftr_id_aa64pfr1[] = { ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_SME), FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR1_EL1_SME_SHIFT, 4, 0), - ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR1_EL1_MPAMFRAC_SHIFT, 4, 0), - ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR1_EL1_RASFRAC_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR1_EL1_MPAM_frac_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR1_EL1_RAS_frac_SHIFT, 4, 0), ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_MTE), FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR1_EL1_MTE_SHIFT, 4, ID_AA64PFR1_EL1_MTE_NI), ARM64_FTR_BITS(FTR_VISIBLE, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64PFR1_EL1_SSBS_SHIFT, 4, ID_AA64PFR1_EL1_SSBS_NI), -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel