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 E0527C00140 for ; Thu, 18 Aug 2022 12:43:32 +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=XZ2ljHp2sfEKZpd+/mmR++ib64Xs+r0+MkmkkfIef0E=; b=mcoAY/Yke407N6 BBNuv3MhuyiVeRvJN/v4fJ0bwKy9vjpltcmiQdrTcn7Y/3iFIyv15RjvbkE3qTb36bzUsEY1tJFrT LoHmnepIUvgNIihP4ZwFwK/KXnpRCVT6o6ETbI3968Riu+4MiJKutl2jt7S9guQL7TWsrKDSyjgSO 7vrnniK8JQAed/7e1v3Th2ob/KGl0s+gEo77s8+nwkb1XX0/0VUpLtPHvqKkn4iHYvJFi7hav+pCc MQ/8O+tnyJEOrZIy/ctXpZ2soxTC9i4hQvdJ3lQE2ghO+3ztujbOI2EfKOe3ZCbTZ91nKgF2Wv0UV L+5JE4tEs1EQy5nG1yQg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oOeqH-004jgW-V0; Thu, 18 Aug 2022 12:41:48 +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 1oOedk-004ZrG-Rj for linux-arm-kernel@lists.infradead.org; Thu, 18 Aug 2022 12:28:50 +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 69D2061592; Thu, 18 Aug 2022 12:28:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 65168C433D7; Thu, 18 Aug 2022 12:28:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660825727; bh=A6XMofLGPQKik0YS4+WBK+oLhG+Cel4hSiZ8hSbgf54=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NJw72yl+9I+i7SRG1Fp0Us0QCoOH++p195coyDTYYwpOxb9dz4Bcl+qcnHYf0jmyZ hvUqPjQQ0wc8EVq/P+7DgI/+hcj8ZXF3ca8QZZ5sIGm6WJILD8PweMYkYOMVwtNwoJ G8g/9fgx2kaambJzs6novo024K3ar23MvtAp0eclMCyZv/cPFkcKZ9ixTS+BLZ80jO 5/vN38njWBy/sOaIgPh6N4/27LVpdZfXlO+BTqLP+rcnAgAo5WWPSV+xBDyoTi/jsQ dxwWvd/nn8y6Y7SC/1xb8aP5cS1Hr9GgsZ9ahgKhDIwsbKga6tsv0gf+9HHZ1yczHu 9Bq8fIW7gRh7A== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , Kristina Martsenko , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v4 17/28] arm64/sysreg: Standardise naming of ID_AA64PFR1_EL1 fractional version fields Date: Thu, 18 Aug 2022 13:24:14 +0100 Message-Id: <20220818122425.37889-18-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220818122425.37889-1-broonie@kernel.org> References: <20220818122425.37889-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2223; i=broonie@kernel.org; h=from:subject; bh=A6XMofLGPQKik0YS4+WBK+oLhG+Cel4hSiZ8hSbgf54=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBi/i9ulugyfdxWWGuLQhLYxBloew5ZLdKcCa6OawNj Rs/eramJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYv4vbgAKCRAk1otyXVSH0IslB/ 9IUk/eiCOP7vqx5HzZt8UhJZHOPkboA6pByiahrmIwW1UJjdOhn1eDOJQ7nLLTd2QSK32HBVpt6XuK pK5xEPCTIWZhlD6/zZcMcvwsOFvZcuu4lmX0dMooKSjNXLR/lHrHez98hXpbaogQ/DBo1ybptK5hAd iTIpYlg5AzqeHpH+i6ggNwhDvTgwcWDnrkaTUdFOutfnXjU1+7i+03ppZSDmn0JM4RunBSYRWfbHyI 6j8RjHLc/0aLwSSqSwvv0S0NzPrX7+16yyIGMKei05WLHRSpzSpRoMmd/i4eXbCcEwHzZx+lsMjg6w 5dfFUl6h20zjZQ2uQd93FpOls+B0vK 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-20220818_052849_050079_902F629F X-CRM114-Status: GOOD ( 14.16 ) 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 05a90fe48025..4ed5bedd43d5 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -714,8 +714,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 e08d10dc2444..9f022ba949fe 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -265,8 +265,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