Wi-Fi upmerge for 2.8.0

boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp.dts

@@ -32,7 +32,6 @@
 		qspi-quad-mode;
 
 		#include "nrf70_common.dtsi"
-		#include "nrf70_common_coex.dtsi"
 		#include "nrf70_common_5g.dtsi"
 	};
 };

boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001.dts

@@ -32,6 +32,5 @@
 		qspi-quad-mode;
 
 		#include "nrf70_common.dtsi"
-		#include "nrf70_common_coex.dtsi"
 	};
 };

boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts

@@ -35,6 +35,5 @@
 		qspi-quad-mode;
 
 		#include "nrf70_common.dtsi"
-		#include "nrf70_common_coex.dtsi"
 	};
 };

boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts

@@ -35,7 +35,6 @@
 		qspi-quad-mode;
 
 		#include "nrf70_common.dtsi"
-		#include "nrf70_common_coex.dtsi"
 		#include "nrf70_common_5g.dtsi"
 	};
 };

boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts

@@ -84,9 +84,12 @@
 
 	nrf70: coex {
 		status = "okay";
-		compatible = "nordic,nrf70-coex";
+		compatible = "nordic,nrf7002-coex";
 
-		#include "nrf70_common_coex.dtsi"
+		req-gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
+		status0-gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>;
+		grant-gpios = <&gpio0 24 (GPIO_PULL_DOWN | GPIO_ACTIVE_LOW)>;
+		swctrl1-gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
 	};
 
 	/* These aliases are provided for compatibility with samples */

boards/nordic/nrf7002dk/nrf70_common.dtsi

@@ -7,6 +7,7 @@
 iovdd-ctrl-gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>;
 bucken-gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
 host-irq-gpios = <&gpio0 23 GPIO_ACTIVE_HIGH>;
+srrf-switch-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
 
 wifi-max-tx-pwr-2g-dsss = <21>;
 wifi-max-tx-pwr-2g-mcs0 = <16>;

boards/shields/nrf7002eb/nrf7002eb_coex.overlay

@@ -4,10 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "nrf7002eb.overlay"
+/ {
+	nrf70: coex {
+		compatible = "nordic,nrf7002-coex";
+		status = "okay";
 
-&nrf70 {
-	status0-gpios = <&edge_connector 5 GPIO_ACTIVE_HIGH>;
-	req-gpios = <&edge_connector 6 GPIO_ACTIVE_HIGH>;
-	grant-gpios = <&edge_connector 15 (GPIO_PULL_DOWN | GPIO_ACTIVE_LOW)>;
+		status0-gpios = <&edge_connector 5 GPIO_ACTIVE_HIGH>;
+		req-gpios = <&edge_connector 6 GPIO_ACTIVE_HIGH>;
+		grant-gpios = <&edge_connector 15 (GPIO_PULL_DOWN | GPIO_ACTIVE_LOW)>;
+	};
 };

boards/shields/nrf7002ek/Kconfig.shield

@@ -9,3 +9,6 @@ config SHIELD_NRF7002EK_NRF7001
 
 config SHIELD_NRF7002EK_NRF7000
 	def_bool $(shields_list_contains,nrf7002ek_nrf7000)
+
+config SHIELD_NRF7002EK_COEX
+	def_bool $(shields_list_contains,nrf7002ek_coex)

boards/shields/nrf7002ek/doc/index.rst

@@ -47,24 +47,25 @@ SR Co-existence
 ###############
 
 The nRF7002 EK supports SR co-existence provided the host board supports it. The SR co-existence
-pins are connected to the host board's GPIO pins.
+pins are connected to the host board's GPIO pins. The interface is selected by setting
+``--shield nrf7002ek_coex`` when invoking ``west build``.
 
 Two Kconfig options are available to enable SR co-existence:
 
-- :kconfig:option:`CONFIG_NRF70_SR_COEX`: Enables SR co-existence.
+- :kconfig:option:`CONFIG_NRF70_SR_COEX`: Enables SR co-existence driver.
 - :kconfig:option:`CONFIG_NRF70_SR_COEX_RF_SWITCH`: Control SR side RF switch.
 
 Shield Variants
 ###############
 
-The nRF7002 EK is available in three variants:
+The nRF7002 EK is available in four variants:
 
 - ``nrf7002ek``: The default variant.
 - ``nrf7002ek_nrf7001``: Variant for the nRF7001 SoC or nRF7002 SoC emulating nRF7001
-   that supports only 2.4GHz Wi-Fi.
+  that supports only 2.4GHz Wi-Fi.
 - ``nrf7002ek_nrf7000``: Variant for the nRF7000 SoC or nRF7002 SoC emulating nRF7000
-   that supports only 2.4GHz Wi-Fi.
-
+  that supports only 2.4GHz Wi-Fi.
+- ``nrf7002ek_coex``: Variant for the SR co-existence interface
 
 References
 **********

boards/shields/nrf7002ek/nrf7002ek_coex.overlay

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	nrf70: coex {
+		compatible = "nordic,nrf7002-coex";
+		status = "okay";
+
+		/* D2 */
+		status0-gpios = <&arduino_header 8 GPIO_ACTIVE_HIGH>;
+		/* D3 */
+		req-gpios = <&arduino_header 9 GPIO_ACTIVE_HIGH>;
+		/* D4 */
+		grant-gpios = <&arduino_header 10 (GPIO_PULL_DOWN | GPIO_ACTIVE_LOW)>;
+		/* D6 */
+		swctrl1-gpios = <&arduino_header 12 GPIO_ACTIVE_HIGH>;
+	};
+};

