fix: incorrect expectation for FFA_ABORT interface in ffa_features
FFA_ABORT_32/64 ABIs are prohibited at NWd FF-A instance but are
supported at SWd FF-A instances.
This patch fixes the tests to remove the checks for these ABIs from
common pool of FFA_FEATURES validation and puts in private pool
targeting tftf and SPs separately.
Change-Id: I14f765c78ba1d18cb34e59e96dec7452345d7ce7
Signed-off-by: Madhukar Pappireddy <madhukar.pappireddy@arm.com>
diff --git a/spm/common/sp_tests/sp_test_ffa.c b/spm/common/sp_tests/sp_test_ffa.c
index 951e44b..25e47ae 100644
--- a/spm/common/sp_tests/sp_test_ffa.c
+++ b/spm/common/sp_tests/sp_test_ffa.c
@@ -94,6 +94,8 @@
FFA_VERSION_1_1},
{"FFA_YIELD_32", FFA_MSG_YIELD, FFA_SUCCESS_SMC32,
FFA_VERSION_1_0},
+ {"FFA_ABORT_32", FFA_ABORT_32, FFA_SUCCESS_SMC32},
+ {"FFA_ABORT_64", FFA_ABORT_64, FFA_SUCCESS_SMC32},
};
INFO("Test FFA_FEATURES.\n");
diff --git a/tftf/tests/runtime_services/secure_service/spm_common.c b/tftf/tests/runtime_services/secure_service/spm_common.c
index 92a6644..baf556b 100644
--- a/tftf/tests/runtime_services/secure_service/spm_common.c
+++ b/tftf/tests/runtime_services/secure_service/spm_common.c
@@ -200,8 +200,6 @@
FFA_SUCCESS_SMC32},
{"FFA_NOTIFICATION_INFO_GET_64", FFA_NOTIFICATION_INFO_GET_SMC64,
FFA_SUCCESS_SMC32},
- {"FFA_ABORT_32", FFA_ABORT_32, FFA_ERROR},
- {"FFA_ABORT_64", FFA_ABORT_64, FFA_ERROR},
{"Check non-existent command", 0xFFFF, FFA_ERROR},
};
diff --git a/tftf/tests/runtime_services/secure_service/test_ffa_setup_and_discovery.c b/tftf/tests/runtime_services/secure_service/test_ffa_setup_and_discovery.c
index 1586fe6..2640fb6 100644
--- a/tftf/tests/runtime_services/secure_service/test_ffa_setup_and_discovery.c
+++ b/tftf/tests/runtime_services/secure_service/test_ffa_setup_and_discovery.c
@@ -97,6 +97,8 @@
{"FFA_FEATURE_NPI", FFA_FEATURE_NPI, FFA_ERROR, 0,
FFA_VERSION_1_1},
{"FFA_YIELD_32", FFA_MSG_YIELD, FFA_ERROR},
+ {"FFA_ABORT_32", FFA_ABORT_32, FFA_ERROR},
+ {"FFA_ABORT_64", FFA_ABORT_64, FFA_ERROR},
};
size_t test_target_size = get_ffa_feature_test_target(&func_ids_target);