zephyr, components: esp32s3: SPIRAM update

* support Wi-Fi SPIRAM heap
* add sources
* Fix locking of SPI1 to work in strtup conditions.
* Update verbose message.

Signed-off-by: Marek Matej <[email protected]>

Author: Marek Matej

components/esp_psram/mmu_psram_flash.c

@@ -78,7 +78,7 @@ esp_err_t mmu_config_psram_text_segment(uint32_t start_page, uint32_t psram_size
 #elif CONFIG_IDF_TARGET_ESP32S3
     page_id = Cache_Flash_To_SPIRAM_Copy(CACHE_IBUS, IRAM0_CACHE_ADDRESS_LOW, page_id, &page0_page);
 #endif
-    ESP_EARLY_LOGV(TAG, "after copy instruction, page_id is %d", page_id);
+    ESP_EARLY_LOGI(TAG, "after copy instruction, page_id is %d", page_id);
     ESP_EARLY_LOGI(TAG, "Instructions copied and mapped to SPIRAM");
 
     *out_page = page_id - start_page;
@@ -172,7 +172,8 @@ void instruction_flash_page_info_init(uint32_t psram_start_physical_page)
     instr_end_page = instr_start_page + instr_page_cnt - 1;
     instr_flash2spiram_offs = instr_start_page - psram_start_physical_page;
     instruction_in_spiram = 1;
-    ESP_DRAM_LOGV("mmu_psram", "Instructions from flash page%d copy to SPIRAM page%d, Offset: %d", instr_start_page, psram_start_physical_page, instr_flash2spiram_offs);
+    ESP_DRAM_LOGV("mmu_psram", "Instructions in flash pages %d..%d copy to SPIRAM page %d, Offset: %d",
+		    instr_start_page, instr_end_page, psram_start_physical_page, instr_flash2spiram_offs);
 }
 
 uint32_t esp_spiram_instruction_access_enabled(void)

components/spi_flash/spi_flash_os_func_app.c

@@ -27,6 +27,7 @@ static const char TAG[] = "spi_flash";
 
 #if SPI_FLASH_CACHE_NO_DISABLE
 K_MUTEX_DEFINE(s_spi1_flash_mutex);
+static unsigned int s_spi1_key;
 #endif  //  #if SPI_FLASH_CACHE_NO_DISABLE
 
 /*
@@ -83,7 +84,11 @@ static IRAM_ATTR esp_err_t spi1_start(void *arg)
      * From 1 to 3, the lock efficiency decreases.
      */
 #if SPI_FLASH_CACHE_NO_DISABLE
-    k_mutex_lock(&s_spi1_flash_mutex, K_FOREVER);
+    if (k_is_pre_kernel()) {
+        s_spi1_key = irq_lock();
+    } else {
+        k_mutex_lock(&s_spi1_flash_mutex, K_FOREVER);
+    }
 #else
     //directly disable the cache and interrupts when lock is not used
     cache_disable(NULL);
@@ -100,7 +105,11 @@ static IRAM_ATTR esp_err_t spi1_end(void *arg)
      * There are three ways for ESP Flash API lock, see `spi1_start`
      */
 #if SPI_FLASH_CACHE_NO_DISABLE
-    k_mutex_unlock(&s_spi1_flash_mutex);
+    if (k_is_pre_kernel()) {
+        irq_unlock(s_spi1_key);
+    } else {
+        k_mutex_unlock(&s_spi1_flash_mutex);
+    }
 #else
     cache_enable(NULL);
 #endif

zephyr/esp32s3/CMakeLists.txt

@@ -241,6 +241,9 @@ if(CONFIG_SOC_SERIES_ESP32S3)
       ../../components/esp_psram/${CONFIG_SOC_SERIES}/esp_psram_impl_octal.c
       )
 
+    zephyr_sources_ifdef(CONFIG_SPIRAM_FETCH_INSTRUCTIONS
+      ../../components/esp_psram/mmu_psram_flash.c
+      )
   endif()
 
   zephyr_sources_ifdef(

zephyr/port/include/esp_heap_adapter.h

@@ -20,6 +20,41 @@
 #define os_wpa_calloc_func(_nmemb, _size) k_calloc(_nmemb, _size)
 #define os_wpa_free_func(_mem)            k_free(_mem)
 
+#elif defined(CONFIG_ESP_WIFI_WIFI_SPIRAM)
+
+#define esp_wifi_malloc_func(_size)                                                               \
+		shared_multi_heap_aligned_alloc(SMH_REG_ATTR_EXTERNAL, 16, _size)
+#define esp_wifi_calloc_func(_nmemb, _size)                                                       \
+	{                                                                                         \
+		void *p;                                                                          \
+		p = shared_multi_heap_aligned_alloc(SMH_REG_ATTR_EXTERNAL, 16, _nmemb * _size);   \
+		if (p) {                                                                          \
+			memset(p, 0, _nmemb * _size);                                             \
+		}                                                                                 \
+		return p;                                                                         \
+	}
+#define esp_wifi_free_func(_mem) shared_multi_heap_free(_mem)
+
+#define os_wpa_malloc_func(_size) shared_multi_heap_aligned_alloc(SMH_REG_ATTR_EXTERNAL, 16, _size)
+#define os_wpa_realloc_func(_ptr, _size)                                                          \
+	{	void *p;                                                                          \
+		if (_ptr) {                                                                       \
+			shared_multi_heap_free(_ptr);                                             \
+		}                                                                                 \
+		p = shared_multi_heap_aligned_alloc(SMH_REG_ATTR_EXTERNAL, 16, _size);            \
+		return p;                                                                         \
+	}
+#define os_wpa_calloc_func(_nmemb, _size)                                                         \
+	{                                                                                         \
+		void *p;                                                                          \
+		p = shared_multi_heap_aligned_alloc(SMH_REG_ATTR_EXTERNAL, 16, _nmemb * _size);   \
+		if (p) {                                                                          \
+			memset(p, 0, _nmemb * _size);                                             \
+		}                                                                                 \
+		return p;                                                                         \
+	}
+#define os_wpa_free_func(_mem) shared_multi_heap_free(_mem)
+
 #else
 
 #define esp_wifi_malloc_func(_size)         malloc(_size)
@@ -39,6 +74,11 @@
 #define esp_bt_malloc_func(_size) k_malloc(_size)
 #define esp_bt_free_func(_mem)    k_free(_mem)
 
+#elif defined(CONFIG_ESP_BT_HEAP_SPIRAM)
+
+#define esp_bt_malloc_func(_size) shared_multi_heap_aligned_alloc(SMH_REG_ATTR_EXTERNAL, 16, _size)
+#define esp_bt_free_func(_mem) shared_multi_heap_free(_mem)
+
 #else
 
 #define esp_bt_malloc_func(_size) malloc(_size)