Removing Ifdef declarations for RME tests
Removing ifdef declarations and creating dummy aarch32
function to return 0 for query of RME capability.
Additonal changes include the fixing of failures with
cleanup of the delegated granules before the end of
each test. Also changed the SMC code for undelegation
to conform with RMM requirements.
Signed-off-by: Mark Dykes <mark.dykes@arm.com>
Change-Id: I06ff82e86dbca3067e977342c0e7476f1b0e58a9
diff --git a/include/lib/aarch32/arch_features.h b/include/lib/aarch32/arch_features.h
index b61e626..1addc44 100644
--- a/include/lib/aarch32/arch_features.h
+++ b/include/lib/aarch32/arch_features.h
@@ -48,4 +48,9 @@
ID_DFR0_COPTRC_MASK) ==
ID_DFR0_COPTRC_SUPPORTED;
}
+
+static inline unsigned int get_armv9_2_feat_rme_support(void)
+{
+ return 0;
+}
#endif /* ARCH_FEATURES_H */
diff --git a/include/runtime_services/realm_payload/realm_payload_test.h b/include/runtime_services/realm_payload/realm_payload_test.h
index eccdbb3..c31dd6a 100644
--- a/include/runtime_services/realm_payload/realm_payload_test.h
+++ b/include/runtime_services/realm_payload/realm_payload_test.h
@@ -26,7 +26,7 @@
#define RMI_FNUM_VERSION_REQ U(0)
#define RMI_FNUM_GRAN_NS_REALM U(1)
-#define RMI_FNUM_GRAN_REALM_NS U(0x10)
+#define RMI_FNUM_GRAN_REALM_NS U(2)
/********************************************************************************/