aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnshuman Khandual <anshuman.khandual@arm.com>2024-04-04 13:07:25 +0530
committerMark Rutland <mark.rutland@arm.com>2024-04-18 11:19:50 +0100
commit5e3760073454c72f3458805a1b7a89ecf80353cb (patch)
tree5439d82c722be56c0de0b200e81c61b70d1506c7
parent44e25f43712597a75f1a5e547c66881b3750e0cf (diff)
downloadboot-wrapper-aarch64-5e3760073454c72f3458805a1b7a89ecf80353cb.tar.gz
aarch64: Enable access to MDSELR_EL1 from EL2 and belowHEADmaster
FEAT_Debugv8p9 adds a new MDSELR_EL1 register to select between banks of breakpoints and watchpoints. Accesses to MDSELR_EL1 from EL2 and below trap to EL3 unless MDCR_EL3.EBWE is set. Enable access to MDSELR_EL1 when it is implemented. Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> Signed-off-by: Mark Rutland <mark.rutland@arm.com>
-rw-r--r--arch/aarch64/include/asm/cpu.h2
-rw-r--r--arch/aarch64/init.c3
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/aarch64/include/asm/cpu.h b/arch/aarch64/include/asm/cpu.h
index d1f8fd9..124ef91 100644
--- a/arch/aarch64/include/asm/cpu.h
+++ b/arch/aarch64/include/asm/cpu.h
@@ -41,6 +41,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_EBWE BIT(43)
#define SCR_EL3_RES1 BITS(5, 4)
#define SCR_EL3_NS BIT(0)
@@ -62,6 +63,7 @@
#define ID_AA64DFR0_EL1_PMSVER BITS(35, 32)
#define ID_AA64DFR0_EL1_TRACEBUFFER BITS(47, 44)
#define ID_AA64DFR0_EL1_BRBE BITS(55, 52)
+#define ID_AA64DFR0_EL1_DEBUGVER BITS(3, 0)
#define ID_AA64ISAR0_EL1_TME BITS(27, 24)
diff --git a/arch/aarch64/init.c b/arch/aarch64/init.c
index c4e91e4..37cb45f 100644
--- a/arch/aarch64/init.c
+++ b/arch/aarch64/init.c
@@ -105,6 +105,9 @@ void cpu_init_el3(void)
if (mrs_field(ID_AA64DFR0_EL1, BRBE))
mdcr |= MDCR_EL3_SBRBE_NOTRAP_NOPROHIBIT;
+ if (mrs_field(ID_AA64DFR0_EL1, DEBUGVER) >= 11)
+ mdcr |= MDCR_EL3_EBWE;
+
msr(MDCR_EL3, mdcr);
if (mrs_field(ID_AA64PFR0_EL1, SVE)) {