From dd6e2678f50c95f9b1d53de8ec6b54124fafe6f8 Mon Sep 17 00:00:00 2001
From: Luis Gerhorst <privat@luisgerhorst.de>
Date: Sat, 16 Jan 2021 10:07:10 +0100
Subject: [PATCH] test_mp_start
$ ZEPHYR_TOOLCHAIN_VARIANT=zephyr ./scripts/sanitycheck -T tests/kernel/mp/ -p qemu_raspi3 -W
---
arch/arm/core/aarch64/CMakeLists.txt | 1 +
arch/arm/core/aarch64/reset.S | 2 +-
soc/arm/qemu_raspi3/mmu_regions.c | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/arm/core/aarch64/CMakeLists.txt b/arch/arm/core/aarch64/CMakeLists.txt
index b336145dfa1..8da3241b28d 100644
--- a/arch/arm/core/aarch64/CMakeLists.txt
+++ b/arch/arm/core/aarch64/CMakeLists.txt
@@ -32,3 +32,4 @@ zephyr_library_sources_ifdef(CONFIG_IRQ_OFFLOAD irq_offload.c)
zephyr_library_sources_ifdef(CONFIG_ARM_MMU arm_mmu.c)
zephyr_library_sources_ifdef(CONFIG_THREAD_LOCAL_STORAGE ../common/tls.c)
zephyr_library_sources_ifdef(CONFIG_SMP cpu_smp.c)
+zephyr_library_sources_ifdef(CONFIG_ZTEST cpu_smp.c)
diff --git a/arch/arm/core/aarch64/reset.S b/arch/arm/core/aarch64/reset.S
index aa8fc1b6ef3..5f14eefbfc7 100644
--- a/arch/arm/core/aarch64/reset.S
+++ b/arch/arm/core/aarch64/reset.S
@@ -204,7 +204,7 @@ raspi3_get_el:
lsr x0, x0, #2
ret
-#if defined(CONFIG_SMP)
+#if defined(CONFIG_SMP) || defined(CONFIG_ZTEST)
.globl raspi3b_smp_init_top_wrapper
raspi3b_smp_init_top_wrapper:
/* Put CPU ID into x4. */
diff --git a/soc/arm/qemu_raspi3/mmu_regions.c b/soc/arm/qemu_raspi3/mmu_regions.c
index 22f7b10f6be..50b3f5e4120 100644
--- a/soc/arm/qemu_raspi3/mmu_regions.c
+++ b/soc/arm/qemu_raspi3/mmu_regions.c
@@ -40,7 +40,7 @@ static const struct arm_mmu_region mmu_regions[] = {
DT_REG_SIZE(DT_INST(0, arm_raspi3_mini)),
MT_DEVICE_nGnRnE | MT_RW | MT_SECURE),
#endif
-#ifdef CONFIG_SMP
+#if defined(CONFIG_SMP) || defined(CONFIG_ZTEST)
MMU_REGION_FLAT_ENTRY("SPINTABLE",
0x00000000,
0x1000,
--
GitLab