espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

esp_wifi: add protection for mac reset (backport 4.3)

Browse Source
This commit is contained in:
liuning
2022-10-27 17:30:45 +08:00
parent 635a9c5efb
commit dbe59eff86
8 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/esp_wifi/esp32/esp_adapter.c
View File

@ -520,8 +520,7 @@ static void IRAM_ATTR timer_arm_us_wrapper(void *ptimer, uint32_t us, bool repea
static void wifi_reset_mac_wrapper(void) static void wifi_reset_mac_wrapper(void)
{ {
DPORT_SET_PERI_REG_MASK(DPORT_CORE_RST_EN_REG, DPORT_WIFIMAC_RST); periph_module_reset(PERIPH_WIFI_MODULE);
DPORT_CLEAR_PERI_REG_MASK(DPORT_CORE_RST_EN_REG, DPORT_WIFIMAC_RST);
} }
static void wifi_clock_enable_wrapper(void) static void wifi_clock_enable_wrapper(void)

6
components/esp_wifi/esp32c3/esp_adapter.c
View File

@ -402,15 +402,13 @@ static void IRAM_ATTR timer_arm_us_wrapper(void *ptimer, uint32_t us, bool repea
static void wifi_reset_mac_wrapper(void) static void wifi_reset_mac_wrapper(void)
{ {
SET_PERI_REG_MASK(SYSCON_WIFI_RST_EN_REG, SYSTEM_WIFIMAC_RST); periph_module_reset(PERIPH_WIFI_MODULE);
CLEAR_PERI_REG_MASK(SYSCON_WIFI_RST_EN_REG, SYSTEM_WIFIMAC_RST);
} }
static void IRAM_ATTR wifi_rtc_enable_iso_wrapper(void) static void IRAM_ATTR wifi_rtc_enable_iso_wrapper(void)
{ {
#if CONFIG_MAC_BB_PD #if CONFIG_MAC_BB_PD
esp_mac_bb_power_down(); esp_mac_bb_power_down();
SET_PERI_REG_MASK(SYSCON_WIFI_RST_EN_REG, SYSTEM_WIFIMAC_RST);
#endif #endif
} }
@ -418,8 +416,6 @@ static void IRAM_ATTR wifi_rtc_disable_iso_wrapper(void)
{ {
#if CONFIG_MAC_BB_PD #if CONFIG_MAC_BB_PD
esp_mac_bb_power_up(); esp_mac_bb_power_up();
SET_PERI_REG_MASK(SYSCON_WIFI_RST_EN_REG, SYSTEM_WIFIMAC_RST);
CLEAR_PERI_REG_MASK(SYSCON_WIFI_RST_EN_REG, SYSTEM_WIFIMAC_RST);
#endif #endif
} }

3
components/esp_wifi/esp32s2/esp_adapter.c
View File

@ -432,8 +432,7 @@ static void IRAM_ATTR timer_arm_us_wrapper(void *ptimer, uint32_t us, bool repea
static void wifi_reset_mac_wrapper(void) static void wifi_reset_mac_wrapper(void)
{ {
DPORT_SET_PERI_REG_MASK(DPORT_CORE_RST_EN_REG, DPORT_WIFIMAC_RST); periph_module_reset(PERIPH_WIFI_MODULE);
DPORT_CLEAR_PERI_REG_MASK(DPORT_CORE_RST_EN_REG, DPORT_WIFIMAC_RST);
} }
static void wifi_clock_enable_wrapper(void) static void wifi_clock_enable_wrapper(void)

6
components/esp_wifi/esp32s3/esp_adapter.c
View File

@ -447,15 +447,13 @@ static void IRAM_ATTR timer_arm_us_wrapper(void *ptimer, uint32_t us, bool repea
static void wifi_reset_mac_wrapper(void) static void wifi_reset_mac_wrapper(void)
{ {
SET_PERI_REG_MASK(SYSCON_WIFI_RST_EN_REG, SYSTEM_WIFIMAC_RST); periph_module_reset(PERIPH_WIFI_MODULE);
CLEAR_PERI_REG_MASK(SYSCON_WIFI_RST_EN_REG, SYSTEM_WIFIMAC_RST);
} }
static void IRAM_ATTR wifi_rtc_enable_iso_wrapper(void) static void IRAM_ATTR wifi_rtc_enable_iso_wrapper(void)
{ {
#if CONFIG_MAC_BB_PD #if CONFIG_MAC_BB_PD
esp_mac_bb_power_down(); esp_mac_bb_power_down();
SET_PERI_REG_MASK(SYSCON_WIFI_RST_EN_REG, SYSTEM_WIFIMAC_RST);
#endif #endif
} }
@ -463,8 +461,6 @@ static void IRAM_ATTR wifi_rtc_disable_iso_wrapper(void)
{ {
#if CONFIG_MAC_BB_PD #if CONFIG_MAC_BB_PD
esp_mac_bb_power_up(); esp_mac_bb_power_up();
SET_PERI_REG_MASK(SYSCON_WIFI_RST_EN_REG, SYSTEM_WIFIMAC_RST);
CLEAR_PERI_REG_MASK(SYSCON_WIFI_RST_EN_REG, SYSTEM_WIFIMAC_RST);
#endif #endif
} }

2
components/hal/esp32/include/hal/clk_gate_ll.h
View File

@ -108,6 +108,8 @@ static inline uint32_t periph_ll_get_rst_en_mask(periph_module_t periph, bool en
switch (periph) { switch (periph) {
case PERIPH_LEDC_MODULE: case PERIPH_LEDC_MODULE:
return DPORT_LEDC_RST; return DPORT_LEDC_RST;
case PERIPH_WIFI_MODULE:
return DPORT_WIFIMAC_RST;
case PERIPH_UART0_MODULE: case PERIPH_UART0_MODULE:
return DPORT_UART_RST; return DPORT_UART_RST;
case PERIPH_UART1_MODULE: case PERIPH_UART1_MODULE:

2
components/hal/esp32c3/include/hal/clk_gate_ll.h
View File

@ -97,6 +97,8 @@ static inline uint32_t periph_ll_get_rst_en_mask(periph_module_t periph, bool en
return SYSTEM_RMT_RST; return SYSTEM_RMT_RST;
case PERIPH_LEDC_MODULE: case PERIPH_LEDC_MODULE:
return SYSTEM_LEDC_RST; return SYSTEM_LEDC_RST;
case PERIPH_WIFI_MODULE:
return SYSTEM_WIFIMAC_RST;
case PERIPH_BT_MODULE: case PERIPH_BT_MODULE:
return (SYSTEM_BTBB_RST | SYSTEM_BTBB_REG_RST | SYSTEM_RW_BTMAC_RST | SYSTEM_RW_BTLP_RST | SYSTEM_RW_BTMAC_REG_RST | SYSTEM_RW_BTLP_REG_RST); return (SYSTEM_BTBB_RST | SYSTEM_BTBB_REG_RST | SYSTEM_RW_BTMAC_RST | SYSTEM_RW_BTLP_RST | SYSTEM_RW_BTMAC_REG_RST | SYSTEM_RW_BTLP_REG_RST);
case PERIPH_UART0_MODULE: case PERIPH_UART0_MODULE:

2
components/hal/esp32s2/include/hal/clk_gate_ll.h
View File

@ -115,6 +115,8 @@ static inline uint32_t periph_ll_get_rst_en_mask(periph_module_t periph, bool en
return DPORT_APB_SARADC_RST; return DPORT_APB_SARADC_RST;
case PERIPH_LEDC_MODULE: case PERIPH_LEDC_MODULE:
return DPORT_LEDC_RST; return DPORT_LEDC_RST;
case PERIPH_WIFI_MODULE:
return DPORT_WIFIMAC_RST;
case PERIPH_UART0_MODULE: case PERIPH_UART0_MODULE:
return DPORT_UART_RST; return DPORT_UART_RST;
case PERIPH_UART1_MODULE: case PERIPH_UART1_MODULE:

2
components/hal/esp32s3/include/hal/clk_gate_ll.h
View File

@ -116,6 +116,8 @@ static inline uint32_t periph_ll_get_rst_en_mask(periph_module_t periph, bool en
return SYSTEM_RMT_RST; return SYSTEM_RMT_RST;
case PERIPH_LEDC_MODULE: case PERIPH_LEDC_MODULE:
return SYSTEM_LEDC_RST; return SYSTEM_LEDC_RST;
case PERIPH_WIFI_MODULE:
return SYSTEM_WIFIMAC_RST;
case PERIPH_UART0_MODULE: case PERIPH_UART0_MODULE:
return SYSTEM_UART_RST; return SYSTEM_UART_RST;
case PERIPH_UART1_MODULE: case PERIPH_UART1_MODULE: