Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-08-13 04:42:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

change(esp_hw_support): update RTC mem attr in sleep_modes.c

Browse Source
This commit is contained in:
wuzhenghui
2025-10-10 17:36:55 +08:00
committed by Armando (Dou Yiwen)
parent 0f6adbebed
commit 5bdcc8f5b0
3 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
components/esp_hw_support/sleep_modes.c
View File

@@ -327,8 +327,14 @@ static portMUX_TYPE __attribute__((unused)) spinlock_rtc_deep_sleep = portMUX_IN
ESP_LOG_ATTR_TAG(TAG, "sleep");
/* APP core of esp32 can't access to RTC FAST MEMORY, do not define it with RTC_IRAM_ATTR */
RTC_SLOW_ATTR static int32_t s_sleep_sub_mode_ref_cnt[ESP_SLEEP_MODE_MAX] = { 0 };
/* APP core of esp32 can't access to RTC FAST MEMORY, do not define it with RTC_IRAM_ATTR,
RTC_SLOW_ATTR is for ESP_SLEEP_USE_ADC_TSEN_MONITOR_MODE only, For other submodules, there is
no logical error if the ref_cnt is stored in DRAM. and ESP_SLEEP_USE_ADC_TSEN_MONITOR_MODE
will only be used on chips that support RTC_MEM */
#if SOC_RTC_FAST_MEM_SUPPORTED || SOC_RTC_SLOW_MEM_SUPPORTED
RTC_SLOW_ATTR
#endif
static int32_t s_sleep_sub_mode_ref_cnt[ESP_SLEEP_MODE_MAX] = { 0 };
void esp_sleep_overhead_out_time_refresh(void)
{
@@ -360,7 +366,6 @@ static void gpio_deep_sleep_wakeup_prepare(void);
#if ESP_ROM_SUPPORT_DEEP_SLEEP_WAKEUP_STUB && SOC_DEEP_SLEEP_SUPPORTED
#if SOC_PM_SUPPORT_DEEPSLEEP_CHECK_STUB_ONLY
static RTC_FAST_ATTR esp_deep_sleep_wake_stub_fn_t wake_stub_fn_handler = NULL;
static void RTC_IRAM_ATTR __attribute__((used, noinline)) esp_wake_stub_start(void)
{
if (wake_stub_fn_handler) {
@@ -391,7 +396,6 @@ static void __attribute__((section(".rtc.entry.text"))) esp_wake_stub_entry(void
// which is sufficient for instruction addressing in RTC fast memory.
__asm__ __volatile__ ("call4 " SYM2STR(esp_wake_stub_start) "\n");
#endif
}
void RTC_IRAM_ATTR esp_set_deep_sleep_wake_stub_default_entry(void)
@@ -427,7 +431,7 @@ esp_deep_sleep_wake_stub_fn_t esp_get_deep_sleep_wake_stub(void)
#if CONFIG_IDF_TARGET_ESP32
/* APP core of esp32 can't access to RTC FAST MEMORY, link to RTC SLOW MEMORY instead*/
RTC_SLOW_ATTR
#else
#elif (SOC_RTC_FAST_MEM_SUPPORTED || SOC_RTC_SLOW_MEM_SUPPORTED)
RTC_IRAM_ATTR
#endif
void esp_set_deep_sleep_wake_stub(esp_deep_sleep_wake_stub_fn_t new_stub)
@@ -443,7 +447,7 @@ void esp_set_deep_sleep_wake_stub(esp_deep_sleep_wake_stub_fn_t new_stub)
#if CONFIG_IDF_TARGET_ESP32
/* APP core of esp32 can't access to RTC FAST MEMORY, link to RTC SLOW MEMORY instead*/
RTC_SLOW_ATTR
#else
#elif (SOC_RTC_FAST_MEM_SUPPORTED || SOC_RTC_SLOW_MEM_SUPPORTED)
RTC_IRAM_ATTR
#endif
void esp_default_wake_deep_sleep(void)
@@ -2863,7 +2867,7 @@ static SLEEP_FN_ATTR uint32_t get_sleep_clock_icg_flags(void)
#if CONFIG_IDF_TARGET_ESP32
/* APP core of esp32 can't access to RTC FAST MEMORY, do not define it with RTC_IRAM_ATTR */
RTC_SLOW_ATTR
#else
#elif (SOC_RTC_FAST_MEM_SUPPORTED || SOC_RTC_SLOW_MEM_SUPPORTED)
RTC_IRAM_ATTR
#endif
void esp_deep_sleep_disable_rom_logging(void)

5
components/esp_hw_support/test_apps/rtc_clk/main/test_rtc_clk.c
View File

@@ -364,7 +364,10 @@ TEST_CASE("Test rtc clk calibration compensation", "[rtc_clk]")
#endif
#if SOC_DEEP_SLEEP_SUPPORTED
static RTC_NOINIT_ATTR int64_t start = 0;
#if SOC_RTC_FAST_MEM_SUPPORTED || SOC_RTC_SLOW_MEM_SUPPORTED
RTC_NOINIT_ATTR
#endif
static int64_t start = 0;
static void trigger_deepsleep(void)
{

6
examples/system/deep_sleep/main/deep_sleep_example_main.c
View File

@@ -18,7 +18,11 @@
#include "nvs.h"
#include "deep_sleep_example.h"
RTC_SLOW_ATTR static struct timeval sleep_enter_time;
// For chips not support RTC memory, sleep_enter_time is stored in NVS Flash
#if SOC_RTC_FAST_MEM_SUPPORTED || SOC_RTC_SLOW_MEM_SUPPORTED
RTC_SLOW_ATTR
#endif
static struct timeval sleep_enter_time;
static void deep_sleep_task(void *args)
{