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

components/coex: Fix bcn timeout with MAC BB power down

Browse Source
This commit is contained in:
baohongde
2021-02-04 22:24:37 +08:00
parent c1aacb2efc
commit f8d85768b0
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/esp_wifi/src/phy_init.c
View File

@@ -63,7 +63,7 @@ static uint8_t s_phy_access_ref = 0;
#if CONFIG_MAC_BB_PD #if CONFIG_MAC_BB_PD
/* Reference of powering down MAC and BB */ /* Reference of powering down MAC and BB */
static uint8_t s_mac_bb_pd_ref = 0; static bool s_mac_bb_pu = true;
#endif #endif
#if CONFIG_IDF_TARGET_ESP32 #if CONFIG_IDF_TARGET_ESP32
@@ -271,7 +271,7 @@ void esp_mac_bb_pd_mem_init(void)
IRAM_ATTR void esp_mac_bb_power_up(void) IRAM_ATTR void esp_mac_bb_power_up(void)
{ {
if (s_mac_bb_pd_mem != NULL && s_mac_bb_pd_ref == 0) { if (s_mac_bb_pd_mem != NULL && (!s_mac_bb_pu)) {
esp_phy_common_clock_enable(); esp_phy_common_clock_enable();
CLEAR_PERI_REG_MASK(RTC_CNTL_DIG_PWC_REG, RTC_CNTL_WIFI_FORCE_PD); CLEAR_PERI_REG_MASK(RTC_CNTL_DIG_PWC_REG, RTC_CNTL_WIFI_FORCE_PD);
SET_PERI_REG_MASK(SYSCON_WIFI_RST_EN_REG, SYSTEM_BB_RST | SYSTEM_FE_RST); SET_PERI_REG_MASK(SYSCON_WIFI_RST_EN_REG, SYSTEM_BB_RST | SYSTEM_FE_RST);
@@ -279,23 +279,19 @@ IRAM_ATTR void esp_mac_bb_power_up(void)
CLEAR_PERI_REG_MASK(RTC_CNTL_DIG_ISO_REG, RTC_CNTL_WIFI_FORCE_ISO); CLEAR_PERI_REG_MASK(RTC_CNTL_DIG_ISO_REG, RTC_CNTL_WIFI_FORCE_ISO);
phy_freq_mem_backup(false, s_mac_bb_pd_mem); phy_freq_mem_backup(false, s_mac_bb_pd_mem);
esp_phy_common_clock_disable(); esp_phy_common_clock_disable();
s_mac_bb_pu = true;
} }
s_mac_bb_pd_ref++;
} }
IRAM_ATTR void esp_mac_bb_power_down(void) IRAM_ATTR void esp_mac_bb_power_down(void)
{ {
if (s_mac_bb_pd_ref == 0) { if (s_mac_bb_pd_mem != NULL && s_mac_bb_pu) {
return;
}
s_mac_bb_pd_ref--;
if (s_mac_bb_pd_mem != NULL && s_mac_bb_pd_ref == 0) {
esp_phy_common_clock_enable(); esp_phy_common_clock_enable();
phy_freq_mem_backup(true, s_mac_bb_pd_mem); phy_freq_mem_backup(true, s_mac_bb_pd_mem);
SET_PERI_REG_MASK(RTC_CNTL_DIG_ISO_REG, RTC_CNTL_WIFI_FORCE_ISO); SET_PERI_REG_MASK(RTC_CNTL_DIG_ISO_REG, RTC_CNTL_WIFI_FORCE_ISO);
SET_PERI_REG_MASK(RTC_CNTL_DIG_PWC_REG, RTC_CNTL_WIFI_FORCE_PD); SET_PERI_REG_MASK(RTC_CNTL_DIG_PWC_REG, RTC_CNTL_WIFI_FORCE_PD);
esp_phy_common_clock_disable(); esp_phy_common_clock_disable();
s_mac_bb_pu = false;
} }
} }
#endif #endif