Merge branch 'bugfix/fix_cpu_crash_bug_esp32' into 'master'

Chai Ji’e · Chai Ji’e · commit 50e3a2bcba63 · 2025-02-20T18:56:01.000+08:00
bugfix/fix_qa_fail_bug_esp32

See merge request espressif/esp-idf!36353
diff --git a/components/esp_hw_support/port/esp32/include/soc/rtc.h b/components/esp_hw_support/port/esp32/include/soc/rtc.h
@@ -71,11 +71,11 @@ extern "C" {
  */
 #define RTC_CNTL_DBIAS_HP_VOLT         (RTC_CNTL_DBIAS_1V25 - efuse_ll_get_vol_level_hp_inv())
 #ifdef CONFIG_ESPTOOLPY_FLASHFREQ_80M
-#define DIG_DBIAS_80M_160M  RTC_CNTL_DBIAS_HP_VOLT
+#define DIG_DBIAS_80M_160M  RTC_CNTL_DBIAS_1V25
 #else
 #define DIG_DBIAS_80M_160M  RTC_CNTL_DBIAS_1V10
 #endif
-#define DIG_DBIAS_240M      RTC_CNTL_DBIAS_HP_VOLT
+#define DIG_DBIAS_240M      RTC_CNTL_DBIAS_1V25
 #define DIG_DBIAS_XTAL      RTC_CNTL_DBIAS_1V10
 #define DIG_DBIAS_2M        RTC_CNTL_DBIAS_1V00
 
diff --git a/components/esp_hw_support/port/esp32/rtc_clk.c b/components/esp_hw_support/port/esp32/rtc_clk.c
@@ -404,6 +404,7 @@ static void rtc_clk_cpu_freq_to_pll_mhz(int cpu_freq_mhz)
     rtc_clk_apb_freq_update(80 * MHZ);
     esp_rom_set_cpu_ticks_per_us(cpu_freq_mhz);
     rtc_clk_wait_for_slow_cycle();
+    esp_rom_delay_us(30);
 }
 
 void rtc_clk_cpu_freq_set_xtal(void)

Original file line number	Diff line number	Diff line change
`@@ -404,6 +404,7 @@ static void rtc_clk_cpu_freq_to_pll_mhz(int cpu_freq_mhz)`
`404`	`404`	`rtc_clk_apb_freq_update(80 * MHZ);`
`405`	`405`	`esp_rom_set_cpu_ticks_per_us(cpu_freq_mhz);`
`406`	`406`	`rtc_clk_wait_for_slow_cycle();`
	`407`	`+ esp_rom_delay_us(30);`
`407`	`408`	`}`
`408`	`409`
`409`	`410`	`void rtc_clk_cpu_freq_set_xtal(void)`