feat(runtime/rmi): report number of breakpoints and watchpoints
This patch sets NUM_BPS and NUM_WPS fields in RmiFeatureRegister0
as number of implemented breakpoints and watchpoints, minus 1,
as per RMM Specification 1.0-rel0-rc2.
This patch also removes setting DebugVer, BRPs and WRPs fields
of ID_AA64DFR0_EL1 register value returned by handle_id_sysreg_trap()
function.
Change-Id: I1e3ea542a75a324af9438a46c4876aad41072f6b
Signed-off-by: AlexeiFedorov <Alexei.Fedorov@arm.com>
diff --git a/lib/arch/include/arch.h b/lib/arch/include/arch.h
index 75a1424..c84fc40 100644
--- a/lib/arch/include/arch.h
+++ b/lib/arch/include/arch.h
@@ -457,10 +457,11 @@
/* Debug architecture version */
#define ID_AA64DFR0_EL1_Debugv8 UL(6)
-#define ID_AA64DFR0_EL1_DebugVHE UL(7)
+#define ID_AA64DFR0_EL1_Debugv8p1 UL(7)
#define ID_AA64DFR0_EL1_Debugv8p2 UL(8)
#define ID_AA64DFR0_EL1_Debugv8p4 UL(9)
#define ID_AA64DFR0_EL1_Debugv8p8 UL(10)
+#define ID_AA64DFR0_EL1_Debugv8p9 UL(11)
/* ID_AA64DFR1_EL1 definitions */
#define ID_AA64DFR1_EL1_EBEP_SHIFT UL(48)
@@ -469,6 +470,12 @@
#define ID_AA64DFR1_EL1_ICNTR_SHIFT UL(36)
#define ID_AA64DFR1_EL1_ICNTR_WIDTH UL(4)
+#define ID_AA64DFR1_EL1_WRPs_SHIFT UL(16)
+#define ID_AA64DFR1_EL1_WRPs_WIDTH UL(8)
+
+#define ID_AA64DFR1_EL1_BRPs_SHIFT UL(8)
+#define ID_AA64DFR1_EL1_BRPs_WIDTH UL(8)
+
/* ID_AA64PFR0_EL1 definitions */
#define ID_AA64PFR0_EL1_SVE_SHIFT UL(32)
#define ID_AA64PFR0_EL1_SVE_WIDTH UL(4)