espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-05-24 10:38:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_nmi_reenter_when_multi_enable_mac_interrupt' into 'master'

Browse Source 
fix(xtensa): Fix NMI reenter when multi enable MAC interrupt

See merge request sdk/ESP8266_RTOS_SDK!1468
This commit is contained in:
Dong Heng
2020-07-08 15:21:18 +08:00
parent 7adc7a6424 a3be9fd9aa
commit 0ad7af2600
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/esp8266/include/esp8266/eagle_soc.h
View File

@ -131,6 +131,7 @@
//}} //}}
//Interrupt remap control registers define{{ //Interrupt remap control registers define{{
#define NMI_INT_ENABLE_REG (PERIPHS_DPORT_BASEADDR)
#define EDGE_INT_ENABLE_REG (PERIPHS_DPORT_BASEADDR + 0x04) #define EDGE_INT_ENABLE_REG (PERIPHS_DPORT_BASEADDR + 0x04)
#define WDT_EDGE_INT_ENABLE() SET_PERI_REG_MASK(EDGE_INT_ENABLE_REG, BIT0) #define WDT_EDGE_INT_ENABLE() SET_PERI_REG_MASK(EDGE_INT_ENABLE_REG, BIT0)
#define TM1_EDGE_INT_ENABLE() SET_PERI_REG_MASK(EDGE_INT_ENABLE_REG, BIT1) #define TM1_EDGE_INT_ENABLE() SET_PERI_REG_MASK(EDGE_INT_ENABLE_REG, BIT1)

12
components/freertos/port/esp8266/port.c
View File

@ -285,24 +285,36 @@ void esp_dport_close_nmi(void)
void IRAM_ATTR vPortETSIntrLock(void) void IRAM_ATTR vPortETSIntrLock(void)
{ {
if (NMIIrqIsOn == 0) { if (NMIIrqIsOn == 0) {
uint32_t regval = REG_READ(NMI_INT_ENABLE_REG);
REG_WRITE(NMI_INT_ENABLE_REG, 0);
vPortEnterCritical(); vPortEnterCritical();
if (!ESP_NMI_IS_CLOSED()) { if (!ESP_NMI_IS_CLOSED()) {
do { do {
REG_WRITE(INT_ENA_WDEV, WDEV_TSF0_REACH_INT); REG_WRITE(INT_ENA_WDEV, WDEV_TSF0_REACH_INT);
} while(REG_READ(INT_ENA_WDEV) != WDEV_TSF0_REACH_INT); } while(REG_READ(INT_ENA_WDEV) != WDEV_TSF0_REACH_INT);
} }
REG_WRITE(NMI_INT_ENABLE_REG, regval);
} }
} }
void IRAM_ATTR vPortETSIntrUnlock(void) void IRAM_ATTR vPortETSIntrUnlock(void)
{ {
if (NMIIrqIsOn == 0) { if (NMIIrqIsOn == 0) {
uint32_t regval = REG_READ(NMI_INT_ENABLE_REG);
REG_WRITE(NMI_INT_ENABLE_REG, 0);
if (!ESP_NMI_IS_CLOSED()) { if (!ESP_NMI_IS_CLOSED()) {
extern uint32_t WDEV_INTEREST_EVENT; extern uint32_t WDEV_INTEREST_EVENT;
REG_WRITE(INT_ENA_WDEV, WDEV_INTEREST_EVENT); REG_WRITE(INT_ENA_WDEV, WDEV_INTEREST_EVENT);
} }
vPortExitCritical(); vPortExitCritical();
REG_WRITE(NMI_INT_ENABLE_REG, regval);
} }
} }