diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2016-07-14 08:25:37 +0100 |
|---|---|---|
| committer | Soby Mathew <soby.mathew@arm.com> | 2016-09-26 14:44:56 +0100 |
| commit | 31942518d7305ffdc34071ccc86fa7f8bff5ee97 (patch) | |
| tree | d0ac486826d847abe625745fa142fd28d664d59f /tests/runtime_services | |
| parent | 7536a0026de009e53cdf6637dfd1d59fab0dd74d (diff) | |
AArch32: Cater for PSCI SMC Function IDs
At present, the SMC function ID constants are explicitly suffixed
for AArch64. This patch renames them so that they appear
architecture-agnostic. The final value of these constants however
are defined according to the architecture TFTF is built for.
Test cases which use these macros have been modified accordingly.
Change-Id: I0ad64003908683dfda472e66135fdce0ffe66897
Diffstat (limited to 'tests/runtime_services')
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/runtime_services/standard_service/psci/api_tests/migrate_info_type/test_migrate_info_type.c b/tests/runtime_services/standard_service/psci/api_tests/migrate_info_type/test_migrate_info_type.c index 4a981f0..d2f6d5f 100644 --- a/tests/runtime_services/standard_service/psci/api_tests/migrate_info_type/test_migrate_info_type.c +++ b/tests/runtime_services/standard_service/psci/api_tests/migrate_info_type/test_migrate_info_type.c @@ -108,7 +108,7 @@ test_result_t test_migrate_info_type(void) * Either there is no Trusted OS or the Trusted OS is the TSP. * In both cases, the MIGRATE call should not be supported. */ - args.arg0 = SMC_PSCI_MIG_AARCH64; + args.arg0 = SMC_PSCI_MIG; /* * Pass a valid MPID so that the MIGRATE call doesn't fail because of * invalid parameters diff --git a/tests/runtime_services/standard_service/psci/api_tests/system_suspend/test_psci_system_suspend.c b/tests/runtime_services/standard_service/psci/api_tests/system_suspend/test_psci_system_suspend.c index aedfdc5..5e1cbcd 100644 --- a/tests/runtime_services/standard_service/psci/api_tests/system_suspend/test_psci_system_suspend.c +++ b/tests/runtime_services/standard_service/psci/api_tests/system_suspend/test_psci_system_suspend.c @@ -243,7 +243,7 @@ int sys_suspend_helper(uintptr_t entry_point_address, u_register_t context_id) { smc_args args = { - SMC_PSCI_SYSTEM_SUSPEND64, + SMC_PSCI_SYSTEM_SUSPEND, (uintptr_t)entry_point_address, (u_register_t)context_id }; |