From patchwork Thu Mar 23 20:44:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 13186079 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 0A03DC77B60 for ; Thu, 23 Mar 2023 20:46:51 +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:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=tqwMZtGdFoIaLk2OqURw8u1mvyUkPb724VP6hzNi9Zs=; b=m0yNMVaSa6qV6Q wc1sniEkEYc/odCLck9QF8nACqbdvhP4O9IhInWIkURwsf0L0nJXFbypw4HbG0DUvkz9Ch3Nx1ypm ZDFKZEi4o3QLrZd/E8fI6Ipm5zfw7HEzzPX8v/1dFIOlF4QGZlqNrikDLifBNRU85rz4B4W9p7n38 CtHVxHgjI5ZnC3bQedz8w9NaVks7FOkj9ZrzQYHpsWM3H7lA4Fc5xZtS9Bu++lpCGvyc6lO6VIlCw 1ZK0JOipF1aqTMF3j8V0ir38OhutjPVBHJT+8WsSffILkO5fCAlD2BKPAJdxYa7P5ZPN3t2zYNMaR iJBK6Md/H/aQtYgcBE8w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pfRok-002wF0-1w; Thu, 23 Mar 2023 20:45:50 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pfRoY-002wCG-10 for linux-arm-kernel@lists.infradead.org; Thu, 23 Mar 2023 20:45:43 +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 AAAB6628B7; Thu, 23 Mar 2023 20:45:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 82484C433A4; Thu, 23 Mar 2023 20:45:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1679604333; bh=kvBBr75CsPjkEV7cYPTetKap1L2dFc3Y02As/bgqHcs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=BKxJddDZJsPaFabEFjFxi0hFB5W6PBwEOezguoeNk6QWe9dwUiWyO0S5JVnQOipeZ MU2UseALm9HsvF45THeIDAbYpk41ixuRpBiJxSPRZhPiBtn/VeLJjprshsHNYgZnjf lSc8gx48cOyAl0KwrQ4YuMvRuPNO/CCe+Hj2gYaw4FSPmAADbxQfMiK5ckQuvZI4uC QqZxpLpqrOI1EUxtrEREJJDFrw7G49UCiDC3gLje2NU+Ae/oI56Mt0bYEAwV106cOn GmHUmGJbKX8Rq/AsJG60QB/cA5G5GR7+aeBHr6FwBP+UAklQs1prYBQY/AJG6nQEPf xvYZbreYX1k7A== From: Mark Brown Date: Thu, 23 Mar 2023 20:44:53 +0000 Subject: [PATCH v3 1/2] arm64/sysreg: Convert HFG[RW]TR_EL2 to automatic generation MIME-Version: 1.0 Message-Id: <20230306-arm64-fgt-reg-gen-v3-1-decba93cbaab@kernel.org> References: <20230306-arm64-fgt-reg-gen-v3-0-decba93cbaab@kernel.org> In-Reply-To: <20230306-arm64-fgt-reg-gen-v3-0-decba93cbaab@kernel.org> To: Catalin Marinas , Will Deacon Cc: Joey Gouly , Anshuman Khandual , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Mark Brown X-Mailer: b4 0.13-dev-bd1bf X-Developer-Signature: v=1; a=openpgp-sha256; l=3347; i=broonie@kernel.org; h=from:subject:message-id; bh=kvBBr75CsPjkEV7cYPTetKap1L2dFc3Y02As/bgqHcs=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBkHLpooC1ip/a1XfD9tuSMB4J2vbxBF12jCmAdEXz3 0Rf/P2OJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZBy6aAAKCRAk1otyXVSH0K2VB/ 9gDYKhZO7wszAf1fRG+vdb0o96Yra2zc7hZ8ON6vbxJ9Cci0oPO7uxnQIe0dt0ueSANX85jTDVsgVW I1ck3T3zkDU3yK309JLqepsz+0vnbm9mZHVnlfG+QL67QEsONrG7diKfYCk2KS9uDn2v4ZNtwqMRge j/+25CgbTk5zLalcoYrXmBDwTrg7tPn3K1SrRixguP5n6UHD6VBPqcTwjs5b0n3o9jit+YwwkW9SV/ sciGxoA+2zExHgADIFLAsNef9QNHUVU06alIXCqAJM8DCFUnGjEDqkp7bC0+8x+BrZbLSsr/Jek5+Q dFx4S4OrO+WjUeZ2fxscv2isHzKdNL 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-20230323_134538_425003_963B3D5A X-CRM114-Status: GOOD ( 10.06 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Convert the fine grained traps read and write control registers to automatic generation as per DDI0601 2022-12. No functional changes. Reviewed-by: Joey Gouly Acked-by: Catalin Marinas Signed-off-by: Mark Brown --- arch/arm64/include/asm/sysreg.h | 8 ----- arch/arm64/tools/sysreg | 75 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 8 deletions(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 9e3ecba3c4e6..e5ca9ece1606 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -419,8 +419,6 @@ #define SYS_MDCR_EL2 sys_reg(3, 4, 1, 1, 1) #define SYS_CPTR_EL2 sys_reg(3, 4, 1, 1, 2) #define SYS_HSTR_EL2 sys_reg(3, 4, 1, 1, 3) -#define SYS_HFGRTR_EL2 sys_reg(3, 4, 1, 1, 4) -#define SYS_HFGWTR_EL2 sys_reg(3, 4, 1, 1, 5) #define SYS_HFGITR_EL2 sys_reg(3, 4, 1, 1, 6) #define SYS_HACR_EL2 sys_reg(3, 4, 1, 1, 7) @@ -758,12 +756,6 @@ #define ICH_VTR_TDS_SHIFT 19 #define ICH_VTR_TDS_MASK (1 << ICH_VTR_TDS_SHIFT) -/* HFG[WR]TR_EL2 bit definitions */ -#define HFGxTR_EL2_nTPIDR2_EL0_SHIFT 55 -#define HFGxTR_EL2_nTPIDR2_EL0_MASK BIT_MASK(HFGxTR_EL2_nTPIDR2_EL0_SHIFT) -#define HFGxTR_EL2_nSMPRI_EL1_SHIFT 54 -#define HFGxTR_EL2_nSMPRI_EL1_MASK BIT_MASK(HFGxTR_EL2_nSMPRI_EL1_SHIFT) - #define ARM64_FEATURE_FIELD_BITS 4 /* Defined for compatibility only, do not add new users. */ diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index dd5a9c7e310f..60829a9409f0 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -1866,6 +1866,81 @@ Field 1 ZA Field 0 SM EndSysreg +SysregFields HFGxTR_EL2 +Field 63 nAMIAIR2_EL1 +Field 62 nMAIR2_EL1 +Field 61 nS2POR_EL1 +Field 60 nPOR_EL1 +Field 59 nPOR_EL0 +Field 58 nPIR_EL1 +Field 57 nPIRE0_EL1 +Field 56 nRCWMASK_EL1 +Field 55 nTPIDR2_EL0 +Field 54 nSMPRI_EL1 +Field 53 nGCS_EL1 +Field 52 nGCS_EL0 +Res0 51 +Field 50 nACCDATA_EL1 +Field 49 ERXADDR_EL1 +Field 48 EXRPFGCDN_EL1 +Field 47 EXPFGCTL_EL1 +Field 46 EXPFGF_EL1 +Field 45 ERXMISCn_EL1 +Field 44 ERXSTATUS_EL1 +Field 43 ERXCTLR_EL1 +Field 42 ERXFR_EL1 +Field 41 ERRSELR_EL1 +Field 40 ERRIDR_EL1 +Field 39 ICC_IGRPENn_EL1 +Field 38 VBAR_EL1 +Field 37 TTBR1_EL1 +Field 36 TTBR0_EL1 +Field 35 TPIDR_EL0 +Field 34 TPIDRRO_EL0 +Field 33 TPIDR_EL1 +Field 32 TCR_EL1 +Field 31 SCTXNUM_EL0 +Field 30 SCTXNUM_EL1 +Field 29 SCTLR_EL1 +Field 28 REVIDR_EL1 +Field 27 PAR_EL1 +Field 26 MPIDR_EL1 +Field 25 MIDR_EL1 +Field 24 MAIR_EL1 +Field 23 LORSA_EL1 +Field 22 LORN_EL1 +Field 21 LORID_EL1 +Field 20 LOREA_EL1 +Field 19 LORC_EL1 +Field 18 ISR_EL1 +Field 17 FAR_EL1 +Field 16 ESR_EL1 +Field 15 DCZID_EL0 +Field 14 CTR_EL0 +Field 13 CSSELR_EL1 +Field 12 CPACR_EL1 +Field 11 CONTEXTIDR_EL1 +Field 10 CLIDR_EL1 +Field 9 CCSIDR_EL1 +Field 8 APIBKey +Field 7 APIAKey +Field 6 APGAKey +Field 5 APDBKey +Field 4 APDAKey +Field 3 AMAIR_EL1 +Field 2 AIDR_EL1 +Field 1 AFSR1_EL1 +Field 0 AFSR0_EL1 +EndSysregFields + +Sysreg HFGRTR_EL2 3 4 1 1 4 +Fields HFGxTR_EL2 +EndSysreg + +Sysreg HFGWTR_EL2 3 4 1 1 5 +Fields HFGxTR_EL2 +EndSysreg + Sysreg ZCR_EL2 3 4 1 2 0 Fields ZCR_ELx EndSysreg From patchwork Thu Mar 23 20:44:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 13186080 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 9FBA9C6FD1C for ; Thu, 23 Mar 2023 20:46:50 +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:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=FGJcE3NzGe7wObf4qyUXbGXvq7DQcopOpzLx8hBQd2I=; b=Z2acmWR79uPhdR dljAzJ+JawSL5iv3W5TXX6wVW6X1EUkjm1+7e/fmVr/fdeViM7n3iuizQf0gR+NrVfZIIYQKyBCjw AKWKPkI8VOLwKZYf1l9itDA+kX4ZukSkJgNerC0h8fQHJoKJjNV/OZa9A8FgFVqM1t9K2scoAJ2ee iAYgK6JNXh/6JIaktlOGCAPuV8w0HvXHpPdxlwoLEjWHyc2vVy67J6S0EU9R96I021t7vPFXZm36N FMjnI2XVz57HfvMucsZDs5oXT0DttJqccbHMbOx0b0N6igM36aTKzyA7h0GoQAQTFXK4VvGN03V+k 8AC5yqECzlTl2FHp3/WA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pfRol-002wF9-1t; Thu, 23 Mar 2023 20:45:51 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pfRoY-002wCc-23 for linux-arm-kernel@lists.infradead.org; Thu, 23 Mar 2023 20:45:46 +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 01343B8224B; Thu, 23 Mar 2023 20:45:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5BC89C433A1; Thu, 23 Mar 2023 20:45:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1679604335; bh=nWKfi1HEudmdxpdb81RertI104eji0uTemho/GX0iSU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=D1jlG8/G0083Nj0cox7djvVUCkT7HM8YbRUrXhqL6O0I2azb1GNT+hpIWIVNWdqKl I32apii0Qqk7UhF1ScHAPIIlX1IJ22K+hoB6zgJYZcMFuVdDcq0HS2K+OvOxI22CeE T8T51A4Lb5cwNlRI+divcYaJCH3RJUB+n8XJXLPp/yFU1hCxk1wjJGASF1N7PKHEuD 1+L1VNcF1uFxtpa3pE2+Tfpl/GnH9DW8A6QwX0ETuTBW1KakrKed+/cW7dk3mMJKEr vKTnY+WkPgl6JgXG4GcCEvVb92izzbVfgoAZ2i7uwFBtuueyxkcr3KRqqtiyYsRG7j Yo2b4KBRr5lZw== From: Mark Brown Date: Thu, 23 Mar 2023 20:44:54 +0000 Subject: [PATCH v3 2/2] arm64/sysreg: Convert HFGITR_EL2 to automatic generation MIME-Version: 1.0 Message-Id: <20230306-arm64-fgt-reg-gen-v3-2-decba93cbaab@kernel.org> References: <20230306-arm64-fgt-reg-gen-v3-0-decba93cbaab@kernel.org> In-Reply-To: <20230306-arm64-fgt-reg-gen-v3-0-decba93cbaab@kernel.org> To: Catalin Marinas , Will Deacon Cc: Joey Gouly , Anshuman Khandual , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Mark Brown X-Mailer: b4 0.13-dev-bd1bf X-Developer-Signature: v=1; a=openpgp-sha256; l=2608; i=broonie@kernel.org; h=from:subject:message-id; bh=nWKfi1HEudmdxpdb81RertI104eji0uTemho/GX0iSU=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBkHLpp5I05qve552Mm+inmnWBhpAdu7yoSQdMMPzF4 X7RFVxqJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZBy6aQAKCRAk1otyXVSH0KTKB/ 9QV65JfqBNLsJ9C48nRt/84ABDsys8h8KsyOr9lnkmKhTpIQwo4BfP35B5gof+xL5UgL7JCjgWTYVE DpnlK7GNTR15t6fkltzHQq9iXXOtELz9Yaaw8+gWqe7KmeeJXslijkmtSFW5Jn67Hu+GcoX0TcCRw6 QI4teQprN/aVbCczRuq6JDHpWBHZGVAhFJ9+JdQ+p8ypBjW/bgpIeA5aGcW5kC0tdDQQV/LQRk2wUD tAJIGPxoZmJtySl4ePPZkFk5vtGrxUQiEv7iu4EijQ0f6Fmy3q6GGpnALuREKNG17p9a041z0vckP7 +y0/LCrmvTP+S7ljMgeItEVovvaWBU 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-20230323_134538_978811_58D9F073 X-CRM114-Status: GOOD ( 10.74 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Automatically generate the Hypervisor Fine-Grained Instruction Trap Register as per DDI0601 2022-12, currently we only have a definition for the register name not any of the contents. No functional change. Signed-off-by: Mark Brown --- arch/arm64/include/asm/sysreg.h | 1 - arch/arm64/tools/sysreg | 65 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index e5ca9ece1606..c48b41c9b0cc 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -419,7 +419,6 @@ #define SYS_MDCR_EL2 sys_reg(3, 4, 1, 1, 1) #define SYS_CPTR_EL2 sys_reg(3, 4, 1, 1, 2) #define SYS_HSTR_EL2 sys_reg(3, 4, 1, 1, 3) -#define SYS_HFGITR_EL2 sys_reg(3, 4, 1, 1, 6) #define SYS_HACR_EL2 sys_reg(3, 4, 1, 1, 7) #define SYS_TTBR0_EL2 sys_reg(3, 4, 2, 0, 0) diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index 60829a9409f0..c06097a8b921 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -1941,6 +1941,71 @@ Sysreg HFGWTR_EL2 3 4 1 1 5 Fields HFGxTR_EL2 EndSysreg +Sysreg HFGITR_EL2 3 4 1 1 6 +Res0 63:61 +Field 60 COSPRCTX +Field 59 nGCSEPP +Field 58 nGCSSTR_EL1 +Field 57 nGCSPUSHM_EL1 +Field 56 nBRBIALL +Field 55 nBRBINJ +Field 54 DCCVAC +Field 53 SVC_EL1 +Field 52 SVC_EL0 +Field 51 ERET +Field 50 CPPRCTX +Field 49 DVPRCTX +Field 48 CFPRCTX +Field 47 TLBIVAALE1 +Field 46 TLBIVALE1 +Field 45 TLBIVAAE1 +Field 44 TLBSIDE1 +Field 43 TLBIVAE1 +Field 42 TLBIVMALLE1 +Field 41 TLBIRVAALE1 +Field 40 TLBIRVALE1 +Field 39 TLBIRVAAE1 +Field 38 TLBIRVAE1 +Field 37 TLBIRVAALE1IS +Field 36 TLBIRVALE1IS +Field 35 TLBIRVAAE1IS +Field 34 TLBIRAALE1IS +Field 33 TLBIVAALE1IS +Field 32 TLBIVALE1IS +Field 31 TLBIVAAE1IS +Field 30 TLBIASIDE1IS +Field 29 TLBIVAE1IS +Field 28 TLBIVVMALLE1IS +Field 27 TLBIRVAALE1OS +Field 26 TLBIRVALE1OS +Field 25 TLBIRVAAE1OS +Field 24 TLBIRVAE1OS +Field 23 TLBIVAALE1OS +Field 22 TLBIVALE1OS +Field 21 TLBIVAAE1OS +Field 20 TLVIASIDE1OS +Field 19 TLBIVAE1OS +Field 18 TLBIVMALLE1OS +Field 17 ATS1E1WP +Field 16 ATS1E1RP +Field 15 ATS1E0W +Field 14 ATS1E0R +Field 13 ATS1E1W +Field 12 ATS1E1R +Field 11 DCZVA +Field 10 DCCIVAC +Field 9 DCCVADP +Field 8 DCCVAP +Field 7 DCCVAU +Field 6 DCCISW +Field 5 DCCSW +Field 4 DCISW +Field 3 DCIVAC +Field 2 ICIVAU +Field 1 ICIALLU +Field 0 ICIALLUIS +EndSysreg + Sysreg ZCR_EL2 3 4 1 2 0 Fields ZCR_ELx EndSysreg