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 C6573C00140 for ; Thu, 18 Aug 2022 12:49: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=QJzM1OUyXeLzucDwUi1JOfC9KpLKj1vR0EpxN8J6V5g=; b=iXseDBlxhqTezi UOh7o+3cJhLkMFs10FKkBT7M+Se0tpKRcjP1LzoR9H5+I4W7xkCA6jaYjWugMlgIPVKhS/BQT+q1g gCmVTKFkqdeC90jExcW4IodhiFJAxm2/pBfr3zIZlmB2DKMRkCEmUNNlRxZaMUrwSvx1VET1KxUML 5MCeQwX6pKyBwvkrn6JcookNfLEL0Opau/PjFItVrV6NxM9zXrMHkugz9x2DNncSBPe4tK6qGf//o NLXy42fDb2NqbzMU5J/R6kb5SKiFX0eQsjonGxPxsoVUpB9f9uCv9otFUaCvlQZm6SJgT83piGwEQ 7sB5p8s8AKqwjjlHjojQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oOewZ-004obj-Uo; Thu, 18 Aug 2022 12:48:16 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oOedv-004ZwG-QT for linux-arm-kernel@lists.infradead.org; Thu, 18 Aug 2022 12:29: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 ams.source.kernel.org (Postfix) with ESMTPS id 735EBB8216A; Thu, 18 Aug 2022 12:28:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CD1CDC43470; Thu, 18 Aug 2022 12:28:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660825737; bh=ASo7mE/QcFIeKxZ8+CdL0aAT1shcvOSRF9BaMFIPMmc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dSRarQeaNYm8egge8j79IrH2BsUGdLsp2M/mtZo6HPwm9mg6IQhqL5ccyzopz6Vem UnOFEEv8JQlJW5sQI5qzgKe0iJO9CAnKC0AWMYSU0o0ekIlvGz3hP6bUNcfLdVZ5SG EsINUS6Ko2AB5xO8DkhNduK7G2KYIJ2nhYh9KbjCOQJ1j/G0NskL7G1eKebPbBcECs x1w+0DDAPtZkoglZIqTLFEwl6DVtB6WvQaGeOaFBA/04YA3NOrFrjmzJZ446EorjPT soceGdqZtOPt12nGvqn8v1eCa/O2l88en+6cWUCzdyUozARTGhm6OdPaneA3hLrK/D 6raSjQzH/ZRqw== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , Kristina Martsenko , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v4 22/28] arm64/sysreg: Convert ID_AA64MMFR1_EL1 to automatic generation Date: Thu, 18 Aug 2022 13:24:19 +0100 Message-Id: <20220818122425.37889-23-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=3283; i=broonie@kernel.org; h=from:subject; bh=qijivEHat3Rq3EkSjcrST/x1xZwekTeFoxANDdXEQ48=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBi/i9y+ePC2CcmoM93MWknDvI8SOvfmt+PVy/VI4hJ E4AiWSqJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYv4vcgAKCRAk1otyXVSH0CaJB/ 0elkwCQO/A/lvxFRNs0OjQ9T8iWFgaKccAkeIokpKk0Zb//rtcj93L4MCnfxn0fzgZ5efV56D6oCPw kMSu4d1qgT00Q7l4v95ZeOVktOaXjBMullUBTuDHUl1tmDos6muFCKX3jnUG7MTQQFy+71nA0jB8Yt i5RzRhD2Qv8XV2aQwLI3wtR2LYq5YIBEtDtfTdYOKfOGRNmfg7TOUzhjmkGd4VY8GSUD4v0XDIUf+7 dQdIV54MpK6758HjBmSVb8F+Rx8+8BC9nzQIMBzmFCUpRUSzw/f1rpFgsDjG3WZ667PIi8n9tusyLN PyJqHWQCHBM4taDeH3pzH2edbhj+Mf 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_052900_239098_71CD1676 X-CRM114-Status: GOOD ( 11.98 ) 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 From: Kristina Martsenko Convert ID_AA64MMFR1_EL1 to be automatically generated as per DDI0487H.a plus ECBHB which was RES0 in DDI0487H.a but has been subsequently defined and is already present in mainline. No functional changes. Signed-off-by: Kristina Martsenko Signed-off-by: Mark Brown --- arch/arm64/include/asm/sysreg.h | 23 ----------- arch/arm64/tools/sysreg | 71 +++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 23 deletions(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 05439cb61f1d..2fabdaa422bd 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -199,7 +199,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_AA64MMFR1_EL1 sys_reg(3, 0, 0, 7, 1) #define SYS_ID_AA64MMFR2_EL1 sys_reg(3, 0, 0, 7, 2) #define SYS_ACTLR_EL1 sys_reg(3, 0, 1, 0, 1) @@ -750,28 +749,6 @@ #define ID_AA64MMFR0_EL1_PARANGE_MAX ID_AA64MMFR0_EL1_PARANGE_48 #endif -/* id_aa64mmfr1 */ -#define ID_AA64MMFR1_EL1_ECBHB_SHIFT 60 -#define ID_AA64MMFR1_EL1_TIDCP1_SHIFT 52 -#define ID_AA64MMFR1_EL1_HCX_SHIFT 40 -#define ID_AA64MMFR1_EL1_AFP_SHIFT 44 -#define ID_AA64MMFR1_EL1_ETS_SHIFT 36 -#define ID_AA64MMFR1_EL1_TWED_SHIFT 32 -#define ID_AA64MMFR1_EL1_XNX_SHIFT 28 -#define ID_AA64MMFR1_EL1_SpecSEI_SHIFT 24 -#define ID_AA64MMFR1_EL1_PAN_SHIFT 20 -#define ID_AA64MMFR1_EL1_LO_SHIFT 16 -#define ID_AA64MMFR1_EL1_HPDS_SHIFT 12 -#define ID_AA64MMFR1_EL1_VH_SHIFT 8 -#define ID_AA64MMFR1_EL1_VMIDBits_SHIFT 4 -#define ID_AA64MMFR1_EL1_HAFDBS_SHIFT 0 - -#define ID_AA64MMFR1_EL1_VMIDBits_8 0 -#define ID_AA64MMFR1_EL1_VMIDBits_16 2 - -#define ID_AA64MMFR1_EL1_TIDCP1_NI 0 -#define ID_AA64MMFR1_EL1_TIDCP1_IMP 1 - /* id_aa64mmfr2 */ #define ID_AA64MMFR2_EL1_E0PD_SHIFT 60 #define ID_AA64MMFR2_EL1_EVT_SHIFT 56 diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index d998dda53a8c..abac5dadd7bb 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -388,6 +388,77 @@ Enum 3:0 PARANGE EndEnum EndSysreg +Sysreg ID_AA64MMFR1_EL1 3 0 0 7 1 +Enum 63:60 ECBHB + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 59:56 CMOW + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 55:52 TIDCP1 + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 51:48 nTLBPA + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 47:44 AFP + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 43:40 HCX + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 39:36 ETS + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 35:32 TWED + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 31:28 XNX + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 27:24 SpecSEI + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 23:20 PAN + 0b0000 NI + 0b0001 IMP + 0b0010 PAN2 + 0b0011 PAN3 +EndEnum +Enum 19:16 LO + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 15:12 HPDS + 0b0000 NI + 0b0001 IMP + 0b0010 HPDS2 +EndEnum +Enum 11:8 VH + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 7:4 VMIDBits + 0b0000 8 + 0b0010 16 +EndEnum +Enum 3:0 HAFDBS + 0b0000 NI + 0b0001 AF + 0b0010 DBM +EndEnum +EndSysreg + Sysreg SCTLR_EL1 3 0 1 0 0 Field 63 TIDCP Field 62 SPINMASK -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel