feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

optimize the live lock soft solution process

Browse Source
This commit is contained in:
Li Shuai
2020-04-20 21:59:28 +08:00
committed by maojianxin
parent 76717f72d6
commit 61b646aa8a
2 changed files with 71 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
components/esp32/dport_panic_highint_hdl.S
View File

@@ -42,16 +42,18 @@ _l5_intr_stack:
.space L5_INTR_STACK_SIZE*portNUM_PROCESSORS .space L5_INTR_STACK_SIZE*portNUM_PROCESSORS
#if CONFIG_ESP32_ECO3_CACHE_LOCK_FIX #if CONFIG_ESP32_ECO3_CACHE_LOCK_FIX
.global _l4_intr_livelock_counter .global _l5_intr_livelock_counter
.global _l4_intr_livelock_max .global _l5_intr_livelock_max
.align 16 .align 16
_l4_intr_livelock_counter: _l5_intr_livelock_counter:
.word 0 .word 0
_l4_intr_livelock_max: _l5_intr_livelock_max:
.word 0 .word 0
_l4_intr_livelock_sync: _l5_intr_livelock_sync:
.word 0, 0 .word 0, 0
_l4_intr_livelock_app: _l5_intr_livelock_app:
.word 0
_l5_intr_livelock_pro:
.word 0 .word 0
#endif #endif
@@ -76,11 +78,11 @@ xt_highint5:
/* Pro cpu (Core 0) can execute to here. */ /* Pro cpu (Core 0) can execute to here. */
wsr a5, depc /* use DEPC as temp storage */ wsr a5, depc /* use DEPC as temp storage */
movi a0, _l4_intr_livelock_counter movi a0, _l5_intr_livelock_counter
l32i a0, a0, 0 l32i a0, a0, 0
movi a5, _l4_intr_livelock_max movi a5, _l5_intr_livelock_max
l32i a5, a5, 0 l32i a5, a5, 0
bltu a0, a5, .handle_livelock_int /* _l4_intr_livelock_counter < _l4_intr_livelock_max */ bltu a0, a5, .handle_livelock_int /* _l5_intr_livelock_counter < _l5_intr_livelock_max */
rsr a5, depc /* restore a5 */ rsr a5, depc /* restore a5 */
#endif #endif
@@ -180,6 +182,7 @@ xt_highint5:
add a3, a3, a2 add a3, a3, a2
movi a2, \inum movi a2, \inum
s32i a2, a3, 0 s32i a2, a3, 0
memw
.endm .endm
/* /*
@@ -193,32 +196,35 @@ xt_highint5:
.macro wdt_clr_intr_status dev .macro wdt_clr_intr_status dev
movi a2, \dev movi a2, \dev
movi a3, TIMG_WDT_WKEY_VALUE movi a3, TIMG_WDT_WKEY_VALUE
memw
s32i a3, a2, 100 /* disable write protect */ s32i a3, a2, 100 /* disable write protect */
memw
l32i a4, a2, 164 l32i a4, a2, 164
memw
movi a3, 4 movi a3, 4
or a3, a4, a3 or a3, a4, a3
memw
s32i a3, a2, 164 /* clear 1st stage timeout interrupt */ s32i a3, a2, 164 /* clear 1st stage timeout interrupt */
memw
movi a3, 0 movi a3, 0
s32i a3, a2, 100 /* enable write protect */ s32i a3, a2, 100 /* enable write protect */
memw
.endm .endm
.macro wdt_feed dev .macro wdt_feed dev
movi a2, \dev movi a2, \dev
movi a3, TIMG_WDT_WKEY_VALUE movi a3, TIMG_WDT_WKEY_VALUE
memw
s32i a3, a2, 100 /* disable write protect */ s32i a3, a2, 100 /* disable write protect */
movi a4, _l4_intr_livelock_max memw
movi a4, _l5_intr_livelock_max
l32i a4, a4, 0 l32i a4, a4, 0
memw
addi a4, a4, 1 addi a4, a4, 1
movi a3, (CONFIG_INT_WDT_TIMEOUT_MS<<1) movi a3, (CONFIG_INT_WDT_TIMEOUT_MS<<1)
quou a3, a3, a4 quou a3, a3, a4
memw
s32i a3, a2, 80 /* set timeout before interrupt */ s32i a3, a2, 80 /* set timeout before interrupt */
movi a3, (CONFIG_INT_WDT_TIMEOUT_MS<<2)
memw memw
movi a3, (CONFIG_INT_WDT_TIMEOUT_MS<<2)
s32i a3, a2, 84 /* set timeout before system reset */ s32i a3, a2, 84 /* set timeout before system reset */
memw
movi a3, 1 movi a3, 1
s32i a3, a2, 96 /* feed wdt */ s32i a3, a2, 96 /* feed wdt */
memw memw
@@ -231,19 +237,19 @@ xt_highint5:
.handle_livelock_int: .handle_livelock_int:
movi a0, SOC_RTC_DATA_LOW movi a0, SOC_RTC_DATA_LOW
movi a5, _l4_intr_livelock_sync movi a5, _l5_intr_livelock_sync
l32i a5, a5, 0 l32i a5, a5, 0
s32i a5, a0, 0 s32i a5, a0, 0
memw memw
movi a5, _l4_intr_livelock_sync movi a5, _l5_intr_livelock_sync
l32i a5, a5, 4 l32i a5, a5, 4
s32i a5, a0, 4 s32i a5, a0, 4
memw memw
movi a5, _l4_intr_livelock_app movi a5, _l5_intr_livelock_app
l32i a5, a5, 0 l32i a5, a5, 0
s32i a5, a0, 8 s32i a5, a0, 8
memw memw
movi a5, _l4_intr_livelock_counter movi a5, _l5_intr_livelock_counter
l32i a5, a5, 0 l32i a5, a5, 0
s32i a5, a0, 12 s32i a5, a0, 12
memw memw
@@ -251,30 +257,30 @@ xt_highint5:
getcoreid a5 getcoreid a5
/* Save A2, A3, A4 so we can use those registers */ /* Save A2, A3, A4 so we can use those registers */
movi a0, L4_INTR_STACK_SIZE movi a0, L5_INTR_STACK_SIZE
mull a5, a5, a0 mull a5, a5, a0
movi a0, _l4_intr_stack movi a0, _l5_intr_stack
add a0, a0, a5 add a0, a0, a5
s32i a2, a0, L4_INTR_A2_OFFSET s32i a2, a0, L5_INTR_A2_OFFSET
s32i a3, a0, L4_INTR_A3_OFFSET s32i a3, a0, L5_INTR_A3_OFFSET
s32i a4, a0, L4_INTR_A4_OFFSET s32i a4, a0, L5_INTR_A4_OFFSET
/* Here, we can use a0, a2, a3, a4, a5 registers */ /* Here, we can use a0, a2, a3, a4, a5 registers */
getcoreid a5 getcoreid a5
beqz a5, 1f beqz a5, 1f
movi a2, _l4_intr_livelock_app movi a2, _l5_intr_livelock_app
l32i a3, a2, 0 l32i a3, a2, 0
addi a3, a3, 1 addi a3, a3, 1
s32i a3, a2, 0 s32i a3, a2, 0
/* Dual core synchronization, ensuring that both cores enter interrupts */ /* Dual core synchronization, ensuring that both cores enter interrupts */
1: movi a4, 0x1 1: movi a4, 0x1
movi a2, _l4_intr_livelock_sync movi a2, _l5_intr_livelock_sync
addx4 a3, a5, a2 addx4 a3, a5, a2
s32i a4, a3, 0 s32i a4, a3, 0
1: movi a2, _l4_intr_livelock_sync 1: movi a2, _l5_intr_livelock_sync
movi a3, 1 movi a3, 1
addx4 a3, a3, a2 addx4 a3, a3, a2
l32i a2, a2, 0 l32i a2, a2, 0
@@ -286,10 +292,10 @@ xt_highint5:
beqz a5, 1f /* Pro cpu (Core 0) jump bypass */ beqz a5, 1f /* Pro cpu (Core 0) jump bypass */
movi a2, _l4_intr_livelock_app movi a2, _l5_intr_livelock_app
l32i a2, a2, 0 l32i a2, a2, 0
bnei a2, 2, 1f bnei a2, 2, 1f
movi a2, _l4_intr_livelock_counter /* _l4_intr_livelock_counter++ */ movi a2, _l5_intr_livelock_counter /* _l5_intr_livelock_counter++ */
l32i a3, a2, 0 l32i a3, a2, 0
addi a3, a3, 1 addi a3, a3, 1
s32i a3, a2, 0 s32i a3, a2, 0
@@ -343,27 +349,34 @@ xt_highint5:
bltu a4, a3, 2b bltu a4, a3, 2b
beqz a5, 2f beqz a5, 2f
movi a2, _l4_intr_livelock_app movi a2, _l5_intr_livelock_app
l32i a2, a2, 0 l32i a2, a2, 0
beqi a2, 2, 8f beqi a2, 2, 8f
j 3f
2: movi a2, _l4_intr_livelock_sync 2: movi a2, _l5_intr_livelock_pro
movi a4, 1 l32i a4, a2, 0
addx4 a3, a4, a2 addi a4, a4, 1
s32i a4, a2, 0
movi a2, _l5_intr_livelock_sync
movi a3, 1
addx4 a3, a3, a2
l32i a2, a2, 0 l32i a2, a2, 0
l32i a3, a3, 0 l32i a3, a3, 0
and a2, a2, a3 and a2, a2, a3
beqz a2, 4f beqz a2, 5f
j 1b
5: bgei a4, 2, 4f
j 1b
beqz a5, 3f
/* /*
Pro cpu (Core 0) jump bypass, continue waiting, App cpu (Core 1) Pro cpu (Core 0) jump bypass, continue waiting, App cpu (Core 1)
can execute to here, unmap itself tg1 1st stage timeout interrupt can execute to here, unmap itself tg1 1st stage timeout interrupt
then restore registers and exit highint4. then restore registers and exit highint5.
*/ */
intr_matrix_map DPORT_APP_MAC_INTR_MAP_REG, ETS_TG1_WDT_LEVEL_INTR_SOURCE, 16 3: intr_matrix_map DPORT_APP_MAC_INTR_MAP_REG, ETS_TG1_WDT_LEVEL_INTR_SOURCE, 16
j 9f j 9f
3: j 1b
/* /*
Here, App cpu (Core 1) has exited isr, Pro cpu (Core 0) help the Here, App cpu (Core 1) has exited isr, Pro cpu (Core 0) help the
@@ -371,13 +384,13 @@ xt_highint5:
*/ */
4: intr_matrix_map DPORT_APP_MAC_INTR_MAP_REG, ETS_TG1_WDT_LEVEL_INTR_SOURCE, ETS_T1_WDT_INUM 4: intr_matrix_map DPORT_APP_MAC_INTR_MAP_REG, ETS_TG1_WDT_LEVEL_INTR_SOURCE, ETS_T1_WDT_INUM
1: movi a2, _l4_intr_livelock_sync 1: movi a2, _l5_intr_livelock_sync
movi a4, 1 movi a4, 1
addx4 a3, a4, a2 addx4 a3, a4, a2
l32i a2, a2, 0 l32i a2, a2, 0
l32i a3, a3, 0 l32i a3, a3, 0
and a2, a2, a3 and a2, a2, a3
beqz a2, 1b /* Wait for App cpu to enter highint4 again */ beqz a2, 1b /* Wait for App cpu to enter highint5 again */
wdt_clr_intr_status TIMERG1 wdt_clr_intr_status TIMERG1
j 9f j 9f
@@ -389,29 +402,32 @@ xt_highint5:
movi a0, 0 movi a0, 0
beqz a5, 1f beqz a5, 1f
movi a2, _l4_intr_livelock_app movi a2, _l5_intr_livelock_app
l32i a3, a2, 0 l32i a3, a2, 0
bnei a3, 2, 1f bnei a3, 2, 1f
s32i a0, a2, 0 s32i a0, a2, 0
1: movi a2, _l4_intr_livelock_sync 1: bnez a5, 2f
movi a2, _l5_intr_livelock_pro
s32i a0, a2, 0
2: movi a2, _l5_intr_livelock_sync
addx4 a2, a5, a2 addx4 a2, a5, a2
s32i a0, a2, 0 s32i a0, a2, 0
/* Done. Restore registers and return. */ /* Done. Restore registers and return. */
movi a0, L4_INTR_STACK_SIZE movi a0, L5_INTR_STACK_SIZE
mull a5, a5, a0 mull a5, a5, a0
movi a0, _l4_intr_stack movi a0, _l5_intr_stack
add a0, a0, a5 add a0, a0, a5
l32i a2, a0, L4_INTR_A2_OFFSET l32i a2, a0, L5_INTR_A2_OFFSET
l32i a3, a0, L4_INTR_A3_OFFSET l32i a3, a0, L5_INTR_A3_OFFSET
l32i a4, a0, L4_INTR_A4_OFFSET l32i a4, a0, L5_INTR_A4_OFFSET
rsync /* ensure register restored */ rsync /* ensure register restored */
rsr a5, depc rsr a5, depc
rsr a0, EXCSAVE_4 /* restore a0 */ rsr a0, EXCSAVE_5 /* restore a0 */
rfi 4 rfi 5
#endif #endif
@@ -423,7 +439,7 @@ xt_highint5:
/* This section is for dport access register protection */ /* This section is for dport access register protection */
/* Allocate exception frame and save minimal context. */ /* Allocate exception frame and save minimal context. */
/* Because the interrupt cause code has protection that only /* Because the interrupt cause code has protection that only
allows one cpu to enter in the dport section of the L4 allows one cpu to enter in the dport section of the L5
interrupt at one time, there's no need to have two interrupt at one time, there's no need to have two
_l5_intr_stack for each cpu */ _l5_intr_stack for each cpu */

10
components/esp32/int_wdt.c
View File

@@ -46,7 +46,7 @@
*/ */
#define TG1_WDT_LIVELOCK_TIMEOUT_MS (20) #define TG1_WDT_LIVELOCK_TIMEOUT_MS (20)
extern uint32_t _l4_intr_livelock_counter, _l4_intr_livelock_max; extern uint32_t _l5_intr_livelock_counter, _l5_intr_livelock_max;
#endif #endif
//Take care: the tick hook can also be called before esp_int_wdt_init() is called. //Take care: the tick hook can also be called before esp_int_wdt_init() is called.
@@ -62,8 +62,8 @@ static void IRAM_ATTR tick_hook(void) {
if (int_wdt_app_cpu_ticked) { if (int_wdt_app_cpu_ticked) {
TIMERG1.wdt_wprotect=TIMG_WDT_WKEY_VALUE; TIMERG1.wdt_wprotect=TIMG_WDT_WKEY_VALUE;
#if CONFIG_ESP32_ECO3_CACHE_LOCK_FIX #if CONFIG_ESP32_ECO3_CACHE_LOCK_FIX
_l4_intr_livelock_counter = 0; _l5_intr_livelock_counter = 0;
TIMERG1.wdt_config2=CONFIG_INT_WDT_TIMEOUT_MS*2/(_l4_intr_livelock_max+1); //Set timeout before interrupt TIMERG1.wdt_config2=CONFIG_INT_WDT_TIMEOUT_MS*2/(_l5_intr_livelock_max+1); //Set timeout before interrupt
#else #else
TIMERG1.wdt_config2=CONFIG_INT_WDT_TIMEOUT_MS*2; //Set timeout before interrupt TIMERG1.wdt_config2=CONFIG_INT_WDT_TIMEOUT_MS*2; //Set timeout before interrupt
#endif #endif
@@ -118,11 +118,11 @@ void esp_int_wdt_cpu_init()
*/ */
intr_matrix_set(xPortGetCoreID(), ETS_TG1_WDT_LEVEL_INTR_SOURCE, WDT_INT_NUM); intr_matrix_set(xPortGetCoreID(), ETS_TG1_WDT_LEVEL_INTR_SOURCE, WDT_INT_NUM);
#if CONFIG_ESP32_ECO3_CACHE_LOCK_FIX #if CONFIG_ESP32_ECO3_CACHE_LOCK_FIX
_l4_intr_livelock_max = 0; _l5_intr_livelock_max = 0;
if (soc_has_cache_lock_bug()) { if (soc_has_cache_lock_bug()) {
assert(((1000/CONFIG_FREERTOS_HZ)<<1) <= TG1_WDT_LIVELOCK_TIMEOUT_MS); assert(((1000/CONFIG_FREERTOS_HZ)<<1) <= TG1_WDT_LIVELOCK_TIMEOUT_MS);
assert(CONFIG_INT_WDT_TIMEOUT_MS >= (TG1_WDT_LIVELOCK_TIMEOUT_MS*3)); assert(CONFIG_INT_WDT_TIMEOUT_MS >= (TG1_WDT_LIVELOCK_TIMEOUT_MS*3));
_l4_intr_livelock_max = CONFIG_INT_WDT_TIMEOUT_MS/TG1_WDT_LIVELOCK_TIMEOUT_MS - 1; _l5_intr_livelock_max = CONFIG_INT_WDT_TIMEOUT_MS/TG1_WDT_LIVELOCK_TIMEOUT_MS - 1;
} }
#endif #endif
//We do not register a handler for the interrupt because it is interrupt level 4 which //We do not register a handler for the interrupt because it is interrupt level 4 which