Skip to content

Commit

Permalink
Merge branch 'bugfix/fix_wakeup_failed_if_powerdown_flash_in_lightsle…
Browse files Browse the repository at this point in the history
…ep_v4.4' into 'release/v4.4'

Power Management: fixed flash funcs called in sleep wakeup process (backport v4.4)

See merge request espressif/esp-idf!24007
  • Loading branch information
jack0c committed Jun 9, 2023
2 parents 2771f0c + 2566e78 commit 5fb50f6
Showing 1 changed file with 14 additions and 9 deletions.
23 changes: 14 additions & 9 deletions components/esp_hw_support/sleep_modes.c
Original file line number Diff line number Diff line change
Expand Up @@ -297,15 +297,20 @@ static void IRAM_ATTR flush_uarts(void)
}
}

static void IRAM_ATTR suspend_uarts(void)
/**
* Suspend enabled uarts and return suspended uarts bit map
*/
static uint32_t IRAM_ATTR suspend_uarts(void)
{
uint32_t suspended_uarts_bmap = 0;
for (int i = 0; i < SOC_UART_NUM; ++i) {
#ifndef CONFIG_IDF_TARGET_ESP32
if (!periph_ll_periph_enabled(PERIPH_UART0_MODULE + i)) {
continue;
}
#endif
uart_ll_force_xoff(i);
suspended_uarts_bmap |= BIT(i);
#if SOC_UART_SUPPORT_FSM_TX_WAIT_SEND
uint32_t uart_fsm = 0;
do {
Expand All @@ -315,17 +320,16 @@ static void IRAM_ATTR suspend_uarts(void)
while (uart_ll_get_fsm_status(i) != 0) {}
#endif
}
return suspended_uarts_bmap;
}

static void IRAM_ATTR resume_uarts(void)
static void IRAM_ATTR resume_uarts(uint32_t uarts_resume_bmap)
{
for (int i = 0; i < SOC_UART_NUM; ++i) {
#ifndef CONFIG_IDF_TARGET_ESP32
if (!periph_ll_periph_enabled(PERIPH_UART0_MODULE + i)) {
continue;
if (uarts_resume_bmap & 0x1) {
uart_ll_force_xon(i);
}
#endif
uart_ll_force_xon(i);
uarts_resume_bmap >>= 1;
}
}

Expand Down Expand Up @@ -375,11 +379,12 @@ static uint32_t IRAM_ATTR esp_sleep_start(uint32_t pd_flags)
// For light sleep, suspend UART output — it will resume after wakeup.
// For deep sleep, wait for the contents of UART FIFO to be sent.
bool deep_sleep = pd_flags & RTC_SLEEP_PD_DIG;
uint32_t suspended_uarts_bmap = 0;

if (deep_sleep) {
flush_uarts();
} else {
suspend_uarts();
suspended_uarts_bmap = suspend_uarts();
}

#if SOC_RTC_SLOW_CLOCK_SUPPORT_8MD256
Expand Down Expand Up @@ -564,7 +569,7 @@ static uint32_t IRAM_ATTR esp_sleep_start(uint32_t pd_flags)
}

// re-enable UART output
resume_uarts();
resume_uarts(suspended_uarts_bmap);

return result;
}
Expand Down

0 comments on commit 5fb50f6

Please sign in to comment.