Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 11:10:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat(openthread): use heap_caps_calloc_prefer for messagepool

Browse Source
This commit is contained in:
Tan Yan Quan
2026-03-13 21:02:03 +08:00
parent 8445719b4c
commit 541e306799
5 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/openthread/CMakeLists.txt
+4 -4
View File
@@ -70,7 +70,7 @@ if(CONFIG_OPENTHREAD_FTD OR CONFIG_OPENTHREAD_MTD)
REQUIRES esp_netif lwip esp_driver_uart driver REQUIRES esp_netif lwip esp_driver_uart driver
LDFRAGMENTS linker.lf LDFRAGMENTS linker.lf
PRIV_REQUIRES console esp_coex esp_event esp_partition esp_timer PRIV_REQUIRES console esp_coex esp_event esp_partition esp_timer
ieee802154 mbedtls nvs_flash) ieee802154 mbedtls nvs_flash esp_psram)
elseif(CONFIG_OPENTHREAD_RADIO) elseif(CONFIG_OPENTHREAD_RADIO)
# RCP mode uses explicit source list from srcs_radio.cmake # RCP mode uses explicit source list from srcs_radio.cmake
idf_component_register(SRCS ${rcp_srcs} idf_component_register(SRCS ${rcp_srcs}
@@ -79,7 +79,7 @@ elseif(CONFIG_OPENTHREAD_RADIO)
REQUIRES esp_netif lwip esp_driver_uart driver REQUIRES esp_netif lwip esp_driver_uart driver
LDFRAGMENTS linker.lf LDFRAGMENTS linker.lf
PRIV_REQUIRES console esp_coex esp_event esp_partition esp_timer PRIV_REQUIRES console esp_coex esp_event esp_partition esp_timer
ieee802154 mbedtls nvs_flash) ieee802154 mbedtls nvs_flash esp_psram)
elseif(CONFIG_OPENTHREAD_SPINEL_ONLY) elseif(CONFIG_OPENTHREAD_SPINEL_ONLY)
# SPINEL_ONLY mode uses explicit source list from srcs_spinel.cmake # SPINEL_ONLY mode uses explicit source list from srcs_spinel.cmake
idf_component_register(SRCS ${spinel_srcs} idf_component_register(SRCS ${spinel_srcs}
@@ -88,7 +88,7 @@ elseif(CONFIG_OPENTHREAD_SPINEL_ONLY)
REQUIRES esp_netif lwip esp_driver_uart driver REQUIRES esp_netif lwip esp_driver_uart driver
LDFRAGMENTS linker.lf LDFRAGMENTS linker.lf
PRIV_REQUIRES console esp_coex esp_event esp_partition esp_timer PRIV_REQUIRES console esp_coex esp_event esp_partition esp_timer
ieee802154 mbedtls nvs_flash) ieee802154 mbedtls nvs_flash esp_psram)
else() else()
# This is not supposed to happen, but in older versions of IDF components couldn't be selectively # This is not supposed to happen, but in older versions of IDF components couldn't be selectively
# enabled based on KConfig options so some examples just included openthread for all configs. # enabled based on KConfig options so some examples just included openthread for all configs.
@@ -97,7 +97,7 @@ else()
REQUIRES esp_netif lwip esp_driver_uart driver REQUIRES esp_netif lwip esp_driver_uart driver
LDFRAGMENTS linker.lf LDFRAGMENTS linker.lf
PRIV_REQUIRES console esp_coex esp_event esp_partition esp_timer PRIV_REQUIRES console esp_coex esp_event esp_partition esp_timer
ieee802154 mbedtls nvs_flash) ieee802154 mbedtls nvs_flash esp_psram)
endif() endif()
if(CONFIG_OPENTHREAD_RADIO_TREL) if(CONFIG_OPENTHREAD_RADIO_TREL)
components/openthread/Kconfig
+1
View File
@@ -436,6 +436,7 @@ menu "OpenThread"
config OPENTHREAD_PLATFORM_MSGPOOL_MANAGEMENT config OPENTHREAD_PLATFORM_MSGPOOL_MANAGEMENT
bool 'Allocate message pool buffer from PSRAM' bool 'Allocate message pool buffer from PSRAM'
depends on OPENTHREAD_PLATFORM_MALLOC_CAP_SPIRAM
default y default y
help help
If enabled, the message pool is managed by platform defined logic. If enabled, the message pool is managed by platform defined logic.
components/openthread/src/esp_openthread_platform.cpp
+1 -1
View File
@@ -227,6 +227,6 @@ uint32_t esp_openthread_get_alloc_caps(void)
#if CONFIG_OPENTHREAD_PLATFORM_MALLOC_CAP_SPIRAM #if CONFIG_OPENTHREAD_PLATFORM_MALLOC_CAP_SPIRAM
(MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT); (MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT);
#else #else
(MALLOC_CAP_DEFAULT | MALLOC_CAP_8BIT); (MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT);
#endif #endif
} }
components/openthread/src/port/esp_openthread_memory.c
+1 -1
View File
@@ -13,7 +13,7 @@
void *otPlatCAlloc(size_t num, size_t size) void *otPlatCAlloc(size_t num, size_t size)
{ {
return heap_caps_calloc(num, size, esp_openthread_get_alloc_caps()); return heap_caps_calloc_prefer(num, size, 3, esp_openthread_get_alloc_caps(), MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT, MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT);
} }
void otPlatFree(void *ptr) void otPlatFree(void *ptr)
components/openthread/src/port/esp_openthread_messagepool.c
+22 -9
View File
@@ -1,35 +1,48 @@
/* /*
* SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2023-2026 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#include "openthread-core-config.h" #include "openthread-core-config.h"
#include "esp_openthread_common_macro.h" #include "esp_openthread_common_macro.h"
#include "esp_openthread_platform.h"
#include "esp_err.h" #include "esp_err.h"
#include "esp_log.h" #include "esp_log.h"
#include "esp_heap_caps.h" #include "esp_heap_caps.h"
#include "esp_psram.h"
#include "openthread/instance.h" #include "openthread/instance.h"
#include "openthread/platform/messagepool.h" #include "openthread/platform/messagepool.h"
int s_buffer_pool_head = -1; // Fallback buffer count at runtime for non-PSRAM targets (matches Kconfig default)
otMessageBuffer **s_buffer_pool_pointer = NULL; #define OT_MSGPOOL_NUM_BUFFERS_NO_PSRAM 65
otMessageBuffer *s_buffer_pool = NULL;
static int s_buffer_pool_head = -1;
static otMessageBuffer **s_buffer_pool_pointer = NULL;
static otMessageBuffer *s_buffer_pool = NULL;
void otPlatMessagePoolInit(otInstance *aInstance, uint16_t aMinNumFreeBuffers, size_t aBufferSize) void otPlatMessagePoolInit(otInstance *aInstance, uint16_t aMinNumFreeBuffers, size_t aBufferSize)
{ {
otMessageBuffer *buffer_pool = (otMessageBuffer *)heap_caps_calloc(aMinNumFreeBuffers, aBufferSize, MALLOC_CAP_SPIRAM); uint16_t num_buffers = aMinNumFreeBuffers;
s_buffer_pool_pointer = (otMessageBuffer **)heap_caps_calloc(aMinNumFreeBuffers, sizeof(otMessageBuffer **), MALLOC_CAP_SPIRAM);
if (!esp_psram_is_initialized() && num_buffers > OT_MSGPOOL_NUM_BUFFERS_NO_PSRAM) {
ESP_LOGW(OT_PLAT_LOG_TAG, "PSRAM not available, reducing message pool from %u to %u buffers",
num_buffers, OT_MSGPOOL_NUM_BUFFERS_NO_PSRAM);
num_buffers = OT_MSGPOOL_NUM_BUFFERS_NO_PSRAM;
}
otMessageBuffer *buffer_pool = (otMessageBuffer *)heap_caps_calloc_prefer(num_buffers, aBufferSize, 3, esp_openthread_get_alloc_caps(), MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT, MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT);
s_buffer_pool_pointer = (otMessageBuffer **)heap_caps_calloc_prefer(num_buffers, sizeof(otMessageBuffer **), 3, esp_openthread_get_alloc_caps(), MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT, MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT);
if (buffer_pool == NULL || s_buffer_pool_pointer == NULL) { if (buffer_pool == NULL || s_buffer_pool_pointer == NULL) {
ESP_LOGE(OT_PLAT_LOG_TAG, "Failed to create message buffer pool"); ESP_LOGE(OT_PLAT_LOG_TAG, "Failed to create message buffer pool");
assert(false); assert(false);
} }
for (uint16_t i = 0; i < aMinNumFreeBuffers; i++) { for (uint16_t i = 0; i < num_buffers; i++) {
s_buffer_pool_pointer[i] = buffer_pool + i * aBufferSize / sizeof(otMessageBuffer); s_buffer_pool_pointer[i] = buffer_pool + i * aBufferSize / sizeof(otMessageBuffer);
} }
s_buffer_pool_head = aMinNumFreeBuffers - 1; s_buffer_pool_head = num_buffers - 1;
s_buffer_pool = buffer_pool; s_buffer_pool = buffer_pool;
ESP_LOGI(OT_PLAT_LOG_TAG, "Create message buffer pool successfully, size %d", aMinNumFreeBuffers*aBufferSize); ESP_LOGI(OT_PLAT_LOG_TAG, "Create message buffer pool successfully, size %d", num_buffers * aBufferSize);
} }
otMessageBuffer *otPlatMessagePoolNew(otInstance *aInstance) otMessageBuffer *otPlatMessagePoolNew(otInstance *aInstance)