Update SP message handling for FFA routing extension
Some SPs (attestation and env_test) were missing modifications needed
for compatibility with the FFA routing extension changes. This
commit adds the changes needed to fix message receive handling.
Signed-off-by: Julian Hall <julian.hall@arm.com>
Change-Id: I5d19f130646ae2dd6fd5379ec3c3ac99c7237c65
diff --git a/deployments/attestation/opteesp/attestation_sp.c b/deployments/attestation/opteesp/attestation_sp.c
index f597e7e..c891f4d 100644
--- a/deployments/attestation/opteesp/attestation_sp.c
+++ b/deployments/attestation/opteesp/attestation_sp.c
@@ -37,7 +37,7 @@
struct attest_provider attest_provider;
struct rpc_interface *attest_iface;
struct ffa_call_ep ffarpc_call_ep;
- struct ffa_direct_msg req_msg;
+ struct sp_msg req_msg;
/* Claim source objects */
struct claim_source *claim_source;
@@ -90,20 +90,18 @@
/*********************************************************
* End of boot phase
*********************************************************/
- ffa_msg_wait(&req_msg);
+ sp_msg_wait(&req_msg);
while (1) {
- if (req_msg.function_id == FFA_MSG_SEND_DIRECT_REQ_32) {
- struct ffa_direct_msg resp_msg;
+ struct sp_msg resp_msg;
- ffa_call_ep_receive(&ffarpc_call_ep, &req_msg, &resp_msg);
+ ffa_call_ep_receive(&ffarpc_call_ep, &req_msg, &resp_msg);
- ffa_msg_send_direct_resp(req_msg.destination_id,
- req_msg.source_id, resp_msg.args[0], resp_msg.args[1],
- resp_msg.args[2], resp_msg.args[3], resp_msg.args[4],
- &req_msg);
- }
+ resp_msg.source_id = req_msg.destination_id;
+ resp_msg.destination_id = req_msg.source_id;
+
+ sp_msg_send_direct_resp(&resp_msg, &req_msg);
}
fatal_error:
diff --git a/deployments/env-test/opteesp/env_test.c b/deployments/env-test/opteesp/env_test.c
index ff2f8df..78c439f 100644
--- a/deployments/env-test/opteesp/env_test.c
+++ b/deployments/env-test/opteesp/env_test.c
@@ -28,7 +28,7 @@
struct ffa_call_ep ffarpc_call_ep;
struct rpc_interface *test_runner_iface;
struct ffarpc_caller ffarpc_caller;
- struct ffa_direct_msg req_msg;
+ struct sp_msg req_msg;
/* Boot */
if (sp_init(&own_id) != 0) goto fatal_error;
@@ -47,20 +47,18 @@
ffa_call_ep_init(&ffarpc_call_ep, test_runner_iface);
/* End of boot phase */
- ffa_msg_wait(&req_msg);
+ sp_msg_wait(&req_msg);
while (1) {
- if (req_msg.function_id == FFA_MSG_SEND_DIRECT_REQ_32) {
- struct ffa_direct_msg resp_msg;
+ struct sp_msg resp_msg;
- ffa_call_ep_receive(&ffarpc_call_ep, &req_msg, &resp_msg);
+ ffa_call_ep_receive(&ffarpc_call_ep, &req_msg, &resp_msg);
- ffa_msg_send_direct_resp(req_msg.destination_id,
- req_msg.source_id, resp_msg.args[0], resp_msg.args[1],
- resp_msg.args[2], resp_msg.args[3], resp_msg.args[4],
- &req_msg);
- }
+ resp_msg.source_id = req_msg.destination_id;
+ resp_msg.destination_id = req_msg.source_id;
+
+ sp_msg_send_direct_resp(&resp_msg, &req_msg);
}
fatal_error: