Update SPCI memory sharing to match latest FF-A spec 1.0 EAC.
SPCI is now called PSA FF-A. Symbols will be renamed in a later change.
Disabled checkpatch SPACING because it disagrees with Clang format.
Bug: 132420445
Change-Id: I41c6cc7ddad136ed7c4797dfa1204718a66ddfce
diff --git a/src/arch/aarch64/hypervisor/handler.c b/src/arch/aarch64/hypervisor/handler.c
index 924d024..d3a4a75 100644
--- a/src/arch/aarch64/hypervisor/handler.c
+++ b/src/arch/aarch64/hypervisor/handler.c
@@ -366,20 +366,22 @@
case SPCI_MEM_DONATE_32:
case SPCI_MEM_LEND_32:
case SPCI_MEM_SHARE_32:
- *args = api_spci_mem_send(func, ipa_init(args->arg1),
- args->arg2, args->arg3, args->arg4,
- args->arg5, current(), next);
+ *args = api_spci_mem_send(func, args->arg1, args->arg2,
+ ipa_init(args->arg3), args->arg4,
+ current(), next);
return true;
case SPCI_MEM_RETRIEVE_REQ_32:
- *args = api_spci_mem_retrieve_req(
- ipa_init(args->arg1), args->arg2, args->arg3,
- args->arg4, args->arg5, current());
+ *args = api_spci_mem_retrieve_req(args->arg1, args->arg2,
+ ipa_init(args->arg3),
+ args->arg4, current());
return true;
case SPCI_MEM_RELINQUISH_32:
*args = api_spci_mem_relinquish(current());
return true;
case SPCI_MEM_RECLAIM_32:
- *args = api_spci_mem_reclaim(args->arg1, args->arg2, current());
+ *args = api_spci_mem_reclaim(
+ (args->arg1 & 0xffffffff) | args->arg2 << 32,
+ args->arg3, current());
return true;
}