Merge branch 'main' into llvm_improvements

MAINTAINERS.yml

@@ -2185,7 +2185,7 @@ Release Notes:
   collaborators:
     - sachinthegreen
   files:
-    - drivers/wifi/nrfwifi/
+    - drivers/wifi/nrf_wifi/
     - dts/bindings/wifi/nordic,nrf70.yaml
     - dts/bindings/wifi/nordic,nrf70-qspi.yaml
     - dts/bindings/wifi/nordic,nrf70-spi.yaml
@@ -4980,6 +4980,16 @@ West:
   labels:
     - "area: native port"
 
+"West project: nrf_wifi":
+  status: maintained
+  maintainers:
+    - krish2718
+    - sachinthegreen
+  files:
+    - modules/nrf_wifi/
+  labels:
+    - "area: Wi-Fi"
+
 "West project: open-amp":
   status: odd fixes
   collaborators:

drivers/wifi/CMakeLists.txt

@@ -10,4 +10,4 @@ add_subdirectory_ifdef(CONFIG_WIFI_SIMPLELINK   simplelink)
 add_subdirectory_ifdef(CONFIG_WIFI_WINC1500     winc1500)
 add_subdirectory_ifdef(CONFIG_WIFI_NXP          nxp)
 add_subdirectory_ifdef(CONFIG_WIFI_AIROC        infineon)
-add_subdirectory_ifdef(CONFIG_WIFI_NRF70        nrfwifi)
+add_subdirectory_ifdef(CONFIG_WIFI_NRF70        nrf_wifi)

drivers/wifi/Kconfig

@@ -42,6 +42,6 @@ source "drivers/wifi/esp_at/Kconfig.esp_at"
 source "drivers/wifi/esp32/Kconfig.esp32"
 source "drivers/wifi/nxp/Kconfig.nxp"
 source "drivers/wifi/infineon/Kconfig.airoc"
-source "drivers/wifi/nrfwifi/Kconfig.nrfwifi"
+source "drivers/wifi/nrf_wifi/Kconfig.nrfwifi"
 
 endif # WIFI

drivers/wifi/nrf_wifi/CMakeLists.txt

@@ -0,0 +1,124 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+zephyr_library_named(nrf_wifi)
+
+set(OS_AGNOSTIC_BASE ${ZEPHYR_NRF_WIFI_MODULE_DIR})
+set(FW_BINS_BASE ${ZEPHYR_NRF_WIFI_MODULE_DIR}/zephyr/blobs/wifi_fw_bins)
+
+zephyr_include_directories(
+  inc
+  src/qspi/inc
+  # for net_sprint_ll_addr
+  ${ZEPHYR_BASE}/subsys/net/ip
+)
+
+zephyr_include_directories_ifdef(CONFIG_NRF70_OFFLOADED_RAW_TX
+  off_raw_tx/inc
+)
+
+zephyr_library_sources_ifdef(CONFIG_NRF70_SR_COEX
+  src/coex.c
+)
+
+zephyr_library_sources(
+  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
+)
+
+if(NOT CONFIG_NRF70_RADIO_TEST AND NOT CONFIG_NRF70_OFFLOADED_RAW_TX)
+  zephyr_library_sources(
+  src/net_if.c
+)
+endif()
+
+zephyr_library_sources_ifdef(CONFIG_NET_L2_WIFI_MGMT
+  src/wifi_mgmt_scan.c
+)
+
+zephyr_library_sources_ifdef(CONFIG_NRF70_SYSTEM_MODE_COMMON
+  src/wifi_mgmt.c
+)
+
+zephyr_library_sources_ifdef(CONFIG_NRF70_OFFLOADED_RAW_TX
+  off_raw_tx/src/off_raw_tx_api.c
+)
+
+zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
+  src/wpa_supp_if.c
+  src/wifi_mgmt.c
+)
+
+# Without WPA supplicant we only support scan
+zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
+  src/wpa_supp_if.c)
+
+zephyr_library_sources_ifdef(CONFIG_NRF70_ON_QSPI
+  src/qspi/src/qspi_if.c
+)
+
+zephyr_library_sources_ifdef(CONFIG_NRF70_ON_SPI
+  src/qspi/src/spi_if.c
+)
+
+zephyr_library_sources_ifdef(CONFIG_NRF70_UTIL
+  src/wifi_util.c
+)
+
+zephyr_compile_definitions_ifdef(CONFIG_NRF70_ON_QSPI
+# These are XIP related anomalies and aren't applicable for nRF7002 and cause
+# throughput issues.
+  -DNRF53_ERRATA_43_ENABLE_WORKAROUND=0
+  -DNRF52_ERRATA_215_ENABLE_WORKAROUND=0
+# nRF70 QSPI doesn't use 192MHz clock and most samples use 128MHz, this can cause anomaly 159
+# but as its rare and not seen in most cases, we can disable it.
+# Alternative is 128MHz CPU should be disabled that impacts Wi-Fi performance.
+  -DNRF53_ERRATA_159_ENABLE_WORKAROUND=0
+)
+
+if (CONFIG_NRF_WIFI_BUILD_ONLY_MODE)
+  message(WARNING "
+  ------------------------------------------------------------------------
+  Building only the nRF70 driver, skipping firmware patch.
+  This is only for building (CI) purposes and will not work on a real device.
+  ------------------------------------------------------------------------
+  ")
+elseif(CONFIG_NRF_WIFI_PATCHES_BUILTIN)
+  zephyr_blobs_verify(MODULE nrf_wifi REQUIRED)
+  # RPU FW patch binaries based on the selected configuration
+  if(CONFIG_NRF70_SYSTEM_MODE)
+    set(NRF70_PATCH ${FW_BINS_BASE}/default/nrf70.bin)
+  elseif(CONFIG_NRF70_RADIO_TEST)
+    set(NRF70_PATCH ${FW_BINS_BASE}/radio_test/nrf70.bin)
+  elseif(CONFIG_NRF70_SCAN_ONLY)
+    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")
+  endif()
+
+  set(gen_inc_dir ${ZEPHYR_BINARY_DIR}/misc/generated)
+  zephyr_include_directories(${gen_inc_dir})
+  set(gen_dir ${gen_inc_dir}/nrf70_fw_patch)
+  generate_inc_file_for_target(
+    nrf_wifi
+    ${NRF70_PATCH}
+    ${gen_dir}/nrf70.bin.inc
+  )
+endif()

drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c → drivers/wifi/nrf_wifi/off_raw_tx/src/off_raw_tx_api.c

@@ -12,7 +12,7 @@
 #include <stdlib.h>
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
-#include <zephyr/drivers/wifi/nrfwifi/off_raw_tx/off_raw_tx_api.h>
+#include <zephyr/drivers/wifi/nrf_wifi/off_raw_tx/off_raw_tx_api.h>
 #include <off_raw_tx.h>
 #include <fmac_api.h>