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 84A8BC00140 for ; Thu, 18 Aug 2022 12:51:52 +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=V1paDYYQ+CYPOKNuVfQR56+yTasAAPUmFCbZG4aDuMQ=; b=Ej5YEFQbD27qcJ 55y/Go70jrAADRTD4lSS6EzKTpS2y1v0Kr+lkx8mnGF74IXBBvbi7bM08JEAHQLdPnfen5KFYvDjp k7E8mFBe1ol6wnsYAmk8XL8Pi0q10df72p45oeXSmTULNZcKf58y1jHuZtuHWn0S5NR2iKNBZPanY zobritou26ZN11uwCnS7ga+cKNWew3L0x74iz85FBbvCvrgGpLqiu83hsMLPuBVR1Svek17WZ/Rn+ yU6Mh4DId10wVtcSBc9rALCWdz4IZL7ndKE1AhoBHZOGqHjTs0Tfv/35m+4ZR0IaxLzRvmXghgKIt jB1AOEz2CTeR/j5ugwcw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oOeyU-004psO-H9; Thu, 18 Aug 2022 12:50:15 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oOedx-004ZyL-W3 for linux-arm-kernel@lists.infradead.org; Thu, 18 Aug 2022 12:29:03 +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 8818F6158F; Thu, 18 Aug 2022 12:29:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87586C433D7; Thu, 18 Aug 2022 12:28:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660825741; bh=uH6ktAmFLEdDdIxr4wL67jPBXit7L6riICXo1UPArQU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dWzdMFFT8TL1mxBkhTW3c4I+KcoFvstSdw5U8//Ngl2Ug9VDYYVCPHslvGtWdgKW2 j5a+0l48q9Xug+H2vgs4WYKT9F8fefNvBQIuKMdR2dSNGUKual0yX7PtwqWy6A3Y33 nQplgiRBqdeEk38g9kn+Ww9WFiXFxXO6nCD2T9bpRndlXcMbflcxPidlKyUGA+FNXx zgX+drn1QCT4dLMZSI2gHS02N0lvqMQlrjJZimQKQbDOSFwvp8Z0cAQK5ZNOmu/3/P NscJmVt3Xn6IOdcnLdiFrpL0QlR2bJ9SdZAUnYxWRmRPHAxDBxYV2rZA6ileC+u7fZ u4vCFvuxRHuNg== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , Kristina Martsenko , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v4 24/28] arm64/sysreg: Convert ID_AA64PFR0_EL1 to automatic generation Date: Thu, 18 Aug 2022 13:24:21 +0100 Message-Id: <20220818122425.37889-25-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=3483; i=broonie@kernel.org; h=from:subject; bh=uH6ktAmFLEdDdIxr4wL67jPBXit7L6riICXo1UPArQU=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBi/i90b7Daf9T0YL9RxTmJE2m9iqzhhCf8cpxLVHQD UWX5rniJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYv4vdAAKCRAk1otyXVSH0L5xB/ 4+6PZ7/MxrAkRMWIVjyFXfn6ejU8v9IUugHGzKXJqjbxTJoZ9rtBNcK9wX6Bi6M1EfmzHUlaFX6IIw PnsxfLYBjaCx+oainPH5pv8FNtHjff+yCT1+Z0v8kWzfKjxEqJh8p83BqL1mDROsRRD2CAU2ieAfms L0NqXinYdSx3nq5I8FHSVirDDgV+DkBoVHDoWbxE6Hh7q+vLbygB1gAvBJAuJnG3InZ3CE83+fZ27U XyfPME+ZAQ14EmIp54uoM6RxhL7TPyhrGsz3fLs7KwP2mDpFoQfn0ql0UVePfdqIDdRyZzc4FoCO/s x1Do25rlvAmOZdCbe2jiOSgAt82BQI 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_052902_188527_52197A2A X-CRM114-Status: GOOD ( 12.25 ) 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 Automatically generate the constants for ID_AA64PFR0_EL1 as per DDI0487H.a, no functional changes. The generic defines for the ELx fields are left in place as they remain useful. Signed-off-by: Mark Brown --- arch/arm64/include/asm/sysreg.h | 24 ---------- arch/arm64/tools/sysreg | 77 +++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 24 deletions(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 64bdde61d736..99c907fea6e7 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -190,7 +190,6 @@ #define SYS_MVFR1_EL1 sys_reg(3, 0, 0, 3, 1) #define SYS_MVFR2_EL1 sys_reg(3, 0, 0, 3, 2) -#define SYS_ID_AA64PFR0_EL1 sys_reg(3, 0, 0, 4, 0) #define SYS_ID_AA64PFR1_EL1 sys_reg(3, 0, 0, 4, 1) #define SYS_ID_AA64DFR0_EL1 sys_reg(3, 0, 0, 5, 0) @@ -681,29 +680,6 @@ #define MAIR_ATTRIDX(attr, idx) ((attr) << ((idx) * 8)) /* id_aa64pfr0 */ -#define ID_AA64PFR0_EL1_CSV3_SHIFT 60 -#define ID_AA64PFR0_EL1_CSV2_SHIFT 56 -#define ID_AA64PFR0_EL1_DIT_SHIFT 48 -#define ID_AA64PFR0_EL1_AMU_SHIFT 44 -#define ID_AA64PFR0_EL1_MPAM_SHIFT 40 -#define ID_AA64PFR0_EL1_SEL2_SHIFT 36 -#define ID_AA64PFR0_EL1_SVE_SHIFT 32 -#define ID_AA64PFR0_EL1_RAS_SHIFT 28 -#define ID_AA64PFR0_EL1_GIC_SHIFT 24 -#define ID_AA64PFR0_EL1_AdvSIMD_SHIFT 20 -#define ID_AA64PFR0_EL1_FP_SHIFT 16 -#define ID_AA64PFR0_EL1_EL3_SHIFT 12 -#define ID_AA64PFR0_EL1_EL2_SHIFT 8 -#define ID_AA64PFR0_EL1_EL1_SHIFT 4 -#define ID_AA64PFR0_EL1_EL0_SHIFT 0 - -#define ID_AA64PFR0_EL1_AMU_IMP 0x1 -#define ID_AA64PFR0_EL1_SVE_IMP 0x1 -#define ID_AA64PFR0_EL1_RAS_IMP 0x1 -#define ID_AA64PFR0_EL1_RAS_V1P1 0x2 -#define ID_AA64PFR0_EL1_FP_NI 0xf -#define ID_AA64PFR0_EL1_FP_IMP 0x0 -#define ID_AA64PFR0_EL1_AdvSIMD_NI 0xf #define ID_AA64PFR0_EL1_ELx_64BIT_ONLY 0x1 #define ID_AA64PFR0_EL1_ELx_32BIT_64BIT 0x2 diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index 2170c9074137..fc32b0649160 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -46,6 +46,83 @@ # feature that introduces them (eg, FEAT_LS64_ACCDATA introduces enumeration # item ACCDATA) though it may be more taseful to do something else. +Sysreg ID_AA64PFR0_EL1 3 0 0 4 0 +Enum 63:60 CSV3 + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 59:56 CSV2 + 0b0000 NI + 0b0001 IMP + 0b0010 CSV2_2 +EndEnum +Enum 55:52 RME + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 51:48 DIT + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 47:44 AMU + 0b0000 NI + 0b0001 IMP + 0b0010 V1P1 +EndEnum +Enum 43:40 MPAM + 0b0000 0 + 0b0001 1 +EndEnum +Enum 39:36 SEL2 + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 35:32 SVE + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 31:28 RAS + 0b0000 NI + 0b0001 IMP + 0b0010 V1P1 +EndEnum +Enum 27:24 GIC + 0b0000 NI + 0b0001 IMP + 0b0010 V4P1 +EndEnum +Enum 23:20 AdvSIMD + 0b0000 IMP + 0b0001 FP16 + 0b1111 NI +EndEnum +Enum 19:16 FP + 0b0000 IMP + 0b0001 FP16 + 0b1111 NI +EndEnum +Enum 15:12 EL3 + 0b0000 NI + 0b0001 IMP + 0b0010 AARCH32 +EndEnum +Enum 11:8 EL2 + 0b0000 NI + 0b0001 IMP + 0b0010 AARCH32 +EndEnum +Enum 7:4 EL1 + 0b0000 NI + 0b0001 IMP + 0b0010 AARCH32 +EndEnum +Enum 3:0 EL0 + 0b0000 NI + 0b0001 IMP + 0b0010 AARCH32 +EndEnum +EndSysreg + Sysreg ID_AA64ZFR0_EL1 3 0 0 4 4 Res0 63:60 Enum 59:56 F64MM -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel