espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-05 13:44:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/sys_fix_build_error_about_livelock' into 'master'

Browse Source 
components/sys: Fix build error about livelock when intwdt is disable

See merge request espressif/esp-idf!9312
This commit is contained in:
Jiang Jiang Jian
2020-07-31 16:43:22 +08:00
parent bda580f3ec acb835d86f
commit d1f9a238f3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/esp_system/port/esp32/dport_panic_highint_hdl.S
View File

@@ -41,7 +41,7 @@ Interrupt , a high-priority interrupt, is used for several things:
_l4_intr_stack: _l4_intr_stack:
.space L4_INTR_STACK_SIZE*portNUM_PROCESSORS /* This allocates stacks for each individual CPU. */ .space L4_INTR_STACK_SIZE*portNUM_PROCESSORS /* This allocates stacks for each individual CPU. */
#if CONFIG_ESP32_ECO3_CACHE_LOCK_FIX #if CONFIG_ESP32_ECO3_CACHE_LOCK_FIX && CONFIG_ESP_INT_WDT
.global _l4_intr_livelock_counter .global _l4_intr_livelock_counter
.global _l4_intr_livelock_max .global _l4_intr_livelock_max
.align 16 .align 16
@@ -70,7 +70,7 @@ xt_highint4:
bnez a0, .handle_dport_access_int bnez a0, .handle_dport_access_int
#endif // CONFIG_FREERTOS_UNICORE #endif // CONFIG_FREERTOS_UNICORE
#if CONFIG_ESP32_ECO3_CACHE_LOCK_FIX #if CONFIG_ESP32_ECO3_CACHE_LOCK_FIX && CONFIG_ESP_INT_WDT
/* See if we're here for the tg1 watchdog interrupt */ /* See if we're here for the tg1 watchdog interrupt */
rsr a0, INTERRUPT rsr a0, INTERRUPT
extui a0, a0, ETS_T1_WDT_INUM, 1 extui a0, a0, ETS_T1_WDT_INUM, 1
@@ -163,7 +163,7 @@ xt_highint4:
rfi 4 rfi 4
#if CONFIG_ESP32_ECO3_CACHE_LOCK_FIX #if CONFIG_ESP32_ECO3_CACHE_LOCK_FIX && CONFIG_ESP_INT_WDT
/* /*
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------