From d090dbc72c9f56561ef1d898625d33dc56b222f2 Mon Sep 17 00:00:00 2001 From: Chaitanya Tata Date: Thu, 28 Nov 2024 21:05:17 +0530 Subject: [PATCH 1/5] manifest: sdk-zephyr: Pull nRF70 driver restructuring changes nRF70 driver is now restructred upstream. Signed-off-by: Chaitanya Tata --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index ffe34a5b063..00d63fa12d2 100644 --- a/west.yml +++ b/west.yml @@ -69,7 +69,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: 53f5e6dae760d95db2dcb5efac83b83023484043 + revision: bc80cbda202a69435c7333544c9c5359e4aef0fc import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above From 6de19342c7faee6370b656347c6f542c217c5abc Mon Sep 17 00:00:00 2001 From: Chaitanya Tata Date: Thu, 28 Nov 2024 21:04:36 +0530 Subject: [PATCH 2/5] treewide: nRF70 driver directory now renamed Fix the name of the directory. Signed-off-by: Chaitanya Tata --- doc/nrf/drivers/wifi/nrf70_native.rst | 4 ++-- doc/nrf/drivers/wifi/nrf70_portable.rst | 2 +- doc/nrf/protocols/wifi/advanced_modes/offloaded_raw_tx.rst | 2 +- samples/wifi/offloaded_raw_tx/src/main.c | 2 +- subsys/net/lib/nrf70_fw_ext/CMakeLists.txt | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/nrf/drivers/wifi/nrf70_native.rst b/doc/nrf/drivers/wifi/nrf70_native.rst index d26dedbfbae..daab07249d4 100644 --- a/doc/nrf/drivers/wifi/nrf70_native.rst +++ b/doc/nrf/drivers/wifi/nrf70_native.rst @@ -34,7 +34,7 @@ Design overview *************** The nRF Wi-Fi driver follows an OS-agnostic design, and the driver implementation is split into OS-agnostic and OS (Zephyr)-specific code. -The OS-agnostic code is located in the :file:`${ZEPHYR_BASE}/../modules/hal/nordic/drivers/nrf_wifi/` folder, and the Zephyr OS port is located in the :file:`${ZEPHYR_BASE}/drivers/wifi/nrfwifi/` folder. +The OS-agnostic code is located in the :file:`${ZEPHYR_BASE}/../modules/hal/nordic/drivers/nrf_wifi/` folder, and the Zephyr OS port is located in the :file:`${ZEPHYR_BASE}/drivers/wifi/nrf_wifi/` folder. The driver supports two modes of operation: @@ -82,7 +82,7 @@ The nRF Wi-Fi driver has the following configuration options: Kconfig configuration ===================== -.. options-from-kconfig:: /../../../../../zephyr/drivers/wifi/nrfwifi/Kconfig.nrfwifi +.. options-from-kconfig:: /../../../../../zephyr/drivers/wifi/nrf_wifi/Kconfig.nrfwifi :show-type: Devicetree specification configuration diff --git a/doc/nrf/drivers/wifi/nrf70_portable.rst b/doc/nrf/drivers/wifi/nrf70_portable.rst index e9d7cd8146d..f5b3afb44ce 100644 --- a/doc/nrf/drivers/wifi/nrf70_portable.rst +++ b/doc/nrf/drivers/wifi/nrf70_portable.rst @@ -6,7 +6,7 @@ nRF Wi-Fi portable driver The nRF Wi-Fi portable driver implements OS-agnostic code for the nRF70 FullMAC Series of devices. This code can be used to implement OS-native drivers for the nRF70 Series devices. -The Zephyr native driver implementation is located in the :file:`${ZEPHYR_BASE}/drivers/wifi/nrfwifi/` folder. +The Zephyr native driver implementation is located in the :file:`${ZEPHYR_BASE}/drivers/wifi/nrf_wifi/` folder. API documentation ***************** diff --git a/doc/nrf/protocols/wifi/advanced_modes/offloaded_raw_tx.rst b/doc/nrf/protocols/wifi/advanced_modes/offloaded_raw_tx.rst index 320b238025a..a4610f74a27 100644 --- a/doc/nrf/protocols/wifi/advanced_modes/offloaded_raw_tx.rst +++ b/doc/nrf/protocols/wifi/advanced_modes/offloaded_raw_tx.rst @@ -42,7 +42,7 @@ Offloaded raw transmit API The offloaded raw transmit functionality of nRF70 Series ICs can be utilized by using the APIs provided by the driver. The API reference can be found at: -| Header file: :file:`zephyr/drivers/wifi/nrfwifi/off_raw_tx/off_raw_tx_api.h` +| Header file: :file:`zephyr/drivers/wifi/nrf_wifi/off_raw_tx/off_raw_tx_api.h` See the :ref:`Offloaded raw transmit sample ` to know more about the offloaded raw transmit API. diff --git a/samples/wifi/offloaded_raw_tx/src/main.c b/samples/wifi/offloaded_raw_tx/src/main.c index 5595ebbb6b1..3f2e6727d88 100644 --- a/samples/wifi/offloaded_raw_tx/src/main.c +++ b/samples/wifi/offloaded_raw_tx/src/main.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #ifdef CONFIG_GENERATE_MAC_ADDRESS #include diff --git a/subsys/net/lib/nrf70_fw_ext/CMakeLists.txt b/subsys/net/lib/nrf70_fw_ext/CMakeLists.txt index 0ddd59c62ea..3a9d43bdaf5 100644 --- a/subsys/net/lib/nrf70_fw_ext/CMakeLists.txt +++ b/subsys/net/lib/nrf70_fw_ext/CMakeLists.txt @@ -10,7 +10,7 @@ endif() if(CONFIG_NRF_WIFI_PATCHES_EXT_FLASH_DISABLED) # The C source is same as that for built-in - zephyr_library_sources(${ZEPHYR_BASE}/drivers/wifi/nrfwifi/src/fw_load.c) + zephyr_library_sources(${ZEPHYR_BASE}/drivers/wifi/nrf_wifi/src/fw_load.c) else() zephyr_library_sources(ext_fw_load.c) if(CONFIG_NRF_WIFI_PATCHES_EXT_FLASH_XIP) @@ -43,7 +43,7 @@ if(DEFINED CONFIG_NRF_WIFI_PATCHES_EXT_FLASH_DISABLED OR zephyr_include_directories(${gen_inc_dir}) set(gen_dir ${gen_inc_dir}/nrf70_fw_patch) generate_inc_file_for_target( - nrfwifi + nrf_wifi ${NRF70_PATCH} ${gen_dir}/nrf70.bin.inc ) From 161d078626c3f1788da8fdedeb2c938476a676d9 Mon Sep 17 00:00:00 2001 From: Chaitanya Tata Date: Fri, 29 Nov 2024 02:03:41 +0530 Subject: [PATCH 3/5] manifest: Add nrf_wifi to allow list nRF70 driver now uses a new module "nrf_wifi", add it to the allow list. Signed-off-by: Chaitanya Tata --- west.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/west.yml b/west.yml index 00d63fa12d2..1e058e335d4 100644 --- a/west.yml +++ b/west.yml @@ -105,6 +105,7 @@ manifest: - nanopb - net-tools - nrf_hw_models + - nrf_wifi - open-amp - picolibc - segger From 8729d60fc3c0ab74b55a8ef312f9e07abc5aa9c4 Mon Sep 17 00:00:00 2001 From: Chaitanya Tata Date: Tue, 3 Dec 2024 02:24:39 +0530 Subject: [PATCH 4/5] samples: wifi: shell: Fix PSA config name The config is now renamed. Signed-off-by: Chaitanya Tata --- samples/wifi/shell/sample.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/wifi/shell/sample.yaml b/samples/wifi/shell/sample.yaml index 9f0d8c7fe73..72710e3dbb1 100644 --- a/samples/wifi/shell/sample.yaml +++ b/samples/wifi/shell/sample.yaml @@ -346,7 +346,7 @@ tests: tags: ci_build sysbuild ci_samples_wifi sample.nrf7002.shell.psa: build_only: true - extra_args: CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_LEGACY_NCS_PSA=y + extra_args: CONFIG_HOSTAP_CRYPTO_LEGACY_PSA=y integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp From 37ec37c02b5db1cb49a36b27d2a9d1419582d766 Mon Sep 17 00:00:00 2001 From: Chaitanya Tata Date: Tue, 3 Dec 2024 02:25:05 +0530 Subject: [PATCH 5/5] net: hostap_crypto: Add missing enterprise configs These configs are missed when moved to hostap external crypto module. Signed-off-by: Chaitanya Tata --- subsys/net/lib/hostap_crypto/Kconfig | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/subsys/net/lib/hostap_crypto/Kconfig b/subsys/net/lib/hostap_crypto/Kconfig index c262052a338..09b9f3f3fee 100644 --- a/subsys/net/lib/hostap_crypto/Kconfig +++ b/subsys/net/lib/hostap_crypto/Kconfig @@ -141,6 +141,24 @@ config HOSTAP_CRYPTO_ALT_PSA endchoice +if WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE + +config HOSTAP_CRYPTO_ENTERPRISE + bool "Enterprise Crypto support for WiFi using nRF security" + select MBEDTLS_ECDH_C + select MBEDTLS_ECDSA_C + select MBEDTLS_DHM_C + select MBEDTLS_SSL_TLS_C + select MBEDTLS_SSL_SRV_C + select MBEDTLS_SSL_CLI_C + select MBEDTLS_X509_LIBRARY + select MBEDTLS_TLS_LIBRARY + select MBEDTLS_X509_CRL_PARSE_C + select MBEDTLS_TLS_VERSION_1_2 + select MBEDTLS_RSA_C + default y +endif + # PSA crypto is WPA2 only for now if HOSTAP_CRYPTO_ALT_PSA config WIFI_NM_WPA_SUPPLICANT_WPA3