refactor: rename type for FF-A IDs
The FF-A ID is a unsigned 16-bit value that was named
ffa_vm_id_t. This patch changes it to simply ffa_id_t.
This is to make clearer the ID type is used for other
endpoints other than simply VMs.
Signed-off-by: J-Alves <joao.alves@arm.com>
Change-Id: I60319c08481b2380bd0063b108a35fc01e2af537
diff --git a/test/hftest/service_common.c b/test/hftest/service_common.c
index a429beb..959d193 100644
--- a/test/hftest/service_common.c
+++ b/test/hftest/service_common.c
@@ -138,7 +138,7 @@
struct hftest_context *ctx;
struct ffa_value ret;
struct fdt fdt;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
struct mailbox_buffers mb = set_up_mailbox();
ffa_notifications_bitmap_t bitmap;
struct ffa_partition_msg *message = (struct ffa_partition_msg *)mb.recv;
@@ -219,13 +219,13 @@
}
}
-ffa_vm_id_t hftest_get_dir_req_source_id(void)
+ffa_id_t hftest_get_dir_req_source_id(void)
{
struct hftest_context *ctx = hftest_get_context();
return ctx->dir_req_source_id;
}
-void hftest_set_dir_req_source_id(ffa_vm_id_t id)
+void hftest_set_dir_req_source_id(ffa_id_t id)
{
struct hftest_context *ctx = hftest_get_context();
ctx->dir_req_source_id = id;
diff --git a/test/inc/test/hftest.h b/test/inc/test/hftest.h
index 2eaa42d..f584c7c 100644
--- a/test/inc/test/hftest.h
+++ b/test/inc/test/hftest.h
@@ -165,12 +165,12 @@
/*
* Return the field tracking the source of the direct request message.
*/
-ffa_vm_id_t hftest_get_dir_req_source_id(void);
+ffa_id_t hftest_get_dir_req_source_id(void);
/*
* Set the field tracking the source of the direct request message.
*/
-void hftest_set_dir_req_source_id(ffa_vm_id_t id);
+void hftest_set_dir_req_source_id(ffa_id_t id);
/* Above this point is the public API. Now include the implementation. */
#include "hftest_impl.h"
diff --git a/test/inc/test/hftest_impl.h b/test/inc/test/hftest_impl.h
index 7b07426..68ca462 100644
--- a/test/inc/test/hftest_impl.h
+++ b/test/inc/test/hftest_impl.h
@@ -141,7 +141,7 @@
void *send;
void *recv;
size_t memory_size;
- ffa_vm_id_t dir_req_source_id;
+ ffa_id_t dir_req_source_id;
};
struct hftest_context *hftest_get_context(void);
diff --git a/test/inc/test/vmapi/ffa.h b/test/inc/test/vmapi/ffa.h
index 1f0a357..3cce99d 100644
--- a/test/inc/test/vmapi/ffa.h
+++ b/test/inc/test/vmapi/ffa.h
@@ -63,7 +63,7 @@
void mailbox_receive_retry(void *buffer, size_t buffer_size, void *recv,
struct ffa_partition_rxtx_header *header);
ffa_memory_handle_t send_memory_and_retrieve_request_multi_receiver(
- uint32_t share_func, void *tx_buffer, ffa_vm_id_t sender,
+ uint32_t share_func, void *tx_buffer, ffa_id_t sender,
struct ffa_memory_region_constituent constituents[],
uint32_t constituent_count, struct ffa_memory_access receivers_send[],
uint32_t receivers_send_count,
@@ -71,9 +71,8 @@
uint32_t receivers_retrieve_count, ffa_memory_region_flags_t send_flags,
ffa_memory_region_flags_t retrieve_flags);
ffa_memory_handle_t send_memory_and_retrieve_request(
- uint32_t share_func, void *tx_buffer, ffa_vm_id_t sender,
- ffa_vm_id_t recipient,
- struct ffa_memory_region_constituent constituents[],
+ uint32_t share_func, void *tx_buffer, ffa_id_t sender,
+ ffa_id_t recipient, struct ffa_memory_region_constituent constituents[],
uint32_t constituent_count, ffa_memory_region_flags_t send_flags,
ffa_memory_region_flags_t retrieve_flags,
enum ffa_data_access send_data_access,
@@ -81,27 +80,26 @@
enum ffa_instruction_access send_instruction_access,
enum ffa_instruction_access retrieve_instruction_access);
ffa_memory_handle_t send_memory_and_retrieve_request_force_fragmented(
- uint32_t share_func, void *tx_buffer, ffa_vm_id_t sender,
- ffa_vm_id_t recipient,
- struct ffa_memory_region_constituent constituents[],
+ uint32_t share_func, void *tx_buffer, ffa_id_t sender,
+ ffa_id_t recipient, struct ffa_memory_region_constituent constituents[],
uint32_t constituent_count, ffa_memory_region_flags_t flags,
enum ffa_data_access send_data_access,
enum ffa_data_access retrieve_data_access,
enum ffa_instruction_access send_instruction_access,
enum ffa_instruction_access retrieve_instruction_access);
void send_retrieve_request_single_receiver(
- void *send, ffa_memory_handle_t handle, ffa_vm_id_t sender,
- ffa_vm_id_t receiver, uint32_t tag, ffa_memory_region_flags_t flags,
+ void *send, ffa_memory_handle_t handle, ffa_id_t sender,
+ ffa_id_t receiver, uint32_t tag, ffa_memory_region_flags_t flags,
enum ffa_data_access data_access,
enum ffa_instruction_access instruction_access,
enum ffa_memory_type type, enum ffa_memory_cacheability cacheability,
enum ffa_memory_shareability shareability);
void send_retrieve_request(
- void *send, ffa_memory_handle_t handle, ffa_vm_id_t sender,
+ void *send, ffa_memory_handle_t handle, ffa_id_t sender,
struct ffa_memory_access receivers[], uint32_t receiver_count,
uint32_t tag, ffa_memory_region_flags_t flags,
enum ffa_memory_type type, enum ffa_memory_cacheability cacheability,
- enum ffa_memory_shareability shareability, ffa_vm_id_t recipient);
+ enum ffa_memory_shareability shareability, ffa_id_t recipient);
void send_fragmented_memory_region(
struct ffa_value *send_ret, void *tx_buffer,
struct ffa_memory_region_constituent constituents[],
@@ -111,13 +109,13 @@
void retrieve_memory(void *recv_buf, ffa_memory_handle_t handle,
struct ffa_memory_region *memory_region_ret,
size_t memory_region_max_size, uint32_t msg_size);
-ffa_vm_id_t retrieve_memory_from_message(
+ffa_id_t retrieve_memory_from_message(
void *recv_buf, void *send_buf, ffa_memory_handle_t *handle,
struct ffa_memory_region *memory_region_ret,
size_t memory_region_max_size);
-ffa_vm_id_t retrieve_memory_from_message_expect_fail(void *recv_buf,
- void *send_buf,
- int32_t expected_error);
+ffa_id_t retrieve_memory_from_message_expect_fail(void *recv_buf,
+ void *send_buf,
+ int32_t expected_error);
ffa_vm_count_t get_ffa_partition_info(struct ffa_uuid *uuid,
struct ffa_partition_info *info,
@@ -129,13 +127,12 @@
struct ffa_boot_info_header *boot_info_heade, uint8_t type,
uint8_t type_id);
-struct ffa_value send_indirect_message(ffa_vm_id_t from, ffa_vm_id_t to,
- void *send, const void *payload,
- size_t payload_size,
+struct ffa_value send_indirect_message(ffa_id_t from, ffa_id_t to, void *send,
+ const void *payload, size_t payload_size,
uint32_t send_flags);
void receive_indirect_message(void *buffer, size_t buffer_size, void *recv,
- ffa_vm_id_t *sender);
+ ffa_id_t *sender);
bool ffa_partition_info_regs_get_part_info(
struct ffa_value args, uint8_t idx,
diff --git a/test/linux/hftest_socket.c b/test/linux/hftest_socket.c
index 1ea363a..6957045 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_sender(ret);
- ffa_vm_id_t src_id = ffa_receiver(ret);
+ ffa_id_t dst_id = ffa_sender(ret);
+ ffa_id_t src_id = ffa_receiver(ret);
EXPECT_EQ(ffa_rx_release().func, FFA_SUCCESS_32);
EXPECT_EQ(
diff --git a/test/linux/linux.c b/test/linux/linux.c
index bfc912d..1b5ce1e 100644
--- a/test/linux/linux.c
+++ b/test/linux/linux.c
@@ -75,7 +75,7 @@
*/
TEST(linux, socket_echo_hafnium)
{
- ffa_vm_id_t vm_id = HF_VM_ID_OFFSET + 1;
+ ffa_id_t vm_id = HF_VM_ID_OFFSET + 1;
int port = 10;
int socket_id;
struct hf_sockaddr addr;
diff --git a/test/vmapi/arch/aarch64/gicv3/services/timer.c b/test/vmapi/arch/aarch64/gicv3/services/timer.c
index 45ee7fc..2a37977 100644
--- a/test/vmapi/arch/aarch64/gicv3/services/timer.c
+++ b/test/vmapi/arch/aarch64/gicv3/services/timer.c
@@ -31,7 +31,7 @@
static void irq_current(void)
{
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
uint32_t interrupt_id = hf_interrupt_get();
char buffer[] = "Got IRQ xx.";
int size = sizeof(buffer);
@@ -61,7 +61,7 @@
bool receive;
bool disable_interrupts;
uint32_t ticks;
- ffa_vm_id_t sender;
+ ffa_id_t sender;
uint8_t actual_message[sizeof("**** xxxxxxx")];
struct ffa_partition_rxtx_header header;
diff --git a/test/vmapi/arch/aarch64/gicv3/timer_secondary.c b/test/vmapi/arch/aarch64/gicv3/timer_secondary.c
index e90d018..9eace3d 100644
--- a/test/vmapi/arch/aarch64/gicv3/timer_secondary.c
+++ b/test/vmapi/arch/aarch64/gicv3/timer_secondary.c
@@ -60,7 +60,7 @@
const char message[] = "loop 0099999";
const char expected_response[] = "Got IRQ 03.";
uint8_t response[sizeof(expected_response)];
- ffa_vm_id_t sender;
+ ffa_id_t sender;
struct ffa_value ret;
/* Let the secondary get started and wait for our message. */
@@ -119,7 +119,7 @@
const char expected_response[] = "Got IRQ 03.";
size_t message_length = strnlen_s(message, 64) + 1;
uint8_t response[sizeof(expected_response)];
- ffa_vm_id_t sender;
+ ffa_id_t sender;
struct ffa_value ret;
/* Let the secondary get started and wait for our message. */
diff --git a/test/vmapi/common/ffa.c b/test/vmapi/common/ffa.c
index d4155f6..1be22b9 100644
--- a/test/vmapi/common/ffa.c
+++ b/test/vmapi/common/ffa.c
@@ -51,10 +51,10 @@
{
const struct ffa_partition_msg *message;
const uint32_t *payload;
- ffa_vm_id_t sender;
+ ffa_id_t sender;
struct ffa_value ret;
ffa_notifications_bitmap_t fwk_notif = 0U;
- const ffa_vm_id_t own_id = hf_vm_get_id();
+ const ffa_id_t own_id = hf_vm_get_id();
ASSERT_LE(buffer_size, FFA_MSG_PAYLOAD_MAX);
ASSERT_TRUE(header != NULL);
@@ -142,7 +142,7 @@
}
ffa_memory_handle_t send_memory_and_retrieve_request_multi_receiver(
- uint32_t share_func, void *tx_buffer, ffa_vm_id_t sender,
+ uint32_t share_func, void *tx_buffer, ffa_id_t sender,
struct ffa_memory_region_constituent constituents[],
uint32_t constituent_count, struct ffa_memory_access receivers_send[],
uint32_t receivers_send_count,
@@ -249,9 +249,8 @@
* request it needs to retrieve it.
*/
ffa_memory_handle_t send_memory_and_retrieve_request(
- uint32_t share_func, void *tx_buffer, ffa_vm_id_t sender,
- ffa_vm_id_t recipient,
- struct ffa_memory_region_constituent constituents[],
+ uint32_t share_func, void *tx_buffer, ffa_id_t sender,
+ ffa_id_t recipient, struct ffa_memory_region_constituent constituents[],
uint32_t constituent_count, ffa_memory_region_flags_t send_flags,
ffa_memory_region_flags_t retrieve_flags,
enum ffa_data_access send_data_access,
@@ -283,9 +282,8 @@
* TODO: check if it can be based off a base function like the above functions.
*/
ffa_memory_handle_t send_memory_and_retrieve_request_force_fragmented(
- uint32_t share_func, void *tx_buffer, ffa_vm_id_t sender,
- ffa_vm_id_t recipient,
- struct ffa_memory_region_constituent constituents[],
+ uint32_t share_func, void *tx_buffer, ffa_id_t sender,
+ ffa_id_t recipient, struct ffa_memory_region_constituent constituents[],
uint32_t constituent_count, ffa_memory_region_flags_t flags,
enum ffa_data_access send_data_access,
enum ffa_data_access retrieve_data_access,
@@ -362,8 +360,8 @@
}
void send_retrieve_request_single_receiver(
- void *send, ffa_memory_handle_t handle, ffa_vm_id_t sender,
- ffa_vm_id_t receiver, uint32_t tag, ffa_memory_region_flags_t flags,
+ void *send, ffa_memory_handle_t handle, ffa_id_t sender,
+ ffa_id_t receiver, uint32_t tag, ffa_memory_region_flags_t flags,
enum ffa_data_access data_access,
enum ffa_instruction_access instruction_access,
enum ffa_memory_type type, enum ffa_memory_cacheability cacheability,
@@ -381,11 +379,11 @@
}
void send_retrieve_request(
- void *send, ffa_memory_handle_t handle, ffa_vm_id_t sender,
+ void *send, ffa_memory_handle_t handle, ffa_id_t sender,
struct ffa_memory_access receivers[], uint32_t receiver_count,
uint32_t tag, ffa_memory_region_flags_t flags,
enum ffa_memory_type type, enum ffa_memory_cacheability cacheability,
- enum ffa_memory_shareability shareability, ffa_vm_id_t recipient)
+ enum ffa_memory_shareability shareability, ffa_id_t recipient)
{
size_t msg_size;
struct ffa_partition_msg *retrieve_message = send;
@@ -405,10 +403,10 @@
static struct ffa_partition_msg *get_mailbox_message(void *recv)
{
- ffa_vm_id_t sender;
- ffa_vm_id_t receiver;
+ ffa_id_t sender;
+ ffa_id_t receiver;
struct ffa_partition_msg *msg = (struct ffa_partition_msg *)recv;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
struct ffa_value ret =
ffa_notification_get(own_id, 0,
FFA_NOTIFICATION_FLAG_BITMAP_HYP |
@@ -510,13 +508,13 @@
* fragments is no more than `memory_region_max_size`. Returns the sender, and
* the handle via `ret_handle`
*/
-ffa_vm_id_t retrieve_memory_from_message(
+ffa_id_t retrieve_memory_from_message(
void *recv_buf, void *send_buf, ffa_memory_handle_t *ret_handle,
struct ffa_memory_region *memory_region_ret,
size_t memory_region_max_size)
{
uint32_t msg_size;
- ffa_vm_id_t sender;
+ ffa_id_t sender;
struct ffa_memory_region *retrieve_request;
ffa_memory_handle_t retrieved_handle;
@@ -549,13 +547,13 @@
* which has been sent to us, expecting it to fail with the given error code.
* Returns the sender.
*/
-ffa_vm_id_t retrieve_memory_from_message_expect_fail(void *recv_buf,
- void *send_buf,
- int32_t expected_error)
+ffa_id_t retrieve_memory_from_message_expect_fail(void *recv_buf,
+ void *send_buf,
+ int32_t expected_error)
{
uint32_t msg_size;
struct ffa_value ret;
- ffa_vm_id_t sender;
+ ffa_id_t sender;
struct ffa_memory_region *retrieve_request;
const struct ffa_partition_msg *retrv_message =
get_mailbox_message(recv_buf);
@@ -675,9 +673,9 @@
return NULL;
}
-struct ffa_value send_indirect_message(ffa_vm_id_t from, ffa_vm_id_t to,
- void *send, const void *payload,
- size_t payload_size, uint32_t send_flags)
+struct ffa_value send_indirect_message(ffa_id_t from, ffa_id_t to, void *send,
+ const void *payload, size_t payload_size,
+ uint32_t send_flags)
{
struct ffa_partition_msg *message = (struct ffa_partition_msg *)send;
@@ -693,15 +691,15 @@
}
void receive_indirect_message(void *buffer, size_t buffer_size, void *recv,
- ffa_vm_id_t *sender)
+ ffa_id_t *sender)
{
const struct ffa_partition_msg *message;
struct ffa_partition_rxtx_header header;
- ffa_vm_id_t source_vm_id;
+ ffa_id_t source_vm_id;
const uint32_t *payload;
struct ffa_value ret;
ffa_notifications_bitmap_t fwk_notif;
- const ffa_vm_id_t own_id = hf_vm_get_id();
+ const ffa_id_t own_id = hf_vm_get_id();
EXPECT_LE(buffer_size, FFA_MSG_PAYLOAD_MAX);
diff --git a/test/vmapi/el0_partitions/services/echo_with_notification.c b/test/vmapi/el0_partitions/services/echo_with_notification.c
index cd84c2c..c36dfa3 100644
--- a/test/vmapi/el0_partitions/services/echo_with_notification.c
+++ b/test/vmapi/el0_partitions/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_receiver(ret);
- ffa_vm_id_t source_vm_id = ffa_sender(ret);
+ ffa_id_t target_vm_id = ffa_receiver(ret);
+ ffa_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/el0_partitions/services/interruptible.c b/test/vmapi/el0_partitions/services/interruptible.c
index 2c3912f..353dd20 100644
--- a/test/vmapi/el0_partitions/services/interruptible.c
+++ b/test/vmapi/el0_partitions/services/interruptible.c
@@ -59,7 +59,7 @@
TEST_SERVICE(interruptible)
{
- ffa_vm_id_t this_vm_id = hf_vm_get_id();
+ ffa_id_t this_vm_id = hf_vm_get_id();
void *recv_buf = SERVICE_RECV_BUFFER();
hf_interrupt_enable(SELF_INTERRUPT_ID, true, INTERRUPT_TYPE_IRQ);
diff --git a/test/vmapi/el0_partitions/services/memory.c b/test/vmapi/el0_partitions/services/memory.c
index c1a1e37..80e79ee 100644
--- a/test/vmapi/el0_partitions/services/memory.c
+++ b/test/vmapi/el0_partitions/services/memory.c
@@ -111,7 +111,7 @@
struct ffa_memory_region *memory_region =
(struct ffa_memory_region *)retrieve_buffer;
- ffa_vm_id_t sender;
+ ffa_id_t sender;
struct ffa_composite_memory_region *composite;
sender = retrieve_memory_from_message(recv_buf, send_buf, NULL,
@@ -219,7 +219,7 @@
struct ffa_memory_region *memory_region =
(struct ffa_memory_region *)retrieve_buffer;
- ffa_vm_id_t sender;
+ ffa_id_t sender;
struct ffa_composite_memory_region *composite;
sender = retrieve_memory_from_message(recv_buf, send_buf, NULL,
@@ -254,7 +254,7 @@
struct ffa_memory_region *memory_region =
(struct ffa_memory_region *)retrieve_buffer;
- ffa_vm_id_t sender;
+ ffa_id_t sender;
struct ffa_composite_memory_region *composite;
struct ffa_memory_region_constituent constituent;
@@ -332,7 +332,7 @@
struct ffa_memory_region *memory_region =
(struct ffa_memory_region *)retrieve_buffer;
- ffa_vm_id_t sender;
+ ffa_id_t sender;
struct ffa_composite_memory_region *composite;
sender = retrieve_memory_from_message(recv_buf, send_buf, NULL,
diff --git a/test/vmapi/ffa_both_worlds_el3_spmc/dir_msg.c b/test/vmapi/ffa_both_worlds_el3_spmc/dir_msg.c
index 8397252..1426726 100644
--- a/test/vmapi/ffa_both_worlds_el3_spmc/dir_msg.c
+++ b/test/vmapi/ffa_both_worlds_el3_spmc/dir_msg.c
@@ -22,9 +22,9 @@
TEST(ffa_msg_send_direct_req, succeeds_nwd_to_sp_echo)
{
const uint32_t msg[] = {0x22223333, 0x44445555, 0x66667777, 0x88889999};
- const ffa_vm_id_t receiver_id = SP_ID(1);
+ const ffa_id_t receiver_id = SP_ID(1);
struct ffa_value res;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
res = sp_echo_cmd_send(own_id, receiver_id, msg[0], msg[1], msg[2],
msg[3]);
@@ -43,9 +43,9 @@
TEST(ffa_msg_send_direct_req, succeeds_sp_to_sp_echo)
{
const uint32_t msg[] = {0x22223333, 0x44445555, 0x66667777, 0x88889999};
- const ffa_vm_id_t receiver_id = SP_ID(1);
+ const ffa_id_t receiver_id = SP_ID(1);
struct ffa_value res;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
res = sp_req_echo_cmd_send(own_id, receiver_id, msg[0], msg[1], msg[2],
msg[3]);
@@ -60,9 +60,9 @@
*/
TEST(ffa_msg_send_direct_req, fails_direct_req_to_waiting_sp)
{
- const ffa_vm_id_t receiver_id = SP_ID(1);
+ const ffa_id_t receiver_id = SP_ID(1);
struct ffa_value res;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
res = sp_req_echo_denied_cmd_send(own_id, receiver_id);
diff --git a/test/vmapi/ffa_both_worlds_el3_spmc/services/arch/aarch64/secure/common.c b/test/vmapi/ffa_both_worlds_el3_spmc/services/arch/aarch64/secure/common.c
index 97cad84..7cc3416 100644
--- a/test/vmapi/ffa_both_worlds_el3_spmc/services/arch/aarch64/secure/common.c
+++ b/test/vmapi/ffa_both_worlds_el3_spmc/services/arch/aarch64/secure/common.c
@@ -12,8 +12,7 @@
#include "partition_services.h"
-struct ffa_value sp_check_ffa_return_resp(ffa_vm_id_t test_source,
- ffa_vm_id_t own_id,
+struct ffa_value sp_check_ffa_return_resp(ffa_id_t test_source, ffa_id_t own_id,
struct ffa_value res)
{
if (res.func == FFA_ERROR_32) {
diff --git a/test/vmapi/ffa_both_worlds_el3_spmc/services/arch/aarch64/secure/inc/partition_services.h b/test/vmapi/ffa_both_worlds_el3_spmc/services/arch/aarch64/secure/inc/partition_services.h
index fc22239..93210ea 100644
--- a/test/vmapi/ffa_both_worlds_el3_spmc/services/arch/aarch64/secure/inc/partition_services.h
+++ b/test/vmapi/ffa_both_worlds_el3_spmc/services/arch/aarch64/secure/inc/partition_services.h
@@ -22,23 +22,22 @@
#define SP_SUCCESS 0
#define SP_ERROR -1
-static inline struct ffa_value sp_success(ffa_vm_id_t sender,
- ffa_vm_id_t receiver, uint64_t val)
+static inline struct ffa_value sp_success(ffa_id_t sender, ffa_id_t receiver,
+ uint64_t val)
{
return ffa_msg_send_direct_resp(sender, receiver, SP_SUCCESS, val, 0, 0,
0);
}
-static inline struct ffa_value sp_error(ffa_vm_id_t sender,
- ffa_vm_id_t receiver,
+static inline struct ffa_value sp_error(ffa_id_t sender, ffa_id_t receiver,
uint32_t error_code)
{
return ffa_msg_send_direct_resp(sender, receiver, SP_ERROR, error_code,
0, 0, 0);
}
-static inline struct ffa_value sp_send_response(ffa_vm_id_t sender,
- ffa_vm_id_t receiver,
+static inline struct ffa_value sp_send_response(ffa_id_t sender,
+ ffa_id_t receiver,
uint64_t resp)
{
return ffa_msg_send_direct_resp(sender, receiver, resp, 0, 0, 0, 0);
@@ -64,8 +63,8 @@
*/
#define SP_ECHO_CMD 0x6563686f
-static inline struct ffa_value sp_echo_cmd_send(ffa_vm_id_t sender,
- ffa_vm_id_t receiver,
+static inline struct ffa_value sp_echo_cmd_send(ffa_id_t sender,
+ ffa_id_t receiver,
uint32_t val1, uint32_t val2,
uint32_t val3, uint32_t val4)
{
@@ -73,7 +72,7 @@
val2, val3, val4);
}
-struct ffa_value sp_echo_cmd(ffa_vm_id_t receiver, uint32_t val1, uint32_t val2,
+struct ffa_value sp_echo_cmd(ffa_id_t receiver, uint32_t val1, uint32_t val2,
uint32_t val3, uint32_t val4, uint32_t val5);
/**
@@ -82,14 +81,14 @@
#define SP_REQ_ECHO_CMD 0x65636870
static inline struct ffa_value sp_req_echo_cmd_send(
- ffa_vm_id_t sender, ffa_vm_id_t receiver, uint32_t val1, uint32_t val2,
+ ffa_id_t sender, ffa_id_t receiver, uint32_t val1, uint32_t val2,
uint32_t val3, uint32_t val4)
{
return ffa_msg_send_direct_req(sender, receiver, SP_REQ_ECHO_CMD, val1,
val2, val3, val4);
}
-struct ffa_value sp_req_echo_cmd(ffa_vm_id_t test_source, uint32_t val1,
+struct ffa_value sp_req_echo_cmd(ffa_id_t test_source, uint32_t val1,
uint32_t val2, uint32_t val3, uint32_t val4);
/**
@@ -97,14 +96,14 @@
*/
#define SP_REQ_ECHO_DENIED_CMD 0x65636871
-static inline struct ffa_value sp_req_echo_denied_cmd_send(ffa_vm_id_t sender,
- ffa_vm_id_t receiver)
+static inline struct ffa_value sp_req_echo_denied_cmd_send(ffa_id_t sender,
+ ffa_id_t receiver)
{
return ffa_msg_send_direct_req(sender, receiver, SP_REQ_ECHO_DENIED_CMD,
0, 0, 0, 0);
}
-struct ffa_value sp_req_echo_denied_cmd(ffa_vm_id_t test_source);
+struct ffa_value sp_req_echo_denied_cmd(ffa_id_t test_source);
/**
* Command to request an SP to perform checks using ffa_partition_info_get_regs
@@ -113,22 +112,22 @@
#define SP_CHECK_PARTITION_INFO_GET_REGS_CMD 0x5054567DU
static inline struct ffa_value sp_check_partition_info_get_regs_cmd_send(
- ffa_vm_id_t test_source, ffa_vm_id_t receiver)
+ ffa_id_t test_source, ffa_id_t receiver)
{
return ffa_msg_send_direct_req(test_source, receiver,
SP_CHECK_PARTITION_INFO_GET_REGS_CMD, 0,
0, 0, 0);
}
-struct ffa_value sp_check_partition_info_get_regs_cmd(ffa_vm_id_t test_source);
+struct ffa_value sp_check_partition_info_get_regs_cmd(ffa_id_t test_source);
/**
* Command to request an SP to retrieve and increment memory.
*/
#define SP_REQ_RETRIEVE_CMD 0x65636900
-static inline struct ffa_value sp_req_retrieve_cmd_send(ffa_vm_id_t sender,
- ffa_vm_id_t receiver,
+static inline struct ffa_value sp_req_retrieve_cmd_send(ffa_id_t sender,
+ ffa_id_t receiver,
uint32_t handle,
uint32_t tag,
uint32_t flags)
@@ -137,6 +136,6 @@
handle, tag, flags, 0);
}
-struct ffa_value sp_req_retrieve_cmd(ffa_vm_id_t sender, uint32_t handle,
+struct ffa_value sp_req_retrieve_cmd(ffa_id_t sender, uint32_t handle,
uint32_t tag, uint32_t flags,
struct mailbox_buffers mb);
diff --git a/test/vmapi/ffa_both_worlds_el3_spmc/services/arch/aarch64/secure/memory.c b/test/vmapi/ffa_both_worlds_el3_spmc/services/arch/aarch64/secure/memory.c
index e14c1a8..1a8fad5 100644
--- a/test/vmapi/ffa_both_worlds_el3_spmc/services/arch/aarch64/secure/memory.c
+++ b/test/vmapi/ffa_both_worlds_el3_spmc/services/arch/aarch64/secure/memory.c
@@ -85,7 +85,7 @@
}
void ffa_mem_retrieve_from_args(struct mailbox_buffers mb,
- void *retrieved_memory, ffa_vm_id_t sender,
+ void *retrieved_memory, ffa_id_t sender,
ffa_memory_handle_t handle, uint32_t tag,
ffa_memory_region_flags_t flags)
{
@@ -102,11 +102,11 @@
msg_size);
}
-struct ffa_value sp_req_retrieve_cmd(ffa_vm_id_t sender, uint32_t handle,
+struct ffa_value sp_req_retrieve_cmd(ffa_id_t sender, uint32_t handle,
uint32_t tag, uint32_t flags,
struct mailbox_buffers mb)
{
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
ffa_mem_retrieve_from_args(mb, (void *)retrieve_buffer, sender, handle,
tag, flags);
diff --git a/test/vmapi/ffa_both_worlds_el3_spmc/services/arch/aarch64/secure/partition_services.c b/test/vmapi/ffa_both_worlds_el3_spmc/services/arch/aarch64/secure/partition_services.c
index af7d9f4..024cb82 100644
--- a/test/vmapi/ffa_both_worlds_el3_spmc/services/arch/aarch64/secure/partition_services.c
+++ b/test/vmapi/ffa_both_worlds_el3_spmc/services/arch/aarch64/secure/partition_services.c
@@ -19,19 +19,19 @@
#include "test/hftest.h"
#include "test/vmapi/ffa.h"
-struct ffa_value sp_echo_cmd(ffa_vm_id_t receiver, uint32_t val1, uint32_t val2,
+struct ffa_value sp_echo_cmd(ffa_id_t receiver, uint32_t val1, uint32_t val2,
uint32_t val3, uint32_t val4, uint32_t val5)
{
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
return ffa_msg_send_direct_resp(own_id, receiver, val1, val2, val3,
val4, val5);
}
-struct ffa_value sp_req_echo_cmd(ffa_vm_id_t test_source, uint32_t val1,
+struct ffa_value sp_req_echo_cmd(ffa_id_t test_source, uint32_t val1,
uint32_t val2, uint32_t val3, uint32_t val4)
{
struct ffa_value res;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
res = sp_echo_cmd_send(own_id, own_id + 1, val1, val2, val3, val4);
@@ -44,9 +44,9 @@
return sp_success(own_id, test_source, 0);
}
-struct ffa_value sp_req_echo_denied_cmd(ffa_vm_id_t test_source)
+struct ffa_value sp_req_echo_denied_cmd(ffa_id_t test_source)
{
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
struct ffa_value res;
if (IS_SP_ID(test_source)) {
@@ -68,11 +68,11 @@
* runtime model for various transitions requested by SP through invocation of
* FFA ABIs.
*/
-struct ffa_value sp_check_state_transitions_cmd(ffa_vm_id_t test_source,
- ffa_vm_id_t companion_sp_id)
+struct ffa_value sp_check_state_transitions_cmd(ffa_id_t test_source,
+ ffa_id_t companion_sp_id)
{
struct ffa_value res;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
/*
* The invocation of FFA_MSG_SEND_DIRECT_REQ under RTM_FFA_DIR_REQ is
diff --git a/test/vmapi/ffa_both_worlds_el3_spmc/services/arch/aarch64/secure/setup_and_discovery.c b/test/vmapi/ffa_both_worlds_el3_spmc/services/arch/aarch64/secure/setup_and_discovery.c
index e2daaa9..a03a43a 100644
--- a/test/vmapi/ffa_both_worlds_el3_spmc/services/arch/aarch64/secure/setup_and_discovery.c
+++ b/test/vmapi/ffa_both_worlds_el3_spmc/services/arch/aarch64/secure/setup_and_discovery.c
@@ -200,9 +200,9 @@
FFA_PARTITION_DIRECT_REQ_SEND);
}
-struct ffa_value sp_check_partition_info_get_regs_cmd(ffa_vm_id_t test_source)
+struct ffa_value sp_check_partition_info_get_regs_cmd(ffa_id_t test_source)
{
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
sp_check_partition_info_get_regs_null_uuid();
sp_check_partition_info_get_regs_uuid();
diff --git a/test/vmapi/ffa_secure_partition_el3_spmc/secure_partition.c b/test/vmapi/ffa_secure_partition_el3_spmc/secure_partition.c
index 15b4509..754a097 100644
--- a/test/vmapi/ffa_secure_partition_el3_spmc/secure_partition.c
+++ b/test/vmapi/ffa_secure_partition_el3_spmc/secure_partition.c
@@ -236,7 +236,7 @@
const uint32_t msg[] = {0x00001111, 0x22223333, 0x44445555, 0x66667777,
0x88889999};
struct ffa_value res;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
res = ffa_msg_send_direct_req(own_id, HF_HYPERVISOR_VM_ID + 1, msg[0],
msg[1], msg[2], msg[3], msg[4]);
diff --git a/test/vmapi/ffa_secure_partition_only/secure_partition.c b/test/vmapi/ffa_secure_partition_only/secure_partition.c
index 94a5119..5304cf3 100644
--- a/test/vmapi/ffa_secure_partition_only/secure_partition.c
+++ b/test/vmapi/ffa_secure_partition_only/secure_partition.c
@@ -361,7 +361,7 @@
const uint32_t msg[] = {0x00001111, 0x22223333, 0x44445555, 0x66667777,
0x88889999};
struct ffa_value res;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
res = ffa_msg_send_direct_req(own_id, HF_HYPERVISOR_VM_ID + 1, msg[0],
msg[1], msg[2], msg[3], msg[4]);
diff --git a/test/vmapi/ffa_secure_partitions/boot_fail.c b/test/vmapi/ffa_secure_partitions/boot_fail.c
index cf3993b..26ac071 100644
--- a/test/vmapi/ffa_secure_partitions/boot_fail.c
+++ b/test/vmapi/ffa_secure_partitions/boot_fail.c
@@ -43,11 +43,11 @@
return (FAILING_SP == 3);
}
-static void nwd_to_sp_echo(ffa_vm_id_t receiver_id)
+static void nwd_to_sp_echo(ffa_id_t receiver_id)
{
const uint32_t msg[] = {0x22223333, 0x44445555, 0x66667777, 0x88889999};
struct ffa_value res;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
res = sp_echo_cmd_send(own_id, receiver_id, msg[0], msg[1], msg[2],
msg[3]);
@@ -141,9 +141,9 @@
TEST_PRECONDITION(boot_fail, dir_msg_to_failed_sp, sp1_fail_at_boot)
{
const uint32_t msg[] = {0x22223333, 0x44445555, 0x66667777, 0x88889999};
- const ffa_vm_id_t receiver_id = SP_ID(1);
+ const ffa_id_t receiver_id = SP_ID(1);
struct ffa_value ret;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
ret = sp_echo_cmd_send(own_id, receiver_id, msg[0], msg[1], msg[2],
msg[3]);
diff --git a/test/vmapi/ffa_secure_partitions/dir_msg.c b/test/vmapi/ffa_secure_partitions/dir_msg.c
index a106c8e..f8c126e 100644
--- a/test/vmapi/ffa_secure_partitions/dir_msg.c
+++ b/test/vmapi/ffa_secure_partitions/dir_msg.c
@@ -25,7 +25,7 @@
alignas(4096) static uint8_t secondary_ec_stack[MAX_CPUS - 1][PAGE_SIZE];
struct secondary_cpu_entry_args {
- ffa_vm_id_t receiver_id;
+ ffa_id_t receiver_id;
ffa_vcpu_count_t vcpu_count;
};
@@ -36,9 +36,9 @@
TEST(ffa_msg_send_direct_req, succeeds_nwd_to_sp_echo)
{
const uint32_t msg[] = {0x22223333, 0x44445555, 0x66667777, 0x88889999};
- const ffa_vm_id_t receiver_id = SP_ID(1);
+ const ffa_id_t receiver_id = SP_ID(1);
struct ffa_value res;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
res = sp_echo_cmd_send(own_id, receiver_id, msg[0], msg[1], msg[2],
msg[3]);
@@ -57,9 +57,9 @@
TEST(ffa_msg_send_direct_req, succeeds_sp_to_sp_echo)
{
const uint32_t msg[] = {0x22223333, 0x44445555, 0x66667777, 0x88889999};
- const ffa_vm_id_t receiver_id = SP_ID(1);
+ const ffa_id_t receiver_id = SP_ID(1);
struct ffa_value res;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
res = sp_req_echo_cmd_send(own_id, receiver_id, msg[0], msg[1], msg[2],
msg[3]);
@@ -74,9 +74,9 @@
*/
TEST(ffa_msg_send_direct_req, fails_direct_req_to_waiting_sp)
{
- const ffa_vm_id_t receiver_id = SP_ID(1);
+ const ffa_id_t receiver_id = SP_ID(1);
struct ffa_value res;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
res = sp_req_echo_denied_cmd_send(own_id, receiver_id);
@@ -90,10 +90,10 @@
*/
TEST(partition_runtime_model, rtm_ffa_dir_req)
{
- const ffa_vm_id_t receiver_id = SP_ID(1);
- const ffa_vm_id_t companion_sp_id = SP_ID(2);
+ const ffa_id_t receiver_id = SP_ID(1);
+ const ffa_id_t companion_sp_id = SP_ID(2);
struct ffa_value res;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
res = sp_check_state_transitions_cmd_send(own_id, receiver_id,
companion_sp_id);
@@ -103,7 +103,7 @@
static void migrate_busy_up_sp(uintptr_t arg)
{
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
struct ffa_value res;
const uint32_t msg[] = {SP_ECHO_CMD, 0x1, 0x2, 0x3, 0x4};
struct secondary_cpu_entry_args *args =
@@ -145,13 +145,13 @@
service2_is_up_sp)
{
struct ffa_value res;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
struct secondary_cpu_entry_args args;
struct mailbox_buffers mb = set_up_mailbox();
struct ffa_partition_info *receiver_info = service2(mb.recv);
struct ffa_partition_info *companion_info = service1(mb.recv);
- ffa_vm_id_t receiver_id = receiver_info->vm_id;
- ffa_vm_id_t companion_id = companion_info->vm_id;
+ ffa_id_t receiver_id = receiver_info->vm_id;
+ ffa_id_t companion_id = companion_info->vm_id;
args.receiver_id = receiver_id;
args.vcpu_count = receiver_info->vcpu_count;
diff --git a/test/vmapi/ffa_secure_partitions/interrupts.c b/test/vmapi/ffa_secure_partitions/interrupts.c
index ae07112..534aa48 100644
--- a/test/vmapi/ffa_secure_partitions/interrupts.c
+++ b/test/vmapi/ffa_secure_partitions/interrupts.c
@@ -100,7 +100,7 @@
struct ffa_value res;
struct mailbox_buffers mb = set_up_mailbox();
struct ffa_partition_info *receiver_info = service2(mb.recv);
- const ffa_vm_id_t receiver_id = receiver_info->vm_id;
+ const ffa_id_t receiver_id = receiver_info->vm_id;
setup_physical_timer();
start_physical_timer(20000000);
@@ -139,10 +139,10 @@
TEST(interrupts, sp_managed_exit)
{
struct ffa_value res;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
struct mailbox_buffers mb = set_up_mailbox();
struct ffa_partition_info *receiver_info = service1(mb.recv);
- const ffa_vm_id_t receiver_id = receiver_info->vm_id;
+ const ffa_id_t receiver_id = receiver_info->vm_id;
setup_physical_timer();
diff --git a/test/vmapi/ffa_secure_partitions/notifications.c b/test/vmapi/ffa_secure_partitions/notifications.c
index 829a14b..e7e5da6 100644
--- a/test/vmapi/ffa_secure_partitions/notifications.c
+++ b/test/vmapi/ffa_secure_partitions/notifications.c
@@ -22,11 +22,11 @@
struct notif_cpu_entry_args {
struct spinlock *lock;
ffa_vcpu_index_t vcpu_id;
- ffa_vm_id_t sp_id;
+ ffa_id_t sp_id;
bool is_sp_up;
};
-static void notif_signal_vm_to_sp(ffa_vm_id_t sender, ffa_vm_id_t receiver,
+static void notif_signal_vm_to_sp(ffa_id_t sender, ffa_id_t receiver,
ffa_notifications_bitmap_t bitmap,
uint32_t flags)
{
@@ -59,7 +59,7 @@
EXPECT_EQ(sp_resp(res), SP_SUCCESS);
}
-static void notif_signal_sp_to_vm(ffa_vm_id_t sender, ffa_vm_id_t receiver,
+static void notif_signal_sp_to_vm(ffa_id_t sender, ffa_id_t receiver,
ffa_notifications_bitmap_t bitmap,
uint32_t flags)
{
@@ -233,8 +233,8 @@
TEST(ffa_notifications, fail_if_mbz_set_in_notification_get)
{
struct ffa_value res;
- const ffa_vm_id_t sender = SP_ID(1);
- ffa_vm_id_t own_id = hf_vm_get_id();
+ const ffa_id_t sender = SP_ID(1);
+ ffa_id_t own_id = hf_vm_get_id();
/* Arbitrarily bind notification. */
res = ffa_notification_bind(sender, own_id, 0,
@@ -255,8 +255,8 @@
TEST(ffa_notifications, fail_if_mbz_set_in_notifications_bind)
{
struct ffa_value res;
- const ffa_vm_id_t sender = SP_ID(1);
- ffa_vm_id_t own_id = hf_vm_get_id();
+ const ffa_id_t sender = SP_ID(1);
+ ffa_id_t own_id = hf_vm_get_id();
res = ffa_notification_bind(sender, own_id,
~FFA_NOTIFICATION_FLAG_PER_VCPU,
diff --git a/test/vmapi/ffa_secure_partitions/power_mgt.c b/test/vmapi/ffa_secure_partitions/power_mgt.c
index aab63b1..5517989 100644
--- a/test/vmapi/ffa_secure_partitions/power_mgt.c
+++ b/test/vmapi/ffa_secure_partitions/power_mgt.c
@@ -22,7 +22,7 @@
alignas(4096) static uint8_t secondary_ec_stack[MAX_CPUS - 1][4096];
struct pwr_mgt_cpu_entry_args {
- ffa_vm_id_t receiver_id;
+ ffa_id_t receiver_id;
ffa_vcpu_count_t vcpu_count;
ffa_vcpu_index_t vcpu_id;
struct spinlock lock;
@@ -33,7 +33,7 @@
*/
static void cpu_entry_echo(uintptr_t arg)
{
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
const uint32_t msg[] = {SP_ECHO_CMD, 0x1, 0x2, 0x3, 0x4};
struct pwr_mgt_cpu_entry_args *args =
// NOLINTNEXTLINE(performance-no-int-to-ptr)
@@ -81,7 +81,7 @@
*/
static void cpu_entry_check_cpu_idx(uintptr_t arg)
{
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
struct pwr_mgt_cpu_entry_args *args =
// NOLINTNEXTLINE(performance-no-int-to-ptr)
(struct pwr_mgt_cpu_entry_args *)arg;
diff --git a/test/vmapi/ffa_secure_partitions/secure_interrupts.c b/test/vmapi/ffa_secure_partitions/secure_interrupts.c
index fb48bbc..ad70d0f 100644
--- a/test/vmapi/ffa_secure_partitions/secure_interrupts.c
+++ b/test/vmapi/ffa_secure_partitions/secure_interrupts.c
@@ -19,8 +19,8 @@
#define SP_SLEEP_TIME 400U
#define NS_SLEEP_TIME 200U
-static void configure_trusted_wdog_interrupt(ffa_vm_id_t source,
- ffa_vm_id_t dest, bool enable)
+static void configure_trusted_wdog_interrupt(ffa_id_t source, ffa_id_t dest,
+ bool enable)
{
struct ffa_value res;
@@ -31,18 +31,18 @@
EXPECT_EQ(sp_resp(res), SP_SUCCESS);
}
-static void enable_trusted_wdog_interrupt(ffa_vm_id_t source, ffa_vm_id_t dest)
+static void enable_trusted_wdog_interrupt(ffa_id_t source, ffa_id_t dest)
{
configure_trusted_wdog_interrupt(source, dest, true);
}
-static void disable_trusted_wdog_interrupt(ffa_vm_id_t source, ffa_vm_id_t dest)
+static void disable_trusted_wdog_interrupt(ffa_id_t source, ffa_id_t dest)
{
configure_trusted_wdog_interrupt(source, dest, false);
}
-static void enable_trigger_trusted_wdog_timer(ffa_vm_id_t own_id,
- ffa_vm_id_t receiver_id,
+static void enable_trigger_trusted_wdog_timer(ffa_id_t own_id,
+ ffa_id_t receiver_id,
uint32_t timer_ms)
{
struct ffa_value res;
@@ -65,8 +65,8 @@
EXPECT_EQ(sp_resp(res), SP_SUCCESS);
}
-static void check_and_disable_trusted_wdog_timer(ffa_vm_id_t own_id,
- ffa_vm_id_t receiver_id)
+static void check_and_disable_trusted_wdog_timer(ffa_id_t own_id,
+ ffa_id_t receiver_id)
{
struct ffa_value res;
@@ -90,10 +90,10 @@
TEST(secure_interrupts, sp_running)
{
struct ffa_value res;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
struct mailbox_buffers mb = set_up_mailbox();
struct ffa_partition_info *service2_info = service2(mb.recv);
- const ffa_vm_id_t receiver_id = service2_info->vm_id;
+ const ffa_id_t receiver_id = service2_info->vm_id;
enable_trigger_trusted_wdog_timer(own_id, receiver_id, 400);
@@ -119,10 +119,10 @@
*/
TEST(secure_interrupts, sp_waiting)
{
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
struct mailbox_buffers mb = set_up_mailbox();
struct ffa_partition_info *service2_info = service2(mb.recv);
- const ffa_vm_id_t receiver_id = service2_info->vm_id;
+ const ffa_id_t receiver_id = service2_info->vm_id;
uint64_t time1;
volatile uint64_t time_lapsed;
uint64_t timer_freq = read_msr(cntfrq_el0);
@@ -151,12 +151,12 @@
TEST(secure_interrupts, sp_blocked)
{
struct ffa_value res;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
struct mailbox_buffers mb = set_up_mailbox();
struct ffa_partition_info *service1_info = service1(mb.recv);
struct ffa_partition_info *service2_info = service2(mb.recv);
- const ffa_vm_id_t receiver_id = service2_info->vm_id;
- const ffa_vm_id_t companion_id = service1_info->vm_id;
+ const ffa_id_t receiver_id = service2_info->vm_id;
+ const ffa_id_t companion_id = service1_info->vm_id;
enable_trigger_trusted_wdog_timer(own_id, receiver_id, 400);
@@ -180,10 +180,10 @@
TEST(secure_interrupts, sp_preempted)
{
struct ffa_value res;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
struct mailbox_buffers mb = set_up_mailbox();
struct ffa_partition_info *service2_info = service2(mb.recv);
- const ffa_vm_id_t receiver_id = service2_info->vm_id;
+ const ffa_id_t receiver_id = service2_info->vm_id;
gicv3_system_setup();
interrupt_enable(PHYSICAL_TIMER_IRQ, true);
@@ -247,7 +247,7 @@
TEST(secure_interrupts, sp_other_s_interrupt_queued)
{
struct ffa_value res;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
struct mailbox_buffers mb = set_up_mailbox();
struct ffa_partition_info *service2_info = service2(mb.recv);
struct ffa_partition_info *service3_info = service3(mb.recv);
@@ -256,8 +256,8 @@
* Service2 SP is the target of trusted watchdog timer interrupt.
* Service3 SP specified action to Other-S Interrupt as queued.
*/
- const ffa_vm_id_t target_id = service2_info->vm_id;
- const ffa_vm_id_t receiver_id = service3_info->vm_id;
+ const ffa_id_t target_id = service2_info->vm_id;
+ const ffa_id_t receiver_id = service3_info->vm_id;
enable_trigger_trusted_wdog_timer(own_id, target_id, 400);
@@ -299,10 +299,10 @@
TEST(secure_interrupts, sp_yield_sec_interrupt_handling)
{
struct ffa_value res;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
struct mailbox_buffers mb = set_up_mailbox();
struct ffa_partition_info *service2_info = service2(mb.recv);
- const ffa_vm_id_t receiver_id = service2_info->vm_id;
+ const ffa_id_t receiver_id = service2_info->vm_id;
uint64_t time1;
volatile uint64_t time_lapsed;
uint64_t timer_freq = read_msr(cntfrq_el0);
diff --git a/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/common.c b/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/common.c
index 1f9b7be..9cc8850 100644
--- a/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/common.c
+++ b/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/common.c
@@ -12,8 +12,7 @@
#include "partition_services.h"
-struct ffa_value sp_check_ffa_return_resp(ffa_vm_id_t test_source,
- ffa_vm_id_t own_id,
+struct ffa_value sp_check_ffa_return_resp(ffa_id_t test_source, ffa_id_t own_id,
struct ffa_value res)
{
if (res.func == FFA_ERROR_32) {
diff --git a/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/discovery.c b/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/discovery.c
index 7e71c7c..8b2dc1a 100644
--- a/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/discovery.c
+++ b/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/discovery.c
@@ -210,9 +210,9 @@
FFA_PARTITION_DIRECT_REQ_SEND);
}
-struct ffa_value sp_check_partition_info_get_regs_cmd(ffa_vm_id_t test_source)
+struct ffa_value sp_check_partition_info_get_regs_cmd(ffa_id_t test_source)
{
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
sp_check_partition_info_get_regs_null_uuid();
sp_check_partition_info_get_regs_uuid();
diff --git a/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/inc/partition_services.h b/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/inc/partition_services.h
index e94b98c..e39e6a1 100644
--- a/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/inc/partition_services.h
+++ b/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/inc/partition_services.h
@@ -15,23 +15,22 @@
#define SP_SUCCESS 0
#define SP_ERROR -1
-static inline struct ffa_value sp_success(ffa_vm_id_t sender,
- ffa_vm_id_t receiver, uint64_t val)
+static inline struct ffa_value sp_success(ffa_id_t sender, ffa_id_t receiver,
+ uint64_t val)
{
return ffa_msg_send_direct_resp(sender, receiver, SP_SUCCESS, val, 0, 0,
0);
}
-static inline struct ffa_value sp_error(ffa_vm_id_t sender,
- ffa_vm_id_t receiver,
+static inline struct ffa_value sp_error(ffa_id_t sender, ffa_id_t receiver,
uint32_t error_code)
{
return ffa_msg_send_direct_resp(sender, receiver, SP_ERROR, error_code,
0, 0, 0);
}
-static inline struct ffa_value sp_send_response(ffa_vm_id_t sender,
- ffa_vm_id_t receiver,
+static inline struct ffa_value sp_send_response(ffa_id_t sender,
+ ffa_id_t receiver,
uint64_t resp)
{
return ffa_msg_send_direct_resp(sender, receiver, resp, 0, 0, 0, 0);
@@ -57,8 +56,8 @@
*/
#define SP_ECHO_CMD 0x6563686f
-static inline struct ffa_value sp_echo_cmd_send(ffa_vm_id_t sender,
- ffa_vm_id_t receiver,
+static inline struct ffa_value sp_echo_cmd_send(ffa_id_t sender,
+ ffa_id_t receiver,
uint32_t val1, uint32_t val2,
uint32_t val3, uint32_t val4)
{
@@ -66,7 +65,7 @@
val2, val3, val4);
}
-struct ffa_value sp_echo_cmd(ffa_vm_id_t receiver, uint32_t val1, uint32_t val2,
+struct ffa_value sp_echo_cmd(ffa_id_t receiver, uint32_t val1, uint32_t val2,
uint32_t val3, uint32_t val4, uint32_t val5);
/**
@@ -75,14 +74,14 @@
#define SP_REQ_ECHO_CMD 0x65636870
static inline struct ffa_value sp_req_echo_cmd_send(
- ffa_vm_id_t sender, ffa_vm_id_t receiver, uint32_t val1, uint32_t val2,
+ ffa_id_t sender, ffa_id_t receiver, uint32_t val1, uint32_t val2,
uint32_t val3, uint32_t val4)
{
return ffa_msg_send_direct_req(sender, receiver, SP_REQ_ECHO_CMD, val1,
val2, val3, val4);
}
-struct ffa_value sp_req_echo_cmd(ffa_vm_id_t test_source, uint32_t val1,
+struct ffa_value sp_req_echo_cmd(ffa_id_t test_source, uint32_t val1,
uint32_t val2, uint32_t val3, uint32_t val4);
/**
@@ -90,14 +89,14 @@
*/
#define SP_REQ_ECHO_DENIED_CMD 0x65636871
-static inline struct ffa_value sp_req_echo_denied_cmd_send(ffa_vm_id_t sender,
- ffa_vm_id_t receiver)
+static inline struct ffa_value sp_req_echo_denied_cmd_send(ffa_id_t sender,
+ ffa_id_t receiver)
{
return ffa_msg_send_direct_req(sender, receiver, SP_REQ_ECHO_DENIED_CMD,
0, 0, 0, 0);
}
-struct ffa_value sp_req_echo_denied_cmd(ffa_vm_id_t test_source);
+struct ffa_value sp_req_echo_denied_cmd(ffa_id_t test_source);
/**
* Command to request SP to set notifications.
@@ -105,7 +104,7 @@
#define SP_NOTIF_SET_CMD 0x736574U
static inline struct ffa_value sp_notif_set_cmd_send(
- ffa_vm_id_t sender, ffa_vm_id_t receiver, ffa_vm_id_t notif_receiver,
+ ffa_id_t sender, ffa_id_t receiver, ffa_id_t notif_receiver,
uint32_t flags, ffa_notifications_bitmap_t bitmap)
{
return ffa_msg_send_direct_req(sender, receiver, SP_NOTIF_SET_CMD,
@@ -114,9 +113,9 @@
(uint32_t)(bitmap >> 32)); /* hi */
}
-static inline ffa_vm_id_t sp_notif_receiver(struct ffa_value cmd)
+static inline ffa_id_t sp_notif_receiver(struct ffa_value cmd)
{
- return (ffa_vm_id_t)cmd.arg4;
+ return (ffa_id_t)cmd.arg4;
}
static inline uint32_t sp_notif_flags(struct ffa_value cmd)
@@ -129,8 +128,8 @@
return ffa_notifications_bitmap(cmd.arg6, cmd.arg7);
}
-struct ffa_value sp_notif_set_cmd(ffa_vm_id_t test_source,
- ffa_vm_id_t notif_receiver, uint32_t flags,
+struct ffa_value sp_notif_set_cmd(ffa_id_t test_source, ffa_id_t notif_receiver,
+ uint32_t flags,
ffa_notifications_bitmap_t bitmap);
/**
@@ -138,8 +137,8 @@
*/
#define SP_NOTIF_GET_CMD 0x676574U
-static inline struct ffa_value sp_notif_get_cmd_send(ffa_vm_id_t test_source,
- ffa_vm_id_t receiver,
+static inline struct ffa_value sp_notif_get_cmd_send(ffa_id_t test_source,
+ ffa_id_t receiver,
uint16_t vcpu_id,
uint32_t flags)
{
@@ -152,12 +151,12 @@
return (uint16_t)cmd.arg4;
}
-struct ffa_value sp_notif_get_cmd(ffa_vm_id_t test_source, uint16_t vcpu_id,
+struct ffa_value sp_notif_get_cmd(ffa_id_t test_source, uint16_t vcpu_id,
uint32_t flags);
static inline struct ffa_value sp_notif_get_success(
- ffa_vm_id_t sender, ffa_vm_id_t receiver,
- ffa_notifications_bitmap_t from_sp, ffa_notifications_bitmap_t from_vm)
+ ffa_id_t sender, ffa_id_t receiver, ffa_notifications_bitmap_t from_sp,
+ ffa_notifications_bitmap_t from_vm)
{
return ffa_msg_send_direct_resp(sender, receiver, SP_SUCCESS,
(uint32_t)from_sp, /*lo*/
@@ -184,7 +183,7 @@
#define SP_NOTIF_BIND_CMD 0x42494e44U
static inline struct ffa_value sp_notif_bind_cmd_send(
- ffa_vm_id_t sender, ffa_vm_id_t receiver, ffa_vm_id_t notif_sender,
+ ffa_id_t sender, ffa_id_t receiver, ffa_id_t notif_sender,
uint32_t flags, ffa_notifications_bitmap_t bitmap)
{
return ffa_msg_send_direct_req(sender, receiver, SP_NOTIF_BIND_CMD,
@@ -193,13 +192,13 @@
(uint32_t)(bitmap >> 32)); /* hi */
}
-static inline ffa_vm_id_t sp_notif_bind_sender(struct ffa_value cmd)
+static inline ffa_id_t sp_notif_bind_sender(struct ffa_value cmd)
{
- return (ffa_vm_id_t)cmd.arg4;
+ return (ffa_id_t)cmd.arg4;
}
-struct ffa_value sp_notif_bind_cmd(ffa_vm_id_t test_source,
- ffa_vm_id_t notif_sender, uint32_t flags,
+struct ffa_value sp_notif_bind_cmd(ffa_id_t test_source, ffa_id_t notif_sender,
+ uint32_t flags,
ffa_notifications_bitmap_t bitmap);
/**
@@ -208,7 +207,7 @@
#define SP_NOTIF_UNBIND_CMD SP_NOTIF_BIND_CMD + 1
static inline struct ffa_value sp_notif_unbind_cmd_send(
- ffa_vm_id_t sender, ffa_vm_id_t receiver, ffa_vm_id_t notif_sender,
+ ffa_id_t sender, ffa_id_t receiver, ffa_id_t notif_sender,
ffa_notifications_bitmap_t bitmap)
{
return ffa_msg_send_direct_req(sender, receiver, SP_NOTIF_UNBIND_CMD,
@@ -217,12 +216,11 @@
(uint32_t)(bitmap >> 32)); /* hi */
}
-struct ffa_value sp_notif_unbind_cmd(ffa_vm_id_t test_source,
- ffa_vm_id_t notif_sender,
+struct ffa_value sp_notif_unbind_cmd(ffa_id_t test_source,
+ ffa_id_t notif_sender,
ffa_notifications_bitmap_t bitmap);
-struct ffa_value sp_check_ffa_return_resp(ffa_vm_id_t test_source,
- ffa_vm_id_t own_id,
+struct ffa_value sp_check_ffa_return_resp(ffa_id_t test_source, ffa_id_t own_id,
struct ffa_value res);
/**
@@ -232,7 +230,7 @@
#define SP_CHECK_CPU_IDX_CMD 0x76637075U
static inline struct ffa_value sp_check_cpu_idx_cmd_send(
- ffa_vm_id_t test_source, ffa_vm_id_t receiver, ffa_vcpu_index_t cpu_idx)
+ ffa_id_t test_source, ffa_id_t receiver, ffa_vcpu_index_t cpu_idx)
{
return ffa_msg_send_direct_req(test_source, receiver,
SP_CHECK_CPU_IDX_CMD, cpu_idx, 0, 0, 0);
@@ -243,7 +241,7 @@
return (ffa_vcpu_index_t)cmd.arg4;
}
-struct ffa_value sp_check_cpu_idx_cmd(ffa_vm_id_t test_source,
+struct ffa_value sp_check_cpu_idx_cmd(ffa_id_t test_source,
ffa_vcpu_index_t received_cpu_idx);
/**
@@ -251,8 +249,8 @@
*/
#define SP_WAIT_BUSY_LOOP_CMD 0x42555359
-static inline struct ffa_value sp_busy_loop_cmd_send(ffa_vm_id_t test_source,
- ffa_vm_id_t receiver,
+static inline struct ffa_value sp_busy_loop_cmd_send(ffa_id_t test_source,
+ ffa_id_t receiver,
uint64_t loop_count)
{
return ffa_msg_send_direct_req(test_source, receiver,
@@ -266,15 +264,15 @@
*/
#define SP_CHECK_STATE_TRANSITIONS_CMD 0x5052544dU
static inline struct ffa_value sp_check_state_transitions_cmd_send(
- ffa_vm_id_t test_source, ffa_vm_id_t receiver, ffa_vm_id_t companion_sp)
+ ffa_id_t test_source, ffa_id_t receiver, ffa_id_t companion_sp)
{
return ffa_msg_send_direct_req(test_source, receiver,
SP_CHECK_STATE_TRANSITIONS_CMD,
companion_sp, 0, 0, 0);
}
-struct ffa_value sp_check_state_transitions_cmd(ffa_vm_id_t test_source,
- ffa_vm_id_t companion_sp);
+struct ffa_value sp_check_state_transitions_cmd(ffa_id_t test_source,
+ ffa_id_t companion_sp);
/**
* Command to request SP to enable/disable a secure virtual interrupt.
@@ -282,8 +280,8 @@
#define SP_VIRTUAL_INTERRUPT_CMD 0x696e7472U
static inline struct ffa_value sp_virtual_interrupt_cmd_send(
- ffa_vm_id_t source, ffa_vm_id_t dest, uint32_t interrupt_id,
- bool enable, uint32_t pin)
+ ffa_id_t source, ffa_id_t dest, uint32_t interrupt_id, bool enable,
+ uint32_t pin)
{
return ffa_msg_send_direct_req(source, dest, SP_VIRTUAL_INTERRUPT_CMD,
interrupt_id, enable, pin, 0);
@@ -304,7 +302,7 @@
return cmd.arg6;
}
-struct ffa_value sp_virtual_interrupt_cmd(ffa_vm_id_t source,
+struct ffa_value sp_virtual_interrupt_cmd(ffa_id_t source,
uint32_t interrupt_id, bool enable,
uint32_t pin);
@@ -314,15 +312,14 @@
*/
#define SP_TWDOG_START_CMD 0x57444f47U
-static inline struct ffa_value sp_twdog_cmd_send(ffa_vm_id_t source,
- ffa_vm_id_t dest,
+static inline struct ffa_value sp_twdog_cmd_send(ffa_id_t source, ffa_id_t dest,
uint64_t time)
{
return ffa_msg_send_direct_req(source, dest, SP_TWDOG_START_CMD, time,
0, 0, 0);
}
-struct ffa_value sp_twdog_cmd(ffa_vm_id_t source, uint64_t time);
+struct ffa_value sp_twdog_cmd(ffa_id_t source, uint64_t time);
/**
* Request SP to map MMIO region of Trusted Watchdog peripheral into it's
@@ -331,14 +328,14 @@
*/
#define SP_TWDOG_MAP_CMD 0x4D415057U
-static inline struct ffa_value sp_twdog_map_cmd_send(ffa_vm_id_t source,
- ffa_vm_id_t dest)
+static inline struct ffa_value sp_twdog_map_cmd_send(ffa_id_t source,
+ ffa_id_t dest)
{
return ffa_msg_send_direct_req(source, dest, SP_TWDOG_MAP_CMD, 0, 0, 0,
0);
}
-struct ffa_value sp_twdog_map_cmd(ffa_vm_id_t source);
+struct ffa_value sp_twdog_map_cmd(ffa_id_t source);
/**
* Request SP to return the last serviced secure virtual interrupt.
@@ -347,14 +344,14 @@
*/
#define SP_LAST_INTERRUPT_SERVICED_CMD 0x76494e54U
-static inline struct ffa_value sp_get_last_interrupt_cmd_send(
- ffa_vm_id_t source, ffa_vm_id_t dest)
+static inline struct ffa_value sp_get_last_interrupt_cmd_send(ffa_id_t source,
+ ffa_id_t dest)
{
return ffa_msg_send_direct_req(
source, dest, SP_LAST_INTERRUPT_SERVICED_CMD, 0, 0, 0, 0);
}
-struct ffa_value sp_get_last_interrupt_cmd(ffa_vm_id_t source);
+struct ffa_value sp_get_last_interrupt_cmd(ffa_id_t source);
/**
* Command to request SP to sleep for the given time in ms.
@@ -363,15 +360,14 @@
*/
#define SP_SLEEP_CMD 0x736c6570U
-static inline struct ffa_value sp_sleep_cmd_send(ffa_vm_id_t source,
- ffa_vm_id_t dest,
+static inline struct ffa_value sp_sleep_cmd_send(ffa_id_t source, ffa_id_t dest,
uint32_t sleep_time)
{
return ffa_msg_send_direct_req(source, dest, SP_SLEEP_CMD, sleep_time,
0, 0, 0);
}
-struct ffa_value sp_sleep_cmd(ffa_vm_id_t source, uint32_t sleep_ms);
+struct ffa_value sp_sleep_cmd(ffa_id_t source, uint32_t sleep_ms);
/**
* Command to request SP to forward sleep command for the given time in ms.
@@ -383,9 +379,9 @@
*/
#define SP_FWD_SLEEP_CMD (SP_SLEEP_CMD + 1)
-static inline struct ffa_value sp_fwd_sleep_cmd_send(ffa_vm_id_t source,
- ffa_vm_id_t dest,
- ffa_vm_id_t fwd_dest,
+static inline struct ffa_value sp_fwd_sleep_cmd_send(ffa_id_t source,
+ ffa_id_t dest,
+ ffa_id_t fwd_dest,
uint32_t busy_wait,
bool hint_interrupted)
{
@@ -399,9 +395,9 @@
return (uint32_t)ret.arg4;
}
-static inline ffa_vm_id_t sp_get_fwd_sleep_dest(struct ffa_value ret)
+static inline ffa_id_t sp_get_fwd_sleep_dest(struct ffa_value ret)
{
- return (ffa_vm_id_t)ret.arg5;
+ return (ffa_id_t)ret.arg5;
}
static inline bool sp_get_fwd_sleep_interrupted_hint(struct ffa_value ret)
@@ -409,8 +405,8 @@
return (bool)ret.arg6;
}
-struct ffa_value sp_fwd_sleep_cmd(ffa_vm_id_t source, uint32_t sleep_ms,
- ffa_vm_id_t fwd_dest, bool hint_interrupted);
+struct ffa_value sp_fwd_sleep_cmd(ffa_id_t source, uint32_t sleep_ms,
+ ffa_id_t fwd_dest, bool hint_interrupted);
/**
* Command to request SP to resume the task requested by current endpoint after
@@ -422,7 +418,7 @@
#define SP_RESUME_AFTER_MANAGED_EXIT 0x52414d45U
static inline struct ffa_value sp_resume_after_managed_exit_send(
- ffa_vm_id_t source, ffa_vm_id_t dest)
+ ffa_id_t source, ffa_id_t dest)
{
return ffa_msg_send_direct_req(
source, dest, SP_RESUME_AFTER_MANAGED_EXIT, 0, 0, 0, 0);
@@ -441,14 +437,14 @@
*/
#define SP_CHECK_PARTITION_INFO_GET_REGS_CMD 0x5054567DU
static inline struct ffa_value sp_check_partition_info_get_regs_cmd_send(
- ffa_vm_id_t test_source, ffa_vm_id_t receiver)
+ ffa_id_t test_source, ffa_id_t receiver)
{
return ffa_msg_send_direct_req(test_source, receiver,
SP_CHECK_PARTITION_INFO_GET_REGS_CMD, 0,
0, 0, 0);
}
-struct ffa_value sp_check_partition_info_get_regs_cmd(ffa_vm_id_t test_source);
+struct ffa_value sp_check_partition_info_get_regs_cmd(ffa_id_t test_source);
/**
* Command to request an SP to yield while handling a secure interrupt.
@@ -457,12 +453,12 @@
#define SP_YIELD_SEC_INTERRUPT_HANDLING_CMD 0x59534948U
static inline struct ffa_value sp_yield_secure_interrupt_handling_cmd_send(
- ffa_vm_id_t source, ffa_vm_id_t dest, bool yield)
+ ffa_id_t source, ffa_id_t dest, bool yield)
{
return ffa_msg_send_direct_req(source, dest,
SP_YIELD_SEC_INTERRUPT_HANDLING_CMD,
yield, 0, 0, 0);
}
-struct ffa_value sp_yield_secure_interrupt_handling_cmd(ffa_vm_id_t source,
+struct ffa_value sp_yield_secure_interrupt_handling_cmd(ffa_id_t source,
bool yield);
diff --git a/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/notifications.c b/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/notifications.c
index 5ceb252..6da5bfe 100644
--- a/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/notifications.c
+++ b/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/notifications.c
@@ -12,22 +12,22 @@
#include "partition_services.h"
-struct ffa_value sp_notif_set_cmd(ffa_vm_id_t test_source,
- ffa_vm_id_t notif_receiver, uint32_t flags,
+struct ffa_value sp_notif_set_cmd(ffa_id_t test_source, ffa_id_t notif_receiver,
+ uint32_t flags,
ffa_notifications_bitmap_t bitmap)
{
struct ffa_value res;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
res = ffa_notification_set(own_id, notif_receiver, flags, bitmap);
return sp_check_ffa_return_resp(test_source, own_id, res);
}
-struct ffa_value sp_notif_get_cmd(ffa_vm_id_t test_source, uint16_t vcpu_id,
+struct ffa_value sp_notif_get_cmd(ffa_id_t test_source, uint16_t vcpu_id,
uint32_t flags)
{
struct ffa_value res;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
res = ffa_notification_get(own_id, vcpu_id, flags);
if (res.func == FFA_ERROR_32) {
@@ -40,24 +40,24 @@
ffa_notification_get_from_vm(res));
}
-struct ffa_value sp_notif_bind_cmd(ffa_vm_id_t test_source,
- ffa_vm_id_t notif_sender, uint32_t flags,
+struct ffa_value sp_notif_bind_cmd(ffa_id_t test_source, ffa_id_t notif_sender,
+ uint32_t flags,
ffa_notifications_bitmap_t bitmap)
{
struct ffa_value res;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
res = ffa_notification_bind(notif_sender, own_id, flags, bitmap);
return sp_check_ffa_return_resp(test_source, own_id, res);
}
-struct ffa_value sp_notif_unbind_cmd(ffa_vm_id_t test_source,
- ffa_vm_id_t notif_sender,
+struct ffa_value sp_notif_unbind_cmd(ffa_id_t test_source,
+ ffa_id_t notif_sender,
ffa_notifications_bitmap_t bitmap)
{
struct ffa_value res;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
dlog_verbose("Unbind notifications %x, from sender: %x\n", bitmap,
notif_sender);
diff --git a/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/partition_services.c b/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/partition_services.c
index 949f804..0320453 100644
--- a/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/partition_services.c
+++ b/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/partition_services.c
@@ -19,19 +19,19 @@
#include "test/hftest.h"
#include "test/vmapi/ffa.h"
-struct ffa_value sp_echo_cmd(ffa_vm_id_t receiver, uint32_t val1, uint32_t val2,
+struct ffa_value sp_echo_cmd(ffa_id_t receiver, uint32_t val1, uint32_t val2,
uint32_t val3, uint32_t val4, uint32_t val5)
{
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
return ffa_msg_send_direct_resp(own_id, receiver, val1, val2, val3,
val4, val5);
}
-struct ffa_value sp_req_echo_cmd(ffa_vm_id_t test_source, uint32_t val1,
+struct ffa_value sp_req_echo_cmd(ffa_id_t test_source, uint32_t val1,
uint32_t val2, uint32_t val3, uint32_t val4)
{
struct ffa_value res;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
res = sp_echo_cmd_send(own_id, own_id + 1, val1, val2, val3, val4);
@@ -44,9 +44,9 @@
return sp_success(own_id, test_source, 0);
}
-struct ffa_value sp_req_echo_denied_cmd(ffa_vm_id_t test_source)
+struct ffa_value sp_req_echo_denied_cmd(ffa_id_t test_source)
{
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
struct ffa_value res;
if (IS_SP_ID(test_source)) {
@@ -68,11 +68,11 @@
* runtime model for various transitions requested by SP through invocation of
* FFA ABIs.
*/
-struct ffa_value sp_check_state_transitions_cmd(ffa_vm_id_t test_source,
- ffa_vm_id_t companion_sp_id)
+struct ffa_value sp_check_state_transitions_cmd(ffa_id_t test_source,
+ ffa_id_t companion_sp_id)
{
struct ffa_value res;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
/*
* The invocation of FFA_MSG_SEND_DIRECT_REQ under RTM_FFA_DIR_REQ is
diff --git a/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/power_mgt.c b/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/power_mgt.c
index 5a0b8aa..6121db2 100644
--- a/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/power_mgt.c
+++ b/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/power_mgt.c
@@ -10,10 +10,10 @@
#include "partition_services.h"
#include "test/hftest.h"
-struct ffa_value sp_check_cpu_idx_cmd(ffa_vm_id_t test_source,
+struct ffa_value sp_check_cpu_idx_cmd(ffa_id_t test_source,
ffa_vcpu_index_t received_cpu_idx)
{
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
ffa_vcpu_index_t core_idx =
(ffa_vcpu_index_t)(read_msr(mpidr_el1) & ~0x80000000ULL);
diff --git a/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/secure_interrupts.c b/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/secure_interrupts.c
index 0894cf1..59c1741 100644
--- a/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/secure_interrupts.c
+++ b/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/secure_interrupts.c
@@ -25,11 +25,11 @@
bool yield_while_handling_sec_interrupt = false;
-static void send_managed_exit_response(ffa_vm_id_t dir_req_source_id)
+static void send_managed_exit_response(ffa_id_t dir_req_source_id)
{
struct ffa_value ffa_ret;
bool waiting_resume_after_managed_exit;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
/* Send managed exit response. */
ffa_ret = sp_send_response(own_id, dir_req_source_id,
@@ -57,7 +57,7 @@
static void irq_current(void)
{
uint32_t intid;
- ffa_vm_id_t dir_req_source_id = hftest_get_dir_req_source_id();
+ ffa_id_t dir_req_source_id = hftest_get_dir_req_source_id();
intid = hf_interrupt_get();
@@ -92,12 +92,12 @@
}
}
-struct ffa_value sp_virtual_interrupt_cmd(ffa_vm_id_t test_source,
+struct ffa_value sp_virtual_interrupt_cmd(ffa_id_t test_source,
uint32_t interrupt_id, bool enable,
uint32_t pin)
{
int64_t ret;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
ret = hf_interrupt_enable(interrupt_id, enable, pin);
if (ret != 0) {
@@ -116,9 +116,9 @@
return sp_success(own_id, test_source, 0);
}
-struct ffa_value sp_twdog_cmd(ffa_vm_id_t test_source, uint64_t time)
+struct ffa_value sp_twdog_cmd(ffa_id_t test_source, uint64_t time)
{
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
HFTEST_LOG("Starting TWDOG: %u ms", time);
sp805_twdog_refresh();
@@ -127,9 +127,9 @@
return sp_success(own_id, test_source, time);
}
-struct ffa_value sp_twdog_map_cmd(ffa_vm_id_t test_source)
+struct ffa_value sp_twdog_map_cmd(ffa_id_t test_source)
{
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
/* Map peripheral(such as secure watchdog timer) address space. */
hftest_mm_identity_map((void*)PLAT_ARM_TWDOG_BASE, PLAT_ARM_TWDOG_SIZE,
@@ -138,9 +138,9 @@
return sp_success(own_id, test_source, 0);
}
-struct ffa_value sp_get_last_interrupt_cmd(ffa_vm_id_t test_source)
+struct ffa_value sp_get_last_interrupt_cmd(ffa_id_t test_source)
{
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
return sp_success(own_id, test_source,
exception_handler_get_last_interrupt());
@@ -165,10 +165,10 @@
return true;
}
-struct ffa_value sp_sleep_cmd(ffa_vm_id_t source, uint32_t sleep_ms)
+struct ffa_value sp_sleep_cmd(ffa_id_t source, uint32_t sleep_ms)
{
uint64_t time_lapsed;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
HFTEST_LOG("Request to sleep %x for %ums", own_id, sleep_ms);
@@ -180,11 +180,11 @@
return sp_success(own_id, source, time_lapsed);
}
-struct ffa_value sp_fwd_sleep_cmd(ffa_vm_id_t source, uint32_t sleep_ms,
- ffa_vm_id_t fwd_dest, bool hint_interrupted)
+struct ffa_value sp_fwd_sleep_cmd(ffa_id_t source, uint32_t sleep_ms,
+ ffa_id_t fwd_dest, bool hint_interrupted)
{
struct ffa_value ffa_ret;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
bool fwd_dest_interrupted = false;
HFTEST_LOG("VM%x requested %x to sleep for %ums", source, fwd_dest,
@@ -241,10 +241,10 @@
return sp_success(own_id, source, 0);
}
-struct ffa_value sp_yield_secure_interrupt_handling_cmd(ffa_vm_id_t source,
+struct ffa_value sp_yield_secure_interrupt_handling_cmd(ffa_id_t source,
bool yield)
{
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
yield_while_handling_sec_interrupt = yield;
return sp_success(own_id, source, 0);
diff --git a/test/vmapi/ffa_secure_partitions/setup_and_discovery.c b/test/vmapi/ffa_secure_partitions/setup_and_discovery.c
index 76305af..12e5333 100644
--- a/test/vmapi/ffa_secure_partitions/setup_and_discovery.c
+++ b/test/vmapi/ffa_secure_partitions/setup_and_discovery.c
@@ -68,9 +68,9 @@
TEST(ffa, ffa_partition_info_get_regs_sp_test)
{
- const ffa_vm_id_t receiver_id = SP_ID(1);
+ const ffa_id_t receiver_id = SP_ID(1);
struct ffa_value res;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
res = sp_check_partition_info_get_regs_cmd_send(own_id, receiver_id);
diff --git a/test/vmapi/primary_only/primary_only.c b/test/vmapi/primary_only/primary_only.c
index 699deb1..69b8208 100644
--- a/test/vmapi/primary_only/primary_only.c
+++ b/test/vmapi/primary_only/primary_only.c
@@ -394,8 +394,8 @@
* Get some numbers that the compiler can't tell are constants, so it
* can't optimise them away.
*/
- ffa_vm_id_t ai = hf_vm_get_id();
- ffa_vm_id_t bi = hf_vm_get_id();
+ ffa_id_t ai = hf_vm_get_id();
+ ffa_id_t bi = hf_vm_get_id();
double a = ai;
double b = bi;
double result = a * b * 8.0;
diff --git a/test/vmapi/primary_with_secondaries/dir_msg.c b/test/vmapi/primary_with_secondaries/dir_msg.c
index 79c9833..c826347 100644
--- a/test/vmapi/primary_with_secondaries/dir_msg.c
+++ b/test/vmapi/primary_with_secondaries/dir_msg.c
@@ -105,7 +105,7 @@
struct mailbox_buffers mb = set_up_mailbox();
struct ffa_partition_info *service1_info = service1(mb.recv);
struct ffa_partition_info *service2_info = service2(mb.recv);
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
struct ffa_value ret;
/* Run service2 for it to wait for a request from service1. */
@@ -137,7 +137,7 @@
struct mailbox_buffers mb = set_up_mailbox();
struct ffa_partition_info *service1_info = service1(mb.recv);
struct ffa_partition_info *service2_info = service2(mb.recv);
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
struct ffa_value ret;
/* Run service2 for it to wait for a request from service1. */
@@ -294,7 +294,7 @@
struct mailbox_buffers mb = set_up_mailbox();
struct ffa_partition_info *service1_info = service1(mb.recv);
struct ffa_partition_info *service2_info = service2(mb.recv);
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
struct ffa_value ret;
/* Run service2 for it to wait for a request from service1. */
diff --git a/test/vmapi/primary_with_secondaries/ffa.c b/test/vmapi/primary_with_secondaries/ffa.c
index 8b489b7..f85024b 100644
--- a/test/vmapi/primary_with_secondaries/ffa.c
+++ b/test/vmapi/primary_with_secondaries/ffa.c
@@ -65,9 +65,9 @@
EXPECT_EQ(vm_count, 4);
for (uint16_t index = 0; index < vm_count; ++index) {
- ffa_vm_id_t vm_id = partitions[index].vm_id;
- EXPECT_GE(vm_id, (ffa_vm_id_t)HF_PRIMARY_VM_ID);
- EXPECT_LE(vm_id, (ffa_vm_id_t)SERVICE_VM3);
+ ffa_id_t vm_id = partitions[index].vm_id;
+ EXPECT_GE(vm_id, (ffa_id_t)HF_PRIMARY_VM_ID);
+ EXPECT_LE(vm_id, (ffa_id_t)SERVICE_VM3);
/*
* NOTE: The ordering is NOT specified by the spec, but is an
diff --git a/test/vmapi/primary_with_secondaries/indirect_messaging.c b/test/vmapi/primary_with_secondaries/indirect_messaging.c
index 94ad2de..aba8180 100644
--- a/test/vmapi/primary_with_secondaries/indirect_messaging.c
+++ b/test/vmapi/primary_with_secondaries/indirect_messaging.c
@@ -33,8 +33,8 @@
struct mailbox_buffers mb = set_up_mailbox();
const uint32_t payload = 0xAA55AA55;
const uint32_t echo_payload;
- ffa_vm_id_t echo_sender;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t echo_sender;
+ ffa_id_t own_id = hf_vm_get_id();
struct ffa_partition_info *service1_info = service1(mb.recv);
SERVICE_SELECT(service1_info->vm_id, "echo_msg_send2", mb.send);
@@ -62,7 +62,7 @@
struct ffa_value ret;
struct mailbox_buffers mb = set_up_mailbox();
const uint32_t payload = 0xAA55AA55;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
struct ffa_partition_info *service1_info = service1(mb.recv);
SERVICE_SELECT(service1_info->vm_id, "ffa_indirect_msg_error", mb.send);
@@ -81,7 +81,7 @@
struct ffa_value ret;
struct mailbox_buffers mb = set_up_mailbox();
const uint32_t payload = 0xAA55AA55;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
struct ffa_partition_info *service1_info = service1(mb.recv);
SERVICE_SELECT(service1_info->vm_id, "ffa_indirect_msg_error", mb.send);
@@ -102,7 +102,7 @@
struct ffa_value ret;
struct mailbox_buffers mb = set_up_mailbox();
const uint32_t payload = 0xAA55AA55;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
struct ffa_partition_info *service1_info = service1(mb.recv);
SERVICE_SELECT(service1_info->vm_id, "ffa_indirect_msg_error", mb.send);
@@ -118,9 +118,8 @@
EXPECT_FFA_ERROR(ret, FFA_BUSY);
}
-static void msg_send2_invalid_parameters(ffa_vm_id_t sender,
- ffa_vm_id_t receiver, uint32_t size,
- void *send, void *recv)
+static void msg_send2_invalid_parameters(ffa_id_t sender, ffa_id_t receiver,
+ uint32_t size, void *send, void *recv)
{
struct ffa_value ret;
struct ffa_partition_msg *message;
@@ -152,7 +151,7 @@
TEST(indirect_messaging, corrupted_sender)
{
struct mailbox_buffers mb = set_up_mailbox();
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
struct ffa_partition_info *service1_info = service1(mb.recv);
msg_send2_invalid_parameters(service1_info->vm_id, own_id, 0, mb.send,
@@ -163,7 +162,7 @@
TEST(indirect_messaging, self_message)
{
struct mailbox_buffers mb = set_up_mailbox();
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
msg_send2_invalid_parameters(own_id, own_id, 0, mb.send, mb.recv);
}
@@ -172,7 +171,7 @@
TEST(indirect_messaging, invalid_size)
{
struct mailbox_buffers mb = set_up_mailbox();
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
struct ffa_partition_info *service1_info = service1(mb.recv);
msg_send2_invalid_parameters(own_id, service1_info->vm_id, 1024 * 1024,
@@ -190,11 +189,11 @@
struct ffa_partition_info *service1_info = service1(mb.recv);
struct ffa_partition_info *service2_info = service2(mb.recv);
const struct ffa_uuid service2_uuid = SERVICE2;
- const ffa_vm_id_t own_id = hf_vm_get_id();
+ const ffa_id_t own_id = hf_vm_get_id();
struct ffa_value ret;
const uint32_t payload = 0xAA55AA55;
uint32_t echo_payload;
- ffa_vm_id_t echo_sender;
+ ffa_id_t echo_sender;
SERVICE_SELECT(service1_info->vm_id, "echo_msg_send2_service", mb.send);
SERVICE_SELECT(service2_info->vm_id, "echo_msg_send2", mb.send);
@@ -259,15 +258,14 @@
TEST(indirect_messaging, relay)
{
const char expected_message[] = "Send this round the relay!";
- const size_t message_size =
- sizeof(expected_message) + sizeof(ffa_vm_id_t);
+ const size_t message_size = sizeof(expected_message) + sizeof(ffa_id_t);
char response[message_size];
char message[message_size];
struct mailbox_buffers mb = set_up_mailbox();
struct ffa_partition_info *service1_info = service1(mb.recv);
struct ffa_partition_info *service2_info = service2(mb.recv);
struct ffa_value ret;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
SERVICE_SELECT(service1_info->vm_id, "relay", mb.send);
SERVICE_SELECT(service2_info->vm_id, "relay", mb.send);
@@ -277,11 +275,11 @@
* service1, then to service2 and finally back to here.
*/
{
- ffa_vm_id_t *chain = (ffa_vm_id_t *)message;
+ ffa_id_t *chain = (ffa_id_t *)message;
*chain = htole32(service2_info->vm_id);
memcpy_s(&message[sizeof(*chain)],
- message_size - sizeof(ffa_vm_id_t), expected_message,
+ message_size - sizeof(ffa_id_t), expected_message,
sizeof(expected_message));
ret = send_indirect_message(own_id, service1_info->vm_id,
@@ -299,7 +297,7 @@
/* Ensure the message is intact. */
receive_indirect_message(response, sizeof(response), mb.recv, NULL);
- EXPECT_EQ(memcmp(&response[sizeof(ffa_vm_id_t)], expected_message,
+ EXPECT_EQ(memcmp(&response[sizeof(ffa_id_t)], expected_message,
sizeof(expected_message)),
0);
}
diff --git a/test/vmapi/primary_with_secondaries/interrupts.c b/test/vmapi/primary_with_secondaries/interrupts.c
index 5539bf5..fe80c1f 100644
--- a/test/vmapi/primary_with_secondaries/interrupts.c
+++ b/test/vmapi/primary_with_secondaries/interrupts.c
@@ -27,9 +27,9 @@
void* recv,
const char* expected_response,
size_t expected_response_size,
- ffa_vm_id_t expected_sender)
+ ffa_id_t expected_sender)
{
- ffa_vm_id_t sender;
+ ffa_id_t sender;
receive_indirect_message(response, response_size, recv, &sender);
EXPECT_EQ(sender, expected_sender);
@@ -48,7 +48,7 @@
char response[sizeof(expected_response)];
struct ffa_value ret;
struct mailbox_buffers mb = set_up_mailbox();
- const ffa_vm_id_t own_id = hf_vm_get_id();
+ const ffa_id_t own_id = hf_vm_get_id();
SERVICE_SELECT(SERVICE_VM1, "interruptible", mb.send);
@@ -153,7 +153,7 @@
char response[sizeof(expected_response)];
struct ffa_value ret;
struct mailbox_buffers mb = set_up_mailbox();
- const ffa_vm_id_t own_id = hf_vm_get_id();
+ const ffa_id_t own_id = hf_vm_get_id();
SERVICE_SELECT(SERVICE_VM1, "interruptible", mb.send);
@@ -193,7 +193,7 @@
char response[sizeof(expected_response)];
struct ffa_value ret;
struct mailbox_buffers mb = set_up_mailbox();
- const ffa_vm_id_t own_id = hf_vm_get_id();
+ const ffa_id_t own_id = hf_vm_get_id();
SERVICE_SELECT(SERVICE_VM1, "interruptible", mb.send);
@@ -281,7 +281,7 @@
char response[sizeof(message)];
struct ffa_value run_res;
struct mailbox_buffers mb = set_up_mailbox();
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
SERVICE_SELECT(SERVICE_VM1, "interruptible_echo", mb.send);
diff --git a/test/vmapi/primary_with_secondaries/memory_sharing.c b/test/vmapi/primary_with_secondaries/memory_sharing.c
index b484046..af27df4 100644
--- a/test/vmapi/primary_with_secondaries/memory_sharing.c
+++ b/test/vmapi/primary_with_secondaries/memory_sharing.c
@@ -2739,7 +2739,7 @@
}
}
-void memory_retrieve_multiple_borrower_base(void *send, ffa_vm_id_t recipient,
+void memory_retrieve_multiple_borrower_base(void *send, ffa_id_t recipient,
ffa_memory_handle_t handle,
struct ffa_memory_access *receivers,
uint32_t receiver_count,
@@ -2810,8 +2810,7 @@
handle = ffa_mem_success_handle(ret);
for (uint32_t j = 0; j < ARRAY_SIZE(receivers); j++) {
- ffa_vm_id_t recipient =
- receivers[j].receiver_permissions.receiver;
+ ffa_id_t recipient = receivers[j].receiver_permissions.receiver;
memory_retrieve_multiple_borrower_base(
mb.send, recipient, handle, receivers,
@@ -2861,8 +2860,7 @@
handle = ffa_mem_success_handle(ret);
for (uint32_t j = 0; j < ARRAY_SIZE(receivers); j++) {
- ffa_vm_id_t recipient =
- receivers[j].receiver_permissions.receiver;
+ ffa_id_t recipient = receivers[j].receiver_permissions.receiver;
/* Set the flag to bypass multiple borrower checks. */
memory_retrieve_multiple_borrower_base(
@@ -2887,7 +2885,7 @@
struct ffa_memory_access receivers[2];
struct ffa_partition_info *service1_info = service1(mb.recv);
struct ffa_partition_info *service2_info = service2(mb.recv);
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
struct ffa_partition_msg *retrieve_message = mb.send;
ffa_memory_access_init_permissions(
@@ -2982,8 +2980,7 @@
handle = ffa_mem_success_handle(ret);
for (uint32_t j = 0; j < ARRAY_SIZE(receivers); j++) {
- ffa_vm_id_t recipient =
- receivers[j].receiver_permissions.receiver;
+ ffa_id_t recipient = receivers[j].receiver_permissions.receiver;
struct ffa_partition_msg *retrieve_message = mb.send;
SERVICE_SELECT(recipient, "memory_increment_relinquish",
@@ -3072,8 +3069,8 @@
}
static void fail_multiple_receiver_mem_share_lend(
- struct ffa_memory_region *mem_region, ffa_vm_id_t receiver_id1,
- ffa_vm_id_t receiver_id2, enum ffa_data_access data_access1,
+ struct ffa_memory_region *mem_region, ffa_id_t receiver_id1,
+ ffa_id_t receiver_id2, enum ffa_data_access data_access1,
enum ffa_data_access data_access2,
enum ffa_instruction_access instruction_access1,
enum ffa_instruction_access instruction_access2)
@@ -3185,7 +3182,7 @@
FFA_INSTRUCTION_ACCESS_NOT_SPECIFIED, 0);
for (i = 0; i < ARRAY_SIZE(receivers); i++) {
- ffa_vm_id_t vm_id = receivers[i].receiver_permissions.receiver;
+ ffa_id_t vm_id = receivers[i].receiver_permissions.receiver;
SERVICE_SELECT(vm_id, "ffa_memory_lend_relinquish", mb.send);
}
@@ -3209,7 +3206,7 @@
FFA_MEMORY_REGION_TRANSACTION_TYPE_LEND);
for (i = 0; i < ARRAY_SIZE(receivers); i++) {
- ffa_vm_id_t vm_id = receivers[i].receiver_permissions.receiver;
+ ffa_id_t vm_id = receivers[i].receiver_permissions.receiver;
run_res = ffa_run(vm_id, 0);
/* Let the memory be returned. */
EXPECT_EQ(run_res.func, FFA_YIELD_32);
@@ -3224,7 +3221,7 @@
/* Check that subsequents accesses to the memory fail. */
for (i = 0; i < ARRAY_SIZE(receivers); i++) {
- ffa_vm_id_t vm_id = receivers[i].receiver_permissions.receiver;
+ ffa_id_t vm_id = receivers[i].receiver_permissions.receiver;
run_res = ffa_run(vm_id, 0);
EXPECT_TRUE(exception_received(&run_res, mb.recv));
}
@@ -3630,8 +3627,7 @@
handle = ffa_mem_success_handle(ret);
for (uint32_t j = 0; j < ARRAY_SIZE(receivers); j++) {
- ffa_vm_id_t recipient =
- receivers[j].receiver_permissions.receiver;
+ ffa_id_t recipient = receivers[j].receiver_permissions.receiver;
struct ffa_partition_msg *retrieve_message = mb.send;
/* Set flag to clear memory after relinquish. */
diff --git a/test/vmapi/primary_with_secondaries/services/check_state.c b/test/vmapi/primary_with_secondaries/services/check_state.c
index 81921ed..d61ddcb 100644
--- a/test/vmapi/primary_with_secondaries/services/check_state.c
+++ b/test/vmapi/primary_with_secondaries/services/check_state.c
@@ -14,7 +14,7 @@
#include "test/hftest.h"
-void send_with_retry(ffa_vm_id_t sender_vm_id, ffa_vm_id_t target_vm_id,
+void send_with_retry(ffa_id_t sender_vm_id, ffa_id_t target_vm_id,
uint32_t size)
{
struct ffa_value res;
diff --git a/test/vmapi/primary_with_secondaries/services/dir_msg.c b/test/vmapi/primary_with_secondaries/services/dir_msg.c
index 1d25eab..4b241ba 100644
--- a/test/vmapi/primary_with_secondaries/services/dir_msg.c
+++ b/test/vmapi/primary_with_secondaries/services/dir_msg.c
@@ -53,7 +53,7 @@
0x88889999};
void *recv_buf = SERVICE_RECV_BUFFER();
struct ffa_value res;
- ffa_vm_id_t target_id;
+ ffa_id_t target_id;
/* Retrieve FF-A ID of the target endpoint. */
receive_indirect_message((void *)&target_id, sizeof(target_id),
@@ -81,7 +81,7 @@
0x88889999};
void *recv_buf = SERVICE_RECV_BUFFER();
struct ffa_value res;
- ffa_vm_id_t target_id;
+ ffa_id_t target_id;
/* Retrieve FF-A ID of the target endpoint. */
receive_indirect_message((void *)&target_id, sizeof(target_id),
@@ -202,12 +202,12 @@
struct ffa_value res;
void *recv_buf = SERVICE_RECV_BUFFER();
struct ffa_partition_info *service2_info = service2(recv_buf);
- ffa_vm_id_t invalid_receiver;
+ ffa_id_t invalid_receiver;
struct ffa_value args = ffa_msg_wait();
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
EXPECT_EQ(args.func, FFA_MSG_SEND_DIRECT_REQ_32);
- ffa_vm_id_t sender = ffa_sender(args);
+ ffa_id_t sender = ffa_sender(args);
ASSERT_EQ(own_id, ffa_receiver(args));
/* Other receiver ID. */
@@ -229,9 +229,9 @@
{
struct ffa_value res;
struct ffa_value args = ffa_msg_wait();
- ffa_vm_id_t sender;
- ffa_vm_id_t receiver;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t sender;
+ ffa_id_t receiver;
+ ffa_id_t own_id = hf_vm_get_id();
ASSERT_EQ(args.func, FFA_MSG_SEND_DIRECT_REQ_32);
receiver = ffa_receiver(args);
diff --git a/test/vmapi/primary_with_secondaries/services/echo.c b/test/vmapi/primary_with_secondaries/services/echo.c
index 519d4ae..198c073 100644
--- a/test/vmapi/primary_with_secondaries/services/echo.c
+++ b/test/vmapi/primary_with_secondaries/services/echo.c
@@ -35,7 +35,7 @@
for (;;) {
uint32_t payload;
- ffa_vm_id_t echo_sender;
+ ffa_id_t echo_sender;
receive_indirect_message((void *)&payload, sizeof(payload),
recv_buf, &echo_sender);
@@ -58,10 +58,10 @@
struct ffa_uuid target_uuid;
struct ffa_partition_info target_info;
uint32_t echo_payload;
- ffa_vm_id_t echo_sender;
+ ffa_id_t echo_sender;
const uint32_t payload = 0xBEEFU;
struct ffa_value ret;
- const ffa_vm_id_t own_id = hf_vm_get_id();
+ const ffa_id_t own_id = hf_vm_get_id();
/* Setup handling of NPI, to handle RX buffer notification. */
exception_setup(check_npi, NULL);
diff --git a/test/vmapi/primary_with_secondaries/services/interruptible.c b/test/vmapi/primary_with_secondaries/services/interruptible.c
index 61dedba..315aba1 100644
--- a/test/vmapi/primary_with_secondaries/services/interruptible.c
+++ b/test/vmapi/primary_with_secondaries/services/interruptible.c
@@ -29,7 +29,7 @@
uint32_t interrupt_id = hf_interrupt_get();
char buffer[] = "Got IRQ xx.";
int size = sizeof(buffer);
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
dlog("secondary IRQ %d from current\n", interrupt_id);
buffer[8] = '0' + interrupt_id / 10;
@@ -43,7 +43,7 @@
TEST_SERVICE(interruptible)
{
- ffa_vm_id_t this_vm_id = hf_vm_get_id();
+ ffa_id_t this_vm_id = hf_vm_get_id();
void *recv_buf = SERVICE_RECV_BUFFER();
exception_setup(irq, NULL);
@@ -58,7 +58,7 @@
/* Allocate for the longest of the above two messages. */
char response[sizeof(enable_message) + 1];
struct ffa_partition_rxtx_header header;
- ffa_vm_id_t sender;
+ ffa_id_t sender;
mailbox_receive_retry(response, sizeof(response), recv_buf,
&header);
diff --git a/test/vmapi/primary_with_secondaries/services/interruptible_echo.c b/test/vmapi/primary_with_secondaries/services/interruptible_echo.c
index 8d17770..19a9bdb 100644
--- a/test/vmapi/primary_with_secondaries/services/interruptible_echo.c
+++ b/test/vmapi/primary_with_secondaries/services/interruptible_echo.c
@@ -31,7 +31,7 @@
TEST_SERVICE(interruptible_echo)
{
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
exception_setup(irq, NULL);
hf_interrupt_enable(EXTERNAL_INTERRUPT_ID_A, true, INTERRUPT_TYPE_IRQ);
@@ -43,7 +43,7 @@
void *send_buf = SERVICE_SEND_BUFFER();
void *recv_buf = SERVICE_RECV_BUFFER();
char response[sizeof("I\'ll see you again.")];
- ffa_vm_id_t sender;
+ ffa_id_t sender;
ASSERT_EQ(res.func, FFA_RUN_32);
EXPECT_EQ(irq_counter, 1);
diff --git a/test/vmapi/primary_with_secondaries/services/memory.c b/test/vmapi/primary_with_secondaries/services/memory.c
index 6d05a18..fac5d1b 100644
--- a/test/vmapi/primary_with_secondaries/services/memory.c
+++ b/test/vmapi/primary_with_secondaries/services/memory.c
@@ -269,7 +269,7 @@
struct ffa_memory_region *memory_region =
(struct ffa_memory_region *)retrieve_buffer;
- ffa_vm_id_t sender = retrieve_memory_from_message(
+ ffa_id_t sender = retrieve_memory_from_message(
recv_buf, send_buf, NULL, memory_region, HF_MAILBOX_SIZE);
struct ffa_composite_memory_region *composite =
ffa_memory_region_get_composite(memory_region, 0);
@@ -422,7 +422,7 @@
struct ffa_memory_region *memory_region =
(struct ffa_memory_region *)retrieve_buffer;
- ffa_vm_id_t sender;
+ ffa_id_t sender;
struct ffa_composite_memory_region *composite;
struct ffa_memory_region_constituent constituent;
@@ -503,7 +503,7 @@
struct ffa_memory_region *memory_region =
(struct ffa_memory_region *)retrieve_buffer;
- ffa_vm_id_t sender = retrieve_memory_from_message(
+ ffa_id_t sender = retrieve_memory_from_message(
recv_buf, send_buf, NULL, memory_region, HF_MAILBOX_SIZE);
struct ffa_composite_memory_region *composite =
ffa_memory_region_get_composite(memory_region, 0);
@@ -975,7 +975,7 @@
struct ffa_memory_region_v1_0 *memory_region =
(struct ffa_memory_region_v1_0 *)retrieve_buffer;
struct ffa_composite_memory_region *composite;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
const struct ffa_partition_msg *retrv_message =
(struct ffa_partition_msg *)recv_buf;
struct ffa_value ret;
diff --git a/test/vmapi/primary_with_secondaries/services/receive_block.c b/test/vmapi/primary_with_secondaries/services/receive_block.c
index 8c8baad..3ee2748 100644
--- a/test/vmapi/primary_with_secondaries/services/receive_block.c
+++ b/test/vmapi/primary_with_secondaries/services/receive_block.c
@@ -35,7 +35,7 @@
int32_t i;
const char message[] = "Done waiting";
void* send_buf = SERVICE_SEND_BUFFER();
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
exception_setup(irq, NULL);
arch_irq_disable();
diff --git a/test/vmapi/primary_with_secondaries/services/relay.c b/test/vmapi/primary_with_secondaries/services/relay.c
index 0f02397..78c8c50 100644
--- a/test/vmapi/primary_with_secondaries/services/relay.c
+++ b/test/vmapi/primary_with_secondaries/services/relay.c
@@ -24,12 +24,12 @@
*/
for (;;) {
const char expected_message[] = "Send this round the relay!";
- ffa_vm_id_t *chain;
- ffa_vm_id_t next_id;
+ ffa_id_t *chain;
+ ffa_id_t next_id;
void *next_message;
- uint8_t message[sizeof(expected_message) + sizeof(ffa_vm_id_t)];
- ffa_vm_id_t sender;
- ffa_vm_id_t own_id = hf_vm_get_id();
+ uint8_t message[sizeof(expected_message) + sizeof(ffa_id_t)];
+ ffa_id_t sender;
+ ffa_id_t own_id = hf_vm_get_id();
/* Prepare to relay the message. */
void *recv_buf = SERVICE_RECV_BUFFER();
void *send_buf = SERVICE_SEND_BUFFER();
@@ -37,7 +37,7 @@
receive_indirect_message(message, sizeof(message), recv_buf,
&sender);
- chain = (ffa_vm_id_t *)message;
+ chain = (ffa_id_t *)message;
next_id = le16toh(*chain);
next_message = &message[sizeof(*chain)];
diff --git a/test/vmapi/primary_with_secondaries/services/wfi.c b/test/vmapi/primary_with_secondaries/services/wfi.c
index 03ad541..c638ddf 100644
--- a/test/vmapi/primary_with_secondaries/services/wfi.c
+++ b/test/vmapi/primary_with_secondaries/services/wfi.c
@@ -33,7 +33,7 @@
int32_t i;
const char message[] = "Done waiting";
void* send_buf = SERVICE_SEND_BUFFER();
- ffa_vm_id_t own_id = hf_vm_get_id();
+ ffa_id_t own_id = hf_vm_get_id();
exception_setup(irq, NULL);
arch_irq_disable();