From 1f152b51466597db5bcf89f64002aa6a5c70d3e1 Mon Sep 17 00:00:00 2001
From: baohongde <baohongde@espressif.com>
Date: Fri, 31 Jul 2020 21:07:34 +0800
Subject: [PATCH] Waits for all previously fetched WSR and XSR instructions to
 be performed before interpreting the register fields of the next instruction

delete logs about livelock
---
 components/bt/hli_vectors.S                |  2 ++
 components/esp32/cpu_start.c               |  5 -----
 components/esp32/dport_panic_highint_hdl.S | 20 +-------------------
 3 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/components/bt/hli_vectors.S b/components/bt/hli_vectors.S
index cfc9112bfa..8965f33b6b 100644
--- a/components/bt/hli_vectors.S
+++ b/components/bt/hli_vectors.S
@@ -64,6 +64,7 @@ xt_highint4:
     addmi   a0, a0, (1<<14)
     addmi   a0, a0, (1<<14)
     wsr     a0, INTENABLE
+    rsync
 1:
 #endif
 
@@ -98,6 +99,7 @@ xt_highint4:
     movi    a2, ~(1<<16)
     and     a0, a2, a0
     wsr     a0, INTENABLE
+    rsync
 #endif
 
     /* disable exception mode, window overflow */
diff --git a/components/esp32/cpu_start.c b/components/esp32/cpu_start.c
index 96a65a0774..61fefd5b17 100644
--- a/components/esp32/cpu_start.c
+++ b/components/esp32/cpu_start.c
@@ -253,11 +253,6 @@ void IRAM_ATTR call_start_cpu0()
        fail initializing it properly. */
     heap_caps_init();
 
-    for (int i = 0; i < 64; i++) {
-        ets_printf(((i+1)%8) ? DRAM_STR("%08x ") : DRAM_STR("%08x\n"), *(((volatile uint32_t *)SOC_RTC_DATA_LOW) + i));
-        *(((volatile uint32_t *)SOC_RTC_DATA_LOW) + i) = 0;
-    }
-
     ESP_EARLY_LOGI(TAG, "Pro cpu start user code");
     start_cpu0();
 }
diff --git a/components/esp32/dport_panic_highint_hdl.S b/components/esp32/dport_panic_highint_hdl.S
index d28bbee97c..1182559b98 100644
--- a/components/esp32/dport_panic_highint_hdl.S
+++ b/components/esp32/dport_panic_highint_hdl.S
@@ -206,7 +206,7 @@ xt_highint5:
     nop
     .endr
 
-    /* Disable Normally Mode */
+    /* Enable Normally Mode */
     movi    a2, ERI_ADDR(APB_ITCTRL)
     rer     a0, a2
     movi    a2, ~0x1
@@ -289,24 +289,6 @@ xt_highint5:
     .align      4
 .handle_livelock_int:
 
-    movi    a0, SOC_RTC_DATA_LOW
-    movi    a5, _l5_intr_livelock_sync
-    l32i    a5, a5, 0
-    s32i    a5, a0, 0
-    memw
-    movi    a5, _l5_intr_livelock_sync
-    l32i    a5, a5, 4
-    s32i    a5, a0, 4
-    memw
-    movi    a5, _l5_intr_livelock_app
-    l32i    a5, a5, 0
-    s32i    a5, a0, 8
-    memw
-    movi    a5, _l5_intr_livelock_counter
-    l32i    a5, a5, 0
-    s32i    a5, a0, 12
-    memw
-
     getcoreid   a5
 
     /* Save A2, A3, A4 so we can use those registers */