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 B0C09C433F5 for ; Mon, 4 Apr 2022 13:51:38 +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=saV6y4eZT/WidXddN/ODveDF94EgYMP6zY56eH1pcnQ=; b=20f+UooFQ0R2Fo N2DDv1wfBfL90y87CMj8pBA2QHp2hGDuvnLny1ld0OMyPjCxOnhGmvvl3lpTb1sohckIL2wmylgOb BiqHWiXxbnVGs+6q5JGtebTYp8SaZpNSpgzYflMVs9+HjlCMIXQA1ajw3LZz1LZ55l6nCpfWfzXuQ 5W22Wx2ES1CPZSGQrDG0DJNc7pr5FkFbi+GJJPosiXelpMRF9YBm8rt1wTV3ha5i+HISr2foCzn7e MqHc90AqvYbqgQAOqJlMlR3v9R0ymfluRuQmxAJaOpfrn05/bfRaKKyphwHlc6B8TvekaG+0U4HuO 5rJYXefX9+dQT6nfIX2w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nbN6J-00FBo3-Th; Mon, 04 Apr 2022 13:50:36 +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 1nbN5W-00FBYx-Aq for linux-arm-kernel@lists.infradead.org; Mon, 04 Apr 2022 13:49:51 +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 E965F61348; Mon, 4 Apr 2022 13:49:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BED68C34110; Mon, 4 Apr 2022 13:49:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649080185; bh=eJy0rbs8Y7GxQT3XTekc4HHe0/1BaCFfdtv0FoEELsY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D218/Fuq0QQYv3a/ApFDiLQqS06wMk4Y3UuwAkRyebGuzeOqDOGgj9IjPwuhClBk9 CeeQUG7Vdcb+d+U+57U66aO6JFi0Fg/zTU2TbFg1+MlHu8dm5wLGG/yoSi/Wr8l45W bHcOYETs36fxTvQc4Lc1LghqW9umjKzazfpIek+KfcsGpCKHGluqPCgNq7TnqPMT5F XizcNLdudHyEinqrtFZse51v4W+lEo1dUJu7Ip73teJLABdABsCZcN3eNG8nrxUgp6 uF0Vbllxm5OdDnQ8ke3RswZfAtBa0LDFjTkiggAHZ4aG7dXrXbLWXMhc6itgCdt4kR IaLcBkpahEcAA== 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 v3 6/8] arm64/sysreg: Generate definitions for ID_AA64ISAR0_EL1 Date: Mon, 4 Apr 2022 14:46:43 +0100 Message-Id: <20220404134645.1675346-7-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220404134645.1675346-1-broonie@kernel.org> References: <20220404134645.1675346-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3228; h=from:subject; bh=eJy0rbs8Y7GxQT3XTekc4HHe0/1BaCFfdtv0FoEELsY=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBiSvbCTLzG61n1IlyGMVV8tXnLswK1MlYsmyv0xdDN N1q/VPiJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYkr2wgAKCRAk1otyXVSH0FMxB/ 9nucUz5JQ3eIUKUDbqSSmAWHQ6BMvgxZ4RwS/ds8pHYhqETSWrZV563kY2komLQUJDLFQf5b+qSpNf y2V4LBbc9E/Nf86WL0mV5gEmw4ivJKTUJbfcc0/4OqtjgS8+roBquCtc9jkvcs9usOIZquoJ32V1Pi x4Q741DSJxVyPTGAtus96Tzl6nDR2JE6wopS+VQb2vZJSxMPNztkCF79Fgmh335hXybXDJraRqh0/L ybWOBYYE1WZGpdQki4F31FBFDn4lPUTRwnGULe5CLe57dNl026dUDVn7gdSQF/lFMJtsBqiAVIDasx FhnvL3+mta+tlukqv2cSoDZb0wtcIx 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-20220404_064946_492604_58234A84 X-CRM114-Status: GOOD ( 11.96 ) 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. Other notable changes: - 27:24 TME is defined rather than RES0 reflecting DDI0487H.a. - 23:20 Atomic is named "atomics" reflecting existing usage. Signed-off-by: Mark Brown --- 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 11bf3636c741..2b5cc67b3bc3 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) @@ -736,25 +735,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_ATOMICS_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 3595c68b9a0b..040745387528 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -32,3 +32,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 ATOMICS + 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