wifi: Upmerge 3 (backport)

doc/nrf/app_dev/device_guides/nrf70/wifi_advanced_security_modes.rst

@@ -181,7 +181,7 @@ To build the nRF70 Series DK for the :ref:`wifi_shell_sample` sample with Enterp
 
       cd nrf/samples/wifi/shell
 
-      west build -p -b nrf7002dk/nrf5340/cpuapp -- -DEXTRA_CONF_FILE=overlay-enterprise.conf -DCONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_DBG=y -DCONFIG_LOG_MODE_IMMEDIATE=y
+      west build -p -b nrf7002dk/nrf5340/cpuapp -S shell_SNIPPET=wifi-enterprise -- -DCONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_DBG=y -DCONFIG_LOG_MODE_IMMEDIATE=y
 
       west flash
 

samples/wifi/offloaded_raw_tx/prj.conf

@@ -4,5 +4,3 @@ CONFIG_NRF70_OFFLOADED_RAW_TX=y
 
 # Memories
 CONFIG_MAIN_STACK_SIZE=5200
-CONFIG_HEAP_MEM_POOL_SIZE=18000
-CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y

samples/wifi/provisioning/softap/boards/nrf54l15dk_nrf54l15_cpuapp.conf

@@ -0,0 +1,7 @@
+CONFIG_WIFI_CREDENTIALS=y
+# Needed for Wi-Fi credentials
+CONFIG_FLASH=y
+CONFIG_FLASH_PAGE_LAYOUT=y
+CONFIG_FLASH_MAP=y
+CONFIG_ZMS=y
+CONFIG_SETTINGS=y

samples/wifi/provisioning/softap/prj.conf

@@ -10,10 +10,8 @@ CONFIG_PM_PARTITION_SIZE_TFM_SRAM=0xa000
 CONFIG_PM_PARTITION_SIZE_TFM=0x20000
 
 # Optimize Wi-Fi stack to save some memory.
-CONFIG_HEAP_MEM_POOL_SIZE=50000
 CONFIG_NRF_WIFI_CTRL_HEAP_SIZE=20000
 CONFIG_NRF_WIFI_DATA_HEAP_SIZE=53000
-CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y
 CONFIG_NRF70_RX_NUM_BUFS=16
 CONFIG_NRF70_MAX_TX_AGGREGATION=4
 

samples/wifi/provisioning/softap/sample.yaml

@@ -11,3 +11,18 @@ tests:
       - ci_build
       - sysbuild
       - ci_samples_wifi
+  sample.nrf54l15.softap.wifi.provision:
+    sysbuild: true
+    build_only: true
+    extra_args:
+      - softap_SHIELD="nrf7002eb_interposer_p1;nrf7002eb"
+      - softap_SNIPPET=nrf70-wifi
+      - CONFIG_HEAP_MEM_POOL_IGNORE_MIN=n
+    integration_platforms:
+      - nrf54l15dk/nrf54l15/cpuapp
+    platform_allow:
+      - nrf54l15dk/nrf54l15/cpuapp
+    tags:
+      - ci_build
+      - sysbuild
+      - ci_samples_wifi

samples/wifi/radio_test/multi_domain/prj.conf

@@ -16,11 +16,6 @@ CONFIG_MAIN_STACK_SIZE=5200
 CONFIG_SHELL_STACK_SIZE=5200
 #64K memory needed for IQ sample captures.
 CONFIG_NRF_WIFI_CTRL_HEAP_SIZE=78304
-#TODO: HAL command queue is using data pool. Needs
-# to be changed to use ctrl pool.
-CONFIG_NRF_WIFI_DATA_HEAP_SIZE=20000
-CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y
-
 
 # Debugging
 CONFIG_STACK_SENTINEL=y

samples/wifi/raw_tx_packet/prj.conf

@@ -32,10 +32,10 @@ CONFIG_NET_PKT_TX_COUNT=8
 # tuned for performance, but this will be revisited in the future.
 CONFIG_NET_BUF_RX_COUNT=8
 CONFIG_NET_BUF_TX_COUNT=16
-CONFIG_HEAP_MEM_POOL_SIZE=105000
-CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y
 CONFIG_NRF70_RX_NUM_BUFS=16
 CONFIG_NET_TC_TX_COUNT=1
