fix(ff-a): reporting support of indirect messaging
Hafnium was not reporting the support of indirect messaging
or direct messaging 2, added in FF-A v1.1 and FF-A v1.2,
respectively, in the returned information of the ABI
FFA_PARTITION_INFO_GET. The patch [1] fixes this issue.
This patch makes equivalent change to the arguments expected
for the FFA_PARTITION_INFO_GET return on cactus partitions.
[1] https://review.trustedfirmware.org/c/hafnium/hafnium/+/31712
Signed-off-by: J-Alves <joao.alves@arm.com>
Change-Id: I29ef51a7566a09b6fbeada55725d571f0440fbcd
diff --git a/spm/common/sp_tests/sp_test_ffa.c b/spm/common/sp_tests/sp_test_ffa.c
index 6e7fe1a..8cc5cf0 100644
--- a/spm/common/sp_tests/sp_test_ffa.c
+++ b/spm/common/sp_tests/sp_test_ffa.c
@@ -33,6 +33,7 @@
.properties = (FFA_PARTITION_AARCH64_EXEC |
FFA_PARTITION_DIRECT_REQ_RECV |
FFA_PARTITION_DIRECT_REQ_SEND |
+ FFA_PARTITION_INDIRECT_MSG |
FFA_PARTITION_NOTIFICATION),
.uuid = {PRIMARY_UUID}
},
diff --git a/tftf/tests/runtime_services/secure_service/spm_common.c b/tftf/tests/runtime_services/secure_service/spm_common.c
index 06e76db..9e4a4dc 100644
--- a/tftf/tests/runtime_services/secure_service/spm_common.c
+++ b/tftf/tests/runtime_services/secure_service/spm_common.c
@@ -721,13 +721,13 @@
}
if (info->exec_context != expected->exec_context) {
- ERROR("Wrong context. Expected %d, got %d\n",
+ ERROR("Wrong context. Expected %x, got %x\n",
expected->exec_context,
info->exec_context);
result = false;
}
if (info->properties != expected->properties) {
- ERROR("Wrong properties. Expected %d, got %d\n",
+ ERROR("Wrong properties. Expected %x, got %x\n",
expected->properties,
info->properties);
result = false;
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 8ca57f9..add3e11 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
@@ -45,6 +45,7 @@
.exec_context = PRIMARY_EXEC_CTX_COUNT,
.properties = FFA_PARTITION_AARCH64_EXEC |
FFA_PARTITION_DIRECT_REQ_RECV |
+ FFA_PARTITION_INDIRECT_MSG |
FFA_PARTITION_NOTIFICATION,
.uuid = {PRIMARY_UUID}
},