sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arch/armv8-m: add ARMV8M_TRUSTZONE_HYBRID feature

Browse Source 
Some chips only have one core that supports secure in smp mode,
so need change EXC_RETURN to non-secure when switching to a core that
does not support secure.

Signed-off-by: zhangyuan21 <zhangyuan21@xiaomi.com>
This commit is contained in:
zhangyuan21 2023-03-27 11:56:35 +08:00 committed by Xiang Xiao
parent ba411fb53d
commit 3b074b153b
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm/src/armv8-m/Kconfig
View File

@ -153,3 +153,19 @@ config ARMV8M_SYSTICK
depends on TIMER depends on TIMER
---help--- ---help---
Enable SysTick timer driver. Enable SysTick timer driver.
config ARMV8M_TRUSTZONE_HYBRID
bool "Hybrid with secure and non-secure."
default n
depends on SMP
---help---
Enable the hybrid with secure and non-secure domain.
In SMP mode, you can enable this configuration when one
core supports secure and the other does not.
config ARMV8M_TRUSTZONE_CPU_BITMASK
hex "Security support bitmap for multicore."
depends on ARMV8M_TRUSTZONE_HYBRID
default 0
---help---
Set Security bitmap for multicore, bit 0 means core 0.

15
arch/arm/src/armv8-m/arm_doirq.c
View File

@ -33,6 +33,7 @@
#include <arch/board/board.h> #include <arch/board/board.h>
#include "arm_internal.h" #include "arm_internal.h"
#include "exc_return.h"
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
@ -92,5 +93,19 @@ uint32_t *arm_doirq(int irq, uint32_t *regs)
#endif #endif
board_autoled_off(LED_INIRQ); board_autoled_off(LED_INIRQ);
#ifdef CONFIG_ARMV8M_TRUSTZONE_HYBRID
if (((1 << up_cpu_index()) & CONFIG_ARMV8M_TRUSTZONE_CPU_BITMASK) == 0)
{
regs[REG_EXC_RETURN] &=
~(EXC_RETURN_EXC_SECURE | EXC_RETURN_SECURE_STACK);
}
else
{
regs[REG_EXC_RETURN] |=
(EXC_RETURN_EXC_SECURE | EXC_RETURN_SECURE_STACK);
}
#endif
return regs; return regs;
} }