diff --git a/components/esp_hw_support/port/pau_regdma.c b/components/esp_hw_support/port/pau_regdma.c index 6e8e4c8970..aab6b17860 100644 --- a/components/esp_hw_support/port/pau_regdma.c +++ b/components/esp_hw_support/port/pau_regdma.c @@ -26,6 +26,9 @@ pau_context_t * __attribute__((weak)) IRAM_ATTR PAU_instance(void) static pau_hal_context_t pau_hal = { .dev = NULL }; static pau_context_t pau_context = { .hal = &pau_hal }; + /* periph_module_enable don not need to be put in iram because it is + * called before the flash is powered off and will not be called again. */ + if (pau_hal.dev == NULL) { pau_hal.dev = &PAU; periph_module_enable(PERIPH_REGDMA_MODULE); @@ -62,6 +65,13 @@ void pau_regdma_trigger_modem_link_restore(void) #if SOC_PM_RETENTION_HAS_REGDMA_POWER_BUG void IRAM_ATTR pau_regdma_set_system_link_addr(void *link_addr) { + /* ESP32H2 use software to trigger REGDMA to restore instead of PMU, + * because regdma has power bug, so we need to manually set the clock + * for regdma before using it after the chip wakes up. We use + * pau_hal_clock_configure because periph_module_enable will consume + * a relatively large amount of memory space. */ + + pau_hal_regdma_clock_configure(PAU_instance()->hal, true); pau_hal_set_regdma_system_link_addr(PAU_instance()->hal, link_addr); } diff --git a/components/hal/esp32h2/pau_hal.c b/components/hal/esp32h2/pau_hal.c index 3f7ba1aab2..cbfecc77e6 100644 --- a/components/hal/esp32h2/pau_hal.c +++ b/components/hal/esp32h2/pau_hal.c @@ -7,7 +7,9 @@ // The HAL layer for PAU (ESP32-H2 specific part) #include "soc/soc.h" +#include "soc/pcr_struct.h" #include "esp_attr.h" +#include "hal/misc.h" #include "hal/pau_hal.h" #include "hal/pau_types.h" @@ -57,3 +59,9 @@ void pau_hal_stop_regdma_extra_link(pau_hal_context_t *hal) pau_ll_select_regdma_entry_link(hal->dev, 0); /* restore link select to default */ pau_ll_clear_regdma_backup_done_intr_state(hal->dev); } + +void IRAM_ATTR pau_hal_regdma_clock_configure(pau_hal_context_t *hal, bool enable) +{ + HAL_FORCE_MODIFY_U32_REG_FIELD(PCR.regdma_conf, regdma_rst_en, !enable); + HAL_FORCE_MODIFY_U32_REG_FIELD(PCR.regdma_conf, regdma_clk_en, enable); +} diff --git a/components/hal/include/hal/pau_hal.h b/components/hal/include/hal/pau_hal.h index 5b28a957d2..5aae8900f5 100644 --- a/components/hal/include/hal/pau_hal.h +++ b/components/hal/include/hal/pau_hal.h @@ -100,6 +100,15 @@ void pau_hal_start_regdma_extra_link(pau_hal_context_t *hal, bool backup_or_rest */ void pau_hal_stop_regdma_extra_link(pau_hal_context_t *hal); +#if SOC_PM_RETENTION_HAS_REGDMA_POWER_BUG +/** + * @brief Enable or disable PAU module clock + * + * @param hal regdma hal context + */ +void pau_hal_regdma_clock_configure(pau_hal_context_t *hal, bool enable); +#endif + #ifdef __cplusplus } #endif diff --git a/components/soc/esp32h2/include/soc/Kconfig.soc_caps.in b/components/soc/esp32h2/include/soc/Kconfig.soc_caps.in index 36bc234861..989ecc2268 100644 --- a/components/soc/esp32h2/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32h2/include/soc/Kconfig.soc_caps.in @@ -1111,6 +1111,10 @@ config SOC_PM_RETENTION_HAS_REGDMA_POWER_BUG bool default y +config SOC_PM_RETENTION_HAS_CLOCK_BUG + bool + default y + config SOC_CLK_RC_FAST_SUPPORT_CALIBRATION bool default y diff --git a/components/soc/esp32h2/include/soc/soc_caps.h b/components/soc/esp32h2/include/soc/soc_caps.h index 04783edc4b..8b7ab7df6c 100644 --- a/components/soc/esp32h2/include/soc/soc_caps.h +++ b/components/soc/esp32h2/include/soc/soc_caps.h @@ -460,6 +460,7 @@ #define SOC_PM_MODEM_RETENTION_BY_REGDMA (1) #define SOC_PM_SUPPORT_DEEPSLEEP_CHECK_STUB_ONLY (1) /*!