From 2c3f30378f7f03dc15d7ba4e6ac402a24488ea25 Mon Sep 17 00:00:00 2001 From: KonstantinKondrashov Date: Thu, 27 Oct 2022 21:45:38 +0800 Subject: [PATCH] esp_hw_support: Fix time jump after reboot Closes https://github.com/espressif/esp-idf/issues/9448 --- components/newlib/port/esp_time_impl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/components/newlib/port/esp_time_impl.c b/components/newlib/port/esp_time_impl.c index 5317156b63..01b9a670c8 100644 --- a/components/newlib/port/esp_time_impl.c +++ b/components/newlib/port/esp_time_impl.c @@ -61,7 +61,7 @@ static uint64_t s_boot_time; // when RTC is used to persist time, two RTC_STORE static _lock_t s_boot_time_lock; static _lock_t s_esp_rtc_time_lock; -static RTC_DATA_ATTR uint64_t s_esp_rtc_time_us = 0, s_rtc_last_ticks = 0; +static RTC_NOINIT_ATTR uint64_t s_esp_rtc_time_us, s_rtc_last_ticks; #if defined( CONFIG_ESP_TIME_FUNCS_USE_ESP_TIMER ) || defined( CONFIG_ESP_TIME_FUNCS_USE_RTC_TIMER ) uint64_t esp_time_impl_get_time_since_boot(void) @@ -137,6 +137,10 @@ uint64_t esp_rtc_get_time_us(void) { _lock_acquire(&s_esp_rtc_time_lock); const uint32_t cal = esp_clk_slowclk_cal_get(); + if (cal == 0) { + s_esp_rtc_time_us = 0; + s_rtc_last_ticks = 0; + } const uint64_t rtc_this_ticks = rtc_time_get(); const uint64_t ticks = rtc_this_ticks - s_rtc_last_ticks; /* RTC counter result is up to 2^48, calibration factor is up to 2^24,