fix: remove dependency on fixed PSCI version in smc32_fast
Eliminate the dependency on a fixed PSCI version when testing single
return register SMC calls.
Change-Id: Iea8fd1bd450615cf2b7409cb5e0dd09e5b804534
Signed-off-by: Imre Kis <imre.kis@arm.com>
diff --git a/tftf/tests/runtime_services/generic/generic_smc.c b/tftf/tests/runtime_services/generic/generic_smc.c
index 676e803..1d15dcf 100644
--- a/tftf/tests/runtime_services/generic/generic_smc.c
+++ b/tftf/tests/runtime_services/generic/generic_smc.c
@@ -17,10 +17,6 @@
/* An invalid SMC function number. */
#define INVALID_FN 0x666
-/* PSCI version returned by TF-A. */
-static const uint32_t psci_version = PSCI_VERSION(PSCI_MAJOR_VER,
- PSCI_MINOR_VER);
-
/* UUID of the standard service in TF-A. */
static const smc_ret_values std_svc_uuid = {
0x108d905b, 0x47e8f863, 0xfbc02dae, 0xe2f64156
@@ -205,10 +201,15 @@
const smc_args args3
= { SMC_PSCI_VERSION, 0x44444444, 0x55555555, 0x66666666,
0x77777777, 0x88888888, 0x99999999, 0xaaaaaaaa };
- const smc_ret_values ret3
- = { psci_version, 0x44444444, 0x55555555, 0x66666666,
+ smc_ret_values ret3
+ = { 0x00000000, 0x44444444, 0x55555555, 0x66666666,
0x77777777, 0x88888888, 0x99999999, 0xaaaaaaaa };
- FAIL_IF(!smc_check_eq(&args3, &ret3));
+
+ const bool check[8] = { false, true, true, true, true, true, true, true };
+ const bool allow_zeros[8] = { false, true, true, true,
+ true, true, true, true };
+
+ FAIL_IF(!smc_check_match(&args3, &ret3, check, allow_zeros));
return TEST_RESULT_SUCCESS;
}