From: Joey Gouly <joey.gouly@arm.com>
To: <linux-arm-kernel@lists.infradead.org>,
Mark Rutland <mark.rutland@arm.com>
Cc: <nd@arm.com>, Joey Gouly <joey.gouly@arm.com>
Subject: [PATCH v2 1/2] aarch64: enable access to TCR2_ELx
Date: Fri, 16 Jun 2023 17:00:35 +0100 [thread overview]
Message-ID: <20230616160036.3825473-1-joey.gouly@arm.com> (raw)
Allow access the TCR2_ELx register which provides extended translation
controls similar to TCR_ELx.
Initialise these registers to a value of 0.
Signed-off-by: Joey Gouly <joey.gouly@arm.com>
---
arch/aarch64/include/asm/cpu.h | 8 ++++++++
arch/aarch64/init.c | 6 ++++++
2 files changed, 14 insertions(+)
diff --git a/arch/aarch64/include/asm/cpu.h b/arch/aarch64/include/asm/cpu.h
index 89a8f78..0213d53 100644
--- a/arch/aarch64/include/asm/cpu.h
+++ b/arch/aarch64/include/asm/cpu.h
@@ -17,6 +17,9 @@
#define CURRENTEL_EL2 (2 << 2)
#define CURRENTEL_EL1 (1 << 2)
+#define TCR2_EL2 s3_4_c2_c0_3
+#define TCR2_EL1 s3_0_c2_c0_3
+
/*
* RES1 bit definitions definitions as of ARM DDI 0487G.b
*
@@ -51,6 +54,7 @@
#define SCR_EL3_TME BIT(34)
#define SCR_EL3_HXEn BIT(38)
#define SCR_EL3_EnTP2 BIT(41)
+#define SCR_EL3_TCR2EN BIT(43)
#define HCR_EL2_RES1 BIT(1)
@@ -73,6 +77,8 @@
#define ID_AA64MMFR1_EL1_HCX BITS(43, 40)
+#define ID_AA64MMFR3_EL1_TCRX BITS(4, 0)
+
#define ID_AA64PFR1_EL1_MTE BITS(11, 8)
#define ID_AA64PFR1_EL1_SME BITS(27, 24)
#define ID_AA64PFR0_EL1_SVE BITS(35, 32)
@@ -122,6 +128,8 @@
#define ID_AA64ISAR2_EL1 s3_0_c0_c6_2
+#define ID_AA64MMFR3_EL1 s3_0_c0_c7_3
+
#define SCTLR_EL1_CP15BEN (1 << 5)
#ifdef KERNEL_32
diff --git a/arch/aarch64/init.c b/arch/aarch64/init.c
index 471e234..e09e050 100644
--- a/arch/aarch64/init.c
+++ b/arch/aarch64/init.c
@@ -64,6 +64,12 @@ void cpu_init_el3(void)
if (mrs_field(ID_AA64MMFR1_EL1, HCX))
scr |= SCR_EL3_HXEn;
+ if (mrs_field(ID_AA64MMFR3_EL1, TCRX)) {
+ scr |= SCR_EL3_TCR2EN;
+ msr(TCR2_EL2, 0);
+ msr(TCR2_EL1, 0);
+ }
+
if (mrs_field(ID_AA64PFR1_EL1, MTE) >= 2)
scr |= SCR_EL3_ATA;
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next reply other threads:[~2023-06-16 16:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-16 16:00 Joey Gouly [this message]
2023-06-16 16:00 ` [PATCH v2 2/2] aarch64: enable Permission Indirection Extension Joey Gouly
2023-06-19 8:39 ` [PATCH v2 1/2] aarch64: enable access to TCR2_ELx Mark Rutland
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230616160036.3825473-1-joey.gouly@arm.com \
--to=joey.gouly@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=mark.rutland@arm.com \
--cc=nd@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox