soc: espressif: Fix psram0 node size and smh heap size calculation

Marek Matej · kartben · commit d13fae97e492 · 2025-02-25T07:56:19.000+01:00
Fixing multiple things related to psram usage:
- fix conflicting psram0 dts node for all ESP32 SiP and SoC.
- fix dcache and icache area used in psram mapping.
- fix smh spiram heap allocations.
- add `espressif,esp32-psram` compatible to set psram0 size in dts.

Signed-off-by: Marek Matej &lt;marek.matej@espressif.com&gt;
diff --git a/boards/adafruit/qt_py_esp32s3/adafruit_qt_py_esp32s3_appcpu_psram.overlay b/boards/adafruit/qt_py_esp32s3/adafruit_qt_py_esp32s3_appcpu_psram.overlay
@@ -27,8 +27,7 @@
 
 /* 2MB psram */
 &psram0 {
-	reg = <0x3c000000 DT_SIZE_M(2)>;
-	status = "okay";
+	size = <DT_SIZE_M(2)>;
 };
 
 #include <espressif/partitions_0x0_amp.dtsi>
diff --git a/boards/adafruit/qt_py_esp32s3/adafruit_qt_py_esp32s3_procpu_psram.overlay b/boards/adafruit/qt_py_esp32s3/adafruit_qt_py_esp32s3_procpu_psram.overlay
@@ -27,8 +27,7 @@
 
 /* 2MB psram */
 &psram0 {
-	reg = <0x3c000000 DT_SIZE_M(2)>;
-	status = "okay";
+	size = <DT_SIZE_M(2)>;
 };
 
 #include <espressif/partitions_0x0_amp.dtsi>
diff --git a/boards/m5stack/m5stack_core2/m5stack_core2_procpu.dts b/boards/m5stack/m5stack_core2/m5stack_core2_procpu.dts
@@ -87,8 +87,7 @@
 };
 
 &psram0 {
-	reg = <0x3f800000 DT_SIZE_M(8)>;
-	status = "disabled";
+	size = <DT_SIZE_M(8)>;
 };
 
 &uart0 {
diff --git a/dts/bindings/memory-controllers/espressif,esp32-psram.yaml b/dts/bindings/memory-controllers/espressif,esp32-psram.yaml
@@ -0,0 +1,13 @@
+# Copyright (c) 2025 Espressif Systems (Shanghai) Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+description: ESP32 Family pseudo-static RAM controller
+
+compatible: "espressif,esp32-psram"
+
+include: base.yaml
+
+properties:
+  size:
+    type: int
+    required: true
diff --git a/dts/xtensa/espressif/esp32/esp32_common.dtsi b/dts/xtensa/espressif/esp32/esp32_common.dtsi
@@ -112,6 +112,29 @@
 			zephyr,memory-region = "SRAM2";
 		};
 
+		dcache0: dcache0@3f400000 {
+			compatible = "zephyr,memory-region", "mmio-sram";
+			reg = <0x3f400000 DT_SIZE_M(4)>;
+			zephyr,memory-region = "DCACHE0";
+		};
+
+		dcache1: dcache1@3f800000 {
+			compatible = "zephyr,memory-region", "mmio-sram";
+			reg = <0x3f800000 DT_SIZE_M(4)>;
+			zephyr,memory-region = "DCACHE1";
+
+			psram0: psram0 {
+				compatible = "espressif,esp32-psram";
+				size = <0x0>;
+			};
+		};
+
+		icache0: icache0@400d0000 {
+			compatible = "zephyr,memory-region", "mmio-sram";
+			reg = <0x400d0000 DT_SIZE_K(11456)>;
+			zephyr,memory-region = "ICACHE0";
+		};
+
 		ipmmem0: memory@3ffe5230 {
 			compatible = "mmio-sram";
 			reg = <0x3ffe5230 0x400>;
@@ -189,14 +212,6 @@
 			};
 		};
 
