diff options
author | Daniel Boulby <daniel.boulby@arm.com> | 2021-03-03 11:34:53 +0000 |
---|---|---|
committer | Daniel Boulby <daniel.boulby@arm.com> | 2021-05-04 12:28:09 +0100 |
commit | e79d2076cc9169e42a82fd90a64506c601a066bb (patch) | |
tree | b1f56408c5627eb688a0b75c652883cbc2bc6173 /tftf/tests | |
parent | 5173bc2016355759ec34ba229c1c8a4e695ddff4 (diff) | |
download | tf-a-tests-e79d2076cc9169e42a82fd90a64506c601a066bb.tar.gz |
Change the name of type ffa_vm_id_t
The type ffa_vm_id_t is used for all ffa_id variables not just
ones specific to vms so remove this element from the name to make
it simple ffa_id_t
Signed-off-by: Daniel Boulby <daniel.boulby@arm.com>
Change-Id: I29d751880c29b0a401cbc698f856c3651cc02789
Diffstat (limited to 'tftf/tests')
4 files changed, 23 insertions, 24 deletions
diff --git a/tftf/tests/runtime_services/secure_service/ffa_helpers.c b/tftf/tests/runtime_services/secure_service/ffa_helpers.c index 8e7b58c6f..9a4dc7217 100644 --- a/tftf/tests/runtime_services/secure_service/ffa_helpers.c +++ b/tftf/tests/runtime_services/secure_service/ffa_helpers.c @@ -55,8 +55,8 @@ smc_ret_values ffa_run(uint32_t dest_id, uint32_t vcpu_id) * -BUSY: Message target is busy * -ABORTED: Message target ran into an unexpected error and has aborted */ -smc_ret_values ffa_msg_send_direct_req64(ffa_vm_id_t source_id, - ffa_vm_id_t dest_id, uint64_t arg0, +smc_ret_values ffa_msg_send_direct_req64(ffa_id_t source_id, + ffa_id_t dest_id, uint64_t arg0, uint64_t arg1, uint64_t arg2, uint64_t arg3, uint64_t arg4) { @@ -74,8 +74,8 @@ smc_ret_values ffa_msg_send_direct_req64(ffa_vm_id_t source_id, return tftf_smc(&args); } -smc_ret_values ffa_msg_send_direct_req32(ffa_vm_id_t source_id, - ffa_vm_id_t dest_id, uint32_t arg0, +smc_ret_values ffa_msg_send_direct_req32(ffa_id_t source_id, + ffa_id_t dest_id, uint32_t arg0, uint32_t arg1, uint32_t arg2, uint32_t arg3, uint32_t arg4) { @@ -93,8 +93,8 @@ smc_ret_values ffa_msg_send_direct_req32(ffa_vm_id_t source_id, return tftf_smc(&args); } -smc_ret_values ffa_msg_send_direct_resp64(ffa_vm_id_t source_id, - ffa_vm_id_t dest_id, uint64_t arg0, +smc_ret_values ffa_msg_send_direct_resp64(ffa_id_t source_id, + ffa_id_t dest_id, uint64_t arg0, uint64_t arg1, uint64_t arg2, uint64_t arg3, uint64_t arg4) { @@ -112,8 +112,8 @@ smc_ret_values ffa_msg_send_direct_resp64(ffa_vm_id_t source_id, return tftf_smc(&args); } -smc_ret_values ffa_msg_send_direct_resp32(ffa_vm_id_t source_id, - ffa_vm_id_t dest_id, uint32_t arg0, +smc_ret_values ffa_msg_send_direct_resp32(ffa_id_t source_id, + ffa_id_t dest_id, uint32_t arg0, uint32_t arg1, uint32_t arg2, uint32_t arg3, uint32_t arg4) { @@ -137,9 +137,9 @@ smc_ret_values ffa_msg_send_direct_resp32(ffa_vm_id_t source_id, * composite memory region offset. */ static void ffa_memory_region_init_header( - struct ffa_memory_region *memory_region, ffa_vm_id_t sender, + struct ffa_memory_region *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, ffa_vm_id_t receiver, + ffa_memory_handle_t handle, uint32_t tag, ffa_id_t receiver, ffa_memory_access_permissions_t permissions) { memory_region->sender = sender; @@ -168,7 +168,7 @@ static void ffa_memory_region_init_header( */ uint32_t ffa_memory_region_init( 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, @@ -259,7 +259,7 @@ uint32_t ffa_memory_region_init( */ uint32_t ffa_memory_retrieve_request_init( 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, @@ -291,7 +291,6 @@ uint32_t ffa_memory_retrieve_request_init( memory_region->receiver_count * sizeof(struct ffa_memory_access); } - /* * FFA Version ABI helper. * Version fields: diff --git a/tftf/tests/runtime_services/secure_service/spm_common.c b/tftf/tests/runtime_services/secure_service/spm_common.c index 12b70a9a2..88626e4f7 100644 --- a/tftf/tests/runtime_services/secure_service/spm_common.c +++ b/tftf/tests/runtime_services/secure_service/spm_common.c @@ -199,7 +199,7 @@ unsigned int get_ffa_feature_test_target( bool memory_retrieve(struct mailbox_buffers *mb, struct ffa_memory_region **retrieved, uint64_t handle, - ffa_vm_id_t sender, ffa_vm_id_t receiver, + ffa_id_t sender, ffa_id_t receiver, uint32_t mem_func) { smc_ret_values ret; @@ -269,7 +269,7 @@ bool memory_retrieve(struct mailbox_buffers *mb, } bool memory_relinquish(struct ffa_mem_relinquish *m, uint64_t handle, - ffa_vm_id_t id) + ffa_id_t id) { smc_ret_values ret; @@ -297,7 +297,7 @@ ffa_memory_handle_t memory_send( uint32_t fragment_length, uint32_t total_length) { smc_ret_values ret; - ffa_vm_id_t receiver = + ffa_id_t receiver = memory_region->receivers[0].receiver_permissions.receiver; if (fragment_length != total_length) { @@ -336,7 +336,7 @@ ffa_memory_handle_t memory_send( */ ffa_memory_handle_t memory_init_and_send( 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 constituents_count, uint32_t mem_func) { diff --git a/tftf/tests/runtime_services/secure_service/test_ffa_direct_messaging.c b/tftf/tests/runtime_services/secure_service/test_ffa_direct_messaging.c index 0a722e497..1b9abe95b 100644 --- a/tftf/tests/runtime_services/secure_service/test_ffa_direct_messaging.c +++ b/tftf/tests/runtime_services/secure_service/test_ffa_direct_messaging.c @@ -27,8 +27,8 @@ static const struct ffa_uuid expected_sp_uuids[] = { static event_t cpu_booted[PLATFORM_CORE_COUNT]; -static test_result_t send_cactus_echo_cmd(ffa_vm_id_t sender, - ffa_vm_id_t dest, +static test_result_t send_cactus_echo_cmd(ffa_id_t sender, + ffa_id_t dest, uint64_t value) { smc_ret_values ret; @@ -92,9 +92,9 @@ test_result_t test_ffa_direct_messaging(void) * otherwise. * For the CACTUS_SUCCESS response, the test returns TEST_RESULT_SUCCESS. */ -static test_result_t send_cactus_req_echo_cmd(ffa_vm_id_t sender, - ffa_vm_id_t dest, - ffa_vm_id_t echo_dest, +static test_result_t send_cactus_req_echo_cmd(ffa_id_t sender, + ffa_id_t dest, + ffa_id_t echo_dest, uint64_t value) { smc_ret_values ret; diff --git a/tftf/tests/runtime_services/secure_service/test_ffa_memory_sharing.c b/tftf/tests/runtime_services/secure_service/test_ffa_memory_sharing.c index f126c57d6..46a7349bf 100644 --- a/tftf/tests/runtime_services/secure_service/test_ffa_memory_sharing.c +++ b/tftf/tests/runtime_services/secure_service/test_ffa_memory_sharing.c @@ -130,8 +130,8 @@ test_result_t test_mem_donate_sp(void) * Cactus SP should reply to TFTF on whether the test succeeded or not. */ static test_result_t test_req_mem_send_sp_to_sp(uint32_t mem_func, - ffa_vm_id_t sender_sp, - ffa_vm_id_t receiver_sp) + ffa_id_t sender_sp, + ffa_id_t receiver_sp) { smc_ret_values ret; |