boards/shields/nrf7002ek/nrf7002ek_common.dtsi

@@ -12,15 +12,8 @@ iovdd-ctrl-gpios = <&arduino_header 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>;
 bucken-gpios = <&arduino_header 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>;
 /* D7 */
 host-irq-gpios = <&arduino_header 13 GPIO_ACTIVE_HIGH>;
+
 /* Short-range (SR) co-existence */
-/* D2 */
-status0-gpios = <&arduino_header 8 GPIO_ACTIVE_HIGH>;
-/* D3 */
-req-gpios = <&arduino_header 9 GPIO_ACTIVE_HIGH>;
-/* D4 */
-grant-gpios = <&arduino_header 10 (GPIO_PULL_DOWN | GPIO_ACTIVE_LOW)>;
-/* D6 */
-swctrl1-gpios = <&arduino_header 12 GPIO_ACTIVE_HIGH>;
 /* D8 */
 srrf-switch-gpios = <&arduino_header 14 GPIO_ACTIVE_HIGH>;
 

doc/connectivity/networking/api/wifi.rst

@@ -38,21 +38,28 @@ module.
     $ cp client.pem samples/net/wifi/test_certs/
     $ cp client-key.pem samples/net/wifi/test_certs/
     $ cp ca.pem samples/net/wifi/test_certs/
-    $ west build -p -b <board> samples/net/wifi
+    $ cp client2.pem samples/net/wifi/test_certs/
+    $ cp client-key2.pem samples/net/wifi/test_certs/
+    $ cp ca2.pem samples/net/wifi/test_certs/
+    $ west build -p -b <board> samples/net/wifi -- -DEXTRA_CONF_FILE=overlay-enterprise.conf
+
+For using variable size network buffer, the following overlay file can be used:
+
+.. code-block:: bash
+
+    $ west build -p -b <board> samples/net/wifi -- -DEXTRA_CONF_FILE=overlay-enterprise-variable-bufs.conf
+
+
 
 To initiate Wi-Fi connection, the following command can be used:
 
 .. code-block:: console
 
-    uart:~$ wifi connect -s <SSID> -k 5 -a anon -K whatever
+    uart:~$ wifi connect -s <SSID> -c 149 -k 17 -w 2 -a client1 --key1-pwd whatever --key2-pwd whatever --eap-id1 id1 --eap-pwd1 pwd1
 
 Server certificate is also provided in the same directory for testing purposes.
 Any AAA server can be used for testing purposes, for example, ``FreeRADIUS`` or ``hostapd``.
 
