Merge "test(spm): test FFA_FEATURES with NPI, SRI, MEI"
diff --git a/tftf/tests/runtime_services/secure_service/spm_common.c b/tftf/tests/runtime_services/secure_service/spm_common.c
index ffd488d..8fb3a72 100644
--- a/tftf/tests/runtime_services/secure_service/spm_common.c
+++ b/tftf/tests/runtime_services/secure_service/spm_common.c
@@ -201,6 +201,9 @@
{"FFA_YIELD_32", FFA_MSG_YIELD, FFA_ERROR},
{"FFA_MSG_SEND_32", FFA_MSG_SEND, FFA_ERROR},
{"FFA_MSG_POLL_32", FFA_MSG_POLL, FFA_ERROR},
+ {"FFA_FEATURE_MEI", FFA_FEATURE_MEI, FFA_ERROR, 0, MAKE_FFA_VERSION(1, 1)},
+ {"FFA_FEATURE_SRI", FFA_FEATURE_SRI, FFA_SUCCESS_SMC32, 0, MAKE_FFA_VERSION(1, 1)},
+ {"FFA_FEATURE_NPI", FFA_FEATURE_NPI, FFA_ERROR, 0, MAKE_FFA_VERSION(1, 1)},
{"Check non-existent command", 0xFFFF, FFA_ERROR},
};
diff --git a/tftf/tests/runtime_services/secure_service/test_ffa_notifications.c b/tftf/tests/runtime_services/secure_service/test_ffa_notifications.c
index 79f2462..ca6c75a 100644
--- a/tftf/tests/runtime_services/secure_service/test_ffa_notifications.c
+++ b/tftf/tests/runtime_services/secure_service/test_ffa_notifications.c
@@ -65,14 +65,8 @@
}
ret = ffa_features(FFA_FEATURE_NPI);
- if (is_ffa_call_error(ret) ||
- ffa_feature_intid(ret) != NOTIFICATION_PENDING_INTERRUPT_INTID) {
- ERROR("Failed to retrieved NPI (exp: %u, got: %u)\n",
- NOTIFICATION_PENDING_INTERRUPT_INTID,
- ffa_feature_intid(ret));
-
+ if (!is_expected_ffa_error(ret, FFA_ERROR_NOT_SUPPORTED))
return TEST_RESULT_FAIL;
- }
ret = ffa_features(FFA_FEATURE_SRI);
if (is_ffa_call_error(ret) ||
@@ -85,14 +79,8 @@
}
ret = ffa_features(FFA_FEATURE_MEI);
- if (is_ffa_call_error(ret) ||
- ffa_feature_intid(ret) != MANAGED_EXIT_INTERRUPT_ID) {
- ERROR("Failed to retrieved MEI (exp: %u, got: %u)\n",
- MANAGED_EXIT_INTERRUPT_ID,
- ffa_feature_intid(ret));
-
+ if (!is_expected_ffa_error(ret, FFA_ERROR_NOT_SUPPORTED))
return TEST_RESULT_FAIL;
- }
return TEST_RESULT_SUCCESS;
}