From: Anshuman Khandual <anshuman.khandual@arm.com>
To: linux-arm-kernel@lists.infradead.org
Cc: Anshuman Khandual <anshuman.khandual@arm.com>,
James Clark <james.clark@linaro.org>,
Mark Rutland <mark.rutland@arm.com>
Subject: [boot-wrapper PATCH V2] aarch64: Enable access into FEAT_SPE_FDS register from EL2 and below
Date: Fri, 6 Jun 2025 10:56:02 +0530 [thread overview]
Message-ID: <20250606052602.3387225-1-anshuman.khandual@arm.com> (raw)
FEAT_SPE_FDS adds system register PMSDSFR_EL1. But accessing that system
register from EL2 and below exception levels, will trap into EL3 unless
MDCR_EL3.EnPMS3 is set.
Enable access to FEAT_SPE_FDS registers when they are implemented.
Cc: James Clark <james.clark@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
---
Changes in V2:
- Check for FEAT_SPE implementation before accessing PMSIDR_EL1 register
Changes in V1:
https://lore.kernel.org/all/20250604114604.629782-1-anshuman.khandual@arm.com/
arch/aarch64/include/asm/cpu.h | 4 ++++
arch/aarch64/init.c | 9 +++++++++
2 files changed, 13 insertions(+)
diff --git a/arch/aarch64/include/asm/cpu.h b/arch/aarch64/include/asm/cpu.h
index 2b3a659..ac50474 100644
--- a/arch/aarch64/include/asm/cpu.h
+++ b/arch/aarch64/include/asm/cpu.h
@@ -55,6 +55,7 @@
#define MDCR_EL3_NSTB_NS_NOTRAP (UL(3) << 24)
#define MDCR_EL3_SBRBE_NOTRAP_NOPROHIBIT (UL(3) << 32)
#define MDCR_EL3_ENPMSN BIT(36)
+#define MDCR_EL3_ENPMS3 BIT(42)
#define MDCR_EL3_EBWE BIT(43)
#define MDCR_EL3_EnPM2 BIT(7)
@@ -185,6 +186,9 @@
#define SCTLR_EL1_CP15BEN (1 << 5)
+#define PMSIDR_EL1 s3_0_c9_c9_7
+#define PMSIDR_EL1_FDS BIT(7)
+
#ifdef KERNEL_32
/*
* When booting a 32-bit kernel, EL1 uses AArch32 and registers which are
diff --git a/arch/aarch64/init.c b/arch/aarch64/init.c
index e1640a9..df43d2d 100644
--- a/arch/aarch64/init.c
+++ b/arch/aarch64/init.c
@@ -146,6 +146,15 @@ static void cpu_init_el3(void)
if (mrs_field(ID_AA64DFR0_EL1, PMSVER) >= 3)
mdcr |= MDCR_EL3_ENPMSN;
+ /*
+ * PMSIDR_EL1 register is present, only when FEAT_SPE
+ * feature is implemeneted. Otherwise direct accesses
+ * to PMSIDR_EL1 are UNDEFINED.
+ */
+ if ((mrs_field(ID_AA64DFR0_EL1, PMSVER) >= 1) &&
+ (mrs_field(PMSIDR_EL1, FDS)))
+ mdcr |= MDCR_EL3_ENPMS3;
+
if (mrs_field(ID_AA64DFR0_EL1, TRACEBUFFER))
mdcr |= MDCR_EL3_NSTB_NS_NOTRAP;
--
2.25.1
next reply other threads:[~2025-06-06 5:28 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-06 5:26 Anshuman Khandual [this message]
2025-06-06 8:49 ` [boot-wrapper PATCH V2] aarch64: Enable access into FEAT_SPE_FDS register from EL2 and below James Clark
2025-06-09 13:36 ` Mark Rutland
2025-06-10 7:40 ` Anshuman Khandual
2025-06-10 17:17 ` 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=20250606052602.3387225-1-anshuman.khandual@arm.com \
--to=anshuman.khandual@arm.com \
--cc=james.clark@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=mark.rutland@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