Switch to using SPIRAM through caps_alloc

tannewt · tannewt · commit 8ceeb4d19ce3 · 2024-01-31T12:33:13.000-08:00
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 adafruit#8682 (again)
diff --git 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
@@ -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
@@ -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
 

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,6 @@ CONFIG_ESP32S2_RTCDATA_IN_FAST_MEM=y`
`44`	`44`	`# Wi-Fi`
`45`	`45`	`#`
`46`	`46`	`CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=4`
`47`		`-CONFIG_ESP_WIFI_CACHE_TX_BUFFER_NUM=16`
`48`	`47`	`CONFIG_ESP_WIFI_RX_BA_WIN=4`
`49`	`48`	`# end of Wi-Fi`
`50`	`49`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,12 @@`
`8`	`8`	`# ESP PSRAM`
`9`	`9`	`#`
`10`	`10`	`CONFIG_SPIRAM=y`
	`11`	`+#`
	`12`	`+# SPI RAM config`
	`13`	`+#`
	`14`	`+CONFIG_SPIRAM_USE_CAPS_ALLOC=y`
	`15`	`+# end of SPI RAM config`
	`16`	`+`
`11`	`17`	`# end of ESP PSRAM`
`12`	`18`
`13`	`19`	`#`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=2048`
`66`	`66`	`#`
`67`	`67`	`# mbedTLS v3.x related`
`68`	`68`	`#`
	`69`	`+CONFIG_MBEDTLS_SSL_VARIABLE_BUFFER_LENGTH=y`
`69`	`70`	`# CONFIG_MBEDTLS_SSL_KEEP_PEER_CERTIFICATE is not set`
`70`	`71`	`# end of mbedTLS v3.x related`
`71`	`72`