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 6AECBC433F5 for ; Tue, 26 Apr 2022 18:22:46 +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=8ag3hOkZ6r2YTbvXdz5p8ULxiU4zfKuamh1s+C87Kns=; b=kbjfS2pXN0nNo7 myOc/vzEZJ7M+wOm95M8zwrtPJIpBIor5T4qvBAKW0Q8Orh9UyCfR2ssXuRj2AbKcR8lrA/Oct5Kf i2FsKkWgfHwmuyCsIqT6C8DNOmkp/OvZ5Yy2ihtwuNNE7QDlZtL445pZHP1FAs7ZsKZGrLJYCjokF zYNMnE4nP02JNSVypVPK/8PnHrgXDvbCAGMuXiydZLCI+8Ez1ru/6FEgXj929FH4yvQTRvHSo7mz9 y7WiftuWb5vhyRT2bl78RSm+yKU2eoIZwOHumgOwc7udZOZI6pCEmXbTznek3MoACd8TWAvavz/kJ +JDQpDzNWJfWxchd7+tg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1njPoc-00FfV1-DK; Tue, 26 Apr 2022 18:21:34 +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 1njPm0-00FeUf-Is for linux-arm-kernel@lists.infradead.org; Tue, 26 Apr 2022 18:18:54 +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 2B59F61844; Tue, 26 Apr 2022 18:18:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EDC8CC385B0; Tue, 26 Apr 2022 18:18:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1650997131; bh=V4OHLIU9ylLkiPeFhFJxlIw7C3+4vcwKn5s7qMbWxT8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dv5AK9ZEiUrVL/rh/EiPs/p9YV/ydeAIc6gOHO1vi/LHwIHxEz6ojibaX5GoRyDuG k0t8eKfmKrzd4IZCYaUshW9n2tED1l9YagcuhujRV4dA62uTCzP3VQqX/nrQfTchfS vcYd7jXAF7bbaLX5IVI5WiqLPePscaRQ1jxEDbCwn0Y/si5eTMVPaWLR4bgAUpafZX JDzBYHu9R6pal9Nv6C1y7nrzndY2SyufCxhJMLUrO1eg4b0+WQqZoeCny2bn3RN36f 4EwQCwYcuSAvxEAF4YePNzpKfF6nhuQ7cqo6dAXyTNBIkvY1UG1dzOw1VC+FNoHMXY J7VEtLlWZtUFQ== 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 05/12] arm64/sysreg: Define bits for previously RES1 fields in SCTLR_EL1 Date: Tue, 26 Apr 2022 19:16:57 +0100 Message-Id: <20220426181704.2583494-6-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=3992; h=from:subject; bh=V4OHLIU9ylLkiPeFhFJxlIw7C3+4vcwKn5s7qMbWxT8=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBiaDcZk+NhetvVFDnvVyGRG8BqmGawMJp9rpuvf44U TsbGDpWJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYmg3GQAKCRAk1otyXVSH0M3cB/ 0ahl2/O7o+WJe9w8dimOO0zFnsbavUG69thp5uU2QIl3qcBMOd6zQF+NOy+QKkmoSH+dN0Syv+EJaS FtM0FnOSMr1SlJHOAnJG4nsGlUwjLBCUU8Jxzh/BJyyMbXWO3wVTyP+nEIoR94B6Y48sWxBPeKGfdi uz4obTypoSSP4oA/plz/Fz/zZiLhkIpCkScQYdD4aICTX+idCPhmCx4KbXDGo0mBJX/rNje2WqfyEU +/7UaBkTtGZVGTTqnk/3fpm9zOn/6uyBRNhAO9q+HOQnTX3cp0Y2jgOBFXnlYbZh2zZrxJRCzS3XUC VmChcbOXDNGrisZB9yv0MO6guKGdjb 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_111852_791509_1C0FDDCB X-CRM114-Status: GOOD ( 12.35 ) 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 In older revisions of the architecture SCTLR_EL1 contained several RES1 fields but in DDI0487H.a these now all have assigned functions. In preparation for automatically generating sysreg.h provide explicit definitions for all these bits and use them in the INIT_SCTLR_EL1_ macros where _RES1 was previously used. There should be no functional change. Signed-off-by: Mark Brown --- arch/arm64/include/asm/sysreg.h | 53 ++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 7e9de3c87cd9..331e2521a81a 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -633,19 +633,24 @@ #define SCTLR_ELx_ENIA_SHIFT 31 -#define SCTLR_ELx_ITFSB (BIT(37)) -#define SCTLR_ELx_ENIA (BIT(SCTLR_ELx_ENIA_SHIFT)) -#define SCTLR_ELx_ENIB (BIT(30)) -#define SCTLR_ELx_ENDA (BIT(27)) -#define SCTLR_ELx_EE (BIT(25)) -#define SCTLR_ELx_IESB (BIT(21)) -#define SCTLR_ELx_WXN (BIT(19)) -#define SCTLR_ELx_ENDB (BIT(13)) -#define SCTLR_ELx_I (BIT(12)) -#define SCTLR_ELx_SA (BIT(3)) -#define SCTLR_ELx_C (BIT(2)) -#define SCTLR_ELx_A (BIT(1)) -#define SCTLR_ELx_M (BIT(0)) +#define SCTLR_ELx_ITFSB (BIT(37)) +#define SCTLR_ELx_ENIA (BIT(SCTLR_ELx_ENIA_SHIFT)) +#define SCTLR_ELx_ENIB (BIT(30)) +#define SCTLR_ELx_LSMAOE (BIT(29)) +#define SCTLR_ELx_nTLSMD (BIT(28)) +#define SCTLR_ELx_ENDA (BIT(27)) +#define SCTLR_ELx_EE (BIT(25)) +#define SCTLR_ELx_EIS (BIT(22)) +#define SCTLR_ELx_IESB (BIT(21)) +#define SCTLR_ELx_TSCXT (BIT(20)) +#define SCTLR_ELx_WXN (BIT(19)) +#define SCTLR_ELx_ENDB (BIT(13)) +#define SCTLR_ELx_I (BIT(12)) +#define SCTLR_ELx_EOS (BIT(11)) +#define SCTLR_ELx_SA (BIT(3)) +#define SCTLR_ELx_C (BIT(2)) +#define SCTLR_ELx_A (BIT(1)) +#define SCTLR_ELx_M (BIT(0)) /* SCTLR_EL2 specific flags. */ #define SCTLR_EL2_RES1 ((BIT(4)) | (BIT(5)) | (BIT(11)) | (BIT(16)) | \ @@ -686,22 +691,24 @@ #define SCTLR_EL1_BT1 (BIT(36)) #define SCTLR_EL1_BT0 (BIT(35)) +#define SCTLR_EL1_LSMAOE (BIT(29)) +#define SCTLR_EL1_nTLSMD (BIT(28)) #define SCTLR_EL1_UCI (BIT(26)) #define SCTLR_EL1_E0E (BIT(24)) #define SCTLR_EL1_SPAN (BIT(23)) +#define SCTLR_EL1_EIS (BIT(22)) +#define SCTLR_EL1_TSCXT (BIT(20)) #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_EOS (BIT(11)) #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 @@ -709,13 +716,17 @@ #endif #define INIT_SCTLR_EL1_MMU_OFF \ - (ENDIAN_SET_EL1 | SCTLR_EL1_RES1) + (ENDIAN_SET_EL1 | SCTLR_EL1_LSMAOE | SCTLR_EL1_nTLSMD | \ + SCTLR_EL1_EIS | SCTLR_EL1_TSCXT | SCTLR_EL1_EOS) #define INIT_SCTLR_EL1_MMU_ON \ - (SCTLR_ELx_M | SCTLR_ELx_C | SCTLR_ELx_SA | SCTLR_EL1_SA0 | \ - SCTLR_EL1_SED | SCTLR_ELx_I | SCTLR_EL1_DZE | SCTLR_EL1_UCT | \ - SCTLR_EL1_nTWE | SCTLR_ELx_IESB | SCTLR_EL1_SPAN | SCTLR_ELx_ITFSB | \ - ENDIAN_SET_EL1 | SCTLR_EL1_UCI | SCTLR_EL1_EPAN | SCTLR_EL1_RES1) + (SCTLR_ELx_M | SCTLR_ELx_C | SCTLR_ELx_SA | \ + SCTLR_EL1_SA0 | SCTLR_EL1_SED | SCTLR_ELx_I | \ + SCTLR_EL1_DZE | SCTLR_EL1_UCT | SCTLR_EL1_nTWE | \ + SCTLR_ELx_IESB | SCTLR_EL1_SPAN | SCTLR_ELx_ITFSB | \ + ENDIAN_SET_EL1 | SCTLR_EL1_UCI | SCTLR_EL1_EPAN | \ + SCTLR_EL1_LSMAOE | SCTLR_EL1_nTLSMD | SCTLR_EL1_EIS | \ + SCTLR_EL1_TSCXT | SCTLR_EL1_EOS) /* MAIR_ELx memory attributes (used by Linux) */ #define MAIR_ATTR_DEVICE_nGnRnE UL(0x00) -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel