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 A522AC43334 for ; Mon, 6 Jun 2022 20:26:17 +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=G1NIBtFuRVSAlydXclLRx7cVidGAJzaWGFGabSz+gPE=; b=i3lRFpyRKX73c+ V/ZTih/HgwbMaEl1+bfB9JoLasR9O0sR0OwNjtPeT6FgjSIXIu22regSmxXPLn9AAr6s0wAm977Wx UnFLxrjFnK5Itf/zTcrMPnPSySD5vggWUt9ygyjHrPNmE5IUOxz1SEMUbQJ8V2Pcc/NyrkFrQcA/f skhWlMQzCaxhymTXwmDdfR3u1IU+b7B62vF6AXa29uIX7kZF1Ud6j574dHGSnnxCzXV73PbnmI504 4GZl/OHikp80XkXWszCcJEFkgfREbJzWL64bIR9vWFIbl5AYAh0l/IEWkewmrCv7/pyjXJ5BT1VEq szlGlcvZWoQYlZq5rbcQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nyJHH-002cMo-Iz; Mon, 06 Jun 2022 20:24:44 +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 1nyJA8-002YtJ-Ag for linux-arm-kernel@lists.infradead.org; Mon, 06 Jun 2022 20:17:21 +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 E43EA61531; Mon, 6 Jun 2022 20:17:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1FF35C3411F; Mon, 6 Jun 2022 20:17:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654546639; bh=TNPwH3xJLs92jIlzLQQwJfEaCUOlPrnkNTVswAeTvGg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MLndgF5gzjaEjRH3k3I18uzT7V+IBONDVPczmKwOAxREXmEU57mFHmSgBlFmow4Fi 8IfvJ0IFCnhWsyYLG5opxHgqSUAGFKLe/6uOojjA4s8BruOQLyWdCmYy0jj7VazAEP Z87KTBnWbywebRwBZTOrZ5lUOgAqIRwmhw9kBpI1pPKvpPU1kjYjHoWzAlvvMaEbeo xpkfD4LXoBoXBKoICOLkS6lkURZuj2w+DGXxJf0zV5XpL6cThFtyQKv6E4sN+FlZne j69UyJTPIsE5mvI1YtYExH2rSTp1qHmS5BcVRUjUfphDQjO2vkFeaeNhiNCu3k2aZe lyYScLl+IeE2A== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v1 17/17] arm64/sysreg: Convert ID_AA64ISAR2_EL1 to automatic generation Date: Mon, 6 Jun 2022 21:12:54 +0100 Message-Id: <20220606201254.104659-18-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220606201254.104659-1-broonie@kernel.org> References: <20220606201254.104659-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2743; h=from:subject; bh=TNPwH3xJLs92jIlzLQQwJfEaCUOlPrnkNTVswAeTvGg=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBinl/EZrbbXCxDB44xmEgVWTFq3jD7JpRpKhpFg3Xn e4eDcGOJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYp5fxAAKCRAk1otyXVSH0NFgB/ 49H3TsJX7z3Bz4ajNFIZOUuGpxokm8IUodtbOPm76PXd96KL6vYb009be4F021thvJ9Yu1+CK55iRL VaCZS2D/FVkkT3b6/y0T+eFVX2I0PtzBRmQzcE7AL7zi6XvutW3iN/Ex0BbvHdKBl2ZJ+ffXse94lQ hLnJknjxCWvRjBBDMegkN7uxsFMEdUROiVlRfJVhQ1pnSOEru6yGZH3ct7F50WjKS6dZ9ksdKNRede i9A+iTxkBkPDopcWidIoqGnQIzhlS3yrIT+DdEHbfsynoZoWYaUd5p6FSETDLzRrwoEmD3yzUDwZzs RVsFspziCE0ZtP/pAa4yCMheUtsH/u 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-20220606_131720_507061_F29D115E X-CRM114-Status: GOOD ( 14.04 ) 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 6a732dba73ac..767f5392ba3d 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 29d081b3dcd2..0c949857e371 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -193,6 +193,39 @@ 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 0b0001 IMP EndEnum EndSysreg -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel