From 8c22cb6c6a2b0ac41bc04458b46ddb23b5eb6052 Mon Sep 17 00:00:00 2001
From: Armando <douyiwen@espressif.com>
Date: Wed, 10 Jul 2024 10:01:22 +0800
Subject: [PATCH] feat(psram): support bss on psram on p4

---
 components/esp_psram/esp_psram.c              |  9 ++++++++
 .../include/esp_private/esp_psram_extram.h    |  7 +++++-
 components/esp_system/ld/esp32p4/memory.ld.in |  9 ++++++++
 .../esp_system/ld/esp32p4/sections.ld.in      | 22 +++++++++++++++++++
 components/esp_system/port/cpu_start.c        |  7 +-----
 5 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/components/esp_psram/esp_psram.c b/components/esp_psram/esp_psram.c
index 23cd5f1b59..debbf9de31 100644
--- a/components/esp_psram/esp_psram.c
+++ b/components/esp_psram/esp_psram.c
@@ -11,6 +11,7 @@
  * When we add more types of external RAM memory, this can be made into a more intelligent dispatcher.
  *----------------------------------------------------------------------------------------------------*/
 #include <sys/param.h>
+#include <string.h>
 #include "sdkconfig.h"
 #include "esp_attr.h"
 #include "esp_err.h"
@@ -521,3 +522,11 @@ bool esp_psram_extram_test(void)
 
     return true;
 }
+
+void esp_psram_bss_init(void)
+{
+#if CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY
+    size_t size = (&_ext_ram_bss_end - &_ext_ram_bss_start) * sizeof(_ext_ram_bss_start);
+    memset(&_ext_ram_bss_start, 0, size);
+#endif
+}
diff --git a/components/esp_psram/include/esp_private/esp_psram_extram.h b/components/esp_psram/include/esp_private/esp_psram_extram.h
index 5cd7e52a15..0b44e1bfd8 100644
--- a/components/esp_psram/include/esp_private/esp_psram_extram.h
+++ b/components/esp_psram/include/esp_private/esp_psram_extram.h
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -55,6 +55,11 @@ esp_err_t esp_psram_extram_reserve_dma_pool(size_t size);
  */
 bool esp_psram_extram_test(void);
 
+/**
+ * @brief Init .bss on psram
+ */
+void esp_psram_bss_init(void);
+
 #if CONFIG_IDF_TARGET_ESP32
 /**
  * @brief Force a writeback of the data in the PSRAM cache. This is to be called whenever
diff --git a/components/esp_system/ld/esp32p4/memory.ld.in b/components/esp_system/ld/esp32p4/memory.ld.in
index 8c76daee19..226803c293 100644
--- a/components/esp_system/ld/esp32p4/memory.ld.in
+++ b/components/esp_system/ld/esp32p4/memory.ld.in
@@ -103,6 +103,9 @@ MEMORY
      This segment is placed at the beginning of LP RAM, as the end of LP RAM is occupied by LP ROM stack/data
   */
   lp_reserved_seg(RW) :        org = 0x50108000, len = RESERVE_RTC_MEM
+
+  /* PSRAM seg */
+  extern_ram_seg(RWX) :        org = 0x48000000, len = IDROM_SEG_SIZE
 }
 
 /* Heap ends at top of dram0_0_seg */
@@ -135,6 +138,12 @@ REGION_ALIAS("rtc_reserved_seg", lp_reserved_seg );
   REGION_ALIAS("rodata_seg_high", sram_high);
 #endif // CONFIG_APP_BUILD_USE_FLASH_SECTIONS
 
+#if CONFIG_SPIRAM_XIP_FROM_PSRAM
+  REGION_ALIAS("ext_ram_seg", drom_seg);
+#else
+  REGION_ALIAS("ext_ram_seg", extern_ram_seg);
+#endif //#if CONFIG_SPIRAM_XIP_FROM_PSRAM
+
 /**
  *  If rodata default segment is placed in `drom_seg`, then flash's first rodata section must
  *  also be first in the segment.
diff --git a/components/esp_system/ld/esp32p4/sections.ld.in b/components/esp_system/ld/esp32p4/sections.ld.in
index 38d844c4bd..ef288b49a9 100644
--- a/components/esp_system/ld/esp32p4/sections.ld.in
+++ b/components/esp_system/ld/esp32p4/sections.ld.in
@@ -475,6 +475,28 @@ SECTIONS
     mapping[rodata_noload]
   } > rodata_seg_low
 
+#if CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY
+#if CONFIG_SPIRAM_XIP_FROM_PSRAM
+  /**
+   * This section is required to skip flash sections, because `extern_ram_seg`
+   * and `drom_seg` / `irom_seg` are on the same bus when xip on psram
+   */
+  .ext_ram.dummy (NOLOAD):
+  {
+    . = ORIGIN(ext_ram_seg) + (_rodata_reserved_end - _flash_rodata_dummy_start);
+    . = ALIGN (0x10000);
+  } > ext_ram_seg
+#endif  //CONFIG_SPIRAM_XIP_FROM_PSRAM
+
+  /* This section holds .ext_ram.bss data, and will be put in PSRAM */
+  .ext_ram.bss (NOLOAD) :
+  {
+    _ext_ram_bss_start = ABSOLUTE(.);
+    mapping[extern_ram]
+    ALIGNED_SYMBOL(4, _ext_ram_bss_end)
+  } > ext_ram_seg
+#endif  //CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY
+
   .dram0.bss (NOLOAD) :
   {
     ALIGNED_SYMBOL(4, _bss_start_low)
diff --git a/components/esp_system/port/cpu_start.c b/components/esp_system/port/cpu_start.c
index ca0c15209c..649007cdfa 100644
--- a/components/esp_system/port/cpu_start.c
+++ b/components/esp_system/port/cpu_start.c
@@ -148,11 +148,6 @@ extern int _mtvt_table;
 
 static const char *TAG = "cpu_start";
 
-#if CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY
-extern int _ext_ram_bss_start;
-extern int _ext_ram_bss_end;
-#endif
-
 #ifdef CONFIG_ESP32_IRAM_AS_8BIT_ACCESSIBLE_MEMORY
 extern int _iram_bss_start;
 extern int _iram_bss_end;
@@ -683,7 +678,7 @@ void IRAM_ATTR call_start_cpu0(void)
 #endif // !CONFIG_APP_BUILD_TYPE_PURE_RAM_APP
 
 #if CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY
-    memset(&_ext_ram_bss_start, 0, (&_ext_ram_bss_end - &_ext_ram_bss_start) * sizeof(_ext_ram_bss_start));
+    esp_psram_bss_init();
 #endif
 
 //Enable trace memory and immediately start trace.