From 8ceeb4d19ce3f454932e1c3ec6c5a8801109285f Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Wed, 31 Jan 2024 12:30:31 -0800 Subject: [PATCH] Switch to using SPIRAM through caps_alloc We used to default to `malloc()` using SPIRAM but it disables dynamic WiFi TX buffers. The increased static buffer allocation prevents MBEDTLS from allocating everything it needs. So, switch the IDF to SPIRAM through caps_alloc only. This is pretty much what we do in CP8 except we no longer need to explicitly give the IDF SPIRAM memory to use. Fixes #8682 (again) --- ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults | 1 - ports/espressif/esp-idf-config/sdkconfig-psram.defaults | 6 ++++++ ports/espressif/esp-idf-config/sdkconfig.defaults | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults index eba36817a893d..20eba6263c7e2 100644 --- a/ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults +++ b/ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults @@ -44,7 +44,6 @@ CONFIG_ESP32S2_RTCDATA_IN_FAST_MEM=y # Wi-Fi # CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=4 -CONFIG_ESP_WIFI_CACHE_TX_BUFFER_NUM=16 CONFIG_ESP_WIFI_RX_BA_WIN=4 # end of Wi-Fi diff --git a/ports/espressif/esp-idf-config/sdkconfig-psram.defaults b/ports/espressif/esp-idf-config/sdkconfig-psram.defaults index c3824cfec5c60..3d4dc69178edb 100644 --- a/ports/espressif/esp-idf-config/sdkconfig-psram.defaults +++ b/ports/espressif/esp-idf-config/sdkconfig-psram.defaults @@ -8,6 +8,12 @@ # ESP PSRAM # CONFIG_SPIRAM=y +# +# SPI RAM config +# +CONFIG_SPIRAM_USE_CAPS_ALLOC=y +# end of SPI RAM config + # end of ESP PSRAM # diff --git a/ports/espressif/esp-idf-config/sdkconfig.defaults b/ports/espressif/esp-idf-config/sdkconfig.defaults index caeef4d1e14d2..758d0efcc3148 100644 --- a/ports/espressif/esp-idf-config/sdkconfig.defaults +++ b/ports/espressif/esp-idf-config/sdkconfig.defaults @@ -66,6 +66,7 @@ CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=2048 # # mbedTLS v3.x related # +CONFIG_MBEDTLS_SSL_VARIABLE_BUFFER_LENGTH=y # CONFIG_MBEDTLS_SSL_KEEP_PEER_CERTIFICATE is not set # end of mbedTLS v3.x related