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 55992C433F5 for ; Mon, 4 Apr 2022 13:52:28 +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=DbpKNBITKeHJT7Yxwdybn36m9MNhNTpC6SCAmeB9sJk=; b=INQueNbXYI3n3L 2tbrTYYX7oLRBS2zT/AwdO/Jh5KY/XmL2XV//AqAYYUifIP5k7d87UMLNGw7FgVPgLdlLByVHBpZk QK1nHF5gxU5Pi4DpVw69om+O3a3tQ+5rgVPW9ykeu91V09+4VbUtt9r+dSnpvJxuTdS2Lb5+rgin8 ERjBfsHGqDx25JKBANORzalXpv9AlX4k97J4OdFHxR5DNnGaz4llAGpbLInjCLJGKmTUMMNPfn4Xm 5gqMBQRnL4eYgwJDzq5Apm5fUVPv4s+30CmJjCdKBhBr9skV4OsIgt2iVXzfHhThHIW/VWeZ+wz5W QdRWZgCCdv9CUzCiW03A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nbN79-00FCGy-H3; Mon, 04 Apr 2022 13:51:27 +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 1nbN5c-00FBaD-6D for linux-arm-kernel@lists.infradead.org; Mon, 04 Apr 2022 13:49:56 +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 F23F161341; Mon, 4 Apr 2022 13:49:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C718FC34114; Mon, 4 Apr 2022 13:49:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649080189; bh=pyCuZhYpIfJQWbEIoD2AUsIuuieuigT1pZKCA9CaEsc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u2wXETx/EBJAvJPSngisQ1tTCuOJKvfuIEkG/aA/fI1YEYAOk9tSPUhyTJcWQThK9 4mdBk0ZQL2x3BWWkB12r7+i122YpZld0mabwh1GLfwjOvcL0X5pbxdG1rHwMX7YES5 Kw924iwRPSlCBm0b5He5r7u3+yc5WDeCUDBqIvcs50qI41qDgdWM8PzOxxH2WWSrFj P3SPWwFjuitPq0qFf/BBlz8pgCjKX3/lrsckH7CbXPqkvFvOtu8p5P2wQq8fqDRD+h tMRQceOIbL3hPDngUnMohzgi4niw0sR9ZRxTuiKnE/APbOXBGjN7DFs3ymCH4SnAQ1 XproSXdhhPj0A== 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 8/8] arm64/sysreg: Generate definitions for SCTLR_EL1 Date: Mon, 4 Apr 2022 14:46:45 +0100 Message-Id: <20220404134645.1675346-9-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=3581; h=from:subject; bh=pyCuZhYpIfJQWbEIoD2AUsIuuieuigT1pZKCA9CaEsc=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBiSvbDSmSOT50VSu04V6FOgXtZweO8aCgXNkKMAUnD Rfvv6xGJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYkr2wwAKCRAk1otyXVSH0I4kB/ 4qft6fdW5sLWoIcOADl5IK4Np9oHPY/E5nHErdlWdo6Cj4f5irByLH8Q8NeQnOpTbMl76mELcPqAXM zE6+NWdzkvBQKYHTihMgePK4UMrRnkGCKTnpqqW6NYJj/VhAvpmxUMAkE9mtGlzy2wkEvb2iiRb+Pp K9OY7PMbZyX98iLVWcDjPNJJC9tl2UxhfZMGW7rm96TZdOOGQr7kpbYNSix2LuhOWPJ4RYsGLDRsbe OGifxcgH9CF+kjoTm4UggpoY3sISmnJTQnjxM8QZrXSVH/Q4H2mZvMviNnMoOJCG9EvscCeA+rVKHQ 4Geih3hpSYFd5IENdUYBdrx2CQPN/C 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_064952_352339_05A92EDC X-CRM114-Status: GOOD ( 12.44 ) 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 register definitions for SCTLR_EL1. No functional change. Several fields which are defined in the current revision of DDI0487 but which are not yet used by the kernel are left as RES1 in order to ensure that the SCTLR_EL1_RES1 mask used for early initialisation of SCTLR_EL1 is not changed. These are LSMAOE, nTLSMD, EIS, TSCXT and EOS. Signed-off-by: Mark Brown --- arch/arm64/include/asm/sysreg.h | 29 -------------- arch/arm64/tools/sysreg | 70 +++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 29 deletions(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index b9023797a5b9..63b545260e62 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -203,7 +203,6 @@ #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_SCTLR_EL1 sys_reg(3, 0, 1, 0, 0) #define SYS_ACTLR_EL1 sys_reg(3, 0, 1, 0, 1) #define SYS_CPACR_EL1 sys_reg(3, 0, 1, 0, 2) #define SYS_RGSR_EL1 sys_reg(3, 0, 1, 0, 5) @@ -679,34 +678,6 @@ (SCTLR_EL2_RES1 | ENDIAN_SET_EL2) /* SCTLR_EL1 specific flags. */ -#define SCTLR_EL1_EPAN (BIT(57)) -#define SCTLR_EL1_ATA0 (BIT(42)) - -#define SCTLR_EL1_TCF0_SHIFT 38 -#define SCTLR_EL1_TCF0_NONE UL(0x0) -#define SCTLR_EL1_TCF0_SYNC UL(0x1) -#define SCTLR_EL1_TCF0_ASYNC UL(0x2) -#define SCTLR_EL1_TCF0_ASYMM UL(0x3) -#define SCTLR_EL1_TCF0_MASK (UL(0x3) << SCTLR_EL1_TCF0_SHIFT) - -#define SCTLR_EL1_BT1 (BIT(36)) -#define SCTLR_EL1_BT0 (BIT(35)) -#define SCTLR_EL1_UCI (BIT(26)) -#define SCTLR_EL1_E0E (BIT(24)) -#define SCTLR_EL1_SPAN (BIT(23)) -#define SCTLR_EL1_nTWE (BIT(18)) -#define SCTLR_EL1_nTWI (BIT(16)) -#define SCTLR_EL1_UCT (BIT(15)) -#define SCTLR_EL1_DZE (BIT(14)) -#define SCTLR_EL1_UMA (BIT(9)) -#define SCTLR_EL1_SED (BIT(8)) -#define SCTLR_EL1_ITD (BIT(7)) -#define SCTLR_EL1_CP15BEN (BIT(5)) -#define SCTLR_EL1_SA0 (BIT(4)) - -#define SCTLR_EL1_RES1 ((BIT(11)) | (BIT(20)) | (BIT(22)) | (BIT(28)) | \ - (BIT(29))) - #ifdef CONFIG_CPU_BIG_ENDIAN #define ENDIAN_SET_EL1 (SCTLR_EL1_E0E | SCTLR_ELx_EE) #else diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index f6195ccbf9b8..6248cfbf5288 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -100,6 +100,76 @@ EndEnum Res0 3:0 EndSysreg +Sysreg SCTLR_EL1 3 0 1 9 9 +Field 63 TIDCP +Field 62 SPINMASK +Field 61 NMI +Field 60 EnTP2 +Res0 59:58 +Field 57 EPAN +Field 56 EnALS +Field 55 EnAS0 +Field 54 EnASR +Field 53 TME +Field 52 TME0 +Field 51 TMT +Field 50 TMT0 +Field 49:46 TWEDEL +Field 45 TWEDEn +Field 44 DSSBS +Field 43 ATA +Field 42 ATA0 +Enum 41:40 TCF + 0b00 NONE + 0b01 SYNC + 0b10 ASYNC + 0b11 ASYMM +EndEnum +Enum 39:38 TCF0 + 0b00 NONE + 0b01 SYNC + 0b10 ASYNC + 0b11 ASYMM +EndEnum +Field 37 ITFSB +Field 36 BT1 +Field 35 BT0 +Res0 34 +Field 33 MSCEn +Field 32 CMOW +Field 31 EnIA +Field 30 EnIB +Res1 29:28 +Field 27 EnDA +Field 26 UCI +Field 25 EE +Field 24 E0E +Field 23 SPAN +Res1 22 +Field 21 IESB +Res1 20 +Field 19 WXN +Field 18 nTWE +Res0 17 +Field 16 nTWI +Field 15 UCT +Field 14 DZE +Field 13 EnDB +Field 12 I +Res1 11 +Field 10 EnRCTX +Field 9 UMA +Field 8 SED +Field 7 ITD +Field 6 nAA +Field 5 CP15BEN +Field 4 SA0 +Field 3 SA +Field 2 C +Field 1 A +Field 0 M +EndSysreg + Sysreg TTBR0_EL1 3 0 2 0 0 Field 63:48 ASID Field 47:1 BADDR -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel