portugalfuturista/seL4
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make SMP conditional check more general

Browse source 
Check for CONFIG_ENABLE_SMP_SUPPORT instead of checking for the
number in CONFIG_MAX_NUM_NODES. This allows enabling SMP support
with just one node also.

Signed-off-by: Axel Heider <axel.heider@codasip.com>
This commit is contained in:
Axel Heider 2024-03-22 16:52:04 +00:00 committed by Indan Zupancic
parent 8c82535e50
commit a58480425c
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/arch/arm/arch/64/mode/machine.h
View file

@ -304,7 +304,7 @@ static inline void invalidateByVA_I(vptr_t vaddr, paddr_t paddr)
static inline void invalidate_I_PoU(void) static inline void invalidate_I_PoU(void)
{ {
#if CONFIG_MAX_NUM_NODES > 1 #ifdef CONFIG_ENABLE_SMP_SUPPORT
asm volatile("ic ialluis"); asm volatile("ic ialluis");
#else #else
asm volatile("ic iallu"); asm volatile("ic iallu");

2
libsel4/include/sel4/syscalls.h
View file

@ -118,7 +118,7 @@ seL4_DebugCapIdentify(seL4_CPtr cap);
*/ */
LIBSEL4_INLINE_FUNC void LIBSEL4_INLINE_FUNC void
seL4_DebugNameThread(seL4_CPtr tcb, const char *name); seL4_DebugNameThread(seL4_CPtr tcb, const char *name);
#if CONFIG_MAX_NUM_NODES > 1 && defined CONFIG_ARCH_ARM #if defined(CONFIG_ENABLE_SMP_SUPPORT) && defined(CONFIG_ARCH_ARM)
/** /**
* @xmlonly <manual name="Send SGI 0-15" label="sel4_debugsendipi"/> @endxmlonly * @xmlonly <manual name="Send SGI 0-15" label="sel4_debugsendipi"/> @endxmlonly
* @brief Sends arbitrary SGI. * @brief Sends arbitrary SGI.

2
src/arch/arm/64/traps.S
View file

@ -32,7 +32,7 @@
.macro lsp_i _tmp .macro lsp_i _tmp
mrs \_tmp, TPIDR mrs \_tmp, TPIDR
#if CONFIG_MAX_NUM_NODES > 1 #ifdef CONFIG_ENABLE_SMP_SUPPORT
bic \_tmp, \_tmp, #0xfff bic \_tmp, \_tmp, #0xfff
#endif #endif
mov sp, \_tmp mov sp, \_tmp

2
src/arch/riscv/head.S
View file

@ -30,7 +30,7 @@ _start:
la sp, (kernel_stack_alloc + BIT(CONFIG_KERNEL_STACK_BITS)) la sp, (kernel_stack_alloc + BIT(CONFIG_KERNEL_STACK_BITS))
csrw sscratch, x0 /* zero sscratch for the init task */ csrw sscratch, x0 /* zero sscratch for the init task */
#if CONFIG_MAX_NUM_NODES > 1 #ifdef CONFIG_ENABLE_SMP_SUPPORT
/* setup the per-core stack */ /* setup the per-core stack */
mv t0, a7 mv t0, a7
slli t0, t0, CONFIG_KERNEL_STACK_BITS slli t0, t0, CONFIG_KERNEL_STACK_BITS