FF-A: Change name of direct message wrappers
Changed the name of 'ffa_msg_send_receiver' and 'ffa_msg_send_sender'
to 'ffa_receiver' and 'ffa_sender'. The intent is to make it
semantically more generic, so they can be used in other contexts than
FF-A direct messaging interfaces. E.g. Notifications interfaces.
Change-Id: Ibca469a5cd2af42d628fe7ac494ba07a11bd0b07
Signed-off-by: J-Alves <joao.alves@arm.com>
diff --git a/test/linux/hftest_socket.c b/test/linux/hftest_socket.c
index 9ce60c2..1ea363a 100644
--- a/test/linux/hftest_socket.c
+++ b/test/linux/hftest_socket.c
@@ -88,8 +88,8 @@
swap(&(hdr->src_port), &(hdr->dst_port));
/* Swap the destination and source ids. */
- ffa_vm_id_t dst_id = ffa_msg_send_sender(ret);
- ffa_vm_id_t src_id = ffa_msg_send_receiver(ret);
+ ffa_vm_id_t dst_id = ffa_sender(ret);
+ ffa_vm_id_t src_id = ffa_receiver(ret);
EXPECT_EQ(ffa_rx_release().func, FFA_SUCCESS_32);
EXPECT_EQ(
diff --git a/test/vmapi/arch/aarch64/gicv3/services/interrupts.c b/test/vmapi/arch/aarch64/gicv3/services/interrupts.c
index 9e95670..2d7596e 100644
--- a/test/vmapi/arch/aarch64/gicv3/services/interrupts.c
+++ b/test/vmapi/arch/aarch64/gicv3/services/interrupts.c
@@ -37,6 +37,6 @@
*/
dlog("Secondary VM sends a direct message response.\n");
- ffa_msg_send_direct_resp(ffa_msg_send_receiver(res),
- ffa_msg_send_sender(res), 2, 0, 0, 0, 0);
+ ffa_msg_send_direct_resp(ffa_receiver(res), ffa_sender(res), 2, 0, 0, 0,
+ 0);
}
diff --git a/test/vmapi/arch/aarch64/gicv3/services/timer.c b/test/vmapi/arch/aarch64/gicv3/services/timer.c
index 31475b8..156f160 100644
--- a/test/vmapi/arch/aarch64/gicv3/services/timer.c
+++ b/test/vmapi/arch/aarch64/gicv3/services/timer.c
@@ -62,10 +62,10 @@
uint32_t ticks;
struct ffa_value ret = mailbox_receive_retry();
- if (ffa_msg_send_sender(ret) != HF_PRIMARY_VM_ID ||
+ if (ffa_sender(ret) != HF_PRIMARY_VM_ID ||
ffa_msg_send_size(ret) != sizeof("**** xxxxxxx")) {
FAIL("Got unexpected message from VM %d, size %d.\n",
- ffa_msg_send_sender(ret), ffa_msg_send_size(ret));
+ ffa_sender(ret), ffa_msg_send_size(ret));
}
/*
@@ -141,6 +141,6 @@
timer_set(9999999);
timer_start();
- ffa_msg_send_direct_resp(ffa_msg_send_receiver(res),
- ffa_msg_send_sender(res), 2, 0, 0, 0, 0);
+ ffa_msg_send_direct_resp(ffa_receiver(res), ffa_sender(res), 2, 0, 0, 0,
+ 0);
}
diff --git a/test/vmapi/common/ffa.c b/test/vmapi/common/ffa.c
index b9c59f7..62f5d51 100644
--- a/test/vmapi/common/ffa.c
+++ b/test/vmapi/common/ffa.c
@@ -239,7 +239,7 @@
EXPECT_EQ(msg_ret.func, FFA_MSG_SEND_32);
msg_size = ffa_msg_send_size(msg_ret);
- sender = ffa_msg_send_sender(msg_ret);
+ sender = ffa_sender(msg_ret);
retrieve_request = (struct ffa_memory_region *)recv_buf;
handle_ = retrieve_request->handle;
@@ -317,7 +317,7 @@
EXPECT_EQ(msg_ret.func, FFA_MSG_SEND_32);
msg_size = ffa_msg_send_size(msg_ret);
- sender = ffa_msg_send_sender(msg_ret);
+ sender = ffa_sender(msg_ret);
memcpy_s(send_buf, HF_MAILBOX_SIZE, recv_buf, msg_size);
ffa_rx_release();
diff --git a/test/vmapi/ffa_secure_partitions/secure_partition_services.c b/test/vmapi/ffa_secure_partitions/secure_partition_services.c
index fe534d2..c2f54d0 100644
--- a/test/vmapi/ffa_secure_partitions/secure_partition_services.c
+++ b/test/vmapi/ffa_secure_partitions/secure_partition_services.c
@@ -26,8 +26,8 @@
HFTEST_LOG("Received direct message request");
EXPECT_EQ(res.func, FFA_MSG_SEND_DIRECT_REQ_32);
- ffa_msg_send_direct_resp(
- ffa_msg_send_receiver(res), ffa_msg_send_sender(res),
- res.arg3, res.arg4, res.arg5, res.arg6, res.arg7);
+ ffa_msg_send_direct_resp(ffa_receiver(res), ffa_sender(res),
+ res.arg3, res.arg4, res.arg5, res.arg6,
+ res.arg7);
}
}
diff --git a/test/vmapi/primary_with_secondaries/mailbox.c b/test/vmapi/primary_with_secondaries/mailbox.c
index 35d278e..9681f51 100644
--- a/test/vmapi/primary_with_secondaries/mailbox.c
+++ b/test/vmapi/primary_with_secondaries/mailbox.c
@@ -174,7 +174,7 @@
/* Let SERVICE_VM1 forward the message. */
run_res = ffa_run(SERVICE_VM1, 0);
EXPECT_EQ(run_res.func, FFA_MSG_SEND_32);
- EXPECT_EQ(ffa_msg_send_receiver(run_res), SERVICE_VM2);
+ EXPECT_EQ(ffa_receiver(run_res), SERVICE_VM2);
EXPECT_EQ(ffa_msg_send_size(run_res), 0);
/* Let SERVICE_VM2 forward the message. */
@@ -182,7 +182,7 @@
EXPECT_EQ(run_res.func, FFA_MSG_SEND_32);
/* Ensure the message is intact. */
- EXPECT_EQ(ffa_msg_send_receiver(run_res), HF_PRIMARY_VM_ID);
+ EXPECT_EQ(ffa_receiver(run_res), HF_PRIMARY_VM_ID);
EXPECT_EQ(ffa_msg_send_size(run_res), sizeof(message));
EXPECT_EQ(memcmp(mb.recv, message, sizeof(message)), 0);
EXPECT_EQ(ffa_rx_release().func, FFA_SUCCESS_32);
diff --git a/test/vmapi/primary_with_secondaries/memory_sharing.c b/test/vmapi/primary_with_secondaries/memory_sharing.c
index 77a90aa..b4f3434 100644
--- a/test/vmapi/primary_with_secondaries/memory_sharing.c
+++ b/test/vmapi/primary_with_secondaries/memory_sharing.c
@@ -926,7 +926,7 @@
/* Let the memory be sent from VM1 to VM2. */
run_res = ffa_run(SERVICE_VM1, 0);
EXPECT_EQ(run_res.func, FFA_MSG_SEND_32);
- EXPECT_EQ(ffa_msg_send_receiver(run_res), SERVICE_VM2);
+ EXPECT_EQ(ffa_receiver(run_res), SERVICE_VM2);
/* Receive memory in VM2. */
run_res = ffa_run(SERVICE_VM2, 0);
diff --git a/test/vmapi/primary_with_secondaries/services/echo.c b/test/vmapi/primary_with_secondaries/services/echo.c
index 41b327a..61f0caf 100644
--- a/test/vmapi/primary_with_secondaries/services/echo.c
+++ b/test/vmapi/primary_with_secondaries/services/echo.c
@@ -18,8 +18,8 @@
/* Loop, echo messages back to the sender. */
for (;;) {
struct ffa_value ret = ffa_msg_wait();
- ffa_vm_id_t target_vm_id = ffa_msg_send_receiver(ret);
- ffa_vm_id_t source_vm_id = ffa_msg_send_sender(ret);
+ ffa_vm_id_t target_vm_id = ffa_receiver(ret);
+ ffa_vm_id_t source_vm_id = ffa_sender(ret);
void *send_buf = SERVICE_SEND_BUFFER();
void *recv_buf = SERVICE_RECV_BUFFER();
diff --git a/test/vmapi/primary_with_secondaries/services/echo_with_notification.c b/test/vmapi/primary_with_secondaries/services/echo_with_notification.c
index 4b9ad66..a4027f0 100644
--- a/test/vmapi/primary_with_secondaries/services/echo_with_notification.c
+++ b/test/vmapi/primary_with_secondaries/services/echo_with_notification.c
@@ -49,8 +49,8 @@
void *send_buf = SERVICE_SEND_BUFFER();
void *recv_buf = SERVICE_RECV_BUFFER();
struct ffa_value ret = ffa_msg_wait();
- ffa_vm_id_t target_vm_id = ffa_msg_send_receiver(ret);
- ffa_vm_id_t source_vm_id = ffa_msg_send_sender(ret);
+ ffa_vm_id_t target_vm_id = ffa_receiver(ret);
+ ffa_vm_id_t source_vm_id = ffa_sender(ret);
memcpy_s(send_buf, FFA_MSG_PAYLOAD_MAX, recv_buf,
ffa_msg_send_size(ret));
diff --git a/test/vmapi/primary_with_secondaries/services/ffa_check.c b/test/vmapi/primary_with_secondaries/services/ffa_check.c
index 035ed29..628b599 100644
--- a/test/vmapi/primary_with_secondaries/services/ffa_check.c
+++ b/test/vmapi/primary_with_secondaries/services/ffa_check.c
@@ -27,8 +27,8 @@
/* Ensure message header has all fields correctly set. */
EXPECT_EQ(ffa_msg_send_size(ret), sizeof(message));
- EXPECT_EQ(ffa_msg_send_receiver(ret), hf_vm_get_id());
- EXPECT_EQ(ffa_msg_send_sender(ret), HF_PRIMARY_VM_ID);
+ EXPECT_EQ(ffa_receiver(ret), hf_vm_get_id());
+ EXPECT_EQ(ffa_sender(ret), HF_PRIMARY_VM_ID);
/* Ensure that the payload was correctly transmitted. */
EXPECT_EQ(memcmp(recv_buf, message, sizeof(message)), 0);
@@ -72,9 +72,9 @@
EXPECT_EQ(args.func, FFA_MSG_SEND_DIRECT_REQ_32);
- ffa_msg_send_direct_resp(ffa_msg_send_receiver(args),
- ffa_msg_send_sender(args), args.arg3,
- args.arg4, args.arg5, args.arg6, args.arg7);
+ ffa_msg_send_direct_resp(ffa_receiver(args), ffa_sender(args),
+ args.arg3, args.arg4, args.arg5, args.arg6,
+ args.arg7);
}
TEST_SERVICE(ffa_direct_msg_req_disallowed_smc)
@@ -87,8 +87,7 @@
ret = ffa_yield();
EXPECT_FFA_ERROR(ret, FFA_DENIED);
- ret = ffa_msg_send(ffa_msg_send_receiver(args),
- ffa_msg_send_sender(args), 0, 0);
+ ret = ffa_msg_send(ffa_receiver(args), ffa_sender(args), 0, 0);
EXPECT_FFA_ERROR(ret, FFA_DENIED);
ret = ffa_msg_wait();
@@ -100,9 +99,9 @@
ret = ffa_msg_poll();
EXPECT_FFA_ERROR(ret, FFA_DENIED);
- ffa_msg_send_direct_resp(ffa_msg_send_receiver(args),
- ffa_msg_send_sender(args), args.arg3,
- args.arg4, args.arg5, args.arg6, args.arg7);
+ ffa_msg_send_direct_resp(ffa_receiver(args), ffa_sender(args),
+ args.arg3, args.arg4, args.arg5, args.arg6,
+ args.arg7);
}
/**
@@ -124,9 +123,9 @@
args = ffa_msg_wait();
EXPECT_EQ(args.func, FFA_MSG_SEND_DIRECT_REQ_32);
- ffa_msg_send_direct_resp(ffa_msg_send_receiver(args),
- ffa_msg_send_sender(args), args.arg3,
- args.arg4, args.arg5, args.arg6, args.arg7);
+ ffa_msg_send_direct_resp(ffa_receiver(args), ffa_sender(args),
+ args.arg3, args.arg4, args.arg5, args.arg6,
+ args.arg7);
}
/**
@@ -145,9 +144,9 @@
args = ffa_msg_wait();
EXPECT_EQ(args.func, FFA_MSG_SEND_DIRECT_REQ_32);
- ffa_msg_send_direct_resp(ffa_msg_send_receiver(args),
- ffa_msg_send_sender(args), args.arg3,
- args.arg4, args.arg5, args.arg6, args.arg7);
+ ffa_msg_send_direct_resp(ffa_receiver(args), ffa_sender(args),
+ args.arg3, args.arg4, args.arg5, args.arg6,
+ args.arg7);
}
/**
@@ -163,8 +162,8 @@
EXPECT_EQ(args.func, FFA_MSG_SEND_DIRECT_REQ_32);
- ffa_vm_id_t sender = ffa_msg_send_sender(args);
- ffa_vm_id_t receiver = ffa_msg_send_receiver(args);
+ ffa_vm_id_t sender = ffa_sender(args);
+ ffa_vm_id_t receiver = ffa_receiver(args);
res = ffa_msg_send_direct_resp(receiver, SERVICE_VM2, 0, 0, 0, 0, 0);
EXPECT_FFA_ERROR(res, FFA_INVALID_PARAMETERS);
@@ -186,11 +185,11 @@
EXPECT_EQ(res.func, FFA_MSG_SEND_DIRECT_REQ_32);
EXPECT_EQ(res.arg3, 1);
- res = ffa_msg_send_direct_resp(ffa_msg_send_receiver(res),
- ffa_msg_send_sender(res), 2, 0, 0, 0, 0);
+ res = ffa_msg_send_direct_resp(ffa_receiver(res), ffa_sender(res), 2, 0,
+ 0, 0, 0);
EXPECT_EQ(res.func, FFA_MSG_SEND_DIRECT_REQ_32);
EXPECT_EQ(res.arg3, 3);
- ffa_msg_send_direct_resp(ffa_msg_send_receiver(res),
- ffa_msg_send_sender(res), 4, 0, 0, 0, 0);
+ ffa_msg_send_direct_resp(ffa_receiver(res), ffa_sender(res), 4, 0, 0, 0,
+ 0);
}
diff --git a/test/vmapi/primary_with_secondaries/services/interruptible.c b/test/vmapi/primary_with_secondaries/services/interruptible.c
index 13573ff..cc1c1f9 100644
--- a/test/vmapi/primary_with_secondaries/services/interruptible.c
+++ b/test/vmapi/primary_with_secondaries/services/interruptible.c
@@ -70,12 +70,12 @@
struct ffa_value ret = mailbox_receive_retry();
ASSERT_EQ(ret.func, FFA_MSG_SEND_32);
- if (ffa_msg_send_sender(ret) == HF_PRIMARY_VM_ID &&
+ if (ffa_sender(ret) == HF_PRIMARY_VM_ID &&
ffa_msg_send_size(ret) == sizeof(ping_message) &&
memcmp(recv_buf, ping_message, sizeof(ping_message)) == 0) {
/* Interrupt ourselves */
hf_interrupt_inject(this_vm_id, 0, SELF_INTERRUPT_ID);
- } else if (ffa_msg_send_sender(ret) == HF_PRIMARY_VM_ID &&
+ } else if (ffa_sender(ret) == HF_PRIMARY_VM_ID &&
ffa_msg_send_size(ret) == sizeof(enable_message) &&
memcmp(recv_buf, enable_message,
sizeof(enable_message)) == 0) {
@@ -84,7 +84,7 @@
INTERRUPT_TYPE_IRQ);
} else {
dlog("Got unexpected message from VM %d, size %d.\n",
- ffa_msg_send_sender(ret), ffa_msg_send_size(ret));
+ ffa_sender(ret), ffa_msg_send_size(ret));
FAIL("Unexpected message");
}
EXPECT_EQ(ffa_rx_release().func, FFA_SUCCESS_32);
diff --git a/test/vmapi/primary_with_secondaries/services/interruptible_echo.c b/test/vmapi/primary_with_secondaries/services/interruptible_echo.c
index 9e5478a..8514f04 100644
--- a/test/vmapi/primary_with_secondaries/services/interruptible_echo.c
+++ b/test/vmapi/primary_with_secondaries/services/interruptible_echo.c
@@ -68,8 +68,8 @@
EXPECT_EQ(res.arg3, 1);
EXPECT_EQ(irq_counter, 0);
- res = ffa_msg_send_direct_resp(ffa_msg_send_receiver(res),
- ffa_msg_send_sender(res), 2, 0, 0, 0, 0);
+ res = ffa_msg_send_direct_resp(ffa_receiver(res), ffa_sender(res), 2, 0,
+ 0, 0, 0);
EXPECT_EQ(res.func, FFA_INTERRUPT_32);
EXPECT_EQ(irq_counter, 1);
@@ -79,8 +79,8 @@
EXPECT_EQ(res.func, FFA_MSG_SEND_DIRECT_REQ_32);
EXPECT_EQ(res.arg3, 3);
- ffa_msg_send_direct_resp(ffa_msg_send_receiver(res),
- ffa_msg_send_sender(res), 4, 0, 0, 0, 0);
+ ffa_msg_send_direct_resp(ffa_receiver(res), ffa_sender(res), 4, 0, 0, 0,
+ 0);
}
/**
@@ -107,6 +107,6 @@
dlog("Secondary VM received direct message request and interrupt.\n");
- ffa_msg_send_direct_resp(ffa_msg_send_receiver(res),
- ffa_msg_send_sender(res), 2, 0, 0, 0, 0);
+ ffa_msg_send_direct_resp(ffa_receiver(res), ffa_sender(res), 2, 0, 0, 0,
+ 0);
}