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 B907BC43334 for ; Wed, 29 Jun 2022 10:51:09 +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=2ORFdndu96Zotq0qrSOcLhSfkanEwnz2JLQQUm1B8Qk=; b=Nk2+LODzKyAZnb nByAMjFmCVByqU+QQ2wtcGoMC+Bv2rQh74feixCcBwida0uDGzwsxhXkoSc4i3DCWOdQYUJ60ckSg zMz2PBiHHTI+zOqlzEY7GHuvmlIYvOwRgDIH3tJ2StT1qHqwObzjTbe6st0AwURYpC/skLEbRM11V I+Nx8fEtOF7z5WEhduxGwL8E/FnsV/TIiqnn72iSn6i7I51RuXGQzapncMOa48cKAguZsc94ZSOLs 93Gaar4h4er09LIylQsPJo9gO1OWRx4LUD20JozwXzaUtsfpcj7qv0WSMnG8UjZRm4HQkdHwhvVfr PRHSfAP78Nyjc8YRogog==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o6VGX-00B9Nw-RJ; Wed, 29 Jun 2022 10:49:51 +0000 Received: from sin.source.kernel.org ([2604:1380:40e1:4800::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o6UxL-00B2Fp-MA for linux-arm-kernel@lists.infradead.org; Wed, 29 Jun 2022 10:30:01 +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 sin.source.kernel.org (Postfix) with ESMTPS id 8755BCE256F; Wed, 29 Jun 2022 10:29:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 979E0C341C8; Wed, 29 Jun 2022 10:29:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1656498596; bh=uabqLngD3iBCdB3UQqaMZK85Fd8b2Tmx2mJoZgxUEcY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WCUBChMZszOW+9s/xsqh1+dfcA5LoMHNy4+hOR28C/72ESkD4WqggdRBWzjq2MDyN NiPwacTxYcWpUdI20rw/nlBuyKDSPxazGiCh+VsARdG349V/ouchXcg1+yO9EFydRq eXK2EjMRpgJabbopAKECOJBo94WQqBnoDB3kZpVq6vMQb1t3/ejVGCBbkd2wOxGRWt gbV5vWhXhO6kkRhQIL4JidljxoJPSz1nblYKzR8Afd1S3M/B/5gXlBaf8LEldIQlcc e5b7OipmSHURGuvjePw9Cg7+ocI8FjBYJyR5F2B3FHukwvpamT6M8o5X6BOMX0NIyE fW8VSAvEqibaA== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , Joey Gouly , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v6 20/27] arm64/sysreg: Convert ID_AA64ISAR2_EL1 to automatic generation Date: Wed, 29 Jun 2022 11:28:27 +0100 Message-Id: <20220629102834.36569-21-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220629102834.36569-1-broonie@kernel.org> References: <20220629102834.36569-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2775; h=from:subject; bh=uabqLngD3iBCdB3UQqaMZK85Fd8b2Tmx2mJoZgxUEcY=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBivClKBCxmGfRMAffOkzp4vcn6SHFj/xBam3TkKi8j 7IZWjsSJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYrwpSgAKCRAk1otyXVSH0IPXB/ 9Zn62amARtnJ5Govp9n/qXwrv8aNLKk7gE++4RztBalQSJJ+/Pr7P4Bh18cu9N6g2K1wliS5QLGpSv BXhw9XpvToupWwBnJi695Er+Bg4bJSUPZItq4w7vgLVwklFha+yXmj+fwDFmwDpUN7rCxKrY7LpWms g0ZNO+SJt7HoazigAuVmo1srYGZDjjDMk7u2kyugsBLLSgkzSzEzY5PbKYKlXZ4Vkxi78QW9RM1c13 2trcsxvuaNHk4aGsHSERpWhBiGQstcBeN9HZ2ziIYtXfhATKVD4HmzGgdOdPQMP7dcmYMQrDZyWC2o bPp3Sb+lEW6VNFiblLJz+C4bsqnItH 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-20220629_033000_161762_9545C918 X-CRM114-Status: GOOD ( 14.43 ) 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 defines for ID_AA64ISAR2_EL1, using the definitions in DDI0487H.a. No functional changes. Signed-off-by: Mark Brown --- arch/arm64/include/asm/sysreg.h | 27 --------------------------- arch/arm64/tools/sysreg | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 27 deletions(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 089e2da3a5a9..a8d882b8e2a2 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -201,8 +201,6 @@ #define SYS_ID_AA64AFR0_EL1 sys_reg(3, 0, 0, 5, 4) #define SYS_ID_AA64AFR1_EL1 sys_reg(3, 0, 0, 5, 5) -#define SYS_ID_AA64ISAR2_EL1 sys_reg(3, 0, 0, 6, 2) - #define SYS_ID_AA64MMFR0_EL1 sys_reg(3, 0, 0, 7, 0) #define SYS_ID_AA64MMFR1_EL1 sys_reg(3, 0, 0, 7, 1) #define SYS_ID_AA64MMFR2_EL1 sys_reg(3, 0, 0, 7, 2) @@ -699,31 +697,6 @@ /* Position the attr at the correct index */ #define MAIR_ATTRIDX(attr, idx) ((attr) << ((idx) * 8)) -/* id_aa64isar2 */ -#define ID_AA64ISAR2_EL1_BC_SHIFT 28 -#define ID_AA64ISAR2_EL1_APA3_SHIFT 12 -#define ID_AA64ISAR2_EL1_GPA3_SHIFT 8 -#define ID_AA64ISAR2_EL1_RPRES_SHIFT 4 -#define ID_AA64ISAR2_EL1_WFxT_SHIFT 0 - -/* - * Value 0x1 has been removed from the architecture, and is - * reserved, but has not yet been removed from the ARM ARM - * as of ARM DDI 0487G.b. - */ -#define ID_AA64ISAR2_EL1_WFxT_NI 0x0 -#define ID_AA64ISAR2_EL1_WFxT_IMP 0x2 - -#define ID_AA64ISAR2_EL1_APA3_NI 0x0 -#define ID_AA64ISAR2_EL1_APA3_PAuth 0x1 -#define ID_AA64ISAR2_EL1_APA3_EPAC 0x2 -#define ID_AA64ISAR2_EL1_APA3_PAuth2 0x3 -#define ID_AA64ISAR2_EL1_APA3_FPAC 0x4 -#define ID_AA64ISAR2_EL1_APA3_FPACCOMBINE 0x5 - -#define ID_AA64ISAR2_EL1_GPA3_NI 0x0 -#define ID_AA64ISAR2_EL1_GPA3_IMP 0x1 - /* id_aa64pfr0 */ #define ID_AA64PFR0_CSV3_SHIFT 60 #define ID_AA64PFR0_CSV2_SHIFT 56 diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index 164221177079..da5e925bf624 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -193,8 +193,41 @@ Enum 3:0 DPB 0b0010 DPB2 EndEnum EndSysreg + +Sysreg ID_AA64ISAR2_EL1 3 0 0 6 2 +Res0 63:28 +Enum 27:24 PAC_frac + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 23:20 BC + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 19:16 MOPS + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 15:12 APA3 + 0b0000 NI + 0b0001 PAuth + 0b0010 EPAC + 0b0011 PAuth2 + 0b0100 FPAC + 0b0101 FPACCOMBINE +EndEnum +Enum 11:8 GPA3 + 0b0000 NI 0b0001 IMP EndEnum +Enum 7:4 RPRES + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 3:0 WFxT + 0b0000 NI + 0b0010 IMP +EndEnum EndSysreg Sysreg SCTLR_EL1 3 0 1 0 0 -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel