mirror of
https://github.com/espressif/esp-idf.git
synced 2024-09-20 00:36:01 -04:00
change(esp_hw_support/sleep): improve esp32c3 systimer stall bug workaround
This commit is contained in:
parent
822fbc2fc2
commit
339ae99b04
@ -100,18 +100,6 @@ menu "Hardware Settings"
|
|||||||
make use of the internal ones.
|
make use of the internal ones.
|
||||||
endmenu
|
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"
|
menu "RTC Clock Config"
|
||||||
# This is used for configure the RTC clock.
|
# This is used for configure the RTC clock.
|
||||||
config RTC_CLOCK_BBPLL_POWER_ON_WITH_USB
|
config RTC_CLOCK_BBPLL_POWER_ON_WITH_USB
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
#include "regi2c_ctrl.h"
|
#include "regi2c_ctrl.h"
|
||||||
#include "esp_efuse.h"
|
#include "esp_efuse.h"
|
||||||
#include "hal/efuse_hal.h"
|
#include "hal/efuse_hal.h"
|
||||||
#if CONFIG_ESP_SLEEP_SYSTIMER_STALL_WORKAROUND
|
#if SOC_SLEEP_SYSTIMER_STALL_WORKAROUND
|
||||||
#include "soc/systimer_reg.h"
|
#include "soc/systimer_reg.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -259,17 +259,6 @@ void rtc_sleep_set_wakeup_time(uint64_t t)
|
|||||||
WRITE_PERI_REG(RTC_CNTL_SLP_TIMER1_REG, t >> 32);
|
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);
|
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)
|
uint32_t rtc_sleep_start(uint32_t wakeup_opt, uint32_t reject_opt, uint32_t lslp_mem_inf_fpu)
|
||||||
|
@ -25,6 +25,10 @@
|
|||||||
#include "driver/rtc_io.h"
|
#include "driver/rtc_io.h"
|
||||||
#include "hal/rtc_io_hal.h"
|
#include "hal/rtc_io_hal.h"
|
||||||
|
|
||||||
|
#if SOC_SLEEP_SYSTIMER_STALL_WORKAROUND
|
||||||
|
#include "hal/systimer_ll.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "driver/uart.h"
|
#include "driver/uart.h"
|
||||||
|
|
||||||
#include "soc/cpu.h"
|
#include "soc/cpu.h"
|
||||||
@ -530,11 +534,6 @@ static uint32_t IRAM_ATTR esp_sleep_start(uint32_t pd_flags)
|
|||||||
timer_wakeup_prepare();
|
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;
|
uint32_t result;
|
||||||
if (deep_sleep) {
|
if (deep_sleep) {
|
||||||
@ -564,18 +563,26 @@ static uint32_t IRAM_ATTR esp_sleep_start(uint32_t pd_flags)
|
|||||||
#endif
|
#endif
|
||||||
#endif // SOC_PM_SUPPORT_DEEPSLEEP_VERIFY_STUB_ONLY
|
#endif // SOC_PM_SUPPORT_DEEPSLEEP_VERIFY_STUB_ONLY
|
||||||
} else {
|
} else {
|
||||||
|
#if SOC_SLEEP_SYSTIMER_STALL_WORKAROUND
|
||||||
|
if (!(pd_flags & RTC_SLEEP_PD_XTAL)) {
|
||||||
|
for (uint32_t counter_id = 0; counter_id < SOC_SYSTIMER_COUNTER_NUM; ++counter_id) {
|
||||||
|
systimer_ll_enable_counter(&SYSTIMER, counter_id, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
uint32_t cache_state;
|
uint32_t cache_state;
|
||||||
uint32_t cpuid = cpu_ll_get_core_id();
|
uint32_t cpuid = cpu_ll_get_core_id();
|
||||||
spi_flash_disable_cache(cpuid, &cache_state);
|
spi_flash_disable_cache(cpuid, &cache_state);
|
||||||
result = call_rtc_sleep_start(reject_triggers, config.lslp_mem_inf_fpu);
|
result = call_rtc_sleep_start(reject_triggers, config.lslp_mem_inf_fpu);
|
||||||
spi_flash_restore_cache(cpuid, cache_state);
|
spi_flash_restore_cache(cpuid, cache_state);
|
||||||
}
|
#if SOC_SLEEP_SYSTIMER_STALL_WORKAROUND
|
||||||
|
|
||||||
#if CONFIG_ESP_SLEEP_SYSTIMER_STALL_WORKAROUND
|
|
||||||
if (!(pd_flags & RTC_SLEEP_PD_XTAL)) {
|
if (!(pd_flags & RTC_SLEEP_PD_XTAL)) {
|
||||||
rtc_sleep_systimer_enable(true);
|
for (uint32_t counter_id = 0; counter_id < SOC_SYSTIMER_COUNTER_NUM; ++counter_id) {
|
||||||
|
systimer_ll_enable_counter(&SYSTIMER, counter_id, true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
// Restore CPU frequency
|
// Restore CPU frequency
|
||||||
rtc_clk_cpu_freq_set_config(&cpu_freq_config);
|
rtc_clk_cpu_freq_set_config(&cpu_freq_config);
|
||||||
|
@ -122,6 +122,10 @@ esp_err_t esp_timer_impl_early_init(void)
|
|||||||
systimer_hal_select_alarm_mode(&systimer_hal, SYSTIMER_LL_ALARM_CLOCK, SYSTIMER_ALARM_MODE_ONESHOT);
|
systimer_hal_select_alarm_mode(&systimer_hal, SYSTIMER_LL_ALARM_CLOCK, SYSTIMER_ALARM_MODE_ONESHOT);
|
||||||
systimer_hal_connect_alarm_counter(&systimer_hal, SYSTIMER_LL_ALARM_CLOCK, SYSTIMER_LL_COUNTER_CLOCK);
|
systimer_hal_connect_alarm_counter(&systimer_hal, SYSTIMER_LL_ALARM_CLOCK, SYSTIMER_LL_COUNTER_CLOCK);
|
||||||
|
|
||||||
|
for (unsigned cpuid = 0; cpuid < SOC_CPU_CORES_NUM; ++cpuid) {
|
||||||
|
systimer_hal_counter_can_stall_by_cpu(&systimer_hal, SYSTIMER_LL_COUNTER_CLOCK, cpuid, (cpuid < portNUM_PROCESSORS) ? true : false);
|
||||||
|
}
|
||||||
|
|
||||||
return ESP_OK;
|
return ESP_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -738,18 +738,6 @@ void rtc_sleep_low_init(uint32_t slowclk_period);
|
|||||||
*/
|
*/
|
||||||
void rtc_sleep_set_wakeup_time(uint64_t t);
|
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_GPIO_TRIG_EN BIT(2) //!< GPIO wakeup
|
||||||
#define RTC_TIMER_TRIG_EN BIT(3) //!< Timer wakeup
|
#define RTC_TIMER_TRIG_EN BIT(3) //!< Timer wakeup
|
||||||
#define RTC_WIFI_TRIG_EN BIT(5) //!< WIFI wakeup (light sleep only)
|
#define RTC_WIFI_TRIG_EN BIT(5) //!< WIFI wakeup (light sleep only)
|
||||||
|
@ -178,6 +178,8 @@
|
|||||||
|
|
||||||
#define SOC_RTC_SLOW_CLOCK_SUPPORT_8MD256 (1)
|
#define SOC_RTC_SLOW_CLOCK_SUPPORT_8MD256 (1)
|
||||||
|
|
||||||
|
#define SOC_SLEEP_SYSTIMER_STALL_WORKAROUND (1)
|
||||||
|
|
||||||
/*-------------------------- RTCIO CAPS --------------------------------------*/
|
/*-------------------------- RTCIO CAPS --------------------------------------*/
|
||||||
/* No dedicated RTCIO subsystem on ESP32-C3. RTC functions are still supported
|
/* No dedicated RTCIO subsystem on ESP32-C3. RTC functions are still supported
|
||||||
* for hold, wake & 32kHz crystal functions - via rtc_cntl_reg */
|
* for hold, wake & 32kHz crystal functions - via rtc_cntl_reg */
|
||||||
|
Loading…
Reference in New Issue
Block a user