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/driver/linux b/driver/linux
index 77b1c7f..c653e72 160000
--- a/driver/linux
+++ b/driver/linux
@@ -1 +1 @@
-Subproject commit 77b1c7fbe8de9c9c629a7361784e3ba6212f92d3
+Subproject commit c653e7242b8b621c6303985eb2df8833ec1da00c
diff --git a/inc/hf/api.h b/inc/hf/api.h
index 55d515b..6bfd971 100644
--- a/inc/hf/api.h
+++ b/inc/hf/api.h
@@ -19,10 +19,10 @@
struct vcpu *api_ffa_get_vm_vcpu(struct vm *vm, struct vcpu *current);
void api_regs_state_saved(struct vcpu *vcpu);
int64_t api_mailbox_writable_get(const struct vcpu *current);
-int64_t api_mailbox_waiter_get(ffa_vm_id_t vm_id, const struct vcpu *current);
+int64_t api_mailbox_waiter_get(ffa_id_t vm_id, const struct vcpu *current);
struct vcpu *api_switch_to_vm(struct vcpu_locked current_locked,
struct ffa_value to_ret,
- enum vcpu_state vcpu_state, ffa_vm_id_t to_id);
+ enum vcpu_state vcpu_state, ffa_id_t to_id);
struct vcpu *api_switch_to_primary(struct vcpu_locked current_locked,
struct ffa_value primary_ret,
enum vcpu_state secondary_state);
@@ -36,7 +36,7 @@
int64_t api_interrupt_enable(uint32_t intid, bool enable,
enum interrupt_type type, struct vcpu *current);
uint32_t api_interrupt_get(struct vcpu *current);
-int64_t api_interrupt_inject(ffa_vm_id_t target_vm_id,
+int64_t api_interrupt_inject(ffa_id_t target_vm_id,
ffa_vcpu_index_t target_vcpu_idx, uint32_t intid,
struct vcpu *current, struct vcpu **next);
int64_t api_interrupt_inject_locked(struct vcpu_locked target_locked,
@@ -45,22 +45,20 @@
struct vcpu **next);
void api_sri_send_if_delayed(struct vcpu *current);
-struct ffa_value api_ffa_msg_send(ffa_vm_id_t sender_vm_id,
- ffa_vm_id_t receiver_vm_id, uint32_t size,
+struct ffa_value api_ffa_msg_send(ffa_id_t sender_vm_id,
+ ffa_id_t receiver_vm_id, uint32_t size,
struct vcpu *current, struct vcpu **next);
-struct ffa_value api_ffa_msg_send2(ffa_vm_id_t sender_vm_id, uint32_t flags,
+struct ffa_value api_ffa_msg_send2(ffa_id_t sender_vm_id, uint32_t flags,
struct vcpu *current);
-struct ffa_value api_ffa_rx_release(ffa_vm_id_t receiver_id,
- struct vcpu *current);
-struct ffa_value api_ffa_rx_acquire(ffa_vm_id_t receiver_id,
- struct vcpu *current);
+struct ffa_value api_ffa_rx_release(ffa_id_t receiver_id, struct vcpu *current);
+struct ffa_value api_ffa_rx_acquire(ffa_id_t receiver_id, struct vcpu *current);
struct ffa_value api_vm_configure_pages(
struct mm_stage1_locked mm_stage1_locked, struct vm_locked vm_locked,
ipaddr_t send, ipaddr_t recv, uint32_t page_count,
struct mpool *local_page_pool);
struct ffa_value api_ffa_rxtx_map(ipaddr_t send, ipaddr_t recv,
uint32_t page_count, struct vcpu *current);
-struct ffa_value api_ffa_rxtx_unmap(ffa_vm_id_t allocator_id,
+struct ffa_value api_ffa_rxtx_unmap(ffa_id_t allocator_id,
struct vcpu *current);
struct ffa_value api_yield(struct vcpu *current, struct vcpu **next,
struct ffa_value *args);
@@ -84,7 +82,7 @@
uint32_t ffa_version);
struct ffa_value api_ffa_msg_wait(struct vcpu *current, struct vcpu **next,
struct ffa_value *args);
-struct ffa_value api_ffa_run(ffa_vm_id_t vm_id, ffa_vcpu_index_t vcpu_idx,
+struct ffa_value api_ffa_run(ffa_id_t vm_id, ffa_vcpu_index_t vcpu_idx,
struct vcpu *current, struct vcpu **next);
struct ffa_value api_ffa_mem_send(uint32_t share_func, uint32_t length,
uint32_t fragment_length, ipaddr_t address,
@@ -99,19 +97,19 @@
struct vcpu *current);
struct ffa_value api_ffa_mem_frag_rx(ffa_memory_handle_t handle,
uint32_t fragment_offset,
- ffa_vm_id_t sender_vm_id,
+ ffa_id_t sender_vm_id,
struct vcpu *current);
struct ffa_value api_ffa_mem_frag_tx(ffa_memory_handle_t handle,
uint32_t fragment_length,
- ffa_vm_id_t sender_vm_id,
+ ffa_id_t sender_vm_id,
struct vcpu *current);
-struct ffa_value api_ffa_msg_send_direct_req(ffa_vm_id_t sender_vm_id,
- ffa_vm_id_t receiver_vm_id,
+struct ffa_value api_ffa_msg_send_direct_req(ffa_id_t sender_vm_id,
+ ffa_id_t receiver_vm_id,
struct ffa_value args,
struct vcpu *current,
struct vcpu **next);
-struct ffa_value api_ffa_msg_send_direct_resp(ffa_vm_id_t sender_vm_id,
- ffa_vm_id_t receiver_vm_id,
+struct ffa_value api_ffa_msg_send_direct_resp(ffa_id_t sender_vm_id,
+ ffa_id_t receiver_vm_id,
struct ffa_value args,
struct vcpu *current,
struct vcpu **next);
@@ -120,22 +118,22 @@
struct vcpu *api_switch_to_other_world(struct vcpu_locked current_locked,
struct ffa_value other_world_ret,
enum vcpu_state vcpu_state);
-struct ffa_value api_ffa_notification_bitmap_create(ffa_vm_id_t vm_id,
+struct ffa_value api_ffa_notification_bitmap_create(ffa_id_t vm_id,
ffa_vcpu_count_t vcpu_count,
struct vcpu *current);
-struct ffa_value api_ffa_notification_bitmap_destroy(ffa_vm_id_t vm_id,
+struct ffa_value api_ffa_notification_bitmap_destroy(ffa_id_t vm_id,
struct vcpu *current);
struct ffa_value api_ffa_notification_update_bindings(
- ffa_vm_id_t sender_vm_id, ffa_vm_id_t receiver_vm_id, uint32_t flags,
+ ffa_id_t sender_vm_id, ffa_id_t receiver_vm_id, uint32_t flags,
ffa_notifications_bitmap_t notifications, bool is_bind,
struct vcpu *current);
struct ffa_value api_ffa_notification_set(
- ffa_vm_id_t sender_vm_id, ffa_vm_id_t receiver_vm_id, uint32_t flags,
+ ffa_id_t sender_vm_id, ffa_id_t receiver_vm_id, uint32_t flags,
ffa_notifications_bitmap_t notifications, struct vcpu *current);
-struct ffa_value api_ffa_notification_get(ffa_vm_id_t receiver_vm_id,
+struct ffa_value api_ffa_notification_get(ffa_id_t receiver_vm_id,
uint16_t vcpu_id, uint32_t flags,
struct vcpu *current);
@@ -150,6 +148,6 @@
void api_ffa_resume_direct_resp_target(struct vcpu_locked current_locked,
struct vcpu **next,
- ffa_vm_id_t receiver_vm_id,
+ ffa_id_t receiver_vm_id,
struct ffa_value to_ret,
bool is_nwd_call_chain);
diff --git a/inc/hf/arch/ffa.h b/inc/hf/arch/ffa.h
index d36a4be..ca17b99 100644
--- a/inc/hf/arch/ffa.h
+++ b/inc/hf/arch/ffa.h
@@ -14,7 +14,7 @@
struct ffa_value arch_ffa_features(uint32_t function_id);
/** Returns the SPMC ID. */
-ffa_vm_id_t arch_ffa_spmc_id_get(void);
+ffa_id_t arch_ffa_spmc_id_get(void);
/** Called once at boot time to initialize the platform ffa module. */
void arch_ffa_init(void);
diff --git a/inc/hf/arch/mm.h b/inc/hf/arch/mm.h
index 8cc3d7e..e126320 100644
--- a/inc/hf/arch/mm.h
+++ b/inc/hf/arch/mm.h
@@ -172,7 +172,7 @@
/**
* Return the arch specific mm mode for send/recv pages of given VM ID.
*/
-uint32_t arch_mm_extra_attributes_from_vm(ffa_vm_id_t id);
+uint32_t arch_mm_extra_attributes_from_vm(ffa_id_t id);
/**
* Execute any barriers or synchronization that is required
diff --git a/inc/hf/arch/plat/ffa.h b/inc/hf/arch/plat/ffa.h
index 7221dcd..8326e5d 100644
--- a/inc/hf/arch/plat/ffa.h
+++ b/inc/hf/arch/plat/ffa.h
@@ -59,18 +59,18 @@
void plat_ffa_log_init(void);
void plat_ffa_set_tee_enabled(bool tee_enabled);
void plat_ffa_init(struct mpool *ppool);
-bool plat_ffa_is_memory_send_valid(ffa_vm_id_t receiver_vm_id,
+bool plat_ffa_is_memory_send_valid(ffa_id_t receiver_vm_id,
uint32_t share_func);
bool plat_ffa_is_direct_request_valid(struct vcpu *current,
- ffa_vm_id_t sender_vm_id,
- ffa_vm_id_t receiver_vm_id);
+ ffa_id_t sender_vm_id,
+ ffa_id_t receiver_vm_id);
bool plat_ffa_is_direct_response_valid(struct vcpu *current,
- ffa_vm_id_t sender_vm_id,
- ffa_vm_id_t receiver_vm_id);
+ ffa_id_t sender_vm_id,
+ ffa_id_t receiver_vm_id);
bool plat_ffa_is_direct_request_supported(struct vm *sender_vm,
struct vm *receiver_vm);
-bool plat_ffa_direct_request_forward(ffa_vm_id_t receiver_vm_id,
+bool plat_ffa_direct_request_forward(ffa_id_t receiver_vm_id,
struct ffa_value args,
struct ffa_value *ret);
@@ -83,33 +83,30 @@
bool plat_ffa_is_indirect_msg_supported(struct vm_locked sender_locked,
struct vm_locked receiver_locked);
-bool plat_ffa_msg_send2_forward(ffa_vm_id_t receiver_vm_id,
- ffa_vm_id_t sender_vm_id,
+bool plat_ffa_msg_send2_forward(ffa_id_t receiver_vm_id, ffa_id_t sender_vm_id,
struct ffa_value *ret);
bool plat_ffa_is_notifications_create_valid(struct vcpu *current,
- ffa_vm_id_t vm_id);
+ ffa_id_t vm_id);
bool plat_ffa_is_notifications_bind_valid(struct vcpu *current,
- ffa_vm_id_t sender_id,
- ffa_vm_id_t receiver_id);
+ ffa_id_t sender_id,
+ ffa_id_t receiver_id);
bool plat_ffa_notifications_update_bindings_forward(
- ffa_vm_id_t receiver_id, ffa_vm_id_t sender_id, uint32_t flags,
+ ffa_id_t receiver_id, ffa_id_t sender_id, uint32_t flags,
ffa_notifications_bitmap_t bitmap, bool is_bind, struct ffa_value *ret);
bool plat_ffa_is_notification_set_valid(struct vcpu *current,
- ffa_vm_id_t sender_id,
- ffa_vm_id_t receiver_id);
+ ffa_id_t sender_id,
+ ffa_id_t receiver_id);
-bool plat_ffa_notification_set_forward(ffa_vm_id_t sender_vm_id,
- ffa_vm_id_t receiver_vm_id,
- uint32_t flags,
+bool plat_ffa_notification_set_forward(ffa_id_t sender_vm_id,
+ ffa_id_t receiver_vm_id, uint32_t flags,
ffa_notifications_bitmap_t bitmap,
struct ffa_value *ret);
bool plat_ffa_is_notification_get_valid(struct vcpu *current,
- ffa_vm_id_t receiver_id,
- uint32_t flags);
+ ffa_id_t receiver_id, uint32_t flags);
bool plat_ffa_notifications_get_from_sp(struct vm_locked receiver_locked,
ffa_vcpu_index_t vcpu_id,
@@ -155,55 +152,55 @@
* to operate NS-memory. The function below returns the mode to use in the mm.h
* library, depending on the memory ownder's id.
*/
-uint32_t plat_ffa_owner_world_mode(ffa_vm_id_t owner_id);
+uint32_t plat_ffa_owner_world_mode(ffa_id_t owner_id);
/**
* Return the FF-A partition info VM/SP properties given the VM id.
*/
ffa_partition_properties_t plat_ffa_partition_properties(
- ffa_vm_id_t vm_id, const struct vm *target);
+ ffa_id_t vm_id, const struct vm *target);
/**
* Get NWd VM's structure.
*/
-struct vm_locked plat_ffa_vm_find_locked(ffa_vm_id_t vm_id);
+struct vm_locked plat_ffa_vm_find_locked(ffa_id_t vm_id);
-struct vm_locked plat_ffa_vm_find_locked_create(ffa_vm_id_t vm_id);
+struct vm_locked plat_ffa_vm_find_locked_create(ffa_id_t vm_id);
/**
* Creates a bitmap for the VM of the given ID.
*/
struct ffa_value plat_ffa_notifications_bitmap_create(
- ffa_vm_id_t vm_id, ffa_vcpu_count_t vcpu_count);
+ ffa_id_t vm_id, ffa_vcpu_count_t vcpu_count);
/**
* Issues a FFA_NOTIFICATION_BITMAP_CREATE.
* Returns true if the call goes well, and false if call returns with
* FFA_ERROR_32.
*/
-bool plat_ffa_notifications_bitmap_create_call(ffa_vm_id_t vm_id,
+bool plat_ffa_notifications_bitmap_create_call(ffa_id_t vm_id,
ffa_vcpu_count_t vcpu_count);
/**
* Destroys the notifications bitmap for the given VM ID.
*/
-struct ffa_value plat_ffa_notifications_bitmap_destroy(ffa_vm_id_t vm_id);
+struct ffa_value plat_ffa_notifications_bitmap_destroy(ffa_id_t vm_id);
/**
* Helper to get the struct notifications, depending on the sender's id.
*/
struct notifications *plat_ffa_vm_get_notifications_senders_world(
- struct vm_locked vm_locked, ffa_vm_id_t sender_id);
+ struct vm_locked vm_locked, ffa_id_t sender_id);
/**
* Helper to check if FF-A ID is a VM ID.
*/
-bool plat_ffa_is_vm_id(ffa_vm_id_t vm_id);
+bool plat_ffa_is_vm_id(ffa_id_t vm_id);
/**
* Forward normal world calls of FFA_RUN ABI to other world.
*/
-bool plat_ffa_run_forward(ffa_vm_id_t vm_id, ffa_vcpu_index_t vcpu_idx,
+bool plat_ffa_run_forward(ffa_id_t vm_id, ffa_vcpu_index_t vcpu_idx,
struct ffa_value *ret);
bool plat_ffa_notification_info_get_call(struct ffa_value *ret);
@@ -250,7 +247,7 @@
* Check if current SP can resume target VM/SP using FFA_RUN ABI.
*/
bool plat_ffa_run_checks(struct vcpu_locked current_locked,
- ffa_vm_id_t target_vm_id, ffa_vcpu_index_t vcpu_idx,
+ ffa_id_t target_vm_id, ffa_vcpu_index_t vcpu_idx,
struct ffa_value *run_ret, struct vcpu **next);
/**
@@ -290,8 +287,8 @@
* being performed.
*/
bool plat_ffa_check_runtime_state_transition(struct vcpu_locked current_locked,
- ffa_vm_id_t vm_id,
- ffa_vm_id_t receiver_vm_id,
+ ffa_id_t vm_id,
+ ffa_id_t receiver_vm_id,
struct vcpu_locked locked_vcpu,
uint32_t func,
enum vcpu_state *next_state);
@@ -302,7 +299,7 @@
void plat_ffa_wind_call_chain_ffa_direct_req(
struct vcpu_locked current_locked,
- struct vcpu_locked receiver_vcpu_locked, ffa_vm_id_t sender_vm_id);
+ struct vcpu_locked receiver_vcpu_locked, ffa_id_t sender_vm_id);
void plat_ffa_unwind_call_chain_ffa_direct_resp(
struct vcpu_locked current_locked, struct vcpu_locked next_locked);
@@ -352,8 +349,8 @@
* This FF-A v1.0 FFA_MSG_SEND interface.
* Implemented for the Hypervisor, but not in the SPMC.
*/
-struct ffa_value plat_ffa_msg_send(ffa_vm_id_t sender_vm_id,
- ffa_vm_id_t receiver_vm_id, uint32_t size,
+struct ffa_value plat_ffa_msg_send(ffa_id_t sender_vm_id,
+ ffa_id_t receiver_vm_id, uint32_t size,
struct vcpu *current, struct vcpu **next);
struct ffa_value plat_ffa_yield_prepare(struct vcpu_locked current_locked,
@@ -371,7 +368,7 @@
struct ffa_value plat_ffa_error_32(struct vcpu *current, struct vcpu **next,
uint32_t error_code);
-bool plat_ffa_is_spmd_lp_id(ffa_vm_id_t vm_id);
+bool plat_ffa_is_spmd_lp_id(ffa_id_t vm_id);
struct ffa_value plat_ffa_msg_recv(bool block,
struct vcpu_locked current_locked,
@@ -379,5 +376,4 @@
int64_t plat_ffa_mailbox_writable_get(const struct vcpu *current);
-int64_t plat_ffa_mailbox_waiter_get(ffa_vm_id_t vm_id,
- const struct vcpu *current);
+int64_t plat_ffa_mailbox_waiter_get(ffa_id_t vm_id, const struct vcpu *current);
diff --git a/inc/hf/dlog.h b/inc/hf/dlog.h
index 9147549..99b10de 100644
--- a/inc/hf/dlog.h
+++ b/inc/hf/dlog.h
@@ -74,4 +74,4 @@
} \
} while (0)
-void dlog_flush_vm_buffer(ffa_vm_id_t id, char buffer[], size_t length);
+void dlog_flush_vm_buffer(ffa_id_t id, char buffer[], size_t length);
diff --git a/inc/hf/ffa_memory.h b/inc/hf/ffa_memory.h
index a8519a1..8187e6f 100644
--- a/inc/hf/ffa_memory.h
+++ b/inc/hf/ffa_memory.h
@@ -30,7 +30,7 @@
struct ffa_value ffa_memory_retrieve_continue(struct vm_locked to_locked,
ffa_memory_handle_t handle,
uint32_t fragment_offset,
- ffa_vm_id_t sender_vm_id,
+ ffa_id_t sender_vm_id,
struct mpool *page_pool);
struct ffa_value ffa_memory_relinquish(
struct vm_locked from_locked,
diff --git a/inc/hf/ffa_memory_internal.h b/inc/hf/ffa_memory_internal.h
index 27608ed..5f4a522 100644
--- a/inc/hf/ffa_memory_internal.h
+++ b/inc/hf/ffa_memory_internal.h
@@ -172,7 +172,7 @@
uint32_t *orig_from_mode_ret);
struct ffa_value ffa_memory_send_continue_validate(
struct share_states_locked share_states, ffa_memory_handle_t handle,
- struct ffa_memory_share_state **share_state_ret, ffa_vm_id_t from_vm_id,
+ struct ffa_memory_share_state **share_state_ret, ffa_id_t from_vm_id,
struct mpool *page_pool);
struct ffa_value ffa_retrieve_check_transition(
struct vm_locked to, uint32_t share_func,
@@ -180,13 +180,13 @@
uint32_t *fragment_constituent_counts, uint32_t fragment_count,
uint32_t memory_to_attributes, uint32_t *to_mode);
struct ffa_value ffa_retrieve_check_update(
- struct vm_locked to_locked, ffa_vm_id_t from_id,
+ struct vm_locked to_locked, ffa_id_t from_id,
struct ffa_memory_region_constituent **fragments,
uint32_t *fragment_constituent_counts, uint32_t fragment_count,
uint32_t memory_to_attributes, uint32_t share_func, bool clear,
struct mpool *page_pool);
uint32_t ffa_memory_region_get_receiver(struct ffa_memory_region *memory_region,
- ffa_vm_id_t receiver);
+ ffa_id_t receiver);
bool ffa_region_group_identity_map(
struct vm_locked vm_locked,
struct ffa_memory_region_constituent **fragments,
diff --git a/inc/hf/ffa_partition_manifest.h b/inc/hf/ffa_partition_manifest.h
index c360f45..c94dd93 100644
--- a/inc/hf/ffa_partition_manifest.h
+++ b/inc/hf/ffa_partition_manifest.h
@@ -125,9 +125,9 @@
/** UUID - mandatory */
struct ffa_uuid uuid;
/** Partition id - optional */
- ffa_vm_id_t id;
+ ffa_id_t id;
/** Aux ids for mem transactions - optional */
- ffa_vm_id_t aux_id;
+ ffa_id_t aux_id;
/* NOTE: optional name field maps to VM debug_name field */
diff --git a/inc/hf/vcpu.h b/inc/hf/vcpu.h
index 71ab200..e9387f2 100644
--- a/inc/hf/vcpu.h
+++ b/inc/hf/vcpu.h
@@ -133,7 +133,7 @@
* The value HF_INVALID_VM_ID implies the vCPU is not executing as
* a result of a prior FFA_MSG_SEND_DIRECT_REQ invocation.
*/
- ffa_vm_id_t direct_request_origin_vm_id;
+ ffa_id_t direct_request_origin_vm_id;
/** Determine whether partition is currently handling managed exit. */
bool processing_managed_exit;
diff --git a/inc/hf/vm.h b/inc/hf/vm.h
index 7297ea3..8898d39 100644
--- a/inc/hf/vm.h
+++ b/inc/hf/vm.h
@@ -98,7 +98,7 @@
const void *send;
/** The ID of the VM which sent the message currently in `recv`. */
- ffa_vm_id_t recv_sender;
+ ffa_id_t recv_sender;
/** The size of the message currently in `recv`. */
uint32_t recv_size;
@@ -147,7 +147,7 @@
* The index in the bindings array relates to the notification
* ID, and bit position in 'ffa_notifications_bitmap_t'.
*/
- ffa_vm_id_t bindings_sender_id[MAX_FFA_NOTIFICATIONS];
+ ffa_id_t bindings_sender_id[MAX_FFA_NOTIFICATIONS];
ffa_notifications_bitmap_t bindings_per_vcpu;
/* The index of the array below relates to the ID of the VCPU.
@@ -199,7 +199,7 @@
};
struct vm {
- ffa_vm_id_t id;
+ ffa_id_t id;
struct ffa_uuid uuid;
uint32_t ffa_version;
struct smc_whitelist smc_whitelist;
@@ -293,21 +293,21 @@
struct vm_locked vm2;
};
-struct vm *vm_init(ffa_vm_id_t id, ffa_vcpu_count_t vcpu_count,
+struct vm *vm_init(ffa_id_t id, ffa_vcpu_count_t vcpu_count,
struct mpool *ppool, bool el0_partition);
bool vm_init_next(ffa_vcpu_count_t vcpu_count, struct mpool *ppool,
struct vm **new_vm, bool el0_partition);
ffa_vm_count_t vm_get_count(void);
-struct vm *vm_find(ffa_vm_id_t id);
-struct vm_locked vm_find_locked(ffa_vm_id_t id);
+struct vm *vm_find(ffa_id_t id);
+struct vm_locked vm_find_locked(ffa_id_t id);
struct vm *vm_find_index(uint16_t index);
struct vm_locked vm_lock(struct vm *vm);
struct two_vm_locked vm_lock_both(struct vm *vm1, struct vm *vm2);
void vm_unlock(struct vm_locked *locked);
struct vcpu *vm_get_vcpu(struct vm *vm, ffa_vcpu_index_t vcpu_index);
-struct wait_entry *vm_get_wait_entry(struct vm *vm, ffa_vm_id_t for_vm);
-ffa_vm_id_t vm_id_for_wait_entry(struct vm *vm, struct wait_entry *entry);
-bool vm_id_is_current_world(ffa_vm_id_t vm_id);
+struct wait_entry *vm_get_wait_entry(struct vm *vm, ffa_id_t for_vm);
+ffa_id_t vm_id_for_wait_entry(struct vm *vm, struct wait_entry *entry);
+bool vm_id_is_current_world(ffa_id_t vm_id);
bool vm_is_mailbox_busy(struct vm_locked to);
bool vm_is_mailbox_other_world_owned(struct vm_locked to);
bool vm_identity_map(struct vm_locked vm_locked, paddr_t begin, paddr_t end,
@@ -338,14 +338,14 @@
bool is_from_vm, bool is_per_vcpu,
ffa_notifications_bitmap_t notif);
bool vm_notifications_validate_bound_sender(
- struct vm_locked vm_locked, bool is_from_vm, ffa_vm_id_t sender_id,
+ struct vm_locked vm_locked, bool is_from_vm, ffa_id_t sender_id,
ffa_notifications_bitmap_t notifications);
bool vm_notifications_validate_binding(struct vm_locked vm_locked,
- bool is_from_vm, ffa_vm_id_t sender_id,
+ bool is_from_vm, ffa_id_t sender_id,
ffa_notifications_bitmap_t notifications,
bool is_per_vcpu);
void vm_notifications_update_bindings(struct vm_locked vm_locked,
- bool is_from_vm, ffa_vm_id_t sender_id,
+ bool is_from_vm, ffa_id_t sender_id,
ffa_notifications_bitmap_t notifications,
bool is_per_vcpu);
void vm_notifications_partition_set_pending(
diff --git a/inc/vmapi/hf/call.h b/inc/vmapi/hf/call.h
index c391744..98d1b3f 100644
--- a/inc/vmapi/hf/call.h
+++ b/inc/vmapi/hf/call.h
@@ -105,7 +105,7 @@
/**
* Returns the VM's own ID.
*/
-static inline ffa_vm_id_t hf_vm_get_id(void)
+static inline ffa_id_t hf_vm_get_id(void)
{
return ffa_id_get().arg2;
}
@@ -113,7 +113,7 @@
/**
* Runs the given vCPU of the given VM.
*/
-static inline struct ffa_value ffa_run(ffa_vm_id_t vm_id,
+static inline struct ffa_value ffa_run(ffa_id_t vm_id,
ffa_vcpu_index_t vcpu_idx)
{
return ffa_call((struct ffa_value){.func = FFA_RUN_32,
@@ -195,8 +195,8 @@
* - BUSY: the message could not be delivered either because the mailbox
* was full or the target VM is not yet set up.
*/
-static inline struct ffa_value ffa_msg_send(ffa_vm_id_t sender_vm_id,
- ffa_vm_id_t target_vm_id,
+static inline struct ffa_value ffa_msg_send(ffa_id_t sender_vm_id,
+ ffa_id_t target_vm_id,
uint32_t size, uint32_t attributes)
{
return ffa_call((struct ffa_value){
@@ -369,7 +369,7 @@
* Returns -1 on failure or if there are no waiters; the VM id of the next
* waiter otherwise.
*/
-static inline int64_t hf_mailbox_waiter_get(ffa_vm_id_t vm_id)
+static inline int64_t hf_mailbox_waiter_get(ffa_id_t vm_id)
{
return hf_call(HF_MAILBOX_WAITER_GET, vm_id, 0, 0);
}
@@ -418,7 +418,7 @@
* - 1 if it was called by the primary VM and the primary VM now needs to wake
* up or kick the target vCPU.
*/
-static inline int64_t hf_interrupt_inject(ffa_vm_id_t target_vm_id,
+static inline int64_t hf_interrupt_inject(ffa_id_t target_vm_id,
ffa_vcpu_index_t target_vcpu_idx,
uint32_t intid)
{
@@ -470,7 +470,7 @@
}
static inline struct ffa_value ffa_msg_send_direct_req(
- ffa_vm_id_t sender_vm_id, ffa_vm_id_t target_vm_id, uint32_t arg3,
+ ffa_id_t sender_vm_id, ffa_id_t target_vm_id, uint32_t arg3,
uint32_t arg4, uint32_t arg5, uint32_t arg6, uint32_t arg7)
{
return ffa_call((struct ffa_value){
@@ -485,7 +485,7 @@
}
static inline struct ffa_value ffa_msg_send_direct_resp(
- ffa_vm_id_t sender_vm_id, ffa_vm_id_t target_vm_id, uint32_t arg3,
+ ffa_id_t sender_vm_id, ffa_id_t target_vm_id, uint32_t arg3,
uint32_t arg4, uint32_t arg5, uint32_t arg6, uint32_t arg7)
{
return ffa_call((struct ffa_value){
@@ -500,7 +500,7 @@
}
static inline struct ffa_value ffa_notification_bind(
- ffa_vm_id_t sender_vm_id, ffa_vm_id_t receiver_vm_id, uint32_t flags,
+ ffa_id_t sender_vm_id, ffa_id_t receiver_vm_id, uint32_t flags,
ffa_notifications_bitmap_t bitmap)
{
return ffa_call((struct ffa_value){
@@ -513,7 +513,7 @@
}
static inline struct ffa_value ffa_notification_unbind(
- ffa_vm_id_t sender_vm_id, ffa_vm_id_t receiver_vm_id,
+ ffa_id_t sender_vm_id, ffa_id_t receiver_vm_id,
ffa_notifications_bitmap_t bitmap)
{
return ffa_call((struct ffa_value){
@@ -525,7 +525,7 @@
}
static inline struct ffa_value ffa_notification_set(
- ffa_vm_id_t sender_vm_id, ffa_vm_id_t receiver_vm_id, uint32_t flags,
+ ffa_id_t sender_vm_id, ffa_id_t receiver_vm_id, uint32_t flags,
ffa_notifications_bitmap_t bitmap)
{
return ffa_call((struct ffa_value){
@@ -537,7 +537,7 @@
});
}
-static inline struct ffa_value ffa_notification_get(ffa_vm_id_t receiver_vm_id,
+static inline struct ffa_value ffa_notification_get(ffa_id_t receiver_vm_id,
ffa_vcpu_index_t vcpu_id,
uint32_t flags)
{
diff --git a/inc/vmapi/hf/ffa.h b/inc/vmapi/hf/ffa.h
index ca965a3..26e777a 100644
--- a/inc/vmapi/hf/ffa.h
+++ b/inc/vmapi/hf/ffa.h
@@ -163,7 +163,7 @@
#define FFA_PAGE_SIZE ((size_t)4096)
/** The ID of a VM. These are assigned sequentially starting with an offset. */
-typedef uint16_t ffa_vm_id_t;
+typedef uint16_t ffa_id_t;
/**
* Partition message header as specified by table 6.2 from FF-A v1.1 EAC0
@@ -185,7 +185,7 @@
#define FFA_RXTX_ALLOCATOR_SHIFT 16
static inline void ffa_rxtx_header_init(
- ffa_vm_id_t sender, ffa_vm_id_t receiver, uint32_t size,
+ ffa_id_t sender, ffa_id_t receiver, uint32_t size,
struct ffa_partition_rxtx_header *header)
{
header->flags = 0;
@@ -196,16 +196,16 @@
header->size = size;
}
-static inline ffa_vm_id_t ffa_rxtx_header_sender(
+static inline ffa_id_t ffa_rxtx_header_sender(
const struct ffa_partition_rxtx_header *h)
{
- return (ffa_vm_id_t)(h->sender_receiver >> FFA_RXTX_SENDER_SHIFT);
+ return (ffa_id_t)(h->sender_receiver >> FFA_RXTX_SENDER_SHIFT);
}
-static inline ffa_vm_id_t ffa_rxtx_header_receiver(
+static inline ffa_id_t ffa_rxtx_header_receiver(
const struct ffa_partition_rxtx_header *h)
{
- return (ffa_vm_id_t)(h->sender_receiver);
+ return (ffa_id_t)(h->sender_receiver);
}
/* The maximum length possible for a single message. */
@@ -359,7 +359,7 @@
* A count of VMs. This has the same range as the VM IDs but we give it a
* different name to make the different semantics clear.
*/
-typedef ffa_vm_id_t ffa_vm_count_t;
+typedef ffa_id_t ffa_vm_count_t;
/** The index of a vCPU within a particular VM. */
typedef uint16_t ffa_vcpu_index_t;
@@ -406,12 +406,12 @@
return (int32_t)val.arg2;
}
-static inline ffa_vm_id_t ffa_sender(struct ffa_value args)
+static inline ffa_id_t ffa_sender(struct ffa_value args)
{
return (args.arg1 >> 16) & 0xffff;
}
-static inline ffa_vm_id_t ffa_receiver(struct ffa_value args)
+static inline ffa_id_t ffa_receiver(struct ffa_value args)
{
return args.arg1 & 0xffff;
}
@@ -476,7 +476,7 @@
.arg3 = (uint32_t)(handle >> 32)};
}
-static inline ffa_vm_id_t ffa_vm_id(struct ffa_value args)
+static inline ffa_id_t ffa_vm_id(struct ffa_value args)
{
return (args.arg1 >> 16) & 0xffff;
}
@@ -486,13 +486,12 @@
return args.arg1 & 0xffff;
}
-static inline uint64_t ffa_vm_vcpu(ffa_vm_id_t vm_id,
- ffa_vcpu_index_t vcpu_index)
+static inline uint64_t ffa_vm_vcpu(ffa_id_t vm_id, ffa_vcpu_index_t vcpu_index)
{
return ((uint32_t)vm_id << 16) | vcpu_index;
}
-static inline ffa_vm_id_t ffa_frag_sender(struct ffa_value args)
+static inline ffa_id_t ffa_frag_sender(struct ffa_value args)
{
return (args.arg4 >> 16) & 0xffff;
}
@@ -573,7 +572,7 @@
* in FF-A 1.1 EAC0 specification.
*/
struct ffa_partition_info {
- ffa_vm_id_t vm_id;
+ ffa_id_t vm_id;
ffa_vcpu_count_t vcpu_count;
ffa_partition_properties_t properties;
struct ffa_uuid uuid;
@@ -841,7 +840,7 @@
*/
struct ffa_memory_region_attributes {
/** The ID of the VM to which the memory is being given or shared. */
- ffa_vm_id_t receiver;
+ ffa_id_t receiver;
/**
* The permissions with which the memory region should be mapped in the
* receiver's page table.
@@ -917,7 +916,7 @@
* The ID of the VM which originally sent the memory region, i.e. the
* owner.
*/
- ffa_vm_id_t sender;
+ ffa_id_t sender;
ffa_memory_attributes_t attributes;
/** Flags to control behaviour of the transaction. */
ffa_memory_region_flags_t flags;
@@ -959,7 +958,7 @@
ffa_memory_handle_t handle;
ffa_memory_region_flags_t flags;
uint32_t endpoint_count;
- ffa_vm_id_t endpoints[];
+ ffa_id_t endpoints[];
};
/**
@@ -984,13 +983,13 @@
static inline uint32_t ffa_mem_relinquish_init(
struct ffa_mem_relinquish *relinquish_request,
ffa_memory_handle_t handle, ffa_memory_region_flags_t flags,
- ffa_vm_id_t sender)
+ ffa_id_t sender)
{
relinquish_request->handle = handle;
relinquish_request->flags = flags;
relinquish_request->endpoint_count = 1;
relinquish_request->endpoints[0] = sender;
- return sizeof(struct ffa_mem_relinquish) + sizeof(ffa_vm_id_t);
+ return sizeof(struct ffa_mem_relinquish) + sizeof(ffa_id_t);
}
void ffa_copy_memory_region_constituents(
@@ -1003,7 +1002,7 @@
* to the SPMC, in order to allow indirect messaging.
*/
struct ffa_endpoint_rx_tx_descriptor {
- ffa_vm_id_t endpoint_id;
+ ffa_id_t endpoint_id;
uint16_t reserved;
/*
@@ -1037,19 +1036,19 @@
}
void ffa_memory_region_init_header(struct ffa_memory_region *memory_region,
- ffa_vm_id_t sender,
+ ffa_id_t sender,
ffa_memory_attributes_t attributes,
ffa_memory_region_flags_t flags,
ffa_memory_handle_t handle, uint32_t tag,
uint32_t receiver_count);
void ffa_memory_access_init_permissions(
- struct ffa_memory_access *receiver, ffa_vm_id_t receiver_id,
+ struct ffa_memory_access *receiver, ffa_id_t receiver_id,
enum ffa_data_access data_access,
enum ffa_instruction_access instruction_access,
ffa_memory_receiver_flags_t flags);
uint32_t ffa_memory_region_init_single_receiver(
struct ffa_memory_region *memory_region, size_t memory_region_max_size,
- ffa_vm_id_t sender, ffa_vm_id_t receiver,
+ ffa_id_t sender, ffa_id_t receiver,
const struct ffa_memory_region_constituent constituents[],
uint32_t constituent_count, uint32_t tag,
ffa_memory_region_flags_t flags, enum ffa_data_access data_access,
@@ -1059,7 +1058,7 @@
uint32_t *total_length);
uint32_t ffa_memory_region_init(
struct ffa_memory_region *memory_region, size_t memory_region_max_size,
- ffa_vm_id_t sender, struct ffa_memory_access receivers[],
+ ffa_id_t sender, struct ffa_memory_access receivers[],
uint32_t receiver_count,
const struct ffa_memory_region_constituent constituents[],
uint32_t constituent_count, uint32_t tag,
@@ -1069,25 +1068,25 @@
uint32_t *total_length);
uint32_t ffa_memory_retrieve_request_init(
struct ffa_memory_region *memory_region, ffa_memory_handle_t handle,
- ffa_vm_id_t sender, struct ffa_memory_access receivers[],
+ 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);
uint32_t ffa_memory_retrieve_request_init_single_receiver(
struct ffa_memory_region *memory_region, ffa_memory_handle_t handle,
- ffa_vm_id_t sender, ffa_vm_id_t receiver, uint32_t tag,
+ 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);
uint32_t ffa_memory_lender_retrieve_request_init(
struct ffa_memory_region *memory_region, ffa_memory_handle_t handle,
- ffa_vm_id_t sender);
+ ffa_id_t sender);
uint32_t ffa_memory_fragment_init(
struct ffa_memory_region_constituent *fragment,
size_t fragment_max_size,
const struct ffa_memory_region_constituent constituents[],
uint32_t constituent_count, uint32_t *fragment_length);
void ffa_endpoint_rx_tx_descriptor_init(
- struct ffa_endpoint_rx_tx_descriptor *desc, ffa_vm_id_t endpoint_id,
+ struct ffa_endpoint_rx_tx_descriptor *desc, ffa_id_t endpoint_id,
uint64_t rx_address, uint64_t tx_address);
diff --git a/inc/vmapi/hf/ffa_v1_0.h b/inc/vmapi/hf/ffa_v1_0.h
index 22824e4..980473f 100644
--- a/inc/vmapi/hf/ffa_v1_0.h
+++ b/inc/vmapi/hf/ffa_v1_0.h
@@ -25,7 +25,7 @@
* in DEN0077A FF-A 1.0 REL specification.
*/
struct ffa_partition_info_v1_0 {
- ffa_vm_id_t vm_id;
+ ffa_id_t vm_id;
ffa_vcpu_count_t vcpu_count;
ffa_partition_properties_t properties;
};
@@ -41,7 +41,7 @@
* The ID of the VM which originally sent the memory region, i.e. the
* owner.
*/
- ffa_vm_id_t sender;
+ ffa_id_t sender;
uint8_t attributes;
/** Reserved field, must be 0. */
uint8_t reserved_0;
@@ -89,13 +89,13 @@
}
void ffa_memory_region_init_header_v1_0(
- struct ffa_memory_region_v1_0 *memory_region, ffa_vm_id_t sender,
+ struct ffa_memory_region_v1_0 *memory_region, ffa_id_t sender,
ffa_memory_attributes_t attributes, ffa_memory_region_flags_t flags,
ffa_memory_handle_t handle, uint32_t tag, uint32_t receiver_count);
uint32_t ffa_memory_region_init_v1_0(
struct ffa_memory_region_v1_0 *memory_region,
- size_t memory_region_max_size, ffa_vm_id_t sender,
+ size_t memory_region_max_size, ffa_id_t sender,
struct ffa_memory_access receivers[], uint32_t receiver_count,
const struct ffa_memory_region_constituent constituents[],
uint32_t constituent_count, uint32_t tag,
@@ -106,7 +106,7 @@
uint32_t ffa_memory_retrieve_request_init_v1_0(
struct ffa_memory_region_v1_0 *memory_region,
- ffa_memory_handle_t handle, ffa_vm_id_t sender,
+ 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,
diff --git a/src/api.c b/src/api.c
index 9494ffe..d511e8d 100644
--- a/src/api.c
+++ b/src/api.c
@@ -122,7 +122,7 @@
*/
struct vcpu *api_switch_to_vm(struct vcpu_locked current_locked,
struct ffa_value to_ret,
- enum vcpu_state vcpu_state, ffa_vm_id_t to_id)
+ enum vcpu_state vcpu_state, ffa_id_t to_id)
{
struct vm *to_vm = vm_find(to_id);
struct vcpu *next = api_ffa_get_vm_vcpu(to_vm, current_locked.vcpu);
@@ -498,7 +498,7 @@
static void api_ffa_fill_partitions_info_array(
struct ffa_partition_info *partitions, size_t partitions_len,
- const struct ffa_uuid *uuid, bool count_flag, ffa_vm_id_t vm_id,
+ const struct ffa_uuid *uuid, bool count_flag, ffa_id_t vm_id,
ffa_vm_count_t *vm_count_out)
{
ffa_vm_count_t vm_count = 0;
@@ -541,7 +541,7 @@
}
static inline void api_ffa_pack_vmid_count_props(
- uint64_t *xn, ffa_vm_id_t vm_id, ffa_vcpu_count_t vcpu_count,
+ uint64_t *xn, ffa_id_t vm_id, ffa_vcpu_count_t vcpu_count,
ffa_partition_properties_t properties)
{
*xn = (uint64_t)vm_id;
@@ -1033,7 +1033,7 @@
*/
static bool api_release_mailbox(struct vm_locked vm_locked, int32_t *error_code)
{
- ffa_vm_id_t vm_id = vm_locked.vm->id;
+ ffa_id_t vm_id = vm_locked.vm->id;
int32_t error_code_to_ret = 0;
switch (vm_locked.vm->mailbox.state) {
@@ -1354,7 +1354,7 @@
return ret;
}
-struct ffa_value api_ffa_run(ffa_vm_id_t vm_id, ffa_vcpu_index_t vcpu_idx,
+struct ffa_value api_ffa_run(ffa_id_t vm_id, ffa_vcpu_index_t vcpu_idx,
struct vcpu *current, struct vcpu **next)
{
struct vm *vm;
@@ -1681,7 +1681,7 @@
static void api_get_rxtx_description(struct vm *current_vm, ipaddr_t *send,
ipaddr_t *recv, uint32_t *page_count,
- ffa_vm_id_t *owner_vm_id)
+ ffa_id_t *owner_vm_id)
{
/*
* If the message has been forwarded the effective addresses are in
@@ -1734,7 +1734,7 @@
struct vm_locked owner_vm_locked;
struct mm_stage1_locked mm_stage1_locked;
struct mpool local_page_pool;
- ffa_vm_id_t owner_vm_id;
+ ffa_id_t owner_vm_id;
/*
* Get the original buffer addresses and VM ID in case of forwarded
@@ -1790,12 +1790,11 @@
* behalf of the caller.
* - FFA_SUCCESS on success if no further action is needed.
*/
-struct ffa_value api_ffa_rxtx_unmap(ffa_vm_id_t allocator_id,
- struct vcpu *current)
+struct ffa_value api_ffa_rxtx_unmap(ffa_id_t allocator_id, struct vcpu *current)
{
struct vm *vm = current->vm;
struct vm_locked vm_locked;
- ffa_vm_id_t owner_vm_id;
+ ffa_id_t owner_vm_id;
struct mm_stage1_locked mm_stage1_locked;
paddr_t send_pa_begin;
paddr_t send_pa_end;
@@ -1886,19 +1885,19 @@
* Copies data from the sender's send buffer to the recipient's receive buffer
* and notifies the receiver.
*/
-struct ffa_value api_ffa_msg_send2(ffa_vm_id_t sender_vm_id, uint32_t flags,
+struct ffa_value api_ffa_msg_send2(ffa_id_t sender_vm_id, uint32_t flags,
struct vcpu *current)
{
struct vm *from = current->vm;
struct vm *to;
struct vm_locked to_locked;
- ffa_vm_id_t msg_sender_id;
+ ffa_id_t msg_sender_id;
struct vm_locked sender_locked;
const void *from_msg;
struct ffa_value ret;
struct ffa_partition_rxtx_header header;
- ffa_vm_id_t sender_id;
- ffa_vm_id_t receiver_id;
+ ffa_id_t sender_id;
+ ffa_id_t receiver_id;
uint32_t msg_size;
ffa_notifications_bitmap_t rx_buffer_full;
@@ -2060,14 +2059,13 @@
* needs to wake up or kick waiters. Waiters should be retrieved by calling
* hf_mailbox_waiter_get.
*/
-struct ffa_value api_ffa_rx_release(ffa_vm_id_t receiver_id,
- struct vcpu *current)
+struct ffa_value api_ffa_rx_release(ffa_id_t receiver_id, struct vcpu *current)
{
struct vm *current_vm = current->vm;
struct vm *vm;
struct vm_locked vm_locked;
- ffa_vm_id_t current_vm_id = current_vm->id;
- ffa_vm_id_t release_vm_id;
+ ffa_id_t current_vm_id = current_vm->id;
+ ffa_id_t release_vm_id;
struct ffa_value ret;
int32_t error_code;
@@ -2125,8 +2123,7 @@
* - FFA_INVALID_PARAMETERS: there is no buffer pair registered for the VM.
* - FFA_NOT_SUPPORTED: function not implemented at the FF-A instance.
*/
-struct ffa_value api_ffa_rx_acquire(ffa_vm_id_t receiver_id,
- struct vcpu *current)
+struct ffa_value api_ffa_rx_acquire(ffa_id_t receiver_id, struct vcpu *current)
{
struct vm_locked receiver_locked;
struct vm *receiver;
@@ -2291,7 +2288,7 @@
* - 1 if it was called by the primary VM and the primary VM now needs to wake
* up or kick the target vCPU.
*/
-int64_t api_interrupt_inject(ffa_vm_id_t target_vm_id,
+int64_t api_interrupt_inject(ffa_id_t target_vm_id,
ffa_vcpu_index_t target_vcpu_idx, uint32_t intid,
struct vcpu *current, struct vcpu **next)
{
@@ -2548,8 +2545,8 @@
/**
* Send an FF-A direct message request.
*/
-struct ffa_value api_ffa_msg_send_direct_req(ffa_vm_id_t sender_vm_id,
- ffa_vm_id_t receiver_vm_id,
+struct ffa_value api_ffa_msg_send_direct_req(ffa_id_t sender_vm_id,
+ ffa_id_t receiver_vm_id,
struct ffa_value args,
struct vcpu *current,
struct vcpu **next)
@@ -2728,7 +2725,7 @@
*/
void api_ffa_resume_direct_resp_target(struct vcpu_locked current_locked,
struct vcpu **next,
- ffa_vm_id_t receiver_vm_id,
+ ffa_id_t receiver_vm_id,
struct ffa_value to_ret,
bool is_nwd_call_chain)
{
@@ -2759,8 +2756,8 @@
/**
* Send an FF-A direct message response.
*/
-struct ffa_value api_ffa_msg_send_direct_resp(ffa_vm_id_t sender_vm_id,
- ffa_vm_id_t receiver_vm_id,
+struct ffa_value api_ffa_msg_send_direct_resp(ffa_id_t sender_vm_id,
+ ffa_id_t receiver_vm_id,
struct ffa_value args,
struct vcpu *current,
struct vcpu **next)
@@ -3226,9 +3223,8 @@
* forwarding if needed.
*/
for (uint32_t i = 0U; i < memory_region->receiver_count; i++) {
- ffa_vm_id_t receiver_id =
- memory_region->receivers[i]
- .receiver_permissions.receiver;
+ ffa_id_t receiver_id = memory_region->receivers[i]
+ .receiver_permissions.receiver;
to = vm_find(receiver_id);
if (vm_id_is_current_world(receiver_id) &&
@@ -3483,7 +3479,7 @@
*/
length = sizeof(struct ffa_mem_relinquish) +
((struct ffa_mem_relinquish *)from_msg)->endpoint_count *
- sizeof(ffa_vm_id_t);
+ sizeof(ffa_id_t);
/*
* Copy the relinquish descriptor to an internal buffer, so that the
* caller can't change it underneath us.
@@ -3499,7 +3495,7 @@
memcpy_s(relinquish_request, message_buffer_size, from_msg, length);
if (sizeof(struct ffa_mem_relinquish) +
- relinquish_request->endpoint_count * sizeof(ffa_vm_id_t) !=
+ relinquish_request->endpoint_count * sizeof(ffa_id_t) !=
length) {
dlog_verbose(
"Endpoint count changed while copying to internal "
@@ -3540,7 +3536,7 @@
struct ffa_value api_ffa_mem_frag_rx(ffa_memory_handle_t handle,
uint32_t fragment_offset,
- ffa_vm_id_t sender_vm_id,
+ ffa_id_t sender_vm_id,
struct vcpu *current)
{
struct vm *to = current->vm;
@@ -3577,7 +3573,7 @@
struct ffa_value api_ffa_mem_frag_tx(ffa_memory_handle_t handle,
uint32_t fragment_length,
- ffa_vm_id_t sender_vm_id,
+ ffa_id_t sender_vm_id,
struct vcpu *current)
{
struct vm *from = current->vm;
@@ -3708,7 +3704,7 @@
return (struct ffa_value){.func = FFA_SUCCESS_32};
}
-struct ffa_value api_ffa_notification_bitmap_create(ffa_vm_id_t vm_id,
+struct ffa_value api_ffa_notification_bitmap_create(ffa_id_t vm_id,
ffa_vcpu_count_t vcpu_count,
struct vcpu *current)
{
@@ -3721,7 +3717,7 @@
return plat_ffa_notifications_bitmap_create(vm_id, vcpu_count);
}
-struct ffa_value api_ffa_notification_bitmap_destroy(ffa_vm_id_t vm_id,
+struct ffa_value api_ffa_notification_bitmap_destroy(ffa_id_t vm_id,
struct vcpu *current)
{
/*
@@ -3737,16 +3733,15 @@
}
struct ffa_value api_ffa_notification_update_bindings(
- ffa_vm_id_t sender_vm_id, ffa_vm_id_t receiver_vm_id, uint32_t flags,
+ ffa_id_t sender_vm_id, ffa_id_t receiver_vm_id, uint32_t flags,
ffa_notifications_bitmap_t notifications, bool is_bind,
struct vcpu *current)
{
struct ffa_value ret = {.func = FFA_SUCCESS_32};
struct vm_locked receiver_locked;
const bool is_per_vcpu = (flags & FFA_NOTIFICATION_FLAG_PER_VCPU) != 0U;
- const ffa_vm_id_t id_to_update =
- is_bind ? sender_vm_id : HF_INVALID_VM_ID;
- const ffa_vm_id_t id_to_validate =
+ const ffa_id_t id_to_update = is_bind ? sender_vm_id : HF_INVALID_VM_ID;
+ const ffa_id_t id_to_validate =
is_bind ? HF_INVALID_VM_ID : sender_vm_id;
const uint32_t flags_mbz =
is_bind ? ~FFA_NOTIFICATIONS_FLAG_PER_VCPU : ~0U;
@@ -3831,7 +3826,7 @@
}
struct ffa_value api_ffa_notification_set(
- ffa_vm_id_t sender_vm_id, ffa_vm_id_t receiver_vm_id, uint32_t flags,
+ ffa_id_t sender_vm_id, ffa_id_t receiver_vm_id, uint32_t flags,
ffa_notifications_bitmap_t notifications, struct vcpu *current)
{
struct ffa_value ret;
@@ -3933,7 +3928,7 @@
};
}
-struct ffa_value api_ffa_notification_get(ffa_vm_id_t receiver_vm_id,
+struct ffa_value api_ffa_notification_get(ffa_id_t receiver_vm_id,
ffa_vcpu_index_t vcpu_id,
uint32_t flags, struct vcpu *current)
{
diff --git a/src/arch/aarch64/hftest/el0/mm.c b/src/arch/aarch64/hftest/el0/mm.c
index 6b4df50..c0c1fcc 100644
--- a/src/arch/aarch64/hftest/el0/mm.c
+++ b/src/arch/aarch64/hftest/el0/mm.c
@@ -26,7 +26,7 @@
{
}
-uint32_t arch_mm_extra_attributes_from_vm(ffa_vm_id_t id)
+uint32_t arch_mm_extra_attributes_from_vm(ffa_id_t id)
{
(void)id;
return 0;
diff --git a/src/arch/aarch64/hypervisor/cpu.c b/src/arch/aarch64/hypervisor/cpu.c
index d494a25..08b9cc4 100644
--- a/src/arch/aarch64/hypervisor/cpu.c
+++ b/src/arch/aarch64/hypervisor/cpu.c
@@ -78,7 +78,7 @@
void arch_regs_reset(struct vcpu *vcpu)
{
- ffa_vm_id_t vm_id = vcpu->vm->id;
+ ffa_id_t vm_id = vcpu->vm->id;
bool is_primary = vm_id == HF_PRIMARY_VM_ID;
cpu_id_t vcpu_id = is_primary ? vcpu->cpu->id : vcpu_index(vcpu);
diff --git a/src/arch/aarch64/hypervisor/debug_el1.c b/src/arch/aarch64/hypervisor/debug_el1.c
index 516704e..484c544 100644
--- a/src/arch/aarch64/hypervisor/debug_el1.c
+++ b/src/arch/aarch64/hypervisor/debug_el1.c
@@ -133,8 +133,7 @@
* Processes an access (msr, mrs) to an EL1 debug register.
* Returns true if the access was allowed and performed, false otherwise.
*/
-bool debug_el1_process_access(struct vcpu *vcpu, ffa_vm_id_t vm_id,
- uintreg_t esr)
+bool debug_el1_process_access(struct vcpu *vcpu, ffa_id_t vm_id, uintreg_t esr)
{
/*
* For now, debug registers are not supported by secondary VMs.
diff --git a/src/arch/aarch64/hypervisor/debug_el1.h b/src/arch/aarch64/hypervisor/debug_el1.h
index 6ba154b..ce0c3ae 100644
--- a/src/arch/aarch64/hypervisor/debug_el1.h
+++ b/src/arch/aarch64/hypervisor/debug_el1.h
@@ -16,5 +16,5 @@
bool debug_el1_is_register_access(uintreg_t esr_el2);
-bool debug_el1_process_access(struct vcpu *vcpu, ffa_vm_id_t vm_id,
+bool debug_el1_process_access(struct vcpu *vcpu, ffa_id_t vm_id,
uintreg_t esr_el2);
diff --git a/src/arch/aarch64/hypervisor/ffa.c b/src/arch/aarch64/hypervisor/ffa.c
index b74cabb..07187e1 100644
--- a/src/arch/aarch64/hypervisor/ffa.c
+++ b/src/arch/aarch64/hypervisor/ffa.c
@@ -15,7 +15,7 @@
#include "smc.h"
-static ffa_vm_id_t spmc_id = HF_INVALID_VM_ID;
+static ffa_id_t spmc_id = HF_INVALID_VM_ID;
/**
* Returns information for features with arch specific implementation.
@@ -28,7 +28,7 @@
/**
* Returns the SPMC ID returned from the SPMD.
*/
-ffa_vm_id_t arch_ffa_spmc_id_get(void)
+ffa_id_t arch_ffa_spmc_id_get(void)
{
return spmc_id;
}
diff --git a/src/arch/aarch64/hypervisor/handler.c b/src/arch/aarch64/hypervisor/handler.c
index 31ccc83..19b0f05 100644
--- a/src/arch/aarch64/hypervisor/handler.c
+++ b/src/arch/aarch64/hypervisor/handler.c
@@ -333,9 +333,9 @@
*/
static bool spmd_handler(struct ffa_value *args, struct vcpu *current)
{
- ffa_vm_id_t sender = ffa_sender(*args);
- ffa_vm_id_t receiver = ffa_receiver(*args);
- ffa_vm_id_t current_vm_id = current->vm->id;
+ ffa_id_t sender = ffa_sender(*args);
+ ffa_id_t receiver = ffa_receiver(*args);
+ ffa_id_t current_vm_id = current->vm->id;
uint32_t fwk_msg = ffa_fwk_msg(*args);
uint8_t fwk_msg_func_id = fwk_msg & SPMD_FWK_MSG_FUNC_MASK;
@@ -665,12 +665,12 @@
return true;
case FFA_NOTIFICATION_BITMAP_CREATE_32:
*args = api_ffa_notification_bitmap_create(
- (ffa_vm_id_t)args->arg1, (ffa_vcpu_count_t)args->arg2,
+ (ffa_id_t)args->arg1, (ffa_vcpu_count_t)args->arg2,
current);
return true;
case FFA_NOTIFICATION_BITMAP_DESTROY_32:
*args = api_ffa_notification_bitmap_destroy(
- (ffa_vm_id_t)args->arg1, current);
+ (ffa_id_t)args->arg1, current);
return true;
case FFA_NOTIFICATION_BIND_32:
*args = api_ffa_notification_update_bindings(
@@ -1390,7 +1390,7 @@
void handle_system_register_access(uintreg_t esr_el2)
{
struct vcpu *vcpu = current();
- ffa_vm_id_t vm_id = vcpu->vm->id;
+ ffa_id_t vm_id = vcpu->vm->id;
uintreg_t ec = GET_ESR_EC(esr_el2);
CHECK(ec == EC_MSR);
diff --git a/src/arch/aarch64/hypervisor/perfmon.c b/src/arch/aarch64/hypervisor/perfmon.c
index f13b035..d4ac184 100644
--- a/src/arch/aarch64/hypervisor/perfmon.c
+++ b/src/arch/aarch64/hypervisor/perfmon.c
@@ -149,7 +149,7 @@
* Processes an access (msr, mrs) to a performance monitor register.
* Returns true if the access was allowed and performed, false otherwise.
*/
-bool perfmon_process_access(struct vcpu *vcpu, ffa_vm_id_t vm_id, uintreg_t esr)
+bool perfmon_process_access(struct vcpu *vcpu, ffa_id_t vm_id, uintreg_t esr)
{
/*
* For now, performance monitor registers are not supported by secondary
@@ -223,7 +223,7 @@
/**
* Returns the value register PMCCFILTR_EL0 should have at initialization.
*/
-uintreg_t perfmon_get_pmccfiltr_el0_init_value(ffa_vm_id_t vm_id)
+uintreg_t perfmon_get_pmccfiltr_el0_init_value(ffa_id_t vm_id)
{
if (vm_id != HF_PRIMARY_VM_ID) {
/* Disable cycle counting for secondary VMs. */
diff --git a/src/arch/aarch64/hypervisor/perfmon.h b/src/arch/aarch64/hypervisor/perfmon.h
index 81669ba..c4934c6 100644
--- a/src/arch/aarch64/hypervisor/perfmon.h
+++ b/src/arch/aarch64/hypervisor/perfmon.h
@@ -66,7 +66,7 @@
bool perfmon_is_register_access(uintreg_t esr_el2);
-bool perfmon_process_access(struct vcpu *vcpu, ffa_vm_id_t vm_id,
+bool perfmon_process_access(struct vcpu *vcpu, ffa_id_t vm_id,
uintreg_t esr_el2);
-uintreg_t perfmon_get_pmccfiltr_el0_init_value(ffa_vm_id_t vm_id);
+uintreg_t perfmon_get_pmccfiltr_el0_init_value(ffa_id_t vm_id);
diff --git a/src/arch/aarch64/mm.c b/src/arch/aarch64/mm.c
index 2f37fe1..d12dc12 100644
--- a/src/arch/aarch64/mm.c
+++ b/src/arch/aarch64/mm.c
@@ -984,7 +984,7 @@
/**
* Return the arch specific mm mode for send/recv pages of given VM ID.
*/
-uint32_t arch_mm_extra_attributes_from_vm(ffa_vm_id_t id)
+uint32_t arch_mm_extra_attributes_from_vm(ffa_id_t id)
{
return ((id & HF_VM_ID_WORLD_MASK) == HF_HYPERVISOR_VM_ID) ? MM_MODE_NS
: 0;
diff --git a/src/arch/aarch64/plat/ffa/absent.c b/src/arch/aarch64/plat/ffa/absent.c
index dfae5cb..140b39d 100644
--- a/src/arch/aarch64/plat/ffa/absent.c
+++ b/src/arch/aarch64/plat/ffa/absent.c
@@ -25,7 +25,7 @@
}
ffa_partition_properties_t plat_ffa_partition_properties(
- ffa_vm_id_t vm_id, const struct vm *target)
+ ffa_id_t vm_id, const struct vm *target)
{
(void)vm_id;
(void)target;
@@ -49,8 +49,7 @@
/**
* Check validity of the FF-A memory send function attempt.
*/
-bool plat_ffa_is_memory_send_valid(ffa_vm_id_t receiver_vm_id,
- uint32_t share_func)
+bool plat_ffa_is_memory_send_valid(ffa_id_t receiver_vm_id, uint32_t share_func)
{
(void)receiver_vm_id;
(void)share_func;
@@ -62,8 +61,8 @@
* Check validity of a FF-A direct message request.
*/
bool plat_ffa_is_direct_request_valid(struct vcpu *current,
- ffa_vm_id_t sender_vm_id,
- ffa_vm_id_t receiver_vm_id)
+ ffa_id_t sender_vm_id,
+ ffa_id_t receiver_vm_id)
{
(void)current;
(void)sender_vm_id;
@@ -85,8 +84,8 @@
* Check validity of a FF-A direct message response.
*/
bool plat_ffa_is_direct_response_valid(struct vcpu *current,
- ffa_vm_id_t sender_vm_id,
- ffa_vm_id_t receiver_vm_id)
+ ffa_id_t sender_vm_id,
+ ffa_id_t receiver_vm_id)
{
(void)current;
(void)sender_vm_id;
@@ -96,7 +95,7 @@
}
bool plat_ffa_is_notifications_create_valid(struct vcpu *current,
- ffa_vm_id_t vm_id)
+ ffa_id_t vm_id)
{
(void)current;
(void)vm_id;
@@ -119,7 +118,7 @@
(void)vm_locked;
}
-bool plat_ffa_direct_request_forward(ffa_vm_id_t receiver_vm_id,
+bool plat_ffa_direct_request_forward(ffa_id_t receiver_vm_id,
struct ffa_value args,
struct ffa_value *ret)
{
@@ -157,8 +156,8 @@
return false;
}
-bool plat_ffa_msg_send2_forward(ffa_vm_id_t receiver_vm_id,
- ffa_vm_id_t sender_vm_id, struct ffa_value *ret)
+bool plat_ffa_msg_send2_forward(ffa_id_t receiver_vm_id, ffa_id_t sender_vm_id,
+ struct ffa_value *ret)
{
(void)receiver_vm_id;
(void)sender_vm_id;
@@ -185,15 +184,15 @@
return 0U;
}
-uint32_t plat_ffa_owner_world_mode(ffa_vm_id_t owner_id)
+uint32_t plat_ffa_owner_world_mode(ffa_id_t owner_id)
{
(void)owner_id;
return 0U;
}
bool plat_ffa_is_notifications_bind_valid(struct vcpu *current,
- ffa_vm_id_t sender_id,
- ffa_vm_id_t receiver_id)
+ ffa_id_t sender_id,
+ ffa_id_t receiver_id)
{
(void)current;
(void)sender_id;
@@ -202,7 +201,7 @@
}
bool plat_ffa_notifications_update_bindings_forward(
- ffa_vm_id_t receiver_id, ffa_vm_id_t sender_id, uint32_t flags,
+ ffa_id_t receiver_id, ffa_id_t sender_id, uint32_t flags,
ffa_notifications_bitmap_t bitmap, bool is_bind, struct ffa_value *ret)
{
(void)ret;
@@ -217,8 +216,8 @@
}
bool plat_ffa_is_notification_set_valid(struct vcpu *current,
- ffa_vm_id_t sender_id,
- ffa_vm_id_t receiver_id)
+ ffa_id_t sender_id,
+ ffa_id_t receiver_id)
{
(void)current;
(void)sender_id;
@@ -227,7 +226,7 @@
}
bool plat_ffa_is_notification_get_valid(struct vcpu *current,
- ffa_vm_id_t receiver_id, uint32_t flags)
+ ffa_id_t receiver_id, uint32_t flags)
{
(void)flags;
(void)current;
@@ -260,9 +259,8 @@
return false;
}
-bool plat_ffa_notification_set_forward(ffa_vm_id_t sender_vm_id,
- ffa_vm_id_t receiver_vm_id,
- uint32_t flags,
+bool plat_ffa_notification_set_forward(ffa_id_t sender_vm_id,
+ ffa_id_t receiver_vm_id, uint32_t flags,
ffa_notifications_bitmap_t bitmap,
struct ffa_value *ret)
{
@@ -276,7 +274,7 @@
}
struct ffa_value plat_ffa_notifications_bitmap_create(
- ffa_vm_id_t vm_id, ffa_vcpu_count_t vcpu_count)
+ ffa_id_t vm_id, ffa_vcpu_count_t vcpu_count)
{
(void)vm_id;
(void)vcpu_count;
@@ -284,7 +282,7 @@
return ffa_error(FFA_NOT_SUPPORTED);
}
-bool plat_ffa_notifications_bitmap_create_call(ffa_vm_id_t vm_id,
+bool plat_ffa_notifications_bitmap_create_call(ffa_id_t vm_id,
ffa_vcpu_count_t vcpu_count)
{
(void)vm_id;
@@ -293,32 +291,32 @@
return false;
}
-struct ffa_value plat_ffa_notifications_bitmap_destroy(ffa_vm_id_t vm_id)
+struct ffa_value plat_ffa_notifications_bitmap_destroy(ffa_id_t vm_id)
{
(void)vm_id;
return ffa_error(FFA_NOT_SUPPORTED);
}
-struct vm_locked plat_ffa_vm_find_locked(ffa_vm_id_t vm_id)
+struct vm_locked plat_ffa_vm_find_locked(ffa_id_t vm_id)
{
(void)vm_id;
return (struct vm_locked){.vm = NULL};
}
-struct vm_locked plat_ffa_vm_find_locked_create(ffa_vm_id_t vm_id)
+struct vm_locked plat_ffa_vm_find_locked_create(ffa_id_t vm_id)
{
(void)vm_id;
return (struct vm_locked){.vm = NULL};
}
-bool plat_ffa_is_vm_id(ffa_vm_id_t vm_id)
+bool plat_ffa_is_vm_id(ffa_id_t vm_id)
{
(void)vm_id;
return false;
}
-bool plat_ffa_run_forward(ffa_vm_id_t vm_id, ffa_vcpu_index_t vcpu_idx,
+bool plat_ffa_run_forward(ffa_id_t vm_id, ffa_vcpu_index_t vcpu_idx,
struct ffa_value *ret)
{
(void)vm_id;
@@ -359,7 +357,7 @@
* Check if current VM can resume target VM/SP using FFA_RUN ABI.
*/
bool plat_ffa_run_checks(struct vcpu_locked current_locked,
- ffa_vm_id_t target_vm_id, ffa_vcpu_index_t vcpu_idx,
+ ffa_id_t target_vm_id, ffa_vcpu_index_t vcpu_idx,
struct ffa_value *run_ret, struct vcpu **next)
{
(void)current_locked;
@@ -465,8 +463,8 @@
}
bool plat_ffa_check_runtime_state_transition(struct vcpu_locked current_locked,
- ffa_vm_id_t vm_id,
- ffa_vm_id_t receiver_vm_id,
+ ffa_id_t vm_id,
+ ffa_id_t receiver_vm_id,
struct vcpu_locked receiver_locked,
uint32_t func, // NOLINTNEXTLINE
enum vcpu_state *next_state)
@@ -490,14 +488,14 @@
void plat_ffa_wind_call_chain_ffa_direct_req(
struct vcpu_locked current_locked,
- struct vcpu_locked receiver_vcpu_locked, ffa_vm_id_t sender_vm_id)
+ struct vcpu_locked receiver_vcpu_locked, ffa_id_t sender_vm_id)
{
(void)current_locked;
(void)receiver_vcpu_locked;
(void)sender_vm_id;
}
-bool plat_ffa_is_spmd_lp_id(ffa_vm_id_t vm_id)
+bool plat_ffa_is_spmd_lp_id(ffa_id_t vm_id)
{
(void)vm_id;
return false;
@@ -590,8 +588,8 @@
return ffa_error(FFA_INVALID_PARAMETERS);
}
-struct ffa_value plat_ffa_msg_send(ffa_vm_id_t sender_vm_id,
- ffa_vm_id_t receiver_vm_id, uint32_t size,
+struct ffa_value plat_ffa_msg_send(ffa_id_t sender_vm_id,
+ ffa_id_t receiver_vm_id, uint32_t size,
struct vcpu *current, struct vcpu **next)
{
(void)sender_vm_id;
@@ -641,8 +639,7 @@
return false;
}
-int64_t plat_ffa_mailbox_waiter_get(ffa_vm_id_t vm_id,
- const struct vcpu *current)
+int64_t plat_ffa_mailbox_waiter_get(ffa_id_t vm_id, const struct vcpu *current)
{
(void)vm_id;
(void)current;
diff --git a/src/arch/aarch64/plat/ffa/hypervisor.c b/src/arch/aarch64/plat/ffa/hypervisor.c
index 878fed3..6c536b9 100644
--- a/src/arch/aarch64/plat/ffa/hypervisor.c
+++ b/src/arch/aarch64/plat/ffa/hypervisor.c
@@ -142,7 +142,7 @@
dlog_verbose("TEE finished setting up buffers.\n");
}
-bool plat_ffa_run_forward(ffa_vm_id_t vm_id, ffa_vcpu_index_t vcpu_idx,
+bool plat_ffa_run_forward(ffa_id_t vm_id, ffa_vcpu_index_t vcpu_idx,
struct ffa_value *ret)
{
/*
@@ -160,8 +160,7 @@
/**
* Check validity of the FF-A memory send function attempt.
*/
-bool plat_ffa_is_memory_send_valid(ffa_vm_id_t receiver_vm_id,
- uint32_t share_func)
+bool plat_ffa_is_memory_send_valid(ffa_id_t receiver_vm_id, uint32_t share_func)
{
/*
* Currently memory interfaces are not forwarded from hypervisor to
@@ -178,10 +177,10 @@
* Check validity of a FF-A direct message request.
*/
bool plat_ffa_is_direct_request_valid(struct vcpu *current,
- ffa_vm_id_t sender_vm_id,
- ffa_vm_id_t receiver_vm_id)
+ ffa_id_t sender_vm_id,
+ ffa_id_t receiver_vm_id)
{
- ffa_vm_id_t current_vm_id = current->vm->id;
+ ffa_id_t current_vm_id = current->vm->id;
/*
* The primary VM can send direct message request to
@@ -197,7 +196,7 @@
* Check validity of a FF-A notifications bitmap create.
*/
bool plat_ffa_is_notifications_create_valid(struct vcpu *current,
- ffa_vm_id_t vm_id)
+ ffa_id_t vm_id)
{
/*
* Call should only be used by the Hypervisor, so any attempt of
@@ -226,10 +225,10 @@
* Check validity of a FF-A direct message response.
*/
bool plat_ffa_is_direct_response_valid(struct vcpu *current,
- ffa_vm_id_t sender_vm_id,
- ffa_vm_id_t receiver_vm_id)
+ ffa_id_t sender_vm_id,
+ ffa_id_t receiver_vm_id)
{
- ffa_vm_id_t current_vm_id = current->vm->id;
+ ffa_id_t current_vm_id = current->vm->id;
/*
* Secondary VMs can send direct message responses to
@@ -240,7 +239,7 @@
receiver_vm_id == HF_PRIMARY_VM_ID;
}
-bool plat_ffa_direct_request_forward(ffa_vm_id_t receiver_vm_id,
+bool plat_ffa_direct_request_forward(ffa_id_t receiver_vm_id,
struct ffa_value args,
struct ffa_value *ret)
{
@@ -266,7 +265,7 @@
struct ffa_value *ret)
{
struct vm *vm = vm_locked.vm;
- ffa_vm_id_t vm_id = vm->id;
+ ffa_id_t vm_id = vm->id;
if (!ffa_tee_enabled || !vm_supports_indirect_messages(vm)) {
return false;
@@ -344,8 +343,8 @@
return true;
}
-bool plat_ffa_msg_send2_forward(ffa_vm_id_t receiver_vm_id,
- ffa_vm_id_t sender_vm_id, struct ffa_value *ret)
+bool plat_ffa_msg_send2_forward(ffa_id_t receiver_vm_id, ffa_id_t sender_vm_id,
+ struct ffa_value *ret)
{
/* FFA_MSG_SEND2 is forwarded to SPMC when the receiver is an SP. */
if (!vm_id_is_current_world(receiver_vm_id)) {
@@ -385,14 +384,14 @@
return 0U;
}
-uint32_t plat_ffa_owner_world_mode(ffa_vm_id_t owner_id)
+uint32_t plat_ffa_owner_world_mode(ffa_id_t owner_id)
{
(void)owner_id;
return plat_ffa_other_world_mode();
}
ffa_partition_properties_t plat_ffa_partition_properties(
- ffa_vm_id_t vm_id, const struct vm *target)
+ ffa_id_t vm_id, const struct vm *target)
{
ffa_partition_properties_t result = target->messaging_method;
/*
@@ -419,16 +418,16 @@
}
bool plat_ffa_is_notifications_bind_valid(struct vcpu *current,
- ffa_vm_id_t sender_id,
- ffa_vm_id_t receiver_id)
+ ffa_id_t sender_id,
+ ffa_id_t receiver_id)
{
- ffa_vm_id_t current_vm_id = current->vm->id;
+ ffa_id_t current_vm_id = current->vm->id;
/** If Hafnium is hypervisor, receiver needs to be current vm. */
return sender_id != receiver_id && current_vm_id == receiver_id;
}
bool plat_ffa_notifications_update_bindings_forward(
- ffa_vm_id_t receiver_id, ffa_vm_id_t sender_id, uint32_t flags,
+ ffa_id_t receiver_id, ffa_id_t sender_id, uint32_t flags,
ffa_notifications_bitmap_t bitmap, bool is_bind, struct ffa_value *ret)
{
CHECK(ret != NULL);
@@ -451,18 +450,17 @@
}
bool plat_ffa_is_notification_set_valid(struct vcpu *current,
- ffa_vm_id_t sender_id,
- ffa_vm_id_t receiver_id)
+ ffa_id_t sender_id,
+ ffa_id_t receiver_id)
{
- ffa_vm_id_t current_vm_id = current->vm->id;
+ ffa_id_t current_vm_id = current->vm->id;
/* If Hafnium is hypervisor, sender needs to be current vm. */
return sender_id == current_vm_id && sender_id != receiver_id;
}
-bool plat_ffa_notification_set_forward(ffa_vm_id_t sender_vm_id,
- ffa_vm_id_t receiver_vm_id,
- uint32_t flags,
+bool plat_ffa_notification_set_forward(ffa_id_t sender_vm_id,
+ ffa_id_t receiver_vm_id, uint32_t flags,
ffa_notifications_bitmap_t bitmap,
struct ffa_value *ret)
{
@@ -489,9 +487,9 @@
}
bool plat_ffa_is_notification_get_valid(struct vcpu *current,
- ffa_vm_id_t receiver_id, uint32_t flags)
+ ffa_id_t receiver_id, uint32_t flags)
{
- ffa_vm_id_t current_vm_id = current->vm->id;
+ ffa_id_t current_vm_id = current->vm->id;
(void)flags;
@@ -500,7 +498,7 @@
}
struct ffa_value plat_ffa_notifications_bitmap_create(
- ffa_vm_id_t vm_id, ffa_vcpu_count_t vcpu_count)
+ ffa_id_t vm_id, ffa_vcpu_count_t vcpu_count)
{
(void)vm_id;
(void)vcpu_count;
@@ -508,14 +506,14 @@
return ffa_error(FFA_NOT_SUPPORTED);
}
-struct ffa_value plat_ffa_notifications_bitmap_destroy(ffa_vm_id_t vm_id)
+struct ffa_value plat_ffa_notifications_bitmap_destroy(ffa_id_t vm_id)
{
(void)vm_id;
return ffa_error(FFA_NOT_SUPPORTED);
}
-bool plat_ffa_notifications_bitmap_create_call(ffa_vm_id_t vm_id,
+bool plat_ffa_notifications_bitmap_create_call(ffa_id_t vm_id,
ffa_vcpu_count_t vcpu_count)
{
struct ffa_value ret;
@@ -539,7 +537,7 @@
return true;
}
-struct vm_locked plat_ffa_vm_find_locked(ffa_vm_id_t vm_id)
+struct vm_locked plat_ffa_vm_find_locked(ffa_id_t vm_id)
{
if (vm_id_is_current_world(vm_id) || vm_id == HF_OTHER_WORLD_ID) {
return vm_find_locked(vm_id);
@@ -548,12 +546,12 @@
return (struct vm_locked){.vm = NULL};
}
-struct vm_locked plat_ffa_vm_find_locked_create(ffa_vm_id_t vm_id)
+struct vm_locked plat_ffa_vm_find_locked_create(ffa_id_t vm_id)
{
return plat_ffa_vm_find_locked(vm_id);
}
-bool plat_ffa_is_vm_id(ffa_vm_id_t vm_id)
+bool plat_ffa_is_vm_id(ffa_id_t vm_id)
{
return vm_id_is_current_world(vm_id);
}
@@ -636,7 +634,7 @@
ffa_notifications_bitmap_t *from_sp,
struct ffa_value *ret)
{
- ffa_vm_id_t receiver_id = receiver_locked.vm->id;
+ ffa_id_t receiver_id = receiver_locked.vm->id;
assert(from_sp != NULL && ret != NULL);
@@ -659,7 +657,7 @@
struct vm_locked receiver_locked, ffa_notifications_bitmap_t *from_fwk,
uint32_t flags, ffa_vcpu_index_t vcpu_id, struct ffa_value *ret)
{
- ffa_vm_id_t receiver_id = receiver_locked.vm->id;
+ ffa_id_t receiver_id = receiver_locked.vm->id;
ffa_notifications_bitmap_t spm_notifications = 0;
(void)flags;
@@ -745,7 +743,7 @@
{
struct ffa_value ret;
uint64_t func;
- ffa_vm_id_t id;
+ ffa_id_t id;
assert(vm_locked.vm != NULL);
@@ -791,7 +789,7 @@
* Check if current VM can resume target VM/SP using FFA_RUN ABI.
*/
bool plat_ffa_run_checks(struct vcpu_locked current_locked,
- ffa_vm_id_t target_vm_id, ffa_vcpu_index_t vcpu_idx,
+ ffa_id_t target_vm_id, ffa_vcpu_index_t vcpu_idx,
struct ffa_value *run_ret, struct vcpu **next)
{
(void)next;
@@ -1093,8 +1091,8 @@
}
bool plat_ffa_check_runtime_state_transition(struct vcpu_locked current_locked,
- ffa_vm_id_t vm_id,
- ffa_vm_id_t receiver_vm_id,
+ ffa_id_t vm_id,
+ ffa_id_t receiver_vm_id,
struct vcpu_locked receiver_locked,
uint32_t func,
enum vcpu_state *next_state)
@@ -1133,7 +1131,7 @@
void plat_ffa_wind_call_chain_ffa_direct_req(
struct vcpu_locked current_locked,
- struct vcpu_locked receiver_vcpu_locked, ffa_vm_id_t sender_vm_id)
+ struct vcpu_locked receiver_vcpu_locked, ffa_id_t sender_vm_id)
{
/* Calls chains not supported in the Hypervisor/VMs. */
(void)current_locked;
@@ -1141,7 +1139,7 @@
(void)sender_vm_id;
}
-bool plat_ffa_is_spmd_lp_id(ffa_vm_id_t vm_id)
+bool plat_ffa_is_spmd_lp_id(ffa_id_t vm_id)
{
(void)vm_id;
return false;
@@ -1198,7 +1196,7 @@
/** Forwards a memory send message on to the other world. */
static struct ffa_value memory_send_other_world_forward(
- struct vm_locked other_world_locked, ffa_vm_id_t sender_vm_id,
+ struct vm_locked other_world_locked, ffa_id_t sender_vm_id,
uint32_t share_func, struct ffa_memory_region *memory_region,
uint32_t memory_share_length, uint32_t fragment_length)
{
@@ -1422,7 +1420,7 @@
* Notifies the `to` VM about the message currently in its mailbox, possibly
* with the help of the primary VM.
*/
-static struct ffa_value deliver_msg(struct vm_locked to, ffa_vm_id_t from_id,
+static struct ffa_value deliver_msg(struct vm_locked to, ffa_id_t from_id,
struct vcpu_locked current_locked,
struct vcpu **next)
{
@@ -1929,7 +1927,7 @@
* Forwards a memory send continuation message on to the other world.
*/
static struct ffa_value memory_send_continue_other_world_forward(
- struct vm_locked other_world_locked, ffa_vm_id_t sender_vm_id,
+ struct vm_locked other_world_locked, ffa_id_t sender_vm_id,
void *fragment, uint32_t fragment_length, ffa_memory_handle_t handle)
{
struct ffa_value ret;
@@ -2179,8 +2177,8 @@
* If the recipient's receive buffer is busy, it can optionally register the
* caller to be notified when the recipient's receive buffer becomes available.
*/
-struct ffa_value plat_ffa_msg_send(ffa_vm_id_t sender_vm_id,
- ffa_vm_id_t receiver_vm_id, uint32_t size,
+struct ffa_value plat_ffa_msg_send(ffa_id_t sender_vm_id,
+ ffa_id_t receiver_vm_id, uint32_t size,
struct vcpu *current, struct vcpu **next)
{
struct vm *from = current->vm;
@@ -2373,8 +2371,7 @@
* Returns -1 on failure or if there are no waiters; the VM id of the next
* waiter otherwise.
*/
-int64_t plat_ffa_mailbox_waiter_get(ffa_vm_id_t vm_id,
- const struct vcpu *current)
+int64_t plat_ffa_mailbox_waiter_get(ffa_id_t vm_id, const struct vcpu *current)
{
struct vm *vm;
struct vm_locked locked;
diff --git a/src/arch/aarch64/plat/ffa/spmc.c b/src/arch/aarch64/plat/ffa/spmc.c
index f21a5e6..e0421a8 100644
--- a/src/arch/aarch64/plat/ffa/spmc.c
+++ b/src/arch/aarch64/plat/ffa/spmc.c
@@ -106,7 +106,7 @@
}
static struct vm_locked plat_ffa_nwd_vm_find_locked(
- struct nwd_vms_locked nwd_vms_locked, ffa_vm_id_t vm_id)
+ struct nwd_vms_locked nwd_vms_locked, ffa_id_t vm_id)
{
assert(nwd_vms_locked.nwd_vms != NULL);
@@ -124,7 +124,7 @@
* If a VM with the ID already exists return it.
* Return NULL if it can't allocate a new VM.
*/
-static struct vm_locked plat_ffa_nwd_vm_create(ffa_vm_id_t vm_id)
+static struct vm_locked plat_ffa_nwd_vm_create(ffa_id_t vm_id)
{
struct vm_locked vm_locked;
struct nwd_vms_locked nwd_vms_locked = nwd_vms_lock();
@@ -239,7 +239,7 @@
plat_ffa_vm_init(ppool);
}
-bool plat_ffa_run_forward(ffa_vm_id_t vm_id, ffa_vcpu_index_t vcpu_idx,
+bool plat_ffa_run_forward(ffa_id_t vm_id, ffa_vcpu_index_t vcpu_idx,
struct ffa_value *ret)
{
(void)vm_id;
@@ -252,8 +252,7 @@
/**
* Check validity of the FF-A memory send function attempt.
*/
-bool plat_ffa_is_memory_send_valid(ffa_vm_id_t receiver_vm_id,
- uint32_t share_func)
+bool plat_ffa_is_memory_send_valid(ffa_id_t receiver_vm_id, uint32_t share_func)
{
bool result = false;
@@ -354,7 +353,7 @@
*/
static bool plat_ffa_check_rtm_ffa_dir_req(struct vcpu_locked current_locked,
struct vcpu_locked locked_vcpu,
- ffa_vm_id_t receiver_vm_id,
+ ffa_id_t receiver_vm_id,
uint32_t func,
enum vcpu_state *next_state)
{
@@ -488,8 +487,8 @@
* by the Partition runtime model.
*/
bool plat_ffa_check_runtime_state_transition(struct vcpu_locked current_locked,
- ffa_vm_id_t vm_id,
- ffa_vm_id_t receiver_vm_id,
+ ffa_id_t vm_id,
+ ffa_id_t receiver_vm_id,
struct vcpu_locked locked_vcpu,
uint32_t func,
enum vcpu_state *next_state)
@@ -536,7 +535,7 @@
return allowed;
}
-bool plat_ffa_is_spmd_lp_id(ffa_vm_id_t vm_id)
+bool plat_ffa_is_spmd_lp_id(ffa_id_t vm_id)
{
return (vm_id >= EL3_SPMD_LP_ID_START && vm_id <= EL3_SPMD_LP_ID_END);
}
@@ -545,10 +544,10 @@
* Check validity of a FF-A direct message request.
*/
bool plat_ffa_is_direct_request_valid(struct vcpu *current,
- ffa_vm_id_t sender_vm_id,
- ffa_vm_id_t receiver_vm_id)
+ ffa_id_t sender_vm_id,
+ ffa_id_t receiver_vm_id)
{
- ffa_vm_id_t current_vm_id = current->vm->id;
+ ffa_id_t current_vm_id = current->vm->id;
/*
* The normal world can send direct message requests
@@ -592,10 +591,10 @@
* Check validity of a FF-A direct message response.
*/
bool plat_ffa_is_direct_response_valid(struct vcpu *current,
- ffa_vm_id_t sender_vm_id,
- ffa_vm_id_t receiver_vm_id)
+ ffa_id_t sender_vm_id,
+ ffa_id_t receiver_vm_id)
{
- ffa_vm_id_t current_vm_id = current->vm->id;
+ ffa_id_t current_vm_id = current->vm->id;
/*
* Direct message responses emitted from a SP target either the NWd,
@@ -606,7 +605,7 @@
vm_id_is_current_world(sender_vm_id);
}
-bool plat_ffa_direct_request_forward(ffa_vm_id_t receiver_vm_id,
+bool plat_ffa_direct_request_forward(ffa_id_t receiver_vm_id,
struct ffa_value args,
struct ffa_value *ret)
{
@@ -676,8 +675,8 @@
return true;
}
-bool plat_ffa_msg_send2_forward(ffa_vm_id_t receiver_vm_id,
- ffa_vm_id_t sender_vm_id, struct ffa_value *ret)
+bool plat_ffa_msg_send2_forward(ffa_id_t receiver_vm_id, ffa_id_t sender_vm_id,
+ struct ffa_value *ret)
{
/* SPMC never needs to forward a FFA_MSG_SEND2, it always handles it. */
(void)receiver_vm_id;
@@ -688,7 +687,7 @@
}
bool plat_ffa_is_notifications_create_valid(struct vcpu *current,
- ffa_vm_id_t vm_id)
+ ffa_id_t vm_id)
{
/**
* Create/Destroy interfaces to be called by the hypervisor, into the
@@ -699,10 +698,10 @@
}
bool plat_ffa_is_notifications_bind_valid(struct vcpu *current,
- ffa_vm_id_t sender_id,
- ffa_vm_id_t receiver_id)
+ ffa_id_t sender_id,
+ ffa_id_t receiver_id)
{
- ffa_vm_id_t current_vm_id = current->vm->id;
+ ffa_id_t current_vm_id = current->vm->id;
/**
* SPMC:
@@ -722,7 +721,7 @@
}
bool plat_ffa_notifications_update_bindings_forward(
- ffa_vm_id_t receiver_id, ffa_vm_id_t sender_id, uint32_t flags,
+ ffa_id_t receiver_id, ffa_id_t sender_id, uint32_t flags,
ffa_notifications_bitmap_t bitmap, bool is_bind, struct ffa_value *ret)
{
(void)ret;
@@ -737,10 +736,10 @@
}
bool plat_ffa_is_notification_set_valid(struct vcpu *current,
- ffa_vm_id_t sender_id,
- ffa_vm_id_t receiver_id)
+ ffa_id_t sender_id,
+ ffa_id_t receiver_id)
{
- ffa_vm_id_t current_vm_id = current->vm->id;
+ ffa_id_t current_vm_id = current->vm->id;
/*
* SPMC:
@@ -759,9 +758,8 @@
vm_id_is_current_world(receiver_id)));
}
-bool plat_ffa_notification_set_forward(ffa_vm_id_t sender_vm_id,
- ffa_vm_id_t receiver_vm_id,
- uint32_t flags,
+bool plat_ffa_notification_set_forward(ffa_id_t sender_vm_id,
+ ffa_id_t receiver_vm_id, uint32_t flags,
ffa_notifications_bitmap_t bitmap,
struct ffa_value *ret)
{
@@ -785,9 +783,9 @@
}
bool plat_ffa_is_notification_get_valid(struct vcpu *current,
- ffa_vm_id_t receiver_id, uint32_t flags)
+ ffa_id_t receiver_id, uint32_t flags)
{
- ffa_vm_id_t current_vm_id = current->vm->id;
+ ffa_id_t current_vm_id = current->vm->id;
/*
* SPMC:
* - A get call cannot be targeted to an SPMD logical partition.
@@ -842,14 +840,14 @@
return MM_MODE_NS;
}
-uint32_t plat_ffa_owner_world_mode(ffa_vm_id_t owner_id)
+uint32_t plat_ffa_owner_world_mode(ffa_id_t owner_id)
{
return vm_id_is_current_world(owner_id) ? 0U
: plat_ffa_other_world_mode();
}
ffa_partition_properties_t plat_ffa_partition_properties(
- ffa_vm_id_t vm_id, const struct vm *target)
+ ffa_id_t vm_id, const struct vm *target)
{
ffa_partition_properties_t result = target->messaging_method;
/*
@@ -869,7 +867,7 @@
return (vm->ns_interrupts_action == NS_ACTION_ME);
}
-struct vm_locked plat_ffa_vm_find_locked(ffa_vm_id_t vm_id)
+struct vm_locked plat_ffa_vm_find_locked(ffa_id_t vm_id)
{
struct vm_locked to_ret_locked;
@@ -886,7 +884,7 @@
return to_ret_locked;
}
-struct vm_locked plat_ffa_vm_find_locked_create(ffa_vm_id_t vm_id)
+struct vm_locked plat_ffa_vm_find_locked_create(ffa_id_t vm_id)
{
if (vm_id_is_current_world(vm_id) || vm_id == HF_OTHER_WORLD_ID) {
return vm_find_locked(vm_id);
@@ -896,7 +894,7 @@
}
struct ffa_value plat_ffa_notifications_bitmap_create(
- ffa_vm_id_t vm_id, ffa_vcpu_count_t vcpu_count)
+ ffa_id_t vm_id, ffa_vcpu_count_t vcpu_count)
{
struct ffa_value ret = (struct ffa_value){.func = FFA_SUCCESS_32};
struct vm_locked vm_locked;
@@ -948,7 +946,7 @@
return ret;
}
-bool plat_ffa_notifications_bitmap_create_call(ffa_vm_id_t vm_id,
+bool plat_ffa_notifications_bitmap_create_call(ffa_id_t vm_id,
ffa_vcpu_count_t vcpu_count)
{
(void)vm_id;
@@ -957,7 +955,7 @@
return true;
}
-struct ffa_value plat_ffa_notifications_bitmap_destroy(ffa_vm_id_t vm_id)
+struct ffa_value plat_ffa_notifications_bitmap_destroy(ffa_id_t vm_id)
{
struct ffa_value ret = {.func = FFA_SUCCESS_32};
struct vm_locked to_destroy_locked = plat_ffa_vm_find_locked(vm_id);
@@ -993,7 +991,7 @@
return ret;
}
-bool plat_ffa_is_vm_id(ffa_vm_id_t vm_id)
+bool plat_ffa_is_vm_id(ffa_id_t vm_id)
{
return !vm_id_is_current_world(vm_id);
}
@@ -1106,7 +1104,7 @@
* Check if current VM can resume target VM using FFA_RUN ABI.
*/
bool plat_ffa_run_checks(struct vcpu_locked current_locked,
- ffa_vm_id_t target_vm_id, ffa_vcpu_index_t vcpu_idx,
+ ffa_id_t target_vm_id, ffa_vcpu_index_t vcpu_idx,
struct ffa_value *run_ret, struct vcpu **next)
{
/*
@@ -2108,7 +2106,7 @@
static struct ffa_value plat_ffa_resume_direct_response(
struct vcpu_locked current_locked, struct vcpu **next)
{
- ffa_vm_id_t receiver_vm_id;
+ ffa_id_t receiver_vm_id;
struct vcpu *current = current_locked.vcpu;
struct ffa_value to_ret;
@@ -2362,7 +2360,7 @@
*/
void plat_ffa_wind_call_chain_ffa_direct_req(
struct vcpu_locked current_locked,
- struct vcpu_locked receiver_vcpu_locked, ffa_vm_id_t sender_vm_id)
+ struct vcpu_locked receiver_vcpu_locked, ffa_id_t sender_vm_id)
{
struct vcpu *current = current_locked.vcpu;
struct vcpu *receiver_vcpu = receiver_vcpu_locked.vcpu;
@@ -2400,7 +2398,7 @@
struct vcpu_locked current_locked, struct vcpu_locked next_locked)
{
struct vcpu *next = next_locked.vcpu;
- ffa_vm_id_t receiver_vm_id = next->vm->id;
+ ffa_id_t receiver_vm_id = next->vm->id;
struct vcpu *current = current_locked.vcpu;
assert(current->call_chain.next_node == NULL);
@@ -2611,8 +2609,8 @@
return ret;
}
-struct ffa_value plat_ffa_msg_send(ffa_vm_id_t sender_vm_id,
- ffa_vm_id_t receiver_vm_id, uint32_t size,
+struct ffa_value plat_ffa_msg_send(ffa_id_t sender_vm_id,
+ ffa_id_t receiver_vm_id, uint32_t size,
struct vcpu *current, struct vcpu **next)
{
(void)sender_vm_id;
@@ -2763,8 +2761,7 @@
return ret;
}
-int64_t plat_ffa_mailbox_waiter_get(ffa_vm_id_t vm_id,
- const struct vcpu *current)
+int64_t plat_ffa_mailbox_waiter_get(ffa_id_t vm_id, const struct vcpu *current)
{
(void)vm_id;
(void)current;
diff --git a/src/arch/aarch64/sysregs.c b/src/arch/aarch64/sysregs.c
index 9c18e5d..7fe6614 100644
--- a/src/arch/aarch64/sysregs.c
+++ b/src/arch/aarch64/sysregs.c
@@ -27,7 +27,7 @@
* Returns the value for HCR_EL2 for the particular VM.
* For now, the primary VM has one value and all secondary VMs share a value.
*/
-uintreg_t get_hcr_el2_value(ffa_vm_id_t vm_id, bool is_el0_partition)
+uintreg_t get_hcr_el2_value(ffa_id_t vm_id, bool is_el0_partition)
{
uintreg_t hcr_el2_value = 0;
diff --git a/src/arch/aarch64/sysregs.h b/src/arch/aarch64/sysregs.h
index 9b3fbbe..1ed66c8 100644
--- a/src/arch/aarch64/sysregs.h
+++ b/src/arch/aarch64/sysregs.h
@@ -15,7 +15,7 @@
#include "sysregs_defs.h"
/** HCR_EL2 */
-uintreg_t get_hcr_el2_value(ffa_vm_id_t vm_id, bool is_el0_partition);
+uintreg_t get_hcr_el2_value(ffa_id_t vm_id, bool is_el0_partition);
/** MDCR_EL2 */
uintreg_t get_mdcr_el2_value(void);
diff --git a/src/arch/fake/hypervisor/ffa.c b/src/arch/fake/hypervisor/ffa.c
index 8374862..54f4203 100644
--- a/src/arch/fake/hypervisor/ffa.c
+++ b/src/arch/fake/hypervisor/ffa.c
@@ -20,7 +20,7 @@
return ffa_error(FFA_NOT_SUPPORTED);
}
-ffa_vm_id_t arch_ffa_spmc_id_get(void)
+ffa_id_t arch_ffa_spmc_id_get(void)
{
return HF_SPMC_VM_ID;
}
@@ -29,8 +29,7 @@
{
}
-bool plat_ffa_is_memory_send_valid(ffa_vm_id_t receiver_vm_id,
- uint32_t share_func)
+bool plat_ffa_is_memory_send_valid(ffa_id_t receiver_vm_id, uint32_t share_func)
{
(void)receiver_vm_id;
(void)share_func;
@@ -39,8 +38,8 @@
}
bool plat_ffa_is_direct_request_valid(struct vcpu *current,
- ffa_vm_id_t sender_vm_id,
- ffa_vm_id_t receiver_vm_id)
+ ffa_id_t sender_vm_id,
+ ffa_id_t receiver_vm_id)
{
(void)current;
(void)sender_vm_id;
@@ -59,8 +58,8 @@
}
bool plat_ffa_is_direct_response_valid(struct vcpu *current,
- ffa_vm_id_t sender_vm_id,
- ffa_vm_id_t receiver_vm_id)
+ ffa_id_t sender_vm_id,
+ ffa_id_t receiver_vm_id)
{
(void)current;
(void)sender_vm_id;
@@ -69,7 +68,7 @@
return true;
}
-bool plat_ffa_run_forward(ffa_vm_id_t vm_id, ffa_vcpu_index_t vcpu_idx,
+bool plat_ffa_run_forward(ffa_id_t vm_id, ffa_vcpu_index_t vcpu_idx,
struct ffa_value *ret)
{
(void)vm_id;
@@ -89,7 +88,7 @@
(void)vm_locked;
}
-bool plat_ffa_direct_request_forward(ffa_vm_id_t receiver_vm_id,
+bool plat_ffa_direct_request_forward(ffa_id_t receiver_vm_id,
struct ffa_value args,
struct ffa_value *ret)
{
@@ -126,8 +125,8 @@
return false;
}
-bool plat_ffa_msg_send2_forward(ffa_vm_id_t receiver_vm_id,
- ffa_vm_id_t sender_vm_id, struct ffa_value *ret)
+bool plat_ffa_msg_send2_forward(ffa_id_t receiver_vm_id, ffa_id_t sender_vm_id,
+ struct ffa_value *ret)
{
(void)receiver_vm_id;
(void)sender_vm_id;
@@ -153,15 +152,15 @@
return 0U;
}
-uint32_t plat_ffa_owner_world_mode(ffa_vm_id_t owner_id)
+uint32_t plat_ffa_owner_world_mode(ffa_id_t owner_id)
{
(void)owner_id;
return 0U;
}
bool plat_ffa_is_notifications_bind_valid(struct vcpu *current,
- ffa_vm_id_t sender_id,
- ffa_vm_id_t receiver_id)
+ ffa_id_t sender_id,
+ ffa_id_t receiver_id)
{
(void)current;
(void)sender_id;
@@ -170,7 +169,7 @@
}
bool plat_ffa_notifications_update_bindings_forward(
- ffa_vm_id_t receiver_id, ffa_vm_id_t sender_id, uint32_t flags,
+ ffa_id_t receiver_id, ffa_id_t sender_id, uint32_t flags,
ffa_notifications_bitmap_t bitmap, bool is_bind, struct ffa_value *ret)
{
(void)ret;
@@ -190,7 +189,7 @@
}
ffa_partition_properties_t plat_ffa_partition_properties(
- ffa_vm_id_t vm_id, const struct vm *target)
+ ffa_id_t vm_id, const struct vm *target)
{
(void)vm_id;
(void)target;
@@ -204,7 +203,7 @@
}
bool plat_ffa_is_notifications_create_valid(struct vcpu *current,
- ffa_vm_id_t vm_id)
+ ffa_id_t vm_id)
{
(void)current;
(void)vm_id;
@@ -213,8 +212,8 @@
}
bool plat_ffa_is_notification_set_valid(struct vcpu *current,
- ffa_vm_id_t sender_id,
- ffa_vm_id_t receiver_id)
+ ffa_id_t sender_id,
+ ffa_id_t receiver_id)
{
(void)current;
(void)sender_id;
@@ -223,7 +222,7 @@
}
bool plat_ffa_is_notification_get_valid(struct vcpu *current,
- ffa_vm_id_t receiver_id, uint32_t flags)
+ ffa_id_t receiver_id, uint32_t flags)
{
(void)flags;
(void)current;
@@ -258,9 +257,8 @@
return false;
}
-bool plat_ffa_notification_set_forward(ffa_vm_id_t sender_vm_id,
- ffa_vm_id_t receiver_vm_id,
- uint32_t flags,
+bool plat_ffa_notification_set_forward(ffa_id_t sender_vm_id,
+ ffa_id_t receiver_vm_id, uint32_t flags,
ffa_notifications_bitmap_t bitmap,
struct ffa_value *ret)
{
@@ -274,7 +272,7 @@
}
struct ffa_value plat_ffa_notifications_bitmap_create(
- ffa_vm_id_t vm_id, ffa_vcpu_count_t vcpu_count)
+ ffa_id_t vm_id, ffa_vcpu_count_t vcpu_count)
{
(void)vm_id;
(void)vcpu_count;
@@ -282,26 +280,26 @@
return ffa_error(FFA_NOT_SUPPORTED);
}
-struct ffa_value plat_ffa_notifications_bitmap_destroy(ffa_vm_id_t vm_id)
+struct ffa_value plat_ffa_notifications_bitmap_destroy(ffa_id_t vm_id)
{
(void)vm_id;
return ffa_error(FFA_NOT_SUPPORTED);
}
-struct vm_locked plat_ffa_vm_find_locked(ffa_vm_id_t vm_id)
+struct vm_locked plat_ffa_vm_find_locked(ffa_id_t vm_id)
{
(void)vm_id;
return (struct vm_locked){.vm = NULL};
}
-struct vm_locked plat_ffa_vm_find_locked_create(ffa_vm_id_t vm_id)
+struct vm_locked plat_ffa_vm_find_locked_create(ffa_id_t vm_id)
{
(void)vm_id;
return (struct vm_locked){.vm = NULL};
}
-bool plat_ffa_is_vm_id(ffa_vm_id_t vm_id)
+bool plat_ffa_is_vm_id(ffa_id_t vm_id)
{
(void)vm_id;
return false;
@@ -337,7 +335,7 @@
* Check if current VM can resume target VM/SP using FFA_RUN ABI.
*/
bool plat_ffa_run_checks(struct vcpu_locked current_locked,
- ffa_vm_id_t target_vm_id, ffa_vcpu_index_t vcpu_idx,
+ ffa_id_t target_vm_id, ffa_vcpu_index_t vcpu_idx,
struct ffa_value *run_ret, struct vcpu **next)
{
(void)current_locked;
@@ -428,8 +426,8 @@
}
bool plat_ffa_check_runtime_state_transition(struct vcpu_locked current_locked,
- ffa_vm_id_t vm_id,
- ffa_vm_id_t receiver_vm_id,
+ ffa_id_t vm_id,
+ ffa_id_t receiver_vm_id,
struct vcpu_locked receiver_locked,
uint32_t func, // NOLINTNEXTLINE
enum vcpu_state *next_state)
@@ -455,7 +453,7 @@
void plat_ffa_wind_call_chain_ffa_direct_req(
struct vcpu_locked current_locked,
- struct vcpu_locked receiver_vcpu_locked, ffa_vm_id_t sender_vm_id)
+ struct vcpu_locked receiver_vcpu_locked, ffa_id_t sender_vm_id)
{
/* Calls chains not supported in the Hypervisor/VMs. */
(void)current_locked;
@@ -471,7 +469,7 @@
(void)next_locked;
}
-bool plat_ffa_is_spmd_lp_id(ffa_vm_id_t vm_id)
+bool plat_ffa_is_spmd_lp_id(ffa_id_t vm_id)
{
(void)vm_id;
return false;
@@ -559,8 +557,8 @@
return ffa_error(FFA_INVALID_PARAMETERS);
}
-struct ffa_value plat_ffa_msg_send(ffa_vm_id_t sender_vm_id,
- ffa_vm_id_t receiver_vm_id, uint32_t size,
+struct ffa_value plat_ffa_msg_send(ffa_id_t sender_vm_id,
+ ffa_id_t receiver_vm_id, uint32_t size,
struct vcpu *current, struct vcpu **next)
{
(void)sender_vm_id;
@@ -663,8 +661,7 @@
return ffa_error(FFA_NOT_SUPPORTED);
}
-int64_t plat_ffa_mailbox_waiter_get(ffa_vm_id_t vm_id,
- const struct vcpu *current)
+int64_t plat_ffa_mailbox_waiter_get(ffa_id_t vm_id, const struct vcpu *current)
{
(void)vm_id;
(void)current;
diff --git a/src/arch/fake/mm.c b/src/arch/fake/mm.c
index b67266e..2465bd1 100644
--- a/src/arch/fake/mm.c
+++ b/src/arch/fake/mm.c
@@ -182,7 +182,7 @@
return true;
}
-uint32_t arch_mm_extra_attributes_from_vm(ffa_vm_id_t id)
+uint32_t arch_mm_extra_attributes_from_vm(ffa_id_t id)
{
(void)id;
diff --git a/src/dlog.c b/src/dlog.c
index ca46bb6..784c1f6 100644
--- a/src/dlog.c
+++ b/src/dlog.c
@@ -221,7 +221,7 @@
* Send the contents of the given VM's log buffer to the log, preceded by the VM
* ID and followed by a newline.
*/
-void dlog_flush_vm_buffer(ffa_vm_id_t id, char buffer[], size_t length)
+void dlog_flush_vm_buffer(ffa_id_t id, char buffer[], size_t length)
{
lock();
diff --git a/src/ffa_memory.c b/src/ffa_memory.c
index ebc5db7..2f5776d 100644
--- a/src/ffa_memory.c
+++ b/src/ffa_memory.c
@@ -1017,7 +1017,7 @@
* Success is indicated by FFA_SUCCESS.
*/
struct ffa_value ffa_retrieve_check_update(
- struct vm_locked to_locked, ffa_vm_id_t from_id,
+ struct vm_locked to_locked, ffa_id_t from_id,
struct ffa_memory_region_constituent **fragments,
uint32_t *fragment_constituent_counts, uint32_t fragment_count,
uint32_t memory_to_attributes, uint32_t share_func, bool clear,
@@ -1109,7 +1109,7 @@
}
static struct ffa_value ffa_relinquish_check_update(
- struct vm_locked from_locked, ffa_vm_id_t owner_id,
+ struct vm_locked from_locked, ffa_id_t owner_id,
struct ffa_memory_region_constituent **fragments,
uint32_t *fragment_constituent_counts, uint32_t fragment_count,
struct mpool *page_pool, bool clear)
@@ -1437,9 +1437,8 @@
ffa_memory_access_permissions_t permissions =
memory_region->receivers[i]
.receiver_permissions.permissions;
- ffa_vm_id_t receiver_id =
- memory_region->receivers[i]
- .receiver_permissions.receiver;
+ ffa_id_t receiver_id = memory_region->receivers[i]
+ .receiver_permissions.receiver;
if (memory_region->sender == receiver_id) {
dlog_verbose("Can't share memory with itself.\n");
@@ -1578,7 +1577,7 @@
*/
struct ffa_value ffa_memory_send_continue_validate(
struct share_states_locked share_states, ffa_memory_handle_t handle,
- struct ffa_memory_share_state **share_state_ret, ffa_vm_id_t from_vm_id,
+ struct ffa_memory_share_state **share_state_ret, ffa_id_t from_vm_id,
struct mpool *page_pool)
{
struct ffa_memory_share_state *share_state;
@@ -1638,8 +1637,8 @@
struct ffa_memory_region *memory_region)
{
for (uint32_t i = 0; i < memory_region->receiver_count; i++) {
- ffa_vm_id_t receiver = memory_region->receivers[i]
- .receiver_permissions.receiver;
+ ffa_id_t receiver = memory_region->receivers[i]
+ .receiver_permissions.receiver;
if (!vm_id_is_current_world(receiver)) {
return true;
}
@@ -1735,7 +1734,7 @@
* that at this point it has been validated:
* - MBZ at virtual FF-A instance.
*/
- ffa_vm_id_t sender_to_ret =
+ ffa_id_t sender_to_ret =
(from_locked.vm->id == HF_OTHER_WORLD_ID)
? memory_region->sender
: 0;
@@ -1861,9 +1860,9 @@
*/
static bool ffa_retrieved_memory_region_init(
void *response, uint32_t ffa_version, size_t response_max_size,
- ffa_vm_id_t sender, ffa_memory_attributes_t attributes,
+ ffa_id_t sender, ffa_memory_attributes_t attributes,
ffa_memory_region_flags_t flags, ffa_memory_handle_t handle,
- ffa_vm_id_t receiver_id, ffa_memory_access_permissions_t permissions,
+ ffa_id_t receiver_id, ffa_memory_access_permissions_t permissions,
uint32_t page_count, uint32_t total_constituent_count,
const struct ffa_memory_region_constituent constituents[],
uint32_t fragment_constituent_count, uint32_t *total_length,
@@ -1970,7 +1969,7 @@
* in the array, return the region's 'receiver_count'.
*/
uint32_t ffa_memory_region_get_receiver(struct ffa_memory_region *memory_region,
- ffa_vm_id_t receiver)
+ ffa_id_t receiver)
{
struct ffa_memory_access *receivers;
uint32_t i;
@@ -2081,7 +2080,7 @@
*/
static struct ffa_value ffa_memory_retrieve_validate_memory_access_list(
struct ffa_memory_region *memory_region,
- struct ffa_memory_region *retrieve_request, ffa_vm_id_t to_vm_id,
+ struct ffa_memory_region *retrieve_request, ffa_id_t to_vm_id,
ffa_memory_access_permissions_t *permissions)
{
uint32_t retrieve_receiver_index;
@@ -2120,7 +2119,7 @@
&retrieve_request->receivers[i];
ffa_memory_access_permissions_t requested_permissions =
current_receiver->receiver_permissions.permissions;
- ffa_vm_id_t current_receiver_id =
+ ffa_id_t current_receiver_id =
current_receiver->receiver_permissions.receiver;
bool found_to_id = current_receiver_id == to_vm_id;
@@ -2245,7 +2244,7 @@
* memory sharing call.
*/
static struct ffa_value ffa_memory_retrieve_validate(
- ffa_vm_id_t receiver_id, struct ffa_memory_region *retrieve_request,
+ ffa_id_t receiver_id, struct ffa_memory_region *retrieve_request,
struct ffa_memory_region *memory_region, uint32_t *receiver_index,
uint32_t share_func)
{
@@ -2389,7 +2388,7 @@
struct ffa_composite_memory_region *composite;
uint32_t total_length;
uint32_t fragment_length;
- ffa_vm_id_t receiver_id = to_locked.vm->id;
+ ffa_id_t receiver_id = to_locked.vm->id;
bool is_send_complete = false;
ffa_memory_attributes_t attributes;
@@ -2634,7 +2633,7 @@
struct ffa_value ffa_memory_retrieve_continue(struct vm_locked to_locked,
ffa_memory_handle_t handle,
uint32_t fragment_offset,
- ffa_vm_id_t sender_vm_id,
+ ffa_id_t sender_vm_id,
struct mpool *page_pool)
{
struct ffa_memory_region *memory_region;
diff --git a/src/load.c b/src/load.c
index e990624..7c22d91 100644
--- a/src/load.c
+++ b/src/load.c
@@ -964,7 +964,7 @@
for (i = 0; i < manifest->vm_count; ++i) {
const struct manifest_vm *manifest_vm = &manifest->vm[i];
- ffa_vm_id_t vm_id = HF_VM_ID_OFFSET + i;
+ ffa_id_t vm_id = HF_VM_ID_OFFSET + i;
uint64_t mem_size;
paddr_t secondary_mem_begin;
paddr_t secondary_mem_end;
diff --git a/src/manifest.c b/src/manifest.c
index cd90005..075c743 100644
--- a/src/manifest.c
+++ b/src/manifest.c
@@ -147,7 +147,7 @@
allocated_mem_regions_index = 0;
}
-static inline size_t count_digits(ffa_vm_id_t vm_id)
+static inline size_t count_digits(ffa_id_t vm_id)
{
size_t digits = 0;
@@ -162,7 +162,7 @@
* Generates a string with the two letters "vm" followed by an integer.
* Assumes `buf` is of size VM_NAME_BUF_SIZE.
*/
-static void generate_vm_node_name(struct string *str, ffa_vm_id_t vm_id)
+static void generate_vm_node_name(struct string *str, ffa_id_t vm_id)
{
static const char *digits = "0123456789";
size_t vm_id_digits = count_digits(vm_id);
@@ -408,7 +408,7 @@
static enum manifest_return_code parse_vm_common(const struct fdt_node *node,
struct manifest_vm *vm,
- ffa_vm_id_t vm_id)
+ ffa_id_t vm_id)
{
struct uint32list_iter smcs;
size_t idx;
@@ -445,7 +445,7 @@
static enum manifest_return_code parse_vm(struct fdt_node *node,
struct manifest_vm *vm,
- ffa_vm_id_t vm_id)
+ ffa_id_t vm_id)
{
TRY(read_optional_string(node, "kernel_filename",
&vm->kernel_filename));
@@ -1220,7 +1220,7 @@
static enum manifest_return_code parse_ffa_partition_package(
struct mm_stage1_locked stage1_locked, struct fdt_node *node,
- struct manifest_vm *vm, ffa_vm_id_t vm_id,
+ struct manifest_vm *vm, ffa_id_t vm_id,
const struct boot_params *boot_params, struct mpool *ppool)
{
enum manifest_return_code ret = MANIFEST_ERROR_NOT_COMPATIBLE;
@@ -1344,7 +1344,7 @@
/* Iterate over reserved VM IDs and check no such nodes exist. */
for (i = HF_VM_ID_BASE; i < HF_VM_ID_OFFSET; i++) {
- ffa_vm_id_t vm_id = (ffa_vm_id_t)i - HF_VM_ID_BASE;
+ ffa_id_t vm_id = (ffa_id_t)i - HF_VM_ID_BASE;
struct fdt_node vm_node = hyp_node;
generate_vm_node_name(&vm_name, vm_id);
@@ -1355,7 +1355,7 @@
/* Iterate over VM nodes until we find one that does not exist. */
for (i = 0; i <= MAX_VMS; ++i) {
- ffa_vm_id_t vm_id = HF_VM_ID_OFFSET + i;
+ ffa_id_t vm_id = HF_VM_ID_OFFSET + i;
struct fdt_node vm_node = hyp_node;
generate_vm_node_name(&vm_name, vm_id - HF_VM_ID_BASE);
diff --git a/src/vm.c b/src/vm.c
index 44bd112..838b134 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -45,7 +45,7 @@
return arch_vm_init_mm(vm, ppool);
}
-struct vm *vm_init(ffa_vm_id_t id, ffa_vcpu_count_t vcpu_count,
+struct vm *vm_init(ffa_id_t id, ffa_vcpu_count_t vcpu_count,
struct mpool *ppool, bool el0_partition)
{
uint32_t i;
@@ -128,7 +128,7 @@
/**
* Returns a pointer to the VM with the corresponding id.
*/
-struct vm *vm_find(ffa_vm_id_t id)
+struct vm *vm_find(ffa_id_t id)
{
uint16_t index;
@@ -152,7 +152,7 @@
/**
* Returns a locked instance of the VM with the corresponding id.
*/
-struct vm_locked vm_find_locked(ffa_vm_id_t id)
+struct vm_locked vm_find_locked(ffa_id_t id)
{
struct vm *vm = vm_find(id);
@@ -228,7 +228,7 @@
/**
* Gets `vm`'s wait entry for waiting on the `for_vm`.
*/
-struct wait_entry *vm_get_wait_entry(struct vm *vm, ffa_vm_id_t for_vm)
+struct wait_entry *vm_get_wait_entry(struct vm *vm, ffa_id_t for_vm)
{
uint16_t index;
@@ -259,7 +259,7 @@
/**
* Gets the ID of the VM which the given VM's wait entry is for.
*/
-ffa_vm_id_t vm_id_for_wait_entry(struct vm *vm, struct wait_entry *entry)
+ffa_id_t vm_id_for_wait_entry(struct vm *vm, struct wait_entry *entry)
{
uint16_t index = entry - vm->wait_entries;
@@ -271,7 +271,7 @@
* i.e. the hypervisor or a normal world VM when running in the normal world, or
* the SPM or an SP when running in the secure world.
*/
-bool vm_id_is_current_world(ffa_vm_id_t vm_id)
+bool vm_id_is_current_world(ffa_id_t vm_id)
{
return (vm_id & HF_VM_ID_WORLD_MASK) !=
(HF_OTHER_WORLD_ID & HF_VM_ID_WORLD_MASK);
@@ -630,7 +630,7 @@
* are per VCPU or global, as specified.
*/
bool vm_notifications_validate_binding(struct vm_locked vm_locked,
- bool is_from_vm, ffa_vm_id_t sender_id,
+ bool is_from_vm, ffa_id_t sender_id,
ffa_notifications_bitmap_t notifications,
bool is_per_vcpu)
{
@@ -645,7 +645,7 @@
* notifications.
*/
void vm_notifications_update_bindings(struct vm_locked vm_locked,
- bool is_from_vm, ffa_vm_id_t sender_id,
+ bool is_from_vm, ffa_id_t sender_id,
ffa_notifications_bitmap_t notifications,
bool is_per_vcpu)
{
@@ -671,7 +671,7 @@
}
bool vm_notifications_validate_bound_sender(
- struct vm_locked vm_locked, bool is_from_vm, ffa_vm_id_t sender_id,
+ struct vm_locked vm_locked, bool is_from_vm, ffa_id_t sender_id,
ffa_notifications_bitmap_t notifications)
{
CHECK(vm_locked.vm != NULL);
@@ -807,7 +807,7 @@
}
static void vm_notifications_state_info_get(
- struct notifications_state *state, ffa_vm_id_t vm_id, bool is_per_vcpu,
+ struct notifications_state *state, ffa_id_t vm_id, bool is_per_vcpu,
ffa_vcpu_index_t vcpu_id, uint16_t *ids, uint32_t *ids_count,
uint32_t *lists_sizes, uint32_t *lists_count,
const uint32_t ids_max_count,
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();
diff --git a/vmlib/ffa.c b/vmlib/ffa.c
index 40122c5..2f00781 100644
--- a/vmlib/ffa.c
+++ b/vmlib/ffa.c
@@ -39,7 +39,7 @@
* Initializes receiver permissions, in a memory transaction descriptor.
*/
void ffa_memory_access_init_permissions(
- struct ffa_memory_access *receiver, ffa_vm_id_t receiver_id,
+ struct ffa_memory_access *receiver, ffa_id_t receiver_id,
enum ffa_data_access data_access,
enum ffa_instruction_access instruction_access,
ffa_memory_receiver_flags_t flags)
@@ -62,7 +62,7 @@
* including the composite memory region offset.
*/
void ffa_memory_region_init_header(struct ffa_memory_region *memory_region,
- ffa_vm_id_t sender,
+ ffa_id_t sender,
ffa_memory_attributes_t attributes,
ffa_memory_region_flags_t flags,
ffa_memory_handle_t handle, uint32_t tag,
@@ -178,7 +178,7 @@
*/
uint32_t ffa_memory_region_init_single_receiver(
struct ffa_memory_region *memory_region, size_t memory_region_max_size,
- ffa_vm_id_t sender, ffa_vm_id_t receiver,
+ ffa_id_t sender, ffa_id_t receiver,
const struct ffa_memory_region_constituent constituents[],
uint32_t constituent_count, uint32_t tag,
ffa_memory_region_flags_t flags, enum ffa_data_access data_access,
@@ -200,7 +200,7 @@
uint32_t ffa_memory_region_init(
struct ffa_memory_region *memory_region, size_t memory_region_max_size,
- ffa_vm_id_t sender, struct ffa_memory_access receivers[],
+ ffa_id_t sender, struct ffa_memory_access receivers[],
uint32_t receiver_count,
const struct ffa_memory_region_constituent constituents[],
uint32_t constituent_count, uint32_t tag,
@@ -241,7 +241,7 @@
*/
uint32_t ffa_memory_retrieve_request_init_single_receiver(
struct ffa_memory_region *memory_region, ffa_memory_handle_t handle,
- ffa_vm_id_t sender, ffa_vm_id_t receiver, uint32_t tag,
+ 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,
@@ -259,7 +259,7 @@
uint32_t ffa_memory_retrieve_request_init(
struct ffa_memory_region *memory_region, ffa_memory_handle_t handle,
- ffa_vm_id_t sender, struct ffa_memory_access receivers[],
+ 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)
@@ -300,7 +300,7 @@
*/
uint32_t ffa_memory_lender_retrieve_request_init(
struct ffa_memory_region *memory_region, ffa_memory_handle_t handle,
- ffa_vm_id_t sender)
+ ffa_id_t sender)
{
memory_region->sender = sender;
memory_region->attributes = 0;
@@ -308,6 +308,7 @@
memory_region->handle = handle;
memory_region->tag = 0;
memory_region->receiver_count = 0;
+
#if defined(__linux__) && defined(__KERNEL__)
memset(memory_region->reserved, 0, sizeof(memory_region->reserved));
#else
@@ -366,7 +367,7 @@
* one `ffa_memory_region_constituent`.
*/
void ffa_endpoint_rx_tx_descriptor_init(
- struct ffa_endpoint_rx_tx_descriptor *desc, ffa_vm_id_t endpoint_id,
+ struct ffa_endpoint_rx_tx_descriptor *desc, ffa_id_t endpoint_id,
uint64_t rx_address, uint64_t tx_address)
{
desc->endpoint_id = endpoint_id;
diff --git a/vmlib/ffa_v1_0.c b/vmlib/ffa_v1_0.c
index 43e7b9b..b76c884 100644
--- a/vmlib/ffa_v1_0.c
+++ b/vmlib/ffa_v1_0.c
@@ -27,7 +27,7 @@
* including the composite memory region offset.
*/
void ffa_memory_region_init_header_v1_0(
- struct ffa_memory_region_v1_0 *memory_region, ffa_vm_id_t sender,
+ struct ffa_memory_region_v1_0 *memory_region, ffa_id_t sender,
ffa_memory_attributes_t attributes, ffa_memory_region_flags_t flags,
ffa_memory_handle_t handle, uint32_t tag, uint32_t receiver_count)
{
@@ -125,7 +125,7 @@
uint32_t ffa_memory_region_init_v1_0(
struct ffa_memory_region_v1_0 *memory_region,
- size_t memory_region_max_size, ffa_vm_id_t sender,
+ size_t memory_region_max_size, ffa_id_t sender,
struct ffa_memory_access receivers[], uint32_t receiver_count,
const struct ffa_memory_region_constituent constituents[],
uint32_t constituent_count, uint32_t tag,
@@ -160,7 +160,7 @@
uint32_t ffa_memory_retrieve_request_init_v1_0(
struct ffa_memory_region_v1_0 *memory_region,
- ffa_memory_handle_t handle, ffa_vm_id_t sender,
+ 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,