summaryrefslogtreecommitdiff
path: root/tests/runtime_services/trusted_os/tsp/test_normal_int_switch.c
diff options
context:
space:
mode:
Diffstat (limited to 'tests/runtime_services/trusted_os/tsp/test_normal_int_switch.c')
-rw-r--r--tests/runtime_services/trusted_os/tsp/test_normal_int_switch.c56
1 files changed, 28 insertions, 28 deletions
diff --git a/tests/runtime_services/trusted_os/tsp/test_normal_int_switch.c b/tests/runtime_services/trusted_os/tsp/test_normal_int_switch.c
index 6f22769..7f7539d 100644
--- a/tests/runtime_services/trusted_os/tsp/test_normal_int_switch.c
+++ b/tests/runtime_services/trusted_os/tsp/test_normal_int_switch.c
@@ -53,7 +53,7 @@
* preempt_tsp_via_SGI routine.
*/
typedef struct {
- smc64_ret_values tsp_result;
+ smc_ret_values tsp_result;
int wait_for_fiq;
} irq_handler_shared_data;
@@ -77,7 +77,7 @@ static int sgi_handler(void *data)
* This routine issues a SGI with interrupts disabled to make sure that the
* pending SGI will preempt a STD SMC.
*/
-static test_result_t preempt_tsp_via_SGI(const smc64_args *tsp_svc_params,
+static test_result_t preempt_tsp_via_SGI(const smc_args *tsp_svc_params,
int hold_irq_handler_for_fiq)
{
int rc;
@@ -114,11 +114,11 @@ static test_result_t preempt_tsp_via_SGI(const smc64_args *tsp_svc_params,
* Invoke an STD SMC. Should be pre-empted because of the SGI that is
* waiting.
*/
- shared_data.tsp_result = tftf_smc64(tsp_svc_params);
+ shared_data.tsp_result = tftf_smc(tsp_svc_params);
if (shared_data.tsp_result.ret0 != TSP_SMC_PREEMPTED) {
- tftf_testcase_printf("SMC returned 0x%lX instead of "
+ tftf_testcase_printf("SMC returned 0x%llX instead of "
"TSP_SMC_PREEMPTED.\n",
- shared_data.tsp_result.ret0);
+ (unsigned long long)shared_data.tsp_result.ret0);
result = TEST_RESULT_FAIL;
}
@@ -148,8 +148,8 @@ static test_result_t preempt_tsp_via_SGI(const smc64_args *tsp_svc_params,
*/
test_result_t tsp_int_and_resume(void)
{
- smc64_args tsp_svc_params;
- smc64_ret_values tsp_result = {0};
+ smc_args tsp_svc_params;
+ smc_ret_values tsp_result = {0};
test_result_t res;
uuid_t tos_uuid;
char tos_uuid_str[UUID_STR_SIZE];
@@ -176,7 +176,7 @@ test_result_t tsp_int_and_resume(void)
/* Now that we have ensured preemption, issue RESUME */
tsp_svc_params.arg0 = TSP_FID_RESUME;
- tsp_result = tftf_smc64(&tsp_svc_params);
+ tsp_result = tftf_smc(&tsp_svc_params);
/* Check the result of the addition */
if (tsp_result.ret0 != 0 || tsp_result.ret1 != 8 ||
@@ -200,7 +200,7 @@ test_result_t tsp_int_and_resume(void)
/* Now that we have ensured preemption, issue RESUME */
tsp_svc_params.arg0 = TSP_FID_RESUME;
- tsp_result = tftf_smc64(&tsp_svc_params);
+ tsp_result = tftf_smc(&tsp_svc_params);
/* Check the result of the substraction */
if (tsp_result.ret0 != 0 || tsp_result.ret1 != 0 ||
@@ -223,7 +223,7 @@ test_result_t tsp_int_and_resume(void)
/* Now that we have ensured preemption, issue RESUME */
tsp_svc_params.arg0 = TSP_FID_RESUME;
- tsp_result = tftf_smc64(&tsp_svc_params);
+ tsp_result = tftf_smc(&tsp_svc_params);
/* Check the result of the multiplication */
if (tsp_result.ret0 != 0 || tsp_result.ret1 != 16 ||
@@ -246,7 +246,7 @@ test_result_t tsp_int_and_resume(void)
/* Now that we have ensured preemption, issue RESUME */
tsp_svc_params.arg0 = TSP_FID_RESUME;
- tsp_result = tftf_smc64(&tsp_svc_params);
+ tsp_result = tftf_smc(&tsp_svc_params);
/* Check the result of the division */
if (tsp_result.ret0 != 0 || tsp_result.ret1 != 1 ||
@@ -272,8 +272,8 @@ test_result_t tsp_int_and_resume(void)
*/
test_result_t test_fast_smc_when_tsp_preempted(void)
{
- smc64_args tsp_svc_params;
- smc64_ret_values tsp_result = {0};
+ smc_args tsp_svc_params;
+ smc_ret_values tsp_result = {0};
test_result_t res = TEST_RESULT_SUCCESS;
uuid_t tos_uuid;
char tos_uuid_str[UUID_STR_SIZE];
@@ -303,7 +303,7 @@ test_result_t test_fast_smc_when_tsp_preempted(void)
tsp_svc_params.arg1 = 4;
tsp_svc_params.arg2 = 6;
- tsp_result = tftf_smc64(&tsp_svc_params);
+ tsp_result = tftf_smc(&tsp_svc_params);
if (tsp_result.ret0 != SMC_UNKNOWN) {
tftf_testcase_printf("Fast SMC should not execute"
@@ -313,7 +313,7 @@ test_result_t test_fast_smc_when_tsp_preempted(void)
/* Issue RESUME */
tsp_svc_params.arg0 = TSP_FID_RESUME;
- tsp_result = tftf_smc64(&tsp_svc_params);
+ tsp_result = tftf_smc(&tsp_svc_params);
/* Check the result of the addition */
if (tsp_result.ret0 != 0 || tsp_result.ret1 != 8 ||
@@ -341,8 +341,8 @@ test_result_t test_fast_smc_when_tsp_preempted(void)
*/
test_result_t test_std_smc_when_tsp_preempted(void)
{
- smc64_args tsp_svc_params;
- smc64_ret_values tsp_result = {0};
+ smc_args tsp_svc_params;
+ smc_ret_values tsp_result = {0};
test_result_t res = TEST_RESULT_SUCCESS;
uuid_t tos_uuid;
char tos_uuid_str[UUID_STR_SIZE];
@@ -372,7 +372,7 @@ test_result_t test_std_smc_when_tsp_preempted(void)
tsp_svc_params.arg1 = 4;
tsp_svc_params.arg2 = 6;
- tsp_result = tftf_smc64(&tsp_svc_params);
+ tsp_result = tftf_smc(&tsp_svc_params);
if (tsp_result.ret0 != SMC_UNKNOWN) {
tftf_testcase_printf("Standard SMC should not execute"
@@ -382,7 +382,7 @@ test_result_t test_std_smc_when_tsp_preempted(void)
/* Issue RESUME */
tsp_svc_params.arg0 = TSP_FID_RESUME;
- tsp_result = tftf_smc64(&tsp_svc_params);
+ tsp_result = tftf_smc(&tsp_svc_params);
/* Check the result of the addition */
if (tsp_result.ret0 != 0 || tsp_result.ret1 != 8 ||
@@ -406,8 +406,8 @@ test_result_t test_std_smc_when_tsp_preempted(void)
*/
test_result_t test_resume_smc_without_preemption(void)
{
- smc64_args tsp_svc_params;
- smc64_ret_values tsp_result = {0};
+ smc_args tsp_svc_params;
+ smc_ret_values tsp_result = {0};
uuid_t tos_uuid;
char tos_uuid_str[UUID_STR_SIZE];
@@ -425,7 +425,7 @@ test_result_t test_resume_smc_without_preemption(void)
/* Issue RESUME */
tsp_svc_params.arg0 = TSP_FID_RESUME;
- tsp_result = tftf_smc64(&tsp_svc_params);
+ tsp_result = tftf_smc(&tsp_svc_params);
if (tsp_result.ret0 != SMC_UNKNOWN) {
tftf_testcase_printf("SMC Resume should return UNKNOWN, got:%d\n", \
@@ -445,8 +445,8 @@ test_result_t test_resume_smc_without_preemption(void)
*/
test_result_t tsp_int_and_resume_stress(void)
{
- smc64_args tsp_svc_params;
- smc64_ret_values tsp_result = {0};
+ smc_args tsp_svc_params;
+ smc_ret_values tsp_result = {0};
test_result_t res = TEST_RESULT_SUCCESS;
uuid_t tos_uuid;
char tos_uuid_str[UUID_STR_SIZE];
@@ -479,7 +479,7 @@ test_result_t tsp_int_and_resume_stress(void)
/* Issue RESUME */
tsp_svc_params.arg0 = TSP_FID_RESUME;
- tsp_result = tftf_smc64(&tsp_svc_params);
+ tsp_result = tftf_smc(&tsp_svc_params);
/* Check the result of the addition */
if (tsp_result.ret0 != 0 || tsp_result.ret1 != 8 ||
@@ -513,8 +513,8 @@ test_result_t tsp_int_and_resume_stress(void)
*/
test_result_t tsp_fiq_while_int(void)
{
- smc64_args tsp_svc_params;
- smc64_ret_values tsp_result = {0};
+ smc_args tsp_svc_params;
+ smc_ret_values tsp_result = {0};
test_result_t res;
uuid_t tos_uuid;
char tos_uuid_str[UUID_STR_SIZE];
@@ -541,7 +541,7 @@ test_result_t tsp_fiq_while_int(void)
/* Now that we have ensured preemption, issue RESUME */
tsp_svc_params.arg0 = TSP_FID_RESUME;
- tsp_result = tftf_smc64(&tsp_svc_params);
+ tsp_result = tftf_smc(&tsp_svc_params);
/* Check the result of the addition */
if (tsp_result.ret0 != 0 || tsp_result.ret1 != 8 ||
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 20:25:39 +0000