aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Deprez <olivier.deprez@arm.com>2021-02-04 15:46:02 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2021-02-04 15:46:02 +0000
commitdb4a2a7453741f86e350a6e296879970da0ec9bf (patch)
tree85dc22ac24fd0b865c00d5a6dd5b40b44937d288
parent8fe3d9d36e7777b56afd8d50bb3a64074aa9b703 (diff)
parent0446930111eb5750c90aedcd4b2513ac990998a3 (diff)
downloadtf-a-tests-db4a2a7453741f86e350a6e296879970da0ec9bf.tar.gz
Merge "Nit: Change name from helper function and macro"
-rw-r--r--include/common/test_helpers.h6
-rw-r--r--tftf/tests/common/test_helpers.c2
-rw-r--r--tftf/tests/runtime_services/secure_service/test_ffa_direct_messaging.c6
-rw-r--r--tftf/tests/runtime_services/secure_service/test_ffa_memory_sharing.c4
4 files changed, 9 insertions, 9 deletions
diff --git a/include/common/test_helpers.h b/include/common/test_helpers.h
index 4be9aba9..3f69df9e 100644
--- a/include/common/test_helpers.h
+++ b/include/common/test_helpers.h
@@ -226,11 +226,11 @@ typedef test_result_t (*test_function_arg_t)(void *arg);
} \
} while (false);
-#define CHECK_HAFNIUM_SPMC_TESTING_SETUP(ffa_major, ffa_minor, expected_uuids) \
+#define CHECK_SPMC_TESTING_SETUP(ffa_major, ffa_minor, expected_uuids) \
do { \
const size_t expected_uuids_size = \
sizeof(expected_uuids) / sizeof(struct ffa_uuid); \
- test_result_t ret = check_hafnium_spmc_testing_set_up( \
+ test_result_t ret = check_spmc_testing_set_up( \
ffa_major, ffa_minor, expected_uuids, \
expected_uuids_size); \
if (ret != TEST_RESULT_SUCCESS) { \
@@ -303,7 +303,7 @@ void set_tftf_mailbox(const struct mailbox_buffers *mb);
*/
bool get_tftf_mailbox(struct mailbox_buffers *mb);
-test_result_t check_hafnium_spmc_testing_set_up(uint32_t ffa_version_major,
+test_result_t check_spmc_testing_set_up(uint32_t ffa_version_major,
uint32_t ffa_version_minor, const struct ffa_uuid *ffa_uuids,
size_t ffa_uuids_size);
diff --git a/tftf/tests/common/test_helpers.c b/tftf/tests/common/test_helpers.c
index 9861070f..05b09d7c 100644
--- a/tftf/tests/common/test_helpers.c
+++ b/tftf/tests/common/test_helpers.c
@@ -148,7 +148,7 @@ bool get_tftf_mailbox(struct mailbox_buffers *mb)
return false;
}
-test_result_t check_hafnium_spmc_testing_set_up(
+test_result_t check_spmc_testing_set_up(
uint32_t ffa_version_major, uint32_t ffa_version_minor,
const struct ffa_uuid *ffa_uuids, size_t ffa_uuids_size)
{
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 36bc3e73..6e79a881 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
@@ -62,7 +62,7 @@ test_result_t test_ffa_direct_messaging(void)
/**********************************************************************
* Check SPMC has ffa_version and expected FFA endpoints are deployed.
**********************************************************************/
- CHECK_HAFNIUM_SPMC_TESTING_SETUP(1, 0, expected_sp_uuids);
+ CHECK_SPMC_TESTING_SETUP(1, 0, expected_sp_uuids);
/**********************************************************************
* Send a message to SP1 through direct messaging
@@ -122,7 +122,7 @@ test_result_t test_ffa_sp_to_sp_direct_messaging(void)
{
test_result_t result;
- CHECK_HAFNIUM_SPMC_TESTING_SETUP(1, 0, expected_sp_uuids);
+ CHECK_SPMC_TESTING_SETUP(1, 0, expected_sp_uuids);
result = send_cactus_req_echo_cmd(HYP_ID, SP_ID(1), SP_ID(2),
ECHO_VAL1);
@@ -153,7 +153,7 @@ test_result_t test_ffa_sp_to_sp_deadlock(void)
/**********************************************************************
* Check SPMC has ffa_version and expected FFA endpoints are deployed.
**********************************************************************/
- CHECK_HAFNIUM_SPMC_TESTING_SETUP(1, 0, expected_sp_uuids);
+ CHECK_SPMC_TESTING_SETUP(1, 0, expected_sp_uuids);
ret = cactus_req_deadlock_send_cmd(HYP_ID, SP_ID(1), SP_ID(2), SP_ID(3));
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 4afe170c..b861d09e 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
@@ -52,7 +52,7 @@ static test_result_t test_memory_send_sp(uint32_t mem_func)
/***********************************************************************
* Check if SPMC has ffa_version and expected FFA endpoints are deployed.
**********************************************************************/
- CHECK_HAFNIUM_SPMC_TESTING_SETUP(1, 0, expected_sp_uuids);
+ CHECK_SPMC_TESTING_SETUP(1, 0, expected_sp_uuids);
GET_TFTF_MAILBOX(mb);
@@ -139,7 +139,7 @@ static test_result_t test_req_mem_send_sp_to_sp(uint32_t mem_func,
/***********************************************************************
* Check if SPMC's ffa_version and presence of expected FF-A endpoints.
**********************************************************************/
- CHECK_HAFNIUM_SPMC_TESTING_SETUP(1, 0, expected_sp_uuids);
+ CHECK_SPMC_TESTING_SETUP(1, 0, expected_sp_uuids);
ret = cactus_req_mem_send_send_cmd(HYP_ID, sender_sp, mem_func,
receiver_sp);