From 06237bfc43edb4bf6c18c524f71d7e4ac33fa83f Mon Sep 17 00:00:00 2001 From: sibeibei Date: Mon, 29 Dec 2025 20:44:58 +0800 Subject: [PATCH] fix: clear modem RF flag before PMU sleep to prevent open rf failed on next wake-up --- components/esp_hw_support/sleep_modem.c | 2 +- components/esp_phy/include/esp_private/phy.h | 14 ++++++++++++- components/esp_phy/src/phy_init.c | 21 ++++++++++++++++--- components/esp_wifi/Kconfig | 9 ++++++++ components/esp_wifi/src/wifi_init.c | 12 ++++++++++- .../esp32c6/include/soc/Kconfig.soc_caps.in | 4 ++++ components/soc/esp32c6/include/soc/soc_caps.h | 1 + 7 files changed, 57 insertions(+), 6 deletions(-) diff --git a/components/esp_hw_support/sleep_modem.c b/components/esp_hw_support/sleep_modem.c index adeddab186..166fe5b53b 100644 --- a/components/esp_hw_support/sleep_modem.c +++ b/components/esp_hw_support/sleep_modem.c @@ -44,7 +44,7 @@ static _lock_t s_modem_prepare_lock; #endif // SOC_PM_RETENTION_HAS_CLOCK_BUG && CONFIG_MAC_BB_PD #if CONFIG_MAC_BB_PD -#define MAC_BB_POWER_DOWN_CB_NO (3) +#define MAC_BB_POWER_DOWN_CB_NO (4) #define MAC_BB_POWER_UP_CB_NO (3) static DRAM_ATTR mac_bb_power_down_cb_t s_mac_bb_power_down_cb[MAC_BB_POWER_DOWN_CB_NO]; diff --git a/components/esp_phy/include/esp_private/phy.h b/components/esp_phy/include/esp_private/phy.h index 809716d386..29581b643d 100644 --- a/components/esp_phy/include/esp_private/phy.h +++ b/components/esp_phy/include/esp_private/phy.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -13,6 +13,7 @@ extern "C" { #endif #define ESP_CAL_DATA_CHECK_FAIL 1 +#define ESP_MODEM_RF_FLAG_UPDATE_CB_REQUIRED (SOC_PM_MODEM_RF_FLAG_UPDATE_WORKAROUND || CONFIG_ESP_WIFI_MODEM_RF_FLAG_UPDATE_DEBUG) typedef enum { PHY_I2C_MST_CMD_TYPE_OFF = 0, @@ -191,6 +192,17 @@ void phy_track_pll(void); */ void phy_wakeup_from_modem_state_extra_init(void); #endif + +#if SOC_PM_SUPPORT_PMU_MODEM_STATE && CONFIG_ESP_WIFI_ENHANCED_LIGHT_SLEEP && ESP_MODEM_RF_FLAG_UPDATE_CB_REQUIRED +/** + * @brief Update modem RF flag + * + * This function is called as a callback during MAC/BB power down operations. + * It checks if modem RF is already enabled and clears the RF power state accordingly. + */ +void esp_phy_modem_rf_flag_update(void); +#endif + #ifdef __cplusplus } #endif diff --git a/components/esp_phy/src/phy_init.c b/components/esp_phy/src/phy_init.c index 70b0c0471d..92da6ac33a 100644 --- a/components/esp_phy/src/phy_init.c +++ b/components/esp_phy/src/phy_init.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -60,6 +60,11 @@ extern wifi_mac_time_update_cb_t s_wifi_mac_time_update_cb; #endif +#if SOC_PM_SUPPORT_PMU_MODEM_STATE && CONFIG_ESP_WIFI_ENHANCED_LIGHT_SLEEP +extern void pm_mac_modem_clear_rf_power_state(void); +extern bool pm_mac_modem_rf_already_enabled(void); +#endif + static const char* TAG = "phy_init"; static _lock_t s_phy_access_lock; @@ -291,6 +296,18 @@ static inline void phy_digital_regs_load(void) } #endif // SOC_PM_MODEM_RETENTION_BY_BACKUPDMA +#if SOC_PM_SUPPORT_PMU_MODEM_STATE && CONFIG_ESP_WIFI_ENHANCED_LIGHT_SLEEP && ESP_MODEM_RF_FLAG_UPDATE_CB_REQUIRED +void IRAM_ATTR esp_phy_modem_rf_flag_update(void) +{ + if (pm_mac_modem_rf_already_enabled()) { +#if CONFIG_ESP_WIFI_MODEM_RF_FLAG_UPDATE_DEBUG + assert(0); +#endif + pm_mac_modem_clear_rf_power_state(); + } +} +#endif + void esp_phy_enable(esp_phy_modem_t modem) { _lock_acquire(&s_phy_access_lock); @@ -309,7 +326,6 @@ void esp_phy_enable(esp_phy_modem_t modem) s_is_phy_calibrated = true; } else { #if SOC_PM_SUPPORT_PMU_MODEM_STATE && CONFIG_ESP_WIFI_ENHANCED_LIGHT_SLEEP - extern bool pm_mac_modem_rf_already_enabled(void); if (!pm_mac_modem_rf_already_enabled()) { if (sleep_modem_wifi_modem_state_enabled() && sleep_modem_wifi_modem_link_done()) { sleep_modem_wifi_do_phy_retention(true); @@ -371,7 +387,6 @@ void esp_phy_disable(esp_phy_modem_t modem) phy_digital_regs_store(); #endif #if SOC_PM_SUPPORT_PMU_MODEM_STATE && CONFIG_ESP_WIFI_ENHANCED_LIGHT_SLEEP - extern void pm_mac_modem_clear_rf_power_state(void); pm_mac_modem_clear_rf_power_state(); if (sleep_modem_wifi_modem_state_enabled()) { sleep_modem_wifi_do_phy_retention(false); diff --git a/components/esp_wifi/Kconfig b/components/esp_wifi/Kconfig index b21b5ee558..d7b791d4b7 100644 --- a/components/esp_wifi/Kconfig +++ b/components/esp_wifi/Kconfig @@ -674,4 +674,13 @@ menu "Wi-Fi" Select this configuration to free dynamic buffers during WiFi enterprise connection. This will enable chip to reduce heap consumption during WiFi enterprise connection. + config ESP_WIFI_MODEM_RF_FLAG_UPDATE_DEBUG + bool "Enable debug assertions for modem RF flag update" + depends on ESP_WIFI_ENHANCED_LIGHT_SLEEP + default n + help + Enable debug assertions to verify modem RF flag update operations. + This option enables assert checks to verify that modem RF power state + is correctly cleared before pmu sleep. + endmenu # Wi-Fi diff --git a/components/esp_wifi/src/wifi_init.c b/components/esp_wifi/src/wifi_init.c index d6535c5c1d..29f4a09375 100644 --- a/components/esp_wifi/src/wifi_init.c +++ b/components/esp_wifi/src/wifi_init.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -220,7 +220,11 @@ static esp_err_t wifi_deinit_internal(void) #if CONFIG_ESP_WIFI_ENHANCED_LIGHT_SLEEP esp_wifi_internal_modem_state_configure(false); esp_pm_unregister_skip_light_sleep_callback(sleep_modem_wifi_modem_state_skip_light_sleep); +#if ESP_MODEM_RF_FLAG_UPDATE_CB_REQUIRED + esp_unregister_mac_bb_pd_callback(esp_phy_modem_rf_flag_update); #endif +#endif /* CONFIG_ESP_WIFI_ENHANCED_LIGHT_SLEEP */ + esp_phy_modem_deinit(); s_wifi_inited = false; @@ -409,6 +413,12 @@ esp_err_t esp_wifi_init(const wifi_init_config_t *config) if (sleep_modem_wifi_modem_state_enabled()) { esp_pm_register_skip_light_sleep_callback(sleep_modem_wifi_modem_state_skip_light_sleep); esp_wifi_internal_modem_state_configure(true); /* require WiFi to enable automatically receives the beacon */ +#if ESP_MODEM_RF_FLAG_UPDATE_CB_REQUIRED + if (esp_register_mac_bb_pd_callback(esp_phy_modem_rf_flag_update) != ESP_OK) { + ESP_LOGE(TAG, "Failed to register modem RF flag update callback"); + goto _deinit; + } +#endif } #endif #if CONFIG_IDF_TARGET_ESP32 diff --git a/components/soc/esp32c6/include/soc/Kconfig.soc_caps.in b/components/soc/esp32c6/include/soc/Kconfig.soc_caps.in index d577028f92..4116d22deb 100644 --- a/components/soc/esp32c6/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32c6/include/soc/Kconfig.soc_caps.in @@ -1307,6 +1307,10 @@ config SOC_PM_PAU_LINK_NUM int default 4 +config SOC_PM_MODEM_RF_FLAG_UPDATE_WORKAROUND + bool + default y + config SOC_PM_PAU_REGDMA_UPDATE_CACHE_BEFORE_WAIT_COMPARE bool default y diff --git a/components/soc/esp32c6/include/soc/soc_caps.h b/components/soc/esp32c6/include/soc/soc_caps.h index dccc767f8e..9bc30baa49 100644 --- a/components/soc/esp32c6/include/soc/soc_caps.h +++ b/components/soc/esp32c6/include/soc/soc_caps.h @@ -533,6 +533,7 @@ #define SOC_PM_RETENTION_HAS_CLOCK_BUG (1) #define SOC_PM_PAU_LINK_NUM (4) +#define SOC_PM_MODEM_RF_FLAG_UPDATE_WORKAROUND (1) #define SOC_PM_PAU_REGDMA_UPDATE_CACHE_BEFORE_WAIT_COMPARE (1) #define SOC_PM_PMU_MIN_SLP_SLOW_CLK_CYCLE_FIXED (1)