From d0de16266f92de180bd34f03aa43f1c489cd883a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 9 May 2021 00:08:30 +1000
Subject: [PATCH] rp2/mpthreadport: Add mp_thread_deinit to reset core1 on soft
 reset.

Any code running on core1 should be stopped on soft-reset (the GC heap is
reset so if code continues to run on core1 it will see corrupt memory).

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/main.c         | 3 +++
 ports/rp2/mpthreadport.c | 5 +++++
 ports/rp2/mpthreadport.h | 1 +
 3 files changed, 9 insertions(+)

diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 8fddeaa560..7709a478bc 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -138,6 +138,9 @@ int main(int argc, char **argv) {
         mp_printf(MP_PYTHON_PRINTER, "MPY: soft reboot\n");
         rp2_pio_deinit();
         machine_pin_deinit();
+        #if MICROPY_PY_THREAD
+        mp_thread_deinit();
+        #endif
         gc_sweep_all();
         mp_deinit();
     }
diff --git a/ports/rp2/mpthreadport.c b/ports/rp2/mpthreadport.c
index fb4428772a..8a36cfca75 100644
--- a/ports/rp2/mpthreadport.c
+++ b/ports/rp2/mpthreadport.c
@@ -46,6 +46,11 @@ void mp_thread_init(void) {
     core1_entry = NULL;
 }
 
+void mp_thread_deinit(void) {
+    multicore_reset_core1();
+    core1_entry = NULL;
+}
+
 void mp_thread_gc_others(void) {
     if (get_core_num() == 0) {
         // GC running on core0, trace core1's stack, if it's running.
diff --git a/ports/rp2/mpthreadport.h b/ports/rp2/mpthreadport.h
index 5eb0bff396..868f8d1411 100644
--- a/ports/rp2/mpthreadport.h
+++ b/ports/rp2/mpthreadport.h
@@ -34,6 +34,7 @@ typedef struct mutex mp_thread_mutex_t;
 extern void *core_state[2];
 
 void mp_thread_init(void);
+void mp_thread_deinit(void);
 void mp_thread_gc_others(void);
 
 static inline void mp_thread_set_state(struct _mp_state_thread_t *state) {