diff options
Diffstat (limited to 'tftf')
3 files changed, 6 insertions, 6 deletions
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 12954426d..50e85825e 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 @@ -38,7 +38,7 @@ static test_result_t send_receive_direct_msg(unsigned int sp_id, * Return responses may be FFA_MSG_SEND_DIRECT_RESP or FFA_INTERRUPT, * but only expect the former. Expect SMC32 convention from SP. */ - if (ffa_func_id(ret_values) != FFA_MSG_SEND_DIRECT_RESP_SMC32) { + if (!is_ffa_direct_response(ret_values)) { tftf_testcase_printf("ffa_msg_send_direct_req returned %x\n", ffa_func_id(ret_values)); return TEST_RESULT_FAIL; @@ -105,7 +105,7 @@ static test_result_t send_cactus_req_echo_cmd(ffa_vm_id_t sender, ret = cactus_req_echo_send_cmd(sender, dest, echo_dest, value); - if (ffa_func_id(ret) != FFA_MSG_SEND_DIRECT_RESP_SMC32) { + if (!is_ffa_direct_response(ret)) { ERROR("Failed to send message. error: %x\n", ffa_error_code(ret)); return TEST_RESULT_FAIL; @@ -157,7 +157,7 @@ test_result_t test_ffa_sp_to_sp_deadlock(void) ret = cactus_req_deadlock_send_cmd(HYP_ID, SP_ID(1), SP_ID(2), SP_ID(3)); - if (ffa_func_id(ret) != FFA_MSG_SEND_DIRECT_RESP_SMC32) { + if (!is_ffa_direct_response(ret)) { ERROR("Failed to send message. error: %x\n", ffa_error_code(ret)); return TEST_RESULT_FAIL; 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 05a8b5914..67ffb53be 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 @@ -79,7 +79,7 @@ static test_result_t test_memory_send_sp(uint32_t mem_func) ret = cactus_mem_send_cmd(SENDER, RECEIVER, mem_func, handle); - if (ffa_func_id(ret) != FFA_MSG_SEND_DIRECT_RESP_SMC32) { + if (!is_ffa_direct_response(ret)) { ERROR("Failed to send message. error: %x\n", ffa_error_code(ret)); return TEST_RESULT_FAIL; @@ -144,7 +144,7 @@ static test_result_t test_req_mem_send_sp_to_sp(uint32_t mem_func, ret = cactus_req_mem_send_send_cmd(HYP_ID, sender_sp, mem_func, receiver_sp); - if (ffa_func_id(ret) != FFA_MSG_SEND_DIRECT_RESP_SMC32) { + if (!is_ffa_direct_response(ret)) { ERROR("Failed to send message. error: %x\n", ffa_error_code(ret)); return TEST_RESULT_FAIL; diff --git a/tftf/tests/runtime_services/secure_service/test_spm_cpu_features.c b/tftf/tests/runtime_services/secure_service/test_spm_cpu_features.c index c6470c14a..8ce4cc3b4 100644 --- a/tftf/tests/runtime_services/secure_service/test_spm_cpu_features.c +++ b/tftf/tests/runtime_services/secure_service/test_spm_cpu_features.c @@ -55,7 +55,7 @@ test_result_t test_simd_vectors_preserved(void) smc_ret_values ret = cactus_req_simd_fill_send_cmd(SENDER, RECEIVER); - if (ffa_func_id(ret) != FFA_MSG_SEND_DIRECT_RESP_SMC32) { + if (!is_ffa_direct_response(ret)) { ERROR("Failed to send message. error: %x\n", ffa_error_code(ret)); return TEST_RESULT_FAIL; |