-.. important::
-
-    The passphrase for the :file:`client-key.pem`` and the :file:`server-key.pem` is ``whatever``.
-
 .. note::
 
     The certificates are for testing purposes only and should not be used in production.

drivers/wifi/nrfwifi/CMakeLists.txt

@@ -29,10 +29,15 @@ zephyr_include_directories_ifdef(CONFIG_NRF70_RADIO_TEST
   ${OS_AGNOSTIC_BASE}/fw_if/umac_if/inc/radio_test
 )
 
-zephyr_include_directories_ifndef(CONFIG_NRF70_RADIO_TEST
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/inc/default
+zephyr_include_directories_ifdef(CONFIG_NRF70_OFFLOADED_RAW_TX
+  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/inc/offload_raw_tx
+  off_raw_tx/inc
 )
 
+if(NOT CONFIG_NRF70_RADIO_TEST AND NOT CONFIG_NRF70_OFFLOADED_RAW_TX)
+  zephyr_include_directories(${OS_AGNOSTIC_BASE}/fw_if/umac_if/inc/default)
+endif()
+
 zephyr_library_sources_ifdef(CONFIG_NRF70_SR_COEX
   src/coex.c
 )
@@ -57,23 +62,28 @@ zephyr_library_sources(
   src/shim.c
   src/work.c
   src/timer.c
-  src/fmac_main.c
   src/qspi/src/device.c
   src/qspi/src/rpu_hw_if.c
   src/qspi/src/ficr_prog.c
 )
 
+zephyr_library_sources_ifndef(CONFIG_NRF70_OFFLOADED_RAW_TX
+  src/fmac_main.c
+)
+
 zephyr_library_sources_ifdef(CONFIG_NRF_WIFI_PATCHES_BUILTIN
   src/fw_load.c
 )
 
-zephyr_library_sources_ifndef(CONFIG_NRF70_RADIO_TEST
+if(NOT CONFIG_NRF70_RADIO_TEST AND NOT CONFIG_NRF70_OFFLOADED_RAW_TX)
+  zephyr_library_sources(
   ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/rx.c
   ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_vif.c
   ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_util.c
   src/net_if.c
   ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/default/fmac_api.c
 )
+endif()
 
 zephyr_library_sources_ifdef(CONFIG_NET_L2_WIFI_MGMT
   src/wifi_mgmt_scan.c
@@ -88,6 +98,12 @@ zephyr_library_sources_ifdef(CONFIG_NRF70_RADIO_TEST
   ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_util.c
 )
 
+zephyr_library_sources_ifdef(CONFIG_NRF70_OFFLOADED_RAW_TX
+  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/offload_raw_tx/fmac_api.c
+  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_util.c
+  off_raw_tx/src/off_raw_tx_api.c
+)
+
 zephyr_library_sources_ifdef(CONFIG_NRF70_DATA_TX
   ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/tx.c
   ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_peer.c
@@ -112,6 +128,10 @@ zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
   ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_util.c
 )
 
+zephyr_library_sources_ifdef(CONFIG_NRF70_PROMISC_DATA_RX
+  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_promisc.c
+)
+
 zephyr_library_sources_ifdef(CONFIG_NRF70_ON_QSPI
   src/qspi/src/qspi_if.c
 )
@@ -152,6 +172,8 @@ elseif(CONFIG_NRF_WIFI_PATCHES_BUILTIN)
     set(NRF70_PATCH ${FW_BINS_BASE}/scan_only/nrf70.bin)
   elseif (CONFIG_NRF70_SYSTEM_WITH_RAW_MODES)
     set(NRF70_PATCH ${FW_BINS_BASE}/system_with_raw/nrf70.bin)
+  elseif(CONFIG_NRF70_OFFLOADED_RAW_TX)
+    set(NRF70_PATCH ${FW_BINS_BASE}/offloaded_raw_tx/nrf70.bin)
   else()
     # Error
     message(FATAL_ERROR "Unsupported nRF70 patch configuration")
@@ -231,6 +253,10 @@ zephyr_compile_definitions_ifdef(CONFIG_NRF70_RADIO_TEST
   -DNRF70_RADIO_TEST
 )
 
+zephyr_compile_definitions_ifdef(CONFIG_NRF70_OFFLOADED_RAW_TX
+  -DNRF70_OFFLOADED_RAW_TX
+)
+
 zephyr_compile_definitions_ifdef(CONFIG_NRF70_TCP_IP_CHECKSUM_OFFLOAD
   -DNRF70_TCP_IP_CHECKSUM_OFFLOAD
 )
@@ -263,6 +289,18 @@ zephyr_compile_definitions_ifdef(CONFIG_NRF70_AP_MODE
   -DNRF70_AP_MODE
 )
 
+zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_MGMT_BUFF_OFFLOAD
+  -DNRF_WIFI_MGMT_BUFF_OFFLOAD
+)
+
+zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_FEAT_KEEPALIVE
+  -DNRF_WIFI_FEAT_KEEPALIVE
+)
+
+zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_FEAT_KEEPALIVE
+  -DNRF_WIFI_KEEPALIVE_PERIOD_S=${CONFIG_NRF_WIFI_KEEPALIVE_PERIOD_S}
+)
+
 zephyr_compile_definitions(
   -DNRF70_RX_NUM_BUFS=${CONFIG_NRF70_RX_NUM_BUFS}
   -DNRF70_MAX_TX_TOKENS=${CONFIG_NRF70_MAX_TX_TOKENS}
@@ -304,4 +342,6 @@ zephyr_compile_definitions(
   -DNRF70_ANT_GAIN_5G_BAND1=${CONFIG_NRF70_ANT_GAIN_5G_BAND1}
   -DNRF70_ANT_GAIN_5G_BAND2=${CONFIG_NRF70_ANT_GAIN_5G_BAND2}
   -DNRF70_ANT_GAIN_5G_BAND3=${CONFIG_NRF70_ANT_GAIN_5G_BAND3}
+  -DNRF_WIFI_PS_INT_PS=${CONFIG_NRF_WIFI_PS_INT_PS}
+  -DNRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS=${CONFIG_NRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS}
 )