Merge branch 'fix/esp32p4_sleep_fixes_v5.3' into 'release/v5.3'

fix(esp_hw_support): esp32p4 lowpower issues fixes (v5.3)

See merge request espressif/esp-idf!43091
This commit is contained in:
Jiang Jiang Jian
2025-12-05 14:55:13 +08:00
3 changed files with 7 additions and 3 deletions
@@ -402,7 +402,11 @@ static TCM_IRAM_ATTR esp_err_t do_cpu_retention(sleep_cpu_entry_cb_t goto_sleep,
} }
#endif #endif
return (*goto_sleep)(wakeup_opt, reject_opt, lslp_mem_inf_fpu, dslp); uint32_t reject = (*goto_sleep)(wakeup_opt, reject_opt, lslp_mem_inf_fpu, dslp);
if (reject) {
restore_mstatus(mstatus);
return reject;
}
} }
#if CONFIG_PM_CHECK_SLEEP_RETENTION_FRAME #if CONFIG_PM_CHECK_SLEEP_RETENTION_FRAME
else { else {
@@ -34,7 +34,7 @@ extern "C" {
// FOR LIGHTSLEEP // FOR LIGHTSLEEP
#define PMU_HP_DRVB_LIGHTSLEEP 0 #define PMU_HP_DRVB_LIGHTSLEEP 0
#define PMU_LP_DRVB_LIGHTSLEEP 0 #define PMU_LP_DRVB_LIGHTSLEEP 0
#define PMU_HP_XPD_LIGHTSLEEP 1 #define PMU_HP_XPD_LIGHTSLEEP 0 // Always use DCDC power supply in lightsleep
#define PMU_DBG_ATTEN_LIGHTSLEEP_DEFAULT 0 #define PMU_DBG_ATTEN_LIGHTSLEEP_DEFAULT 0
#define PMU_HP_DBIAS_LIGHTSLEEP_0V6 1 #define PMU_HP_DBIAS_LIGHTSLEEP_0V6 1
+1 -1
View File
@@ -2452,7 +2452,7 @@ static uint32_t get_power_down_flags(void)
#endif #endif
#if SOC_PM_SUPPORT_CNNT_PD #if SOC_PM_SUPPORT_CNNT_PD
if (s_config.domain[ESP_PD_DOMAIN_CNNT].pd_option != ESP_PD_OPTION_ON) { if (s_config.domain[ESP_PD_DOMAIN_CNNT].pd_option != ESP_PD_OPTION_ON && top_domain_pd_allowed()) {
pd_flags |= PMU_SLEEP_PD_CNNT; pd_flags |= PMU_SLEEP_PD_CNNT;
} }
#endif #endif