fix(dm): route Cortex-M resets through power core

3 files changed, 68 insertions, 3 deletions

diff --git a/libcpu/arm/cortex-m4/cpuport.c b/libcpu/arm/cortex-m4/cpuport.c
index 58a9a7c095..5db2fca7f3 100644
--- a/libcpu/arm/cortex-m4/cpuport.c
+++ b/libcpu/arm/cortex-m4/cpuport.c
@@ -20,6 +20,10 @@
 
 #include <rtthread.h>
 
+#ifdef RT_USING_DM
+#include <drivers/core/power.h>
+#endif
+
 #define DBG_TAG           "cortex.m4"
 #define DBG_LVL           DBG_INFO
 #include <rtdbg.h>
@@ -440,11 +444,29 @@ void rt_hw_hard_fault_exception(struct exception_info *exception_info)
 /**
  * reset CPU
  */
-void rt_hw_cpu_reset(void)
+static void cortex_m_cpu_reset(void)
 {
     SCB_AIRCR = SCB_RESET_VALUE;
 }
 
+#ifdef RT_USING_DM
+static int cortex_m_cpu_reset_init(void)
+{
+    if (!rt_dm_machine_reset)
+    {
+        rt_dm_machine_reset = cortex_m_cpu_reset;
+    }
+
+    return RT_EOK;
+}
+INIT_BOARD_EXPORT(cortex_m_cpu_reset_init);
+#else
+void rt_hw_cpu_reset(void)
+{
+    cortex_m_cpu_reset();
+}
+#endif
+
 /**
   \brief   Get IPSR Register
   \details Returns the content of the IPSR Register.
diff --git a/libcpu/arm/cortex-m7/cpuport.c b/libcpu/arm/cortex-m7/cpuport.c
index 87677a012c..43d738fc2f 100644
--- a/libcpu/arm/cortex-m7/cpuport.c
+++ b/libcpu/arm/cortex-m7/cpuport.c
@@ -18,6 +18,9 @@
  */
 
 #include <rtthread.h>
+#ifdef RT_USING_DM
+#include <drivers/core/power.h>
+#endif
 #ifdef RT_USING_HW_STACK_GUARD
 #include <mprotect.h>
 #endif
@@ -460,11 +463,29 @@ void rt_hw_hard_fault_exception(struct exception_info *exception_info)
 /**
  * reset CPU
  */
-void rt_hw_cpu_reset(void)
+static void cortex_m_cpu_reset(void)
 {
     SCB_AIRCR = SCB_RESET_VALUE;
 }
 
+#ifdef RT_USING_DM
+static int cortex_m_cpu_reset_init(void)
+{
+    if (!rt_dm_machine_reset)
+    {
+        rt_dm_machine_reset = cortex_m_cpu_reset;
+    }
+
+    return RT_EOK;
+}
+INIT_BOARD_EXPORT(cortex_m_cpu_reset_init);
+#else
+void rt_hw_cpu_reset(void)
+{
+    cortex_m_cpu_reset();
+}
+#endif
+
 #ifdef RT_USING_CPU_FFS
 /**
  * This function finds the first bit set (beginning with the least significant bit)
diff --git a/libcpu/arm/cortex-m85/cpuport.c b/libcpu/arm/cortex-m85/cpuport.c
index cc07371710..4e38b2de95 100644
--- a/libcpu/arm/cortex-m85/cpuport.c
+++ b/libcpu/arm/cortex-m85/cpuport.c
@@ -19,6 +19,10 @@
 
 #include <rtthread.h>
 
+#ifdef RT_USING_DM
+#include <drivers/core/power.h>
+#endif
+
 rt_weak int rt_hw_cpu_id(void)
 {
     return 0;
@@ -443,11 +447,29 @@ rt_weak void rt_hw_cpu_shutdown(void)
 /**
  * reset CPU
  */
-rt_weak void rt_hw_cpu_reset(void)
+static void cortex_m_cpu_reset(void)
 {
     SCB_AIRCR = SCB_RESET_VALUE;
 }
 
+#ifdef RT_USING_DM
+static int cortex_m_cpu_reset_init(void)
+{
+    if (!rt_dm_machine_reset)
+    {
+        rt_dm_machine_reset = cortex_m_cpu_reset;
+    }
+
+    return RT_EOK;
+}
+INIT_BOARD_EXPORT(cortex_m_cpu_reset_init);
+#else
+rt_weak void rt_hw_cpu_reset(void)
+{
+    cortex_m_cpu_reset();
+}
+#endif
+
 void TaskSwitch_StackCheck(void)
 {
     volatile rt_uint32_t end_of_stack_val = (rt_uint32_t) rt_thread_self()->stack_addr;