aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJ-Alves <joao.alves@arm.com>2020-10-28 10:29:05 +0000
committerJ-Alves <joao.alves@arm.com>2020-10-29 10:16:53 +0000
commit8f4a56f23ed26798402f3964a61fcd764bf7e539 (patch)
treec059618787d2d4dbfb1db5a8a68cfb9b2acd85d7
parentf474306a656c58b7698e486b9a857b73b5b7f4ee (diff)
downloadtf-a-tests-8f4a56f23ed26798402f3964a61fcd764bf7e539.tar.gz
SPM: FFA endpoints header
Introduced ffa_endpoints.h file, to contain definitions regarding FFA endpoints that are possible to be part of a testing set-up, with either cactus and/or tftf. Signed-off-by: J-Alves <joao.alves@arm.com> Change-Id: Ia5a94034ad232b319d5a113834421f807f50eaf5
-rw-r--r--include/runtime_services/ffa_endpoints.h23
-rw-r--r--spm/cactus/cactus_def.h8
-rw-r--r--spm/cactus/cactus_ffa_tests.c1
-rw-r--r--tftf/tests/runtime_services/secure_service/ffa_helpers.c6
4 files changed, 25 insertions, 13 deletions
diff --git a/include/runtime_services/ffa_endpoints.h b/include/runtime_services/ffa_endpoints.h
new file mode 100644
index 00000000..8d108edc
--- /dev/null
+++ b/include/runtime_services/ffa_endpoints.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2020, Arm Limited. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef FFA_ENDPOINTS_H
+#define FFA_ENDPOINTS_H
+
+/* UUID of cactus SPs as defined in the respective manifests. */
+#define PRIMARY_UUID {0xb4b5671e, 0x4a904fe1, 0xb81ffb13, 0xdae1dacb}
+#define SECONDARY_UUID {0xd1582309, 0xf02347b9, 0x827c4464, 0xf5578fc8}
+#define TERTIARY_UUID {0x79b55c73, 0x1d8c44b9, 0x859361e1, 0x770ad8d2}
+
+/* UUID of OPTEE SP as defined in the respective manifest. */
+#define OPTEE_UUID {0x486178e0, 0xe7f811e3, 0xbc5e0002, 0xa5d5c51b}
+
+#define OPTEE_FFA_GET_API_VERSION (0)
+#define OPTEE_FFA_GET_OS_VERSION (1)
+#define OPTEE_FFA_GET_OS_VERSION_MAJOR (3)
+#define OPTEE_FFA_GET_OS_VERSION_MINOR (8)
+
+#endif
diff --git a/spm/cactus/cactus_def.h b/spm/cactus/cactus_def.h
index 83be35f7..190f0631 100644
--- a/spm/cactus/cactus_def.h
+++ b/spm/cactus/cactus_def.h
@@ -36,12 +36,4 @@
#define get_sp_tx_start(sp_id) (CACTUS_TX_BASE + (((sp_id & 0x7FFFU) - 1U) * CACTUS_RX_TX_SIZE))
#define get_sp_tx_end(sp_id) (CACTUS_TX_BASE + (((sp_id & 0x7FFFU) - 1U) * CACTUS_RX_TX_SIZE) + PAGE_SIZE)
-/*
- * UUID of secure partition as defined in the respective manifests.
- */
-#define PRIMARY_UUID {0xb4b5671e, 0x4a904fe1, 0xb81ffb13, 0xdae1dacb}
-#define SECONDARY_UUID {0xd1582309, 0xf02347b9, 0x827c4464, 0xf5578fc8}
-#define TERTIARY_UUID {0x79b55c73, 0x1d8c44b9, 0x859361e1, 0x770ad8d2}
-
-
#endif /* CACTUS_DEF_H */
diff --git a/spm/cactus/cactus_ffa_tests.c b/spm/cactus/cactus_ffa_tests.c
index 1b12fb7c..a49d6657 100644
--- a/spm/cactus/cactus_ffa_tests.c
+++ b/spm/cactus/cactus_ffa_tests.c
@@ -8,6 +8,7 @@
#include <errno.h>
#include <cactus_platform_def.h>
#include <cactus_def.h>
+#include <ffa_endpoints.h>
#include <ffa_helpers.h>
#include <sp_helpers.h>
diff --git a/tftf/tests/runtime_services/secure_service/ffa_helpers.c b/tftf/tests/runtime_services/secure_service/ffa_helpers.c
index 78dfa422..8ee4ebc7 100644
--- a/tftf/tests/runtime_services/secure_service/ffa_helpers.c
+++ b/tftf/tests/runtime_services/secure_service/ffa_helpers.c
@@ -6,14 +6,10 @@
#include <debug.h>
#include <smccc.h>
+#include <ffa_endpoints.h>
#include <ffa_helpers.h>
#include <ffa_svc.h>
-#define OPTEE_FFA_GET_API_VERSION (0)
-#define OPTEE_FFA_GET_OS_VERSION (1)
-#define OPTEE_FFA_GET_OS_VERSION_MAJOR (3)
-#define OPTEE_FFA_GET_OS_VERSION_MINOR (8)
-
/*-----------------------------------------------------------------------------
* FFA_RUN
*