zephyr: esp32s3: SPIRAM option for Wi-Fi adapter

Use SPIRAM option when allocating Wi-Fi buffers.

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

Author: Marek Matej

zephyr/esp32s3/src/coex/esp_coex_adapter.c

@@ -125,7 +125,7 @@ void IRAM_ATTR esp_coex_common_timer_arm_us_wrapper(void *ptimer, uint32_t us, b
 
 void * IRAM_ATTR esp_coex_common_malloc_internal_wrapper(size_t size)
 {
-	return wifi_malloc(size);
+	return k_malloc(size);
 }
 
 uint32_t esp_coex_common_clk_slowclk_cal_get_wrapper(void)

zephyr/esp32s3/src/wifi/esp_wifi_adapter.c

@@ -49,7 +49,7 @@ static void *wifi_msgq_buffer;
 
 static struct k_thread wifi_task_handle;
 
-static void esp_wifi_free(void *mem);
+static void wifi_free(void *mem);
 
 IRAM_ATTR void *wifi_malloc(size_t size)
 {
@@ -81,16 +81,12 @@ IRAM_ATTR void *wifi_calloc(size_t n, size_t size)
 
 static void *IRAM_ATTR wifi_zalloc_wrapper(size_t size)
 {
-	void *ptr = wifi_malloc(size);
-
-	if (ptr) {
-		memset(ptr, 0, size);
-	}
+	void *ptr = wifi_calloc(1, size);
 
 	return ptr;
 }
 
-static void esp_wifi_free(void *mem)
+static void wifi_free(void *mem)
 {
 	esp_wifi_free_func(mem);
 }
@@ -99,21 +95,24 @@ wifi_static_queue_t *wifi_create_queue(int queue_len, int item_size)
 {
 	wifi_static_queue_t *queue = NULL;
 
-	queue = (wifi_static_queue_t *) wifi_malloc(sizeof(wifi_static_queue_t));
+	queue = (wifi_static_queue_t *) k_malloc(sizeof(wifi_static_queue_t));
+
 	if (!queue) {
 		LOG_ERR("msg buffer allocation failed");
 		return NULL;
 	}
 
-	wifi_msgq_buffer = wifi_malloc(queue_len * item_size);
+	wifi_msgq_buffer = k_malloc(queue_len * item_size);
+
 	if (wifi_msgq_buffer == NULL) {
 		LOG_ERR("msg buffer allocation failed");
 		return NULL;
 	}
 
-	queue->handle = wifi_malloc(sizeof(struct k_msgq));
+	queue->handle = k_malloc(sizeof(struct k_msgq));
+
 	if (queue->handle == NULL) {
-		esp_wifi_free(wifi_msgq_buffer);
+		k_free(wifi_msgq_buffer);
 		LOG_ERR("queue handle allocation failed");
 		return NULL;
 	}
@@ -126,8 +125,8 @@ wifi_static_queue_t *wifi_create_queue(int queue_len, int item_size)
 void wifi_delete_queue(wifi_static_queue_t *queue)
 {
 	if (queue) {
-		esp_wifi_free(queue->handle);
-		esp_wifi_free(queue);
+		k_free(queue->handle);
+		k_free(queue);
 	}
 }
 
@@ -214,7 +213,7 @@ static void *mutex_create_wrapper(void)
 
 static void mutex_delete_wrapper(void *mutex)
 {
-	esp_wifi_free(mutex);
+	wifi_free(mutex);
 }
 
 static int32_t IRAM_ATTR mutex_lock_wrapper(void *mutex)
@@ -250,7 +249,7 @@ static void *queue_create_wrapper(uint32_t queue_len, uint32_t item_size)
 static void queue_delete_wrapper(void *handle)
 {
 	if (handle != NULL) {
-		esp_wifi_free(handle);
+		wifi_free(handle);
 	}
 }
 
@@ -408,12 +407,12 @@ static void *IRAM_ATTR realloc_internal_wrapper(void *ptr, size_t size)
 
 static void *IRAM_ATTR calloc_internal_wrapper(size_t n, size_t size)
 {
-	return wifi_calloc(n, size);
+	return k_calloc(n, size);
 }
 
 static void *IRAM_ATTR zalloc_internal_wrapper(size_t size)
 {
-	return wifi_calloc(1, size);
+	return k_calloc(1, size);
 }
 
 uint32_t uxQueueMessagesWaiting(void *queue)
@@ -746,7 +745,7 @@ wifi_osi_funcs_t g_wifi_osi_funcs = {
 	._ints_off = intr_off,
 	._is_from_isr = k_is_in_isr,
 	._spin_lock_create = esp_coex_common_spin_lock_create_wrapper,
-	._spin_lock_delete = esp_wifi_free,
+	._spin_lock_delete = wifi_free,
 	._wifi_int_disable = esp_coex_common_int_disable_wrapper,
 	._wifi_int_restore = esp_coex_common_int_restore_wrapper,
 	._task_yield_from_isr = esp_coex_common_task_yield_from_isr_wrapper,
@@ -781,7 +780,7 @@ wifi_osi_funcs_t g_wifi_osi_funcs = {
 	._task_get_current_task = (void *(*)(void))k_current_get,
 	._task_get_max_priority = task_get_max_priority_wrapper,
 	._malloc = wifi_malloc,
-	._free = esp_wifi_free,
+	._free = wifi_free,
 	._event_post = esp_event_post_wrapper,
 	._get_free_heap_size = esp_get_free_heap_size,
 	._rand = sys_rand32_get,

zephyr/port/include/esp_heap_adapter.h

@@ -6,6 +6,7 @@
 
 #pragma once
 
+#include <soc.h>
 #include <string.h>
 #include <zephyr/multi_heap/shared_multi_heap.h>
 
@@ -23,6 +24,8 @@
 
 #elif defined(CONFIG_ESP_WIFI_HEAP_SPIRAM)
 
+#define IS_DRAM(addr) ((uint32_t)addr >= SOC_DRAM_LOW && (uint32_t)addr < SOC_DRAM_HIGH)
+
 static inline void* esp_wifi_malloc_func(size_t _size)
 {
 	return shared_multi_heap_aligned_alloc(SMH_REG_ATTR_EXTERNAL, 16, _size);
@@ -39,7 +42,11 @@ static inline void* esp_wifi_calloc_func(size_t _nmemb, size_t _size)
 
 static inline void esp_wifi_free_func(void *_mem)
 {
-	shared_multi_heap_free(_mem);
+	if (IS_DRAM(_mem)) {
+		k_free(_mem);
+	} else {
+		shared_multi_heap_free(_mem);
+	}
 }
 
 static inline void* os_wpa_malloc_func(size_t _size)
@@ -50,21 +57,22 @@ static inline void* os_wpa_malloc_func(size_t _size)
 static inline void* os_wpa_realloc_func(void *_ptr, size_t _size)
 {
 	if (_ptr) {
-		shared_multi_heap_free(_ptr);
+		esp_wifi_free_func(_ptr);
 	}
-	return shared_multi_heap_aligned_alloc(SMH_REG_ATTR_EXTERNAL, 16, _size);
+	return os_wpa_malloc_func(_size);
 }
+
 static inline void* os_wpa_calloc_func(size_t _nmemb, size_t _size)
 {
-	void *p = shared_multi_heap_aligned_alloc(SMH_REG_ATTR_EXTERNAL, 16, _nmemb * _size);
+	void *p = os_wpa_malloc_func(_nmemb * _size);
 	if (p) {
 		memset(p, 0, _nmemb * _size);
 	}
 	return p;
 }
 static inline void os_wpa_free_func(void *_mem)
 {
-	shared_multi_heap_free(_mem);
+	esp_wifi_free_func(_mem);
 }
 
 #else