fix(rmm): rename RmiFeature type definitions
This patch renames RmiFeature type definitions
to RMI_FEATURE_FALSE and RMI_FEATURE_TRUE as
per RMM Specification 1.0-eac1. No functional
modifications are made.
Signed-off-by: AlexeiFedorov <Alexei.Fedorov@arm.com>
Change-Id: I49bccd1246e50fd1da060a32888ac6a5781aedcd
diff --git a/lib/smc/include/smc-rmi.h b/lib/smc/include/smc-rmi.h
index f215578..8ddeb3d 100644
--- a/lib/smc/include/smc-rmi.h
+++ b/lib/smc/include/smc-rmi.h
@@ -127,8 +127,8 @@
#define RMI_VALID_NS U(4)
/* RmiFeature enumerations */
-#define RMI_NOT_SUPPORTED UL(0)
-#define RMI_SUPPORTED UL(1)
+#define RMI_FEATURE_FALSE UL(0)
+#define RMI_FEATURE_TRUE UL(1)
/* RmiFeatureRegister0 format */
#define RMM_FEATURE_REGISTER_0_INDEX UL(0)
diff --git a/runtime/rmi/feature.c b/runtime/rmi/feature.c
index b1ea024..352b140 100644
--- a/runtime/rmi/feature.c
+++ b/runtime/rmi/feature.c
@@ -25,16 +25,16 @@
/* Set support for SHA256 and SHA512 hash algorithms */
feat_reg0 |= INPLACE(RMM_FEATURE_REGISTER_0_HASH_SHA_256,
- RMI_SUPPORTED);
+ RMI_FEATURE_TRUE);
feat_reg0 |= INPLACE(RMM_FEATURE_REGISTER_0_HASH_SHA_512,
- RMI_SUPPORTED);
+ RMI_FEATURE_TRUE);
/* RMM supports PMUv3p7+ */
assert(read_pmu_version() >= ID_AA64DFR0_EL1_PMUv3p7);
/* Set support for PMUv3 */
feat_reg0 |= INPLACE(RMM_FEATURE_REGISTER_0_PMU_EN,
- RMI_SUPPORTED);
+ RMI_FEATURE_TRUE);
/* Set number of PMU counters available */
feat_reg0 |= INPLACE(RMM_FEATURE_REGISTER_0_PMU_NUM_CTRS,
@@ -43,7 +43,7 @@
/* Set SVE fields */
if (is_feat_sve_present()) {
feat_reg0 |= INPLACE(RMM_FEATURE_REGISTER_0_SVE_EN,
- RMI_SUPPORTED);
+ RMI_FEATURE_TRUE);
feat_reg0 |= INPLACE(RMM_FEATURE_REGISTER_0_SVE_VL,
simd_sve_get_max_vq());
@@ -89,14 +89,15 @@
*/
/* Validate number of PMU counters if PMUv3 is enabled */
- if ((EXTRACT(RMM_FEATURE_REGISTER_0_PMU_EN, value) == RMI_SUPPORTED) &&
+ if ((EXTRACT(RMM_FEATURE_REGISTER_0_PMU_EN, value) ==
+ RMI_FEATURE_TRUE) &&
(EXTRACT(RMM_FEATURE_REGISTER_0_PMU_NUM_CTRS, value) !=
EXTRACT(RMM_FEATURE_REGISTER_0_PMU_NUM_CTRS, feat_reg0))) {
return false;
}
/* Validate SVE flag */
- if ((EXTRACT(RMM_FEATURE_REGISTER_0_SVE_EN, value) == RMI_SUPPORTED)) {
+ if ((EXTRACT(RMM_FEATURE_REGISTER_0_SVE_EN, value) == RMI_FEATURE_TRUE)) {
if (!is_feat_sve_present()) {
return false;
}