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/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);