test(vhe): add vhe test setup with SPs
Created test setup based on "primary_with_secondaries" that deploys
both the SPMC with VHE enabled and the hypervisor:
- Primary VM controls test execution and communicates with an S-EL0
partition.
- S-EL0 partition added to replace "Secure Service1" (of the equivalent
setup without VHE enabled).
For the time being including only the indirect messaging test suite.
Change-Id: Ib9c58bf010bcfacfb8126afdeaccafae105d74e4
Signed-off-by: J-Alves <joao.alves@arm.com>
diff --git a/test/hftest/BUILD.gn b/test/hftest/BUILD.gn
index 24b7b0f..c64d5e3 100644
--- a/test/hftest/BUILD.gn
+++ b/test/hftest/BUILD.gn
@@ -64,6 +64,7 @@
sources = [
"sel0_secure_service.c",
+ "service_common.c",
]
deps = [
diff --git a/test/hftest/sel0_secure_service.c b/test/hftest/sel0_secure_service.c
index 6eca211..a5913a0 100644
--- a/test/hftest/sel0_secure_service.c
+++ b/test/hftest/sel0_secure_service.c
@@ -15,37 +15,27 @@
#include "vmapi/hf/call.h"
+#include "test/abort.h"
#include "test/hftest.h"
#include "test/vmapi/ffa.h"
alignas(4096) uint8_t kstack[4096];
-HFTEST_ENABLE();
-
-static struct hftest_context global_context;
-
-struct hftest_context *hftest_get_context(void)
-{
- return &global_context;
-}
-
bool sel1_secure_service = false;
+static struct ffa_boot_info_header* boot_info_header;
+
+struct ffa_boot_info_header* get_boot_info_header(void)
+{
+ return boot_info_header;
+}
+
void test_main_sp(bool);
-noreturn void abort(void)
+noreturn void kmain(struct ffa_boot_info_header* boot_info_blob)
{
- HFTEST_LOG("Service contained failures.");
- /* Cause a fault, as a secondary can't power down the machine. */
- *((volatile uint8_t *)1) = 1;
+ boot_info_header = boot_info_blob;
- /* This should never be reached, but to make the compiler happy... */
- for (;;) {
- }
-}
-
-noreturn void kmain(void)
-{
/* Register RX/TX buffers via FFA_RXTX_MAP */
set_up_mailbox();