+# TODO: Fix unaligned buffers over (Q)SPI when Zero-copy TX is enabled
+CONFIG_NRF_WIFI_ZERO_COPY_TX=n
 
 CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT=1
 CONFIG_NET_MAX_CONTEXTS=5

samples/wifi/scan/prj.conf

@@ -6,8 +6,6 @@
 CONFIG_WIFI=y
 CONFIG_WIFI_NRF70=y
 CONFIG_NET_L2_WIFI_MGMT=y
-CONFIG_NRF_WIFI_CTRL_HEAP_SIZE=25000
-CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y
 
 # System settings
 CONFIG_ASSERT=y

samples/wifi/shell/boards/nrf54l15dk_nrf54l15_cpuapp.conf

@@ -0,0 +1,7 @@
+CONFIG_WIFI_CREDENTIALS=y
+# Needed for Wi-Fi credentials
+CONFIG_FLASH=y
+CONFIG_FLASH_PAGE_LAYOUT=y
+CONFIG_FLASH_MAP=y
+CONFIG_ZMS=y
+CONFIG_SETTINGS=y

samples/wifi/shell/prj.conf

@@ -34,9 +34,6 @@ CONFIG_NET_BUF_RX_COUNT=16
 CONFIG_NET_BUF_TX_COUNT=16
 CONFIG_NRF70_RX_NUM_BUFS=16
 CONFIG_NRF70_MAX_TX_AGGREGATION=4
-# nRF700x is main consumer: (16 + 8) * 1600 = ~40KB + ~40KB control path (experimental)
-CONFIG_HEAP_MEM_POOL_SIZE=40144
-CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y
 CONFIG_NET_TC_TX_COUNT=1
 
 CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=4

samples/wifi/shell/sample.yaml

@@ -311,6 +311,26 @@ tests:
       - ci_build
       - sysbuild
       - ci_samples_wifi
+  sample.nrf7002eb_interposer_p1.nrf7002eb.shell.superset:
+    sysbuild: true
+    build_only: true
+    extra_args:
+      - shell_SHIELD="nrf7002eb_interposer_p1;nrf7002eb"
+      - shell_SNIPPET=nrf70-wifi
+      - EXTRA_CONF_FILE=overlay-zperf.conf
+      - CONFIG_NRF70_UTIL=y
+      - CONFIG_WPA_CLI=y
+      - CONFIG_NET_IPV4_FRAGMENT=y
+      - CONFIG_NET_IPV4_FRAGMENT_MAX_PKT=24
+      - CONFIG_NRF_WIFI_DATA_HEAP_SIZE=199000
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+    tags:
+      - ci_build
+      - sysbuild
+      - ci_samples_wifi
   sample.nrf7002eb2.shell:
     sysbuild: true
     build_only: true
@@ -417,7 +437,7 @@ tests:
   sample.nrf7002.enterprise_mode:
     sysbuild: true
     build_only: true
-    extra_args: EXTRA_CONF_FILE=overlay-enterprise.conf
+    extra_args: shell_SNIPPET=wifi-enterprise
     integration_platforms:
       - nrf7002dk/nrf5340/cpuapp
     platform_allow: nrf7002dk/nrf5340/cpuapp
@@ -498,3 +518,18 @@ tests:
       - ci_build
       - sysbuild
       - ci_samples_wifi
+  sample.nrf54l15.softap.superset:
+    sysbuild: true
+    build_only: true
+    extra_args:
+      - softap_SHIELD="nrf7002eb_interposer_p1;nrf7002eb"
+      - softap_SNIPPET=nrf70-wifi
+      - CONFIG_HEAP_MEM_POOL_IGNORE_MIN=n
+    integration_platforms:
+      - nrf54l15dk/nrf54l15/cpuapp
+    platform_allow:
+      - nrf54l15dk/nrf54l15/cpuapp
+    tags:
+      - ci_build
+      - sysbuild
+      - ci_samples_wifi

samples/wifi/shutdown/prj.conf

@@ -6,8 +6,6 @@
 CONFIG_WIFI=y
 CONFIG_WIFI_NRF70=y
 CONFIG_NET_L2_WIFI_MGMT=y
-CONFIG_HEAP_MEM_POOL_SIZE=25000
-CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y
 
 # Networking
 CONFIG_NETWORKING=y

