fix: remove `test_ffa_partition_info_v1_0`
The test `test_ffa_partition_info_v1_0` relies on being able to change
the FF-A version after it has been negotiated. That is no longer
allowed, so the test will fail. It will be moved to the Hafnium test
framework, where each test runs in its own session.
Signed-off-by: Karl Meakin <karl.meakin@arm.com>
Change-Id: I377b40b88d26246e9a584d65c7e12bab3050fde7
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 6041472..8ca57f9 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
@@ -713,71 +713,3 @@
return TEST_RESULT_SUCCESS;
}
-
-/**
- * Attempt to get v1.0 partition info descriptors.
- */
-test_result_t test_ffa_partition_info_v1_0(void)
-{
- /**************************************************************
- * Check if SPMC has ffa_version and expected FFA endpoints
- * are deployed.
- *************************************************************/
- CHECK_SPMC_TESTING_SETUP(1, 0, sp_uuids);
-
- GET_TFTF_MAILBOX(mb);
-
- test_result_t result = TEST_RESULT_SUCCESS;
- struct ffa_value ret = ffa_partition_info_get(NULL_UUID);
- uint64_t expected_size = ARRAY_SIZE(ffa_expected_partition_info);
-
- if (ffa_func_id(ret) == FFA_SUCCESS_SMC32) {
- if (ffa_partition_info_count(ret) != expected_size) {
- ERROR("Unexpected number of partitions %d\n",
- ffa_partition_info_count(ret));
- return TEST_RESULT_FAIL;
- }
- if (ffa_partition_info_desc_size(ret) !=
- sizeof(struct ffa_partition_info_v1_0)) {
- ERROR("Unexepcted partition info descriptor size %d\n",
- ffa_partition_info_desc_size(ret));
- return TEST_RESULT_FAIL;
- }
- const struct ffa_partition_info_v1_0 *info =
- (const struct ffa_partition_info_v1_0 *)(mb.recv);
-
- for (unsigned int i = 0U; i < expected_size; i++) {
- uint32_t expected_properties_v1_0 =
- ffa_expected_partition_info[i].properties &
- ~FFA_PARTITION_v1_0_RES_MASK;
-
- if (info[i].id != ffa_expected_partition_info[i].id) {
- ERROR("Wrong ID. Expected %x, got %x\n",
- ffa_expected_partition_info[i].id,
- info[i].id);
- result = TEST_RESULT_FAIL;
- }
- if (info[i].exec_context !=
- ffa_expected_partition_info[i].exec_context) {
- ERROR("Wrong context. Expected %d, got %d\n",
- ffa_expected_partition_info[i].exec_context,
- info[i].exec_context);
- result = TEST_RESULT_FAIL;
- }
- if (info[i].properties !=
- expected_properties_v1_0) {
- ERROR("Wrong properties. Expected %d, got %d\n",
- expected_properties_v1_0,
- info[i].properties);
- result = TEST_RESULT_FAIL;
- }
- }
- }
-
- ret = ffa_rx_release();
- if (is_ffa_call_error(ret)) {
- ERROR("Failed to release RX buffer\n");
- result = TEST_RESULT_FAIL;
- }
- return result;
-}
diff --git a/tftf/tests/tests-spm.xml b/tftf/tests/tests-spm.xml
index cbddb98..0434d4b 100644
--- a/tftf/tests/tests-spm.xml
+++ b/tftf/tests/tests-spm.xml
@@ -58,8 +58,6 @@
<testcase name="Test FFA_PARTITION_INFO_GET"
function="test_ffa_partition_info" />
- <testcase name="Test FFA_PARTITION_INFO_GET v1.0"
- function="test_ffa_partition_info_v1_0" />
</testsuite>
<testsuite name="FF-A SMCCC compliance"