Merge branch 'fix/fix_p4_mpll_disable_order' into 'master'

fix(esp_hw_support): disable P4 mpll clock after L1 dcache writeback Closes PM-138 See merge request espressif/esp-idf!31587
espressif · Jul 8, 2024 · 7cf952e · 7cf952e
2 parents 2fe8373 + 1ac05e8
commit 7cf952e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/components/esp_hw_support/port/esp32p4/pmu_sleep.c b/components/esp_hw_support/port/esp32p4/pmu_sleep.c
@@ -11,6 +11,7 @@
 #include "sdkconfig.h"
 #include "esp_err.h"
 #include "esp_attr.h"
+#include "esp_private/rtc_clk.h"
 #include "esp_private/regi2c_ctrl.h"
 #include "esp32p4/rom/cache.h"
 #include "soc/chip_revision.h"
@@ -22,6 +23,7 @@
 #include "soc/pau_reg.h"
 #include "soc/pmu_reg.h"
 #include "soc/pmu_struct.h"
+#include "hal/clk_tree_hal.h"
 #include "hal/lp_aon_hal.h"
 #include "soc/lp_system_reg.h"
 #include "hal/pmu_hal.h"
@@ -290,6 +292,8 @@ FORCE_INLINE_ATTR void sleep_writeback_l1_dcache(void) {
     while (!REG_GET_BIT(CACHE_SYNC_CTRL_REG, CACHE_SYNC_DONE));
 }
 
+static TCM_DRAM_ATTR uint32_t s_mpll_freq_mhz_before_sleep = 0;
+
 TCM_IRAM_ATTR uint32_t pmu_sleep_start(uint32_t wakeup_opt, uint32_t reject_opt, uint32_t lslp_mem_inf_fpu, bool dslp)
 {
     lp_aon_hal_inform_wakeup_type(dslp);
@@ -302,8 +306,15 @@ TCM_IRAM_ATTR uint32_t pmu_sleep_start(uint32_t wakeup_opt, uint32_t reject_opt,
     pmu_ll_hp_clear_reject_intr_status(PMU_instance()->hal->dev);
     pmu_ll_hp_clear_reject_cause(PMU_instance()->hal->dev);
 
+    // !!! Need to manually check that data in L2 memory will not be modified from now on. !!!
     sleep_writeback_l1_dcache();
 
+    // !!! Need to manually check that data in PSRAM will not be accessed from now on. !!!
+    s_mpll_freq_mhz_before_sleep = rtc_clk_mpll_get_freq();
+    if (s_mpll_freq_mhz_before_sleep) {
+        rtc_clk_mpll_disable();
+    }
+
     /* Start entry into sleep mode */
     pmu_ll_hp_set_sleep_enable(PMU_instance()->hal->dev);
 
@@ -336,6 +347,11 @@ TCM_IRAM_ATTR bool pmu_sleep_finish(bool dslp)
     // Wait eFuse memory update done.
     while(efuse_ll_get_controller_state() != EFUSE_CONTROLLER_STATE_IDLE);
 
+    if (s_mpll_freq_mhz_before_sleep) {
+        rtc_clk_mpll_enable();
+        rtc_clk_mpll_configure(clk_hal_xtal_get_freq_mhz(), s_mpll_freq_mhz_before_sleep);
+    }
+
     unsigned chip_version = efuse_hal_chip_revision();
     if (!ESP_CHIP_REV_ABOVE(chip_version, 1)) {
         REGI2C_WRITE_MASK(I2C_CPLL, I2C_CPLL_OC_DIV_7_0, 6); // lower default cpu_pll freq to 400M

diff --git a/components/esp_hw_support/port/esp32p4/rtc_clk.c b/components/esp_hw_support/port/esp32p4/rtc_clk.c
@@ -28,7 +28,7 @@ static const char *TAG = "rtc_clk";
 static int s_cur_cpll_freq = 0;
 
 // MPLL frequency option, 400MHz. Zero if MPLL is not enabled.
-static DRAM_ATTR uint32_t s_cur_mpll_freq = 0;
+static TCM_DRAM_ATTR uint32_t s_cur_mpll_freq = 0;
 
 void rtc_clk_32k_enable(bool enable)
 {
@@ -484,13 +484,13 @@ bool rtc_dig_8m_enabled(void)
 }
 
 //------------------------------------MPLL-------------------------------------//
-void rtc_clk_mpll_disable(void)
+TCM_IRAM_ATTR void rtc_clk_mpll_disable(void)
 {
     clk_ll_mpll_disable();
     s_cur_mpll_freq = 0;
 }
 
-void rtc_clk_mpll_enable(void)
+TCM_IRAM_ATTR void rtc_clk_mpll_enable(void)
 {
     clk_ll_mpll_enable();
 }
@@ -508,7 +508,7 @@ void rtc_clk_mpll_configure(uint32_t xtal_freq, uint32_t mpll_freq)
     s_cur_mpll_freq = mpll_freq;
 }
 
-uint32_t rtc_clk_mpll_get_freq(void)
+TCM_IRAM_ATTR uint32_t rtc_clk_mpll_get_freq(void)
 {
     return s_cur_mpll_freq;
 }
diff --git a/components/esp_hw_support/sleep_modes.c b/components/esp_hw_support/sleep_modes.c
@@ -990,13 +990,6 @@ static esp_err_t IRAM_ATTR esp_sleep_start(uint32_t pd_flags, esp_sleep_mode_t m
 #endif
 #endif
 
-#if SOC_CLK_MPLL_SUPPORTED
-            uint32_t mpll_freq_mhz = rtc_clk_mpll_get_freq();
-            if (mpll_freq_mhz) {
-                rtc_clk_mpll_disable();
-            }
-#endif
-
 #if SOC_DCDC_SUPPORTED
 #if CONFIG_ESP_SLEEP_KEEP_DCDC_ALWAYS_ON
             if (!deep_sleep) {
@@ -1031,13 +1024,6 @@ static esp_err_t IRAM_ATTR esp_sleep_start(uint32_t pd_flags, esp_sleep_mode_t m
             result = call_rtc_sleep_start(reject_triggers, config.lslp_mem_inf_fpu, deep_sleep);
 #endif
 
-#if SOC_CLK_MPLL_SUPPORTED
-            if (mpll_freq_mhz) {
-                rtc_clk_mpll_enable();
-                rtc_clk_mpll_configure(clk_hal_xtal_get_freq_mhz(), mpll_freq_mhz);
-            }
-#endif
-
             /* Unhold the SPI CS pin */
 #if (CONFIG_PM_POWER_DOWN_PERIPHERAL_IN_LIGHT_SLEEP && CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND)
 #if !CONFIG_IDF_TARGET_ESP32H2 // ESP32H2 TODO IDF-7359