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 DC620C433F5 for ; Tue, 26 Apr 2022 18:25:49 +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=cfRIG/D3DEnDYKQjXBeJfsx3kt3htD+kqYzPvEGt/yE=; b=ThYXkrSAn2+fdk 04WtoXDXezazAU/lKzd20dvfedxUjDz0a2gMTlcCiYB3II9t/lGjY3XUqhFXSvFudxkOkA7IG8pTy ViecZFOQpfMbzUK83qaBTdL65BF7H48jJvtvk7TuavZs/7WpLRT+b4U3RKSoCid59r627NwtjoUeX QoDop6kKdS44yPhMpMdWjSsU6V9QTQxM7Cd89qZzL563q9sZREdnZOS94HJrYW/8xAePcl8ifBipL aVoGm1IVwCzP3g3WC4O5A4kJJNjNmxQceI56MjG0QX//CUdNISPfc1VE8dBGkDbSa2w6zpEFEekFL GaG47d+wPPO1ixyaF5Rw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1njPrX-00Fgqb-NC; Tue, 26 Apr 2022 18:24:36 +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 1njPmB-00FeZ9-Fm for linux-arm-kernel@lists.infradead.org; Tue, 26 Apr 2022 18:19:05 +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 AD38D61843; Tue, 26 Apr 2022 18:19:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 80CC9C385AF; Tue, 26 Apr 2022 18:19:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1650997142; bh=kgHTTwNLuvT8i5PTMvv2BAFqrR64c+FFEN3Zjg4W6x8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EgZJpz5vE0O2kePWOpgaTYBuCM5ZStJqPL1dBXfjaFKajo76WRx5rXdVlnkRSATmp OaP5DPAhCl0Ni3iooBn4Sdo8xDRAG+oe1i2nFrNyAtyLj+qWp+iIINI8MUvK9XmW5j WvZjFoPac7LTfAId7mwPOzIyjy+/3YqNXpxUzJZr8+cY88Y8XL0Aa5T0bIOcf/BGah GdLtFez74b9C4qsLkstMLIXq0ESPPFR2xtDdNROguaSw5fc3G2WQnbjlHC9Z8ZS40g Z7MKD3neLH1K3li7iuJkvhkPlkUpXxyo8/Gc9knZpT5evoLD+nJcboHD0K6IpZvocX c2b8QjrT9oPgQ== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , Marc Zyngier , Suzuki K Poulose , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v5 10/12] arm64/sysreg: Generate definitions for ID_AA64ISAR0_EL1 Date: Tue, 26 Apr 2022 19:17:02 +0100 Message-Id: <20220426181704.2583494-11-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220426181704.2583494-1-broonie@kernel.org> References: <20220426181704.2583494-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3214; h=from:subject; bh=kgHTTwNLuvT8i5PTMvv2BAFqrR64c+FFEN3Zjg4W6x8=; b=owGbwMvMwMWocq27KDak/QLjabUkhqQMc9m/xi8vBCXXFBbZP/xxfJnNbBYRp82fPCpc9PdrVhjZ GRV2MhqzMDByMciKKbKsfZaxKj1cYuv8R/NfwQxiZQKZwsDFKQATWS7A/lekUNRQ8fSSvL6Zup8EV0 xclqkrG3y2SEInWeBz/anoutqb0w0SU16ZqyY6HJ0444t2U4PXrUJLd9OptzWcY0O+PP+Xz+e7yf1F hVNgtRKT4OLipPdBv+b5zQ79wfyl6P6SMhFL8aY74i+LC3fUnHorX/Rg8v7yZlHfLc94s9Nn6K6Mfm 0ds/lGZVSmcwbfravui/eYzd/zjH3qRx/Z0lf2CsyBF9w82qJ4ORYsFDy8PKrj7AqmWanLb0a7/f19 M1jug0puR4Hgo1MMU3rSGbUnuL9fEL+o59nPtPcfWR18I62PPjs56aXcxvn/W5uMr6ok/Y/WW9fiZW CUy69i33G7PWtHqkjhEcvKt0WrAA== 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-20220426_111903_683508_622B74A6 X-CRM114-Status: GOOD ( 11.90 ) 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 Remove the manual definitions for ID_AA64ISAR0_EL1 in favour of automatic generation. There should be no functional change. The only notable change is that 27:24 TME is defined rather than RES0 reflecting DDI0487H.a. Signed-off-by: Mark Brown Acked-by: Mark Rutland --- arch/arm64/include/asm/sysreg.h | 20 ---------- arch/arm64/tools/sysreg | 67 +++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 20 deletions(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index db07a01776d8..f5e02f27a5c9 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -196,7 +196,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_AA64ISAR0_EL1 sys_reg(3, 0, 0, 6, 0) #define SYS_ID_AA64ISAR1_EL1 sys_reg(3, 0, 0, 6, 1) #define SYS_ID_AA64ISAR2_EL1 sys_reg(3, 0, 0, 6, 2) @@ -747,25 +746,6 @@ /* Position the attr at the correct index */ #define MAIR_ATTRIDX(attr, idx) ((attr) << ((idx) * 8)) -/* id_aa64isar0 */ -#define ID_AA64ISAR0_EL1_RNDR_SHIFT 60 -#define ID_AA64ISAR0_EL1_TLB_SHIFT 56 -#define ID_AA64ISAR0_EL1_TS_SHIFT 52 -#define ID_AA64ISAR0_EL1_FHM_SHIFT 48 -#define ID_AA64ISAR0_EL1_DP_SHIFT 44 -#define ID_AA64ISAR0_EL1_SM4_SHIFT 40 -#define ID_AA64ISAR0_EL1_SM3_SHIFT 36 -#define ID_AA64ISAR0_EL1_SHA3_SHIFT 32 -#define ID_AA64ISAR0_EL1_RDM_SHIFT 28 -#define ID_AA64ISAR0_EL1_ATOMIC_SHIFT 20 -#define ID_AA64ISAR0_EL1_CRC32_SHIFT 16 -#define ID_AA64ISAR0_EL1_SHA2_SHIFT 12 -#define ID_AA64ISAR0_EL1_SHA1_SHIFT 8 -#define ID_AA64ISAR0_EL1_AES_SHIFT 4 - -#define ID_AA64ISAR0_EL1_TLB_RANGE_NI 0x0 -#define ID_AA64ISAR0_EL1_TLB_RANGE 0x2 - /* id_aa64isar1 */ #define ID_AA64ISAR1_I8MM_SHIFT 52 #define ID_AA64ISAR1_DGH_SHIFT 48 diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index 8e39c718c1b8..4d8991574437 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -46,3 +46,70 @@ # feature that introduces them (eg, FEAT_LS64_ACCDATA introduces enumeration # item ACCDATA) though it may be more taseful to do something else. +Sysreg ID_AA64ISAR0_EL1 3 0 0 6 0 +Enum 63:60 RNDR + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 59:56 TLB + 0b0000 NI + 0b0001 OS + 0b0010 RANGE +EndEnum +Enum 55:52 TS + 0b0000 NI + 0b0001 FLAGM + 0b0010 FLAGM2 +EndEnum +Enum 51:48 FHM + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 47:44 DP + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 43:40 SM4 + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 39:36 SM3 + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 35:32 SHA3 + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 31:28 RDM + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 27:24 TME + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 23:20 ATOMIC + 0b0000 NI + 0b0010 IMP +EndEnum +Enum 19:16 CRC32 + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 15:12 SHA2 + 0b0000 NI + 0b0001 SHA256 + 0b0010 SHA512 +EndEnum +Enum 11:8 SHA1 + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 7:4 AES + 0b0000 NI + 0b0001 AES + 0b0010 PMULL +EndEnum +Res0 3:0 +EndSysreg -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel