SPCI is now called PSA FF-A
SPCI is renamed as PSA FF-A which stands for Platform Security
Architecture Firmware Framework for A class processors.
This patch replaces the occurrence of SPCI with PSA FF-A(in documents)
or simply FFA(in code).
Signed-off-by: J-Alves <joao.alves@arm.com>
Change-Id: I17728c1503312845944a5ba060c252c2b98f3e91
diff --git a/include/common/test_helpers.h b/include/common/test_helpers.h
index 5c0f090..e9e0b7b 100644
--- a/include/common/test_helpers.h
+++ b/include/common/test_helpers.h
@@ -10,7 +10,7 @@
#include <arch_features.h>
#include <plat_topology.h>
#include <psci.h>
-#include <spci_svc.h>
+#include <ffa_svc.h>
#include <tftf_lib.h>
#include <trusted_os.h>
#include <tsp.h>
@@ -143,27 +143,27 @@
version & MM_VERSION_MINOR_MASK); \
} while (0)
-#define SKIP_TEST_IF_SPCI_VERSION_LESS_THAN(major, minor) \
+#define SKIP_TEST_IF_FFA_VERSION_LESS_THAN(major, minor) \
do { \
- smc_args version_smc = { SPCI_VERSION }; \
+ smc_args version_smc = { FFA_VERSION }; \
smc_ret_values smc_ret = tftf_smc(&version_smc); \
uint32_t version = smc_ret.ret2; \
\
- if (smc_ret.ret0 != SPCI_SUCCESS_SMC32) { \
+ if (smc_ret.ret0 != FFA_SUCCESS_SMC32) { \
tftf_testcase_printf("SPM not detected.\n"); \
return TEST_RESULT_SKIPPED; \
} \
\
- if ((version & SPCI_VERSION_BIT31_MASK) != 0) { \
- tftf_testcase_printf("SPCI_VERSION bad response.\n"); \
+ if ((version & FFA_VERSION_BIT31_MASK) != 0) { \
+ tftf_testcase_printf("FFA_VERSION bad response.\n"); \
return TEST_RESULT_SKIPPED; \
} \
\
- if (version < MAKE_SPCI_VERSION(major, minor)) { \
- tftf_testcase_printf("SPCI_VERSION returned %d.%d\n" \
+ if (version < MAKE_FFA_VERSION(major, minor)) { \
+ tftf_testcase_printf("FFA_VERSION returned %d.%d\n" \
"The required version is %d.%d\n", \
- version >> SPCI_VERSION_MAJOR_SHIFT,\
- version & SPCI_VERSION_MINOR_MASK, \
+ version >> FFA_VERSION_MAJOR_SHIFT,\
+ version & FFA_VERSION_MINOR_MASK, \
major, minor); \
return TEST_RESULT_SKIPPED; \
} \