samples/wifi/softap/boards/nrf54l15dk_nrf54l15_cpuapp.conf

@@ -0,0 +1,7 @@
+CONFIG_WIFI_CREDENTIALS=y
+# Needed for Wi-Fi credentials
+CONFIG_FLASH=y
+CONFIG_FLASH_PAGE_LAYOUT=y
+CONFIG_FLASH_MAP=y
+CONFIG_ZMS=y
+CONFIG_SETTINGS=y

samples/wifi/softap/prj.conf

@@ -32,8 +32,6 @@ CONFIG_NET_PKT_TX_COUNT=8
 CONFIG_NET_BUF_RX_COUNT=8
 CONFIG_NET_BUF_TX_COUNT=16
 CONFIG_NRF70_RX_NUM_BUFS=16
-CONFIG_HEAP_MEM_POOL_SIZE=51000
-CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y
 CONFIG_NRF_WIFI_CTRL_HEAP_SIZE=20000
 CONFIG_NRF_WIFI_DATA_HEAP_SIZE=53000
 CONFIG_NET_TC_TX_COUNT=1

samples/wifi/softap/sample.yaml

@@ -64,6 +64,7 @@ tests:
     extra_args:
       - softap_SHIELD="nrf7002eb_interposer_p1;nrf7002eb"
       - softap_SNIPPET=nrf70-wifi
+      - CONFIG_HEAP_MEM_POOL_IGNORE_MIN=n
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
     platform_allow:

samples/wifi/throughput/overlay-high-performance.conf

@@ -4,7 +4,6 @@ CONFIG_NET_PKT_TX_COUNT=30
 CONFIG_NET_PKT_RX_COUNT=27
 CONFIG_NET_BUF_TX_COUNT=60
 CONFIG_NET_BUF_RX_COUNT=27
-CONFIG_HEAP_MEM_POOL_SIZE=40144
 CONFIG_NRF_WIFI_CTRL_HEAP_SIZE=15000
 CONFIG_NRF_WIFI_DATA_HEAP_SIZE=204856
 CONFIG_SPEED_OPTIMIZATIONS=y

samples/wifi/throughput/overlay-iot-devices.conf

@@ -5,7 +5,6 @@ CONFIG_NET_PKT_RX_COUNT=6
 CONFIG_NET_BUF_TX_COUNT=12
 CONFIG_NET_BUF_RX_COUNT=6
 CONFIG_NRF70_RX_NUM_BUFS=6
-CONFIG_HEAP_MEM_POOL_SIZE=40144
 CONFIG_NRF_WIFI_CTRL_HEAP_SIZE=20000
 CONFIG_NRF_WIFI_DATA_HEAP_SIZE=199856
 CONFIG_SPEED_OPTIMIZATIONS=y

samples/wifi/throughput/overlay-memory-optimized.conf

@@ -5,7 +5,6 @@ CONFIG_NET_PKT_RX_COUNT=6
 CONFIG_NET_BUF_TX_COUNT=12
 CONFIG_NET_BUF_RX_COUNT=6
 CONFIG_NRF70_RX_NUM_BUFS=6
-CONFIG_HEAP_MEM_POOL_SIZE=40144
 CONFIG_NRF_WIFI_CTRL_HEAP_SIZE=20000
 CONFIG_NRF_WIFI_DATA_HEAP_SIZE=199856
 CONFIG_SPEED_OPTIMIZATIONS=y

samples/wifi/throughput/overlay-rx-prio.conf

@@ -5,7 +5,6 @@ CONFIG_NET_PKT_RX_COUNT=64
 CONFIG_NET_BUF_TX_COUNT=10
 CONFIG_NET_BUF_RX_COUNT=64
 CONFIG_NRF70_RX_NUM_BUFS=64
-CONFIG_HEAP_MEM_POOL_SIZE=40144
 CONFIG_NRF_WIFI_CTRL_HEAP_SIZE=20000
 CONFIG_NRF_WIFI_DATA_HEAP_SIZE=199856
 CONFIG_SPEED_OPTIMIZATIONS=y

samples/wifi/throughput/overlay-tx-prio.conf

@@ -5,7 +5,6 @@ CONFIG_NET_PKT_RX_COUNT=10
 CONFIG_NET_BUF_TX_COUNT=64
 CONFIG_NET_BUF_RX_COUNT=10
 CONFIG_NRF70_RX_NUM_BUFS=10
