blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-10 01:29:21 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix/fix_systimer_stall_issue_in_lightsleep-esp32c2_espnow_enter_modem_sleep_unexpectly_v5.0' into 'release/v5.0'

Browse Source 
fix: systimer_stall_issue_in_lightsleep & esp32c2_espnow_enter_modem_sleep_unexpectly (v5.0)

See merge request espressif/esp-idf!22983
This commit is contained in:
Jiang Jiang Jian 2023-03-30 04:14:51 +08:00
commit 7d5c6b9b0a
6 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/esp_hw_support/Kconfig
View File

@ -120,6 +120,18 @@ menu "Hardware Settings"
console after deep sleep reset, try increasing this value.
endmenu
menu "ESP_SLEEP_WORKAROUND"
# No visible menu/configs for workaround
visible if 0
config ESP_SLEEP_SYSTIMER_STALL_WORKAROUND
bool "ESP32C3 SYSTIMER Stall Issue Workaround"
depends on IDF_TARGET_ESP32C3
help
Its not able to stall ESP32C3 systimer in sleep.
To fix related RTOS TICK issue, select it to disable related systimer during sleep.
TODO: IDF-7036
endmenu
menu "RTC Clock Config"
orsource "./port/$IDF_TARGET/Kconfig.rtc"

14
components/esp_hw_support/port/esp32c3/rtc_sleep.c
View File

@ -23,6 +23,9 @@
#include "soc/regi2c_dig_reg.h"
#include "soc/regi2c_lp_bias.h"
#include "hal/efuse_hal.h"
#if CONFIG_ESP_SLEEP_SYSTIMER_STALL_WORKAROUND
#include "soc/systimer_reg.h"
#endif
/**
* Configure whether certain peripherals are powered down in deep sleep
@ -199,6 +202,17 @@ void rtc_sleep_set_wakeup_time(uint64_t t)
WRITE_PERI_REG(RTC_CNTL_SLP_TIMER1_REG, t >> 32);
}
#if CONFIG_ESP_SLEEP_SYSTIMER_STALL_WORKAROUND
void rtc_sleep_systimer_enable(bool en)
{
if (en) {
REG_SET_BIT(SYSTIMER_CONF_REG, SYSTIMER_TIMER_UNIT1_WORK_EN);
} else {
REG_CLR_BIT(SYSTIMER_CONF_REG, SYSTIMER_TIMER_UNIT1_WORK_EN);
}
}
#endif
static uint32_t rtc_sleep_finish(uint32_t lslp_mem_inf_fpu);
uint32_t rtc_sleep_start(uint32_t wakeup_opt, uint32_t reject_opt, uint32_t lslp_mem_inf_fpu)

12
components/esp_hw_support/sleep_modes.c
View File

@ -519,6 +519,12 @@ static uint32_t IRAM_ATTR esp_sleep_start(uint32_t pd_flags)
timer_wakeup_prepare();
}
#if CONFIG_ESP_SLEEP_SYSTIMER_STALL_WORKAROUND
if (!(pd_flags & RTC_SLEEP_PD_XTAL)) {
rtc_sleep_systimer_enable(false);
}
#endif
uint32_t result;
if (deep_sleep) {
#if !CONFIG_IDF_TARGET_ESP32H2 // IDF does not officially support esp32h2 in v5.0
@ -552,6 +558,12 @@ static uint32_t IRAM_ATTR esp_sleep_start(uint32_t pd_flags)
result = call_rtc_sleep_start(reject_triggers, config.lslp_mem_inf_fpu);
}
#if CONFIG_ESP_SLEEP_SYSTIMER_STALL_WORKAROUND
if (!(pd_flags & RTC_SLEEP_PD_XTAL)) {
rtc_sleep_systimer_enable(true);
}
#endif
// Restore CPU frequency
rtc_clk_cpu_freq_set_config(&cpu_freq_config);

2
components/esp_rom/esp32c2/ld/esp32c2.rom.ld
View File

@ -1575,7 +1575,7 @@ pm_on_tbtt = 0x40001ba8;
pm_process_tim = 0x40001bb0;
/*pm_rx_beacon_process = 0x40001bb4;*/
pm_rx_data_process = 0x40001bb8;
pm_sleep = 0x40001bbc;
/*pm_sleep = 0x40001bbc;*/
pm_sleep_for = 0x40001bc0;
pm_tbtt_process = 0x40001bc4;
ppAMPDU2Normal = 0x40001bc8;

1
components/freertos/Kconfig
View File

@ -400,6 +400,7 @@ menu "FreeRTOS"
config FREERTOS_SYSTICK_USES_SYSTIMER
bool
default y if FREERTOS_CORETIMER_SYSTIMER_LVL1 || FREERTOS_CORETIMER_SYSTIMER_LVL3
select ESP_SLEEP_SYSTIMER_STALL_WORKAROUND if IDF_TARGET_ESP32C3
config FREERTOS_SYSTICK_USES_CCOUNT
bool

12
components/soc/esp32c3/include/soc/rtc.h
View File

@ -650,6 +650,18 @@ void rtc_sleep_low_init(uint32_t slowclk_period);
*/
void rtc_sleep_set_wakeup_time(uint64_t t);
#if CONFIG_ESP_SLEEP_SYSTIMER_STALL_WORKAROUND
/**
* @brief Configure systimer for esp32c3 systimer stall issue workaround
*
* This function configures related systimer for esp32c3 systimer stall issue.
* Only apply workaround when xtal powered up.
*
* @param en enable systimer or not
*/
void rtc_sleep_systimer_enable(bool en);
#endif
#define RTC_GPIO_TRIG_EN BIT(2) //!< GPIO wakeup
#define RTC_TIMER_TRIG_EN BIT(3) //!< Timer wakeup
#define RTC_WIFI_TRIG_EN BIT(5) //!< WIFI wakeup (light sleep only)