[nuttx] branch master updated: arch/armv8-m: add ARMV8M_TRUSTZONE_HYBRID feature

[xiaoxiang]

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new 3b074b153b arch/armv8-m: add ARMV8M_TRUSTZONE_HYBRID feature
3b074b153b is described below

commit 3b074b153b2c845f4561237d3a9b343940308a64
Author: zhangyuan21 <zhangyua...@xiaomi.com>
AuthorDate: Mon Mar 27 11:56:35 2023 +0800

    arch/armv8-m: add ARMV8M_TRUSTZONE_HYBRID feature
    
    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 <zhangyua...@xiaomi.com>
---
 arch/arm/src/armv8-m/Kconfig     | 16 ++++++++++++++++
 arch/arm/src/armv8-m/arm_doirq.c | 15 +++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/arch/arm/src/armv8-m/Kconfig b/arch/arm/src/armv8-m/Kconfig
index 064d09c47c..afa57a4f9a 100644
--- a/arch/arm/src/armv8-m/Kconfig
+++ b/arch/arm/src/armv8-m/Kconfig
@@ -153,3 +153,19 @@ config ARMV8M_SYSTICK
        depends on TIMER
        ---help---
                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.
diff --git a/arch/arm/src/armv8-m/arm_doirq.c b/arch/arm/src/armv8-m/arm_doirq.c
index 0670c76aef..1d10b520c6 100644
--- a/arch/arm/src/armv8-m/arm_doirq.c
+++ b/arch/arm/src/armv8-m/arm_doirq.c
@@ -33,6 +33,7 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
+#include "exc_return.h"
 
 /****************************************************************************
  * Public Functions
@@ -92,5 +93,19 @@ uint32_t *arm_doirq(int irq, uint32_t *regs)
 #endif
 
   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;
 }