-		psram0: psram@3f800000 {
-			device_type = "memory";
-			compatible = "mmio-sram";
-			/* PSRAM size is specified in SOC/SIP dtsi */
-			reg = <0x3f800000 DT_SIZE_M(2)>;
-			status = "disabled";
-		};
-
 		ipi0: ipi@3f4c0058 {
 			compatible = "espressif,crosscore-interrupt";
 			reg = <0x3f4c0058 0x4>;
diff --git a/dts/xtensa/espressif/esp32/esp32_d0wdr2_v3.dtsi b/dts/xtensa/espressif/esp32/esp32_d0wdr2_v3.dtsi
@@ -15,6 +15,5 @@
 
 /* 2MB psram */
 &psram0 {
-	reg = <0x3f800000 DT_SIZE_M(2)>;
-	status = "okay";
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32/esp32_pico_v3_02.dtsi b/dts/xtensa/espressif/esp32/esp32_pico_v3_02.dtsi
@@ -19,6 +19,5 @@
 
 /* 2MB psram */
 &psram0 {
-	reg = <0x3f800000 DT_SIZE_M(2)>;
-	status = "okay";
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32/esp32_wrover_e_n16r2.dtsi b/dts/xtensa/espressif/esp32/esp32_wrover_e_n16r2.dtsi
@@ -23,6 +23,5 @@
 
 /* 2MB psram */
 &psram0 {
-	reg = <0x3f800000 DT_SIZE_M(2)>;
-	status = "okay";
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32/esp32_wrover_e_n16r4.dtsi b/dts/xtensa/espressif/esp32/esp32_wrover_e_n16r4.dtsi
@@ -23,6 +23,5 @@
 
 /* 4MB psram */
 &psram0 {
-	reg = <0x3f800000 DT_SIZE_M(4)>;
-	status = "okay";
+	size = <DT_SIZE_M(4)>;
 };
diff --git a/dts/xtensa/espressif/esp32/esp32_wrover_e_n16r8.dtsi b/dts/xtensa/espressif/esp32/esp32_wrover_e_n16r8.dtsi
@@ -23,6 +23,5 @@
 
 /* 8MB psram */
 &psram0 {
-	reg = <0x3f800000 DT_SIZE_M(8)>;
-	status = "okay";
+	size = <DT_SIZE_M(8)>;
 };
diff --git a/dts/xtensa/espressif/esp32/esp32_wrover_e_n4r2.dtsi b/dts/xtensa/espressif/esp32/esp32_wrover_e_n4r2.dtsi
@@ -23,6 +23,5 @@
 
 /* 2MB psram */
 &psram0 {
-	reg = <0x3f800000 DT_SIZE_M(2)>;
-	status = "okay";
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32/esp32_wrover_e_n4r8.dtsi b/dts/xtensa/espressif/esp32/esp32_wrover_e_n4r8.dtsi
@@ -23,6 +23,5 @@
 
 /* 8MB psram */
 &psram0 {
-	reg = <0x3f800000 DT_SIZE_M(8)>;
-	status = "okay";
+	size = <DT_SIZE_M(8)>;
 };
diff --git a/dts/xtensa/espressif/esp32/esp32_wrover_e_n8r2.dtsi b/dts/xtensa/espressif/esp32/esp32_wrover_e_n8r2.dtsi
@@ -23,6 +23,5 @@
 
 /* 2MB psram */
 &psram0 {
-	reg = <0x3f800000 DT_SIZE_M(2)>;
-	status = "okay";
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32/esp32_wrover_e_n8r8.dtsi b/dts/xtensa/espressif/esp32/esp32_wrover_e_n8r8.dtsi
@@ -24,6 +24,5 @@
 
 /* 8MB flash */
 &psram0 {
-	reg = <0x3f800000 DT_SIZE_M(8)>;
-	status = "okay";
+	size = <DT_SIZE_M(8)>;
 };
diff --git a/dts/xtensa/espressif/esp32s2/esp32s2_common.dtsi b/dts/xtensa/espressif/esp32s2/esp32s2_common.dtsi
@@ -91,6 +91,29 @@
 			zephyr,memory-region = "SRAM1";
 		};
 
+		dcache0: dcache0@3f000000 {
+			compatible = "zephyr,memory-region";
+			reg = <0x3f000000 DT_SIZE_M(4)>;
+			zephyr,memory-region = "DCACHE0";
+		};
+
+		dcache1: dcache1@3f500000 {
+			compatible = "zephyr,memory-region";
+			reg = <0x3f500000 DT_SIZE_K(10752)>;
+			zephyr,memory-region = "DCACHE1";
+
+			psram0: psram0 {
+				compatible = "espressif,esp32-psram";
+				size = <0x0>;
+			};
+		};
+
+		icache0: icache0@40080000 {
+			compatible = "zephyr,memory-region";
+			reg = <0x40080000 DT_SIZE_K(7680)>;
+			zephyr,memory-region = "ICACHE0";
+		};
+
 		intc: interrupt-controller@3f4c2000 {
 			#interrupt-cells = <3>;
 			#address-cells = <0>;
@@ -142,14 +165,6 @@
 			};
 		};
 
-		psram0: psram@3f500000 {
-			device_type = "memory";
-			compatible = "mmio-sram";
-			/* PSRAM size is specified in SOC/SIP dtsi */
-			reg = <0x3f500000 DT_SIZE_M(2)>;
-			status = "disabled";
-		};
-
 		uart0: uart@3f400000 {
 			compatible = "espressif,esp32-uart";
 			reg = <0x3f400000 0x400>;
diff --git a/dts/xtensa/espressif/esp32s2/esp32s2_fn4r2.dtsi b/dts/xtensa/espressif/esp32s2/esp32s2_fn4r2.dtsi
@@ -13,6 +13,5 @@
 
 /* 2MB psram */
 &psram0 {
-	reg = <0x3f500000 DT_SIZE_M(2)>;
-	status = "okay";
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32s2/esp32s2_mini_n4r2.dtsi b/dts/xtensa/espressif/esp32s2/esp32s2_mini_n4r2.dtsi
@@ -13,6 +13,5 @@
 
 /* 2MB psram */
 &psram0 {
-	status = "okay";
-	reg = <0x3f500000 DT_SIZE_M(2)>;
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32s2/esp32s2_r2.dtsi b/dts/xtensa/espressif/esp32s2/esp32s2_r2.dtsi
@@ -8,6 +8,5 @@
 
 /* 2MB psram */
 &psram0 {
-	status = "okay";
-	reg = <0x3f500000 DT_SIZE_M(2)>;
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32s2/esp32s2_solo_n4r2.dtsi b/dts/xtensa/espressif/esp32s2/esp32s2_solo_n4r2.dtsi
@@ -13,6 +13,5 @@
 
 /* 2MB psram */
 &psram0 {
-	status = "okay";
-	reg = <0x3f500000 DT_SIZE_M(2)>;
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32s2/esp32s2_wrover_n16r2.dtsi b/dts/xtensa/espressif/esp32s2/esp32s2_wrover_n16r2.dtsi
@@ -13,6 +13,5 @@
 
 /* 2MB psram */
 &psram0 {
-	status = "okay";
-	reg = <0x3f500000 DT_SIZE_M(2)>;
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32s2/esp32s2_wrover_n4r2.dtsi b/dts/xtensa/espressif/esp32s2/esp32s2_wrover_n4r2.dtsi
@@ -13,6 +13,5 @@
 
 /* 2MB psram */
 &psram0 {
-	status = "okay";
-	reg = <0x3f500000 DT_SIZE_M(2)>;
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32s2/esp32s2_wrover_n8r2.dtsi b/dts/xtensa/espressif/esp32s2/esp32s2_wrover_n8r2.dtsi
@@ -13,6 +13,5 @@
 
 /* 2MB psram */
 &psram0 {
-	status = "okay";
-	reg = <0x3f500000 DT_SIZE_M(2)>;
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32s3/esp32s3_common.dtsi b/dts/xtensa/espressif/esp32s3/esp32s3_common.dtsi
@@ -89,13 +89,18 @@
 		icache0: memory@42000000 {
 			compatible = "zephyr,memory-region";
 			reg = <0x42000000 DT_SIZE_M(32)>;
-			zephyr,memory-region = "ICACHE";
+			zephyr,memory-region = "ICACHE0";
 		};
 
 		dcache0: memory@3c000000 {
 			compatible = "zephyr,memory-region";
 			reg = <0x3c000000 DT_SIZE_M(32)>;
-			zephyr,memory-region = "DCACHE";
+			zephyr,memory-region = "DCACHE0";
+
+			psram0: psram0 {
+				compatible = "espressif,esp32-psram";
+				size = <0x0>;
+			};
 		};
 
 		sram0: memory@40370000 {
@@ -201,14 +206,6 @@
 			};
 		};
 
-		psram0: psram@3c000000 {
-			device_type = "memory";
-			compatible = "mmio-sram";
-			/* PSRAM size is specified in SOC/SIP dtsi */
-			reg = <0x3c000000 DT_SIZE_M(2)>;
-			status = "disabled";
-		};
-
 		uart0: uart@60000000 {
 			compatible = "espressif,esp32-uart";
 			reg = <0x60000000 0x1000>;
diff --git a/dts/xtensa/espressif/esp32s3/esp32s3_mini_n4r2.dtsi b/dts/xtensa/espressif/esp32s3/esp32s3_mini_n4r2.dtsi
@@ -13,6 +13,5 @@
 
 /* 2MB psram */
 &psram0 {
-	reg = <0x3c000000 DT_SIZE_M(2)>;
-	status = "okay";
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32s3/esp32s3_mini_n8.dtsi b/dts/xtensa/espressif/esp32s3/esp32s3_mini_n8.dtsi
@@ -10,3 +10,7 @@
 &flash0 {
 	reg = <0x0 DT_SIZE_M(8)>;
 };
+
+&psram0 {
+	size = <DT_SIZE_M(8)>;
+};
diff --git a/dts/xtensa/espressif/esp32s3/esp32s3_pico_n8r2.dtsi b/dts/xtensa/espressif/esp32s3/esp32s3_pico_n8r2.dtsi
@@ -13,6 +13,5 @@
 
 /* 2MB psram */
 &psram0 {
-	reg = <0x3c000000 DT_SIZE_M(2)>;
-	status = "okay";
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32s3/esp32s3_pico_n8r8.dtsi b/dts/xtensa/espressif/esp32s3/esp32s3_pico_n8r8.dtsi
@@ -13,6 +13,5 @@
 
 /* 8MB psram */
 &psram0 {
-	reg = <0x3c000000 DT_SIZE_M(8)>;
-	status = "okay";
+	size = <DT_SIZE_M(8)>;
 };
diff --git a/dts/xtensa/espressif/esp32s3/esp32s3_r2.dtsi b/dts/xtensa/espressif/esp32s3/esp32s3_r2.dtsi
@@ -8,6 +8,5 @@
 
 /* 2MB psram */
 &psram0 {
-	reg = <0x3c000000 DT_SIZE_M(2)>;
-	status = "okay";
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32s3/esp32s3_r8.dtsi b/dts/xtensa/espressif/esp32s3/esp32s3_r8.dtsi
@@ -8,6 +8,5 @@
 
 /* 8MB psram */
 &psram0 {
-	reg = <0x3c000000 DT_SIZE_M(8)>;
-	status = "okay";
+	size = <DT_SIZE_M(8)>;
 };
diff --git a/dts/xtensa/espressif/esp32s3/esp32s3_r8v.dtsi b/dts/xtensa/espressif/esp32s3/esp32s3_r8v.dtsi
@@ -8,6 +8,5 @@
 
 /* 8MB psram */
 &psram0 {
-	reg = <0x3c000000 DT_SIZE_M(8)>;
-	status = "okay";
+	size = <DT_SIZE_M(8)>;
 };
diff --git a/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n16r2.dtsi b/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n16r2.dtsi
@@ -13,6 +13,5 @@
 
 /* 2MB psram */
 &psram0 {
-	reg = <0x3c000000 DT_SIZE_M(2)>;
-	status = "okay";
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n16r8.dtsi b/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n16r8.dtsi
@@ -13,6 +13,5 @@
 
 /* 8MB psram */
 &psram0 {
-	reg = <0x3c000000 DT_SIZE_M(8)>;
-	status = "okay";
+	size = <DT_SIZE_M(8)>;
 };
diff --git a/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n4r2.dtsi b/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n4r2.dtsi
@@ -13,6 +13,5 @@
 
 /* 2MB psram */
 &psram0 {
-	reg = <0x3c000000 DT_SIZE_M(2)>;
-	status = "okay";
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n4r8.dtsi b/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n4r8.dtsi
@@ -13,6 +13,5 @@
 
 /* 8MB psram */
 &psram0 {
-	reg = <0x3c000000 DT_SIZE_M(8)>;
-	status = "okay";
+	size = <DT_SIZE_M(8)>;
 };
diff --git a/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n8r2.dtsi b/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n8r2.dtsi
@@ -13,6 +13,5 @@
 
 /* 2MB psram */
 &psram0 {
-	reg = <0x3c000000 DT_SIZE_M(2)>;
-	status = "okay";
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n8r8.dtsi b/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n8r8.dtsi
diff --git a/soc/espressif/common/Kconfig.spiram b/soc/espressif/common/Kconfig.spiram
diff --git a/soc/espressif/common/esp_psram.c b/soc/espressif/common/esp_psram.c
diff --git a/soc/espressif/esp32/default.ld b/soc/espressif/esp32/default.ld
diff --git a/soc/espressif/esp32/memory.h b/soc/espressif/esp32/memory.h
diff --git a/soc/espressif/esp32s2/default.ld b/soc/espressif/esp32s2/default.ld
diff --git a/soc/espressif/esp32s2/memory.h b/soc/espressif/esp32s2/memory.h
diff --git a/soc/espressif/esp32s3/default.ld b/soc/espressif/esp32s3/default.ld
