pioduino/esp-idf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_failure_of_wifi_channel_configuration' into 'master'

Browse Source 
phy: only set phy_init_flag at power domain off, when all modems deinit

Closes WIFI-4983

See merge request espressif/esp-idf!21235
This commit is contained in:
Jiang Jiang Jian
2022-11-30 14:41:08 +08:00
parent 7955a11384 b8d3553a1c
commit 09231b4fa2
7 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_phy/include/esp_phy_init.h
+3 -2
View File
@@ -178,12 +178,13 @@ void esp_phy_load_cal_and_init(void);
/**
* @brief Initialize backup memory for Phy power up/down
*/
void esp_phy_pd_mem_init(void);
void esp_phy_modem_init(void);
/**
* @brief Deinitialize backup memory for Phy power up/down
* Set phy_init_flag if all modems deinit on ESP32C3
*/
void esp_phy_pd_mem_deinit(void);
void esp_phy_modem_deinit(void);
#if CONFIG_MAC_BB_PD
/**
components/esp_phy/src/phy_init.c
+12 -6
View File
@@ -76,7 +76,7 @@ static DRAM_ATTR portMUX_TYPE s_phy_int_mux = portMUX_INITIALIZER_UNLOCKED;
/* Memory to store PHY digital registers */
static uint32_t* s_phy_digital_regs_mem = NULL;
static uint8_t s_phy_backup_mem_ref = 0;
static uint8_t s_phy_modem_init_ref = 0;
#if CONFIG_MAC_BB_PD
uint32_t* s_mac_bb_pd_mem = NULL;
@@ -306,11 +306,11 @@ void esp_wifi_bt_power_domain_off(void)
#endif
}
void esp_phy_pd_mem_init(void)
void esp_phy_modem_init(void)
{
_lock_acquire(&s_phy_access_lock);
s_phy_backup_mem_ref++;
s_phy_modem_init_ref++;
if (s_phy_digital_regs_mem == NULL) {
s_phy_digital_regs_mem = (uint32_t *)heap_caps_malloc(SOC_PHY_DIG_REGS_MEM_SIZE, MALLOC_CAP_DMA|MALLOC_CAP_INTERNAL);
}
@@ -319,15 +319,21 @@ void esp_phy_pd_mem_init(void)
}
void esp_phy_pd_mem_deinit(void)
void esp_phy_modem_deinit(void)
{
_lock_acquire(&s_phy_access_lock);
s_phy_backup_mem_ref--;
if (s_phy_backup_mem_ref == 0) {
s_phy_modem_init_ref--;
if (s_phy_modem_init_ref == 0) {
s_is_phy_reg_stored = false;
free(s_phy_digital_regs_mem);
s_phy_digital_regs_mem = NULL;
/* Fix the issue caused by the power domain off.
* This issue is only on ESP32C3.
*/
#if CONFIG_IDF_TARGET_ESP32C3
phy_init_flag();
#endif
}
_lock_release(&s_phy_access_lock);