Merge branch 'fix/fix_esp32p4_stuck_in_pd_ana_v5.5' into 'release/v5.5'

Jiang Jiang Jian · Jiang Jiang Jian · commit 7f46f6152e6a · 2025-05-20T21:10:26.000+08:00
fix(esp_hw_support): fix esp32p4 may get stuck when entering deepsleep (v5.5)

See merge request espressif/esp-idf!39283
diff --git a/components/hal/esp32p4/include/hal/pmu_ll.h b/components/hal/esp32p4/include/hal/pmu_ll.h
@@ -678,9 +678,11 @@ FORCE_INLINE_ATTR void pmu_ll_set_dcdc_switch_force_power_down(pmu_dev_t *hw, bo
 FORCE_INLINE_ATTR void pmu_ll_set_dcdc_en(pmu_dev_t *hw, bool en)
 {
     if (en) {
+        hw->dcm_ctrl.done_force = 0;
         hw->dcm_ctrl.on_req = 1;
     } else {
         hw->dcm_ctrl.off_req = 1;
+        hw->dcm_ctrl.done_force = 1;
     }
 }
 
diff --git a/examples/protocols/https_server/simple/sdkconfig.defaults b/examples/protocols/https_server/simple/sdkconfig.defaults
@@ -1 +1,2 @@
 CONFIG_ESP_HTTPS_SERVER_ENABLE=y
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
diff --git a/examples/wifi/iperf/sdkconfig.ci.esp32p4_with_extconn b/examples/wifi/iperf/sdkconfig.ci.esp32p4_with_extconn
@@ -3,4 +3,3 @@
 #
 CONFIG_IDF_TARGET="esp32p4"
 CONFIG_ESP_HOST_WIFI_ENABLED=y
-CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
diff --git a/examples/wifi/iperf/sdkconfig.defaults b/examples/wifi/iperf/sdkconfig.defaults
@@ -12,3 +12,5 @@ CONFIG_LWIP_TCPIP_TASK_PRIO=23
 CONFIG_IPERF_TRAFFIC_TASK_PRIORITY=23
 CONFIG_IPERF_REPORT_TASK_PRIORITY=24
 CONFIG_COMPILER_OPTIMIZATION_PERF=y
+
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y

Original file line number	Diff line number	Diff line change
`@@ -678,9 +678,11 @@ FORCE_INLINE_ATTR void pmu_ll_set_dcdc_switch_force_power_down(pmu_dev_t *hw, bo`
`678`	`678`	`FORCE_INLINE_ATTR void pmu_ll_set_dcdc_en(pmu_dev_t *hw, bool en)`
`679`	`679`	`{`
`680`	`680`	`if (en) {`
	`681`	`+ hw->dcm_ctrl.done_force = 0;`
`681`	`682`	`hw->dcm_ctrl.on_req = 1;`
`682`	`683`	`} else {`
`683`	`684`	`hw->dcm_ctrl.off_req = 1;`
	`685`	`+ hw->dcm_ctrl.done_force = 1;`
`684`	`686`	`}`
`685`	`687`	`}`
`686`	`688`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`CONFIG_ESP_HTTPS_SERVER_ENABLE=y`
	`2`	`+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y`
Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,3 @@`
`3`	`3`	`#`
`4`	`4`	`CONFIG_IDF_TARGET="esp32p4"`
`5`	`5`	`CONFIG_ESP_HOST_WIFI_ENABLED=y`
`6`		`-CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y`