Merge branch 'bugfix/ulp_lp_core_wakeup_race_v6.1' into 'release/v6.1'

fix(ulp): fix LP core wakeup race with LP timer (v6.1)

See merge request espressif/esp-idf!49561
This commit is contained in:
Jiang Jiang Jian
2026-07-03 21:35:44 +08:00
+7 -7
View File
@@ -165,16 +165,9 @@ esp_err_t ulp_lp_core_run(ulp_lp_core_cfg_t* cfg)
lp_core_ll_rst_at_sleep_enable(true);
#endif
/* Set wake-up sources */
lp_core_ll_set_wakeup_source(lp_core_get_wakeup_source_hw_flags(cfg->wakeup_source));
/* Enable JTAG debugging */
lp_core_ll_debug_module_enable(true);
if (cfg->wakeup_source & ULP_LP_CORE_WAKEUP_SOURCE_HP_CPU) {
lp_core_ll_hp_wake_lp();
}
#if SOC_ULP_LP_UART_SUPPORTED
if (cfg->wakeup_source & ULP_LP_CORE_WAKEUP_SOURCE_LP_UART) {
lp_core_ll_enable_lp_uart_wakeup(true);
@@ -196,6 +189,13 @@ esp_err_t ulp_lp_core_run(ulp_lp_core_cfg_t* cfg)
}
#endif
/* Set wake-up sources */
lp_core_ll_set_wakeup_source(lp_core_get_wakeup_source_hw_flags(cfg->wakeup_source));
if (cfg->wakeup_source & ULP_LP_CORE_WAKEUP_SOURCE_HP_CPU) {
lp_core_ll_hp_wake_lp();
}
return ESP_OK;
}