cactus: re-align secure partition id
According to [1] and [2] secure partition ids are defined from
0x8001 to 0xfffe. Update the cactus test payload and TFTF such
that it uses the appropriate IDs.
0x8000 and 0xffff are reserved FF-A IDs respectively for the SPMC
and the SPMD.
Conversely in the NWd, the Hypervisor ID is 0 and VMs are numbered
in the range of 1 to 0x7fff.
[1] https://trustedfirmware-a.readthedocs.io/en/latest/components/
secure-partition-manager.html#ffa-id-get
[2] https://review.trustedfirmware.org/c/hafnium/hafnium/+/5165
Signed-off-by: Olivier Deprez <olivier.deprez@arm.com>
Change-Id: I3e9786212b227e6637a7650e60ddc4e59ad05a46
diff --git a/spm/cactus/cactus_main.c b/spm/cactus/cactus_main.c
index e833310..737fd11 100644
--- a/spm/cactus/cactus_main.c
+++ b/spm/cactus/cactus_main.c
@@ -54,7 +54,7 @@
continue;
}
- if (ffa_ret.ret1 != SP_ID(vm_id)) {
+ if (ffa_ret.ret1 != vm_id) {
ffa_ret = ffa_error(-2);
continue;
}
@@ -74,8 +74,7 @@
* Send a response through direct messaging then block
* until receiving a new message request.
*/
- ffa_ret = ffa_msg_send_direct_resp(SP_ID(vm_id),
- HYP_ID, sp_response);
+ ffa_ret = ffa_msg_send_direct_resp(vm_id, HYP_ID, sp_response);
}
}
@@ -188,7 +187,7 @@
NOTICE("Booting Secondary Cactus Secure Partition (ID: %u)\n%s\n%s\n",
ffa_id, build_message, version_string);
- if (ffa_id == SPM_VM_ID_THIRD) {
+ if (ffa_id == (SPM_VM_ID_FIRST + 2)) {
NOTICE("Mapping RXTX Region\n");
/* Declare RX/TX buffers at virtual FF-A instance */