Merge branch 'chip/add_wifi_support_for_esp32s31_rebase_master' into 'master'

feat(wifi): add wifi support for esp32s31

See merge request espressif/esp-idf!47339

components/wpa_supplicant/CMakeLists.txt

@@ -118,7 +118,7 @@ if(CONFIG_ESP_WIFI_MBEDTLS_CRYPTO)
     "esp_supplicant/src/crypto/crypto_mbedtls-bignum.c"
     "esp_supplicant/src/crypto/crypto_mbedtls-rsa.c"
     "esp_supplicant/src/crypto/crypto_mbedtls-ec.c")
-    if(NOT CONFIG_IDF_TARGET_ESP32)
+    if(NOT CONFIG_IDF_TARGET_ESP32 AND NOT CONFIG_IDF_TARGET_ESP32S31) # TDOD IDF-14630
         list(APPEND crypto_src "esp_supplicant/src/crypto/fastpsk.c")
     endif()
     # Add internal RC4 as RC4 has been removed from mbedtls
@@ -130,7 +130,8 @@ if(CONFIG_ESP_WIFI_MBEDTLS_CRYPTO)
         set(crypto_src ${crypto_src} "src/crypto/sha1-pbkdf2.c"
                        ${crypto_src} "src/crypto/sha1.c"
                        ${crypto_src} "src/crypto/sha1-internal.c")
-    else()
+    elseif(NOT CONFIG_IDF_TARGET_ESP32S31)
+        #TDOD IDF-14630: use mbedtls_pkcs5_pbkdf2_hmac (software) instead of fastpbkdf2.
         set(crypto_src ${crypto_src} "esp_supplicant/src/crypto/fastpbkdf2.c")
     endif()
     if(NOT CONFIG_MBEDTLS_SHA1_C AND CONFIG_MBEDTLS_HARDWARE_SHA)
@@ -281,7 +282,7 @@ target_compile_definitions(${COMPONENT_LIB} PRIVATE
     CONFIG_NO_RADIUS
     )
 
-if(CONFIG_MBEDTLS_SHA1_C OR CONFIG_MBEDTLS_HARDWARE_SHA)
+if((CONFIG_MBEDTLS_SHA1_C OR CONFIG_MBEDTLS_HARDWARE_SHA) AND NOT CONFIG_IDF_TARGET_ESP32S31) # TDOD IDF-14630
     target_compile_definitions(${COMPONENT_LIB} PRIVATE CONFIG_FAST_PBKDF2)
 endif()
 

components/wpa_supplicant/esp_supplicant/src/crypto/crypto_mbedtls.c

@@ -30,6 +30,7 @@
 #include "aes_wrap.h"
 #include "crypto.h"
 #include "mbedtls/esp_config.h"
+#include "mbedtls/private/pkcs5.h"
 
 #include "psa/crypto.h"
 #include "mbedtls/psa_util.h"

components/wpa_supplicant/src/utils/includes.h

@@ -80,6 +80,8 @@
 #include "esp32p4/rom/ets_sys.h"
 #elif CONFIG_IDF_TARGET_ESP32C61
 #include "esp32c61/rom/ets_sys.h"
+#elif CONFIG_IDF_TARGET_ESP32S31
+#include "esp32s31/rom/ets_sys.h"
 #endif
 
 #endif /* !__ets__ */

components/wpa_supplicant/test_apps/.build-test-rules.yml

@@ -3,6 +3,10 @@
 components/wpa_supplicant/test_apps:
   disable:
     - if: SOC_WIFI_SUPPORTED != 1
+  disable_test:
+    - if: IDF_TARGET in ["esp32s31"]
+      temporary: true
+      reason: lack of runners
   depends_components:
     - *common_components
     - esp_wifi

components/wpa_supplicant/test_apps/README.md

@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-S2 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | --------- |
 
 # wpa_supplicant unit test
 

components/wpa_supplicant/test_apps/pytest_wpa_supplicant_ut.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2023-2026 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: CC0-1.0
 import pytest
 from pytest_embedded import Dut
@@ -9,7 +9,16 @@ from pytest_embedded_idf.utils import idf_parametrize
 @pytest.mark.generic
 @idf_parametrize(
     'target',
-    ['esp32', 'esp32s2', 'esp32s3', 'esp32c3', 'esp32c2', 'esp32c6', 'esp32c61', 'esp32c5'],
+    [
+        'esp32',
+        'esp32s2',
+        'esp32s3',
+        'esp32c3',
+        'esp32c2',
+        'esp32c6',
+        'esp32c61',
+        'esp32c5',
+    ],
     indirect=['target'],
 )
 def test_wpa_supplicant_ut(dut: Dut) -> None:
@@ -26,6 +35,7 @@ def test_wpa_supplicant_ut(dut: Dut) -> None:
 )
 @idf_parametrize(
     'target',
+    # esp32s31: no two_duts runner in CI (rev_default) yet
     ['esp32', 'esp32s2', 'esp32s3', 'esp32c6', 'esp32c61', 'esp32c5'],
     indirect=['target'],
 )