-CONFIG_HEAP_MEM_POOL_SIZE=40144
 CONFIG_NRF_WIFI_CTRL_HEAP_SIZE=20000
 CONFIG_NRF_WIFI_DATA_HEAP_SIZE=199856
 CONFIG_SPEED_OPTIMIZATIONS=y

samples/wifi/throughput/prj.conf

@@ -36,9 +36,6 @@ CONFIG_NET_BUF_RX_COUNT=16
 CONFIG_NET_BUF_TX_COUNT=16
 CONFIG_NRF70_RX_NUM_BUFS=16
 CONFIG_NRF70_MAX_TX_AGGREGATION=4
-# nRF700x is main consumer: (16 + 8) * 1600 = ~40KB + ~40KB control path (experimental)
-CONFIG_HEAP_MEM_POOL_SIZE=110000
-CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y
 CONFIG_NET_TC_TX_COUNT=1
 
 CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=4

samples/wifi/twt/prj.conf

@@ -29,8 +29,6 @@ CONFIG_NET_PKT_TX_COUNT=8
 CONFIG_NET_PKT_RX_COUNT=16
 CONFIG_NET_BUF_TX_COUNT=16
 CONFIG_NET_BUF_RX_COUNT=16
-CONFIG_HEAP_MEM_POOL_SIZE=105000
-CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y
 CONFIG_NRF70_RX_NUM_BUFS=16
 #CONFIG_SPEED_OPTIMIZATIONS=y
 #CONFIG_NRF70_MAX_TX_AGGREGATION=9

subsys/net/lib/hostap_crypto/Kconfig

@@ -92,6 +92,7 @@ config HOSTAP_CRYPTO_ENTERPRISE
 	select MBEDTLS_TLS_VERSION_1_2
 	select MBEDTLS_RSA_C
 	select MBEDTLS_SSL_SERVER_NAME_INDICATION
+	select MBEDTLS_SSL_CLI_ALLOW_WEAK_CERTIFICATE_VERIFICATION_WITHOUT_HOSTNAME
 	default y
 endif
 

subsys/nrf_security/Kconfig.legacy

@@ -899,5 +899,8 @@ config MBEDTLS_PEM_WRITE_C
 	prompt "Support writing PEM files"
 	depends on MBEDTLS_BASE64_C
 
+config MBEDTLS_SSL_CLI_ALLOW_WEAK_CERTIFICATE_VERIFICATION_WITHOUT_HOSTNAME
+	bool
+	depends on WIFI_NM_WPA_SUPPLICANT
 
 endmenu # Legacy mbed TLS crypto APIs

subsys/nrf_security/configs/legacy_crypto_config.h.template

@@ -3252,6 +3252,10 @@ it is (2^48 - 1), our restriction is :  (int - 0xFFFF - 0xF).*/
 #define MBEDTLS_ECP_FIXED_POINT_OPTIM      0 /**< Enable fixed-point speed-up */
 #endif
 
+#if defined(CONFIG_MBEDTLS_SSL_CLI_ALLOW_WEAK_CERTIFICATE_VERIFICATION_WITHOUT_HOSTNAME)
+#define MBEDTLS_SSL_CLI_ALLOW_WEAK_CERTIFICATE_VERIFICATION_WITHOUT_HOSTNAME
+#endif
+
 #if CONFIG_MBEDTLS_CMAC_ALT
 /* NCSDK-24838 */
 #define MBEDTLS_CIPHER_MODE_CBC

west.yml

@@ -65,7 +65,7 @@ manifest:
     # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
     - name: zephyr
       repo-path: sdk-zephyr
-      revision: 3475ff5b973770f39f0c723581bc510311edea4e
+      revision: 288fcb52ed6578d9913bcf911b08e3799ef02ed2
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above
@@ -144,7 +144,7 @@ manifest:
     - name: nrfxlib
       repo-path: sdk-nrfxlib
       path: nrfxlib
-      revision: cccd436dcac86c19055a7b3b9780d363149197e9
+      revision: 94c213ba1b719d61b955552127f2ee4395655023
     - name: trusted-firmware-m
       repo-path: sdk-trusted-firmware-m
       path: modules/tee/tf-m/trusted-firmware-m