3.1.0 wi-fi upmerge

Kconfig.zephyr

@@ -1030,6 +1030,12 @@ config WARN_EXPERIMENTAL
 	  Print a warning when the Kconfig tree is parsed if any experimental
 	  features are enabled.
 
+config NOT_SECURE
+	bool
+	help
+	  Symbol to be selected by a feature to inidicate that feature is
+	  not secure.
+
 config TAINT
 	bool
 	help

drivers/wifi/nrf_wifi/Kconfig.nrfwifi

@@ -570,6 +570,21 @@ config NRF70_RSSI_STALE_TIMEOUT_MS
 	  value as the driver does not store it and requires RPU to provide the
 	  information.
 
+config NRF_WIFI_GLOBAL_HEAP
+	bool "Use Zephyr kernel heap for Wi-Fi driver"
+	depends on KERNEL_MEM_POOL && ((HEAP_MEM_POOL_SIZE > 0) || HEAP_MEM_POOL_IGNORE_MIN)
+	help
+	  Enable this option to use K_HEAP for memory allocations in Wi-Fi driver.
+
+if NRF_WIFI_GLOBAL_HEAP
+config HEAP_MEM_POOL_ADD_SIZE_NRF70
+	# Use a maximum that works for typical use cases and boards, each sample/app can override
+	# this value if needed by using CONFIG_HEAP_MEM_POOL_IGNORE_MIN
+	def_int 25000 if NRF70_SCAN_ONLY
+	def_int 150000
+endif # NRF_WIFI_GLOBAL_HEAP
+
+if !NRF_WIFI_GLOBAL_HEAP
 config NRF_WIFI_CTRL_HEAP_SIZE
 	int "Dedicated memory pool for control plane"
 	default 20000
@@ -580,13 +595,12 @@ config NRF_WIFI_DATA_HEAP_SIZE
 	default 8000 if NRF70_SCAN_ONLY
 	default 110000 if !SOC_FAMILY_NORDIC_NRF
 	default 130000
+endif
 
 if NETWORKING
 # Finetune defaults for certain system components used by the driver
-
-config SYSTEM_WORKQUEUE_STACK_SIZE
-	default 4096
-
+# Note: These will take effect only if the symbol is not defined already
+# (i.e., the original symbol is processed after "drivers/Kconfig")
 config NET_TX_STACK_SIZE
 	default 4096
 

drivers/wifi/nrf_wifi/inc/fmac_main.h

@@ -52,6 +52,7 @@ struct nrf_wifi_vif_ctx_zep {
 	uint16_t max_bss_cnt;
 	unsigned int scan_res_cnt;
 	struct k_work_delayable scan_timeout_work;
+	struct k_work disp_scan_res_work;
 
 	struct net_eth_addr mac_addr;
 	int if_type;
@@ -120,6 +121,8 @@ struct nrf_wifi_ctx_zep {
 	unsigned int rpu_recovery_retries;
 	int rpu_recovery_success;
 	int rpu_recovery_failure;
+	int wdt_irq_received;
+	int wdt_irq_ignored;
 #endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
 };
 

drivers/wifi/nrf_wifi/src/fmac_main.c

@@ -171,12 +171,8 @@
 	switch (vif_ctx_zep->scan_type) {
 #ifdef CONFIG_NET_L2_WIFI_MGMT
 	case SCAN_DISPLAY:
-		status = nrf_wifi_disp_scan_res_get_zep(vif_ctx_zep);
-		if (status != NRF_WIFI_STATUS_SUCCESS) {
-			LOG_ERR("%s: nrf_wifi_disp_scan_res_get_zep failed", __func__);
-			return;
-		}
-		vif_ctx_zep->scan_in_progress = false;
+		/* Schedule scan result processing in system workqueue to avoid deadlock */
+		k_work_submit(&vif_ctx_zep->disp_scan_res_work);
 		break;
 #endif /* CONFIG_NET_L2_WIFI_MGMT */
 #ifdef CONFIG_NRF70_STA_MODE
@@ -242,6 +238,26 @@
 	vif_ctx_zep->scan_in_progress = false;
 }
 
+void nrf_wifi_disp_scan_res_work_handler(struct k_work *work)
+{
+	struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL;
+	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
+
+	vif_ctx_zep = CONTAINER_OF(work, struct nrf_wifi_vif_ctx_zep, disp_scan_res_work);
+
+	if (!vif_ctx_zep) {
+		LOG_ERR("%s: vif_ctx_zep is NULL", __func__);
+		return;
+	}
+
+	status = nrf_wifi_disp_scan_res_get_zep(vif_ctx_zep);
+	if (status != NRF_WIFI_STATUS_SUCCESS) {
+		LOG_ERR("%s: nrf_wifi_disp_scan_res_get_zep failed", __func__);
+		return;
+	}
+	vif_ctx_zep->scan_in_progress = false;
+}
+
 #ifdef CONFIG_NRF70_STA_MODE
 static void nrf_wifi_process_rssi_from_rx(void *vif_ctx,
 				   signed short signal)
@@ -837,7 +853,9 @@
 #else
 	k_work_init_delayable(&vif_ctx_zep->scan_timeout_work,
 			      nrf_wifi_scan_timeout_work);
+	k_work_init(&vif_ctx_zep->disp_scan_res_work,
+		    nrf_wifi_disp_scan_res_work_handler);
 #endif /* CONFIG_NRF70_RADIO_TEST */
 
 	k_mutex_init(&rpu_drv_priv_zep.rpu_ctx_zep.rpu_lock);
 	return 0;
@@ -852,7 +870,7 @@
 
 #ifndef CONFIG_NRF70_RADIO_TEST
 #ifdef CONFIG_NET_L2_WIFI_MGMT
-static struct wifi_mgmt_ops nrf_wifi_mgmt_ops = {
+static const struct wifi_mgmt_ops nrf_wifi_mgmt_ops = {
 	.scan = nrf_wifi_disp_scan_zep,
 #ifdef CONFIG_NET_STATISTICS_WIFI
 	.get_stats = nrf_wifi_stats_get,
@@ -883,7 +901,7 @@
 
 
 #ifdef CONFIG_NRF70_STA_MODE
-static struct zep_wpa_supp_dev_ops wpa_supp_ops = {
+static const struct zep_wpa_supp_dev_ops wpa_supp_ops = {
 	.init = nrf_wifi_wpa_supp_dev_init,
 	.deinit = nrf_wifi_wpa_supp_dev_deinit,
 	.scan2 = nrf_wifi_wpa_supp_scan2,

drivers/wifi/nrf_wifi/src/net_if.c

@@ -18,6 +18,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(wifi_nrf, CONFIG_WIFI_NRF70_LOG_LEVEL);
 
+#include <zephyr/net/conn_mgr_monitor.h>
 #include <zephyr/sys/reboot.h>
 
 #include "net_private.h"
@@ -72,6 +73,8 @@ static void nrf_wifi_rpu_recovery_work_handler(struct k_work *work)
 								struct nrf_wifi_vif_ctx_zep,
 								nrf_wifi_rpu_recovery_work);
 	struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
+	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = NULL;
+	struct nrf_wifi_hal_dev_ctx *hal_dev_ctx = NULL;
 	int ret;
 
 	if (!vif_ctx_zep) {
@@ -90,6 +93,18 @@ static void nrf_wifi_rpu_recovery_work_handler(struct k_work *work)
 		return;
 	}
 
+	fmac_dev_ctx = rpu_ctx_zep->rpu_ctx;
+	if (!fmac_dev_ctx) {
+		LOG_ERR("%s: fmac_dev_ctx is NULL", __func__);
+		return;
+	}
+
+	hal_dev_ctx = fmac_dev_ctx->hal_dev_ctx;
+	if (!hal_dev_ctx) {
+		LOG_ERR("%s: hal_dev_ctx is NULL", __func__);
+		return;
+	}
+
 	if (rpu_ctx_zep->rpu_recovery_in_progress) {
 #ifdef CONFIG_NRF_WIFI_RPU_RECOVERY_DEBUG
 		LOG_ERR("%s: RPU recovery already in progress", __func__);
@@ -134,6 +149,8 @@ static void nrf_wifi_rpu_recovery_work_handler(struct k_work *work)
 	}
 #endif
 	rpu_ctx_zep->rpu_recovery_in_progress = true;
+	rpu_ctx_zep->wdt_irq_received += hal_dev_ctx->wdt_irq_received;
+	rpu_ctx_zep->wdt_irq_ignored += hal_dev_ctx->wdt_irq_ignored;
 #ifdef CONFIG_NRF_WIFI_RPU_RECOVERY_DEBUG
 	LOG_ERR("%s: Bringing the interface down", __func__);
 #else
@@ -363,7 +380,7 @@ enum ethernet_hw_caps nrf_wifi_if_caps_get(const struct device *dev)
 int nrf_wifi_if_send(const struct device *dev,
 		     struct net_pkt *pkt)
 {
-	int ret = -1;
+	int ret = -EINVAL;
 #ifdef CONFIG_NRF70_DATA_TX
 	struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL;
 	struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
@@ -404,6 +421,7 @@ int nrf_wifi_if_send(const struct device *dev,
 
 	if (nbuf == NULL) {
 		LOG_ERR("%s: allocation failed", __func__);
+		ret = -ENOMEM;
 		goto drop;
 	}
 
@@ -420,6 +438,7 @@ int nrf_wifi_if_send(const struct device *dev,
 #endif /* CONFIG_NRF70_RAW_DATA_TX */
 		if ((vif_ctx_zep->if_carr_state != NRF_WIFI_FMAC_IF_CARR_STATE_ON) ||
 		    (!vif_ctx_zep->authorized && !is_eapol(pkt))) {
+			ret = -EPERM;
 			goto drop;
 		}
 
@@ -429,6 +448,12 @@ int nrf_wifi_if_send(const struct device *dev,
 #ifdef CONFIG_NRF70_RAW_DATA_TX
 	}
 #endif /* CONFIG_NRF70_RAW_DATA_TX */
+	if (ret == NRF_WIFI_STATUS_FAIL) {
+		/* FMAC API takes care of freeing the nbuf */
+		host_stats->total_tx_drop_pkts++;
+		/* Could be many reasons, but likely no space in the queue */
+		ret = -ENOBUFS;
+	}
 	goto unlock;
 drop:
 	if (host_stats != NULL) {
@@ -678,6 +703,11 @@ void nrf_wifi_if_init_zep(struct net_if *iface)
 		    nrf_wifi_net_iface_work_handler);
 #endif /* CONFIG_NRF70_DATA_TX */
 
+#ifdef CONFIG_NRF70_SCAN_ONLY
+	/* In scan only mode this interface should be ignored by the connectivity manager */
+	conn_mgr_ignore_iface(iface);
+#endif /* CONFIG_NRF70_SCAN_ONLY */
+
 #ifdef CONFIG_NRF_WIFI_RPU_RECOVERY
 	k_work_init(&vif_ctx_zep->nrf_wifi_rpu_recovery_work,
 		    nrf_wifi_rpu_recovery_work_handler);

drivers/wifi/nrf_wifi/src/wifi_mgmt.c

@@ -203,11 +203,6 @@ int nrf_wifi_get_power_save_config(const struct device *dev,
 
 	fmac_dev_ctx = rpu_ctx_zep->rpu_ctx;
 
-	if (!rpu_ctx_zep) {
-		LOG_ERR("%s: rpu_ctx_zep is NULL", __func__);
-		goto out;
-	}
-
 	vif_ctx_zep->ps_info = ps_config;
 
 	vif_ctx_zep->ps_config_info_evnt = false;

drivers/wifi/nrf_wifi/src/wifi_util.c

@@ -938,10 +938,20 @@ static int nrf_wifi_util_rpu_recovery_info(const struct shell *sh,
 	}
 
 	fmac_dev_ctx = ctx->rpu_ctx;
+	if (!fmac_dev_ctx) {
+		shell_fprintf(sh, SHELL_ERROR, "FMAC context not initialized\n");
+		ret = -ENOEXEC;
+		goto unlock;
+	}
+
 	hal_dev_ctx = fmac_dev_ctx->hal_dev_ctx;
+	if (!hal_dev_ctx) {
+		shell_fprintf(sh, SHELL_ERROR, "HAL context not initialized\n");
+		ret = -ENOEXEC;
+		goto unlock;
+	}
 
-	shell_fprintf(sh,
-		      SHELL_INFO,
+	shell_fprintf(sh, SHELL_INFO,
 		      "wdt_irq_received: %d\n"
 		      "wdt_irq_ignored: %d\n"
 		      "last_wakeup_now_asserted_time_ms: %lu milliseconds\n"
@@ -950,14 +960,11 @@ static int nrf_wifi_util_rpu_recovery_info(const struct shell *sh,
 		      "current time: %lu milliseconds\n"
 		      "rpu_recovery_success: %d\n"
 		      "rpu_recovery_failure: %d\n\n",
-		      hal_dev_ctx->wdt_irq_received,
-		      hal_dev_ctx->wdt_irq_ignored,
+		      ctx->wdt_irq_received, ctx->wdt_irq_ignored,
 		      hal_dev_ctx->last_wakeup_now_asserted_time_ms,
 		      hal_dev_ctx->last_wakeup_now_deasserted_time_ms,
-		      hal_dev_ctx->last_rpu_sleep_opp_time_ms,
-		      current_time_ms,
-		      ctx->rpu_recovery_success,
-		      ctx->rpu_recovery_failure);
+		      hal_dev_ctx->last_rpu_sleep_opp_time_ms, current_time_ms,
+		      ctx->rpu_recovery_success, ctx->rpu_recovery_failure);
 
 	ret = 0;
 unlock:

include/zephyr/drivers/wifi/nrf_wifi/bus/rpu_hw_if.h

@@ -31,6 +31,11 @@ enum {
 	NUM_MEM_BLOCKS
 };
 
+/* Keeping it higher to avoid changing it ofter, but modify this value
+ * if rpu_7002_memmap is changed.
+ */
+#define NRF_WIFI_QSPI_SLAVE_MAX_LATENCY 4
+
 extern char blk_name[][15];
 extern uint32_t rpu_7002_memmap[][3];
 

kernel/Kconfig

@@ -578,7 +578,7 @@ rsource "Kconfig.obj_core"
 menu "System Work Queue Options"
 config SYSTEM_WORKQUEUE_STACK_SIZE
 	int "System workqueue stack size"
-	default 4096 if COVERAGE_GCOV
+	default 4096 if COVERAGE_GCOV || WIFI_NRF70
 	default 2560 if WIFI_NM_WPA_SUPPLICANT
 	default 1024
 

lib/os/zvfs/Kconfig

@@ -25,6 +25,7 @@ if ZVFS_EVENTFD
 
 config ZVFS_EVENTFD_MAX
 	int "Maximum number of ZVFS eventfd's"
+	default 8 if WIFI_NM_WPA_SUPPLICANT
 	default 1
 	range 1 4096
 	help

modules/hostap/Kconfig

@@ -13,19 +13,21 @@ config WIFI_NM_WPA_SUPPLICANT
 	select XSI_SINGLE_PROCESS
 	select NET_SOCKETS
 	select NET_SOCKETS_PACKET
-	select NET_SOCKETPAIR
 	select NET_L2_WIFI_MGMT
 	select WIFI_NM
 	select EXPERIMENTAL
 	select COMMON_LIBC_MALLOC
+	select ZVFS
+	select ZVFS_EVENTFD
 	help
 	  WPA supplicant as a network management backend for WIFI_NM.
 
 if WIFI_NM_WPA_SUPPLICANT
 
 config HEAP_MEM_POOL_ADD_SIZE_HOSTAP
 	def_int 66560 if WIFI_NM_HOSTAPD_AP
-	def_int 55000 if WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
+	def_int 55000 if WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE && WIFI_CREDENTIALS
+	def_int 48000 if WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
 	def_int 41808 if WIFI_NM_WPA_SUPPLICANT_AP
 	# 30K is mandatory, but might need more for long duration use cases
 	def_int 30000
@@ -35,6 +37,8 @@ config WIFI_NM_WPA_SUPPLICANT_THREAD_STACK_SIZE
 	# TODO: Providing higher stack size for Enterprise mode to fix stack
 	# overflow issues. Need to identify the cause for higher stack usage.
 	default 8192 if WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
+	# This is needed to handle stack overflow issues on nRF Wi-Fi drivers.
+	default 5900 if WIFI_NM_WPA_SUPPLICANT_AP
 	default 5800
 
 config WIFI_NM_WPA_SUPPLICANT_WQ_STACK_SIZE
@@ -196,8 +200,14 @@ config WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
 	select MBEDTLS_SERVER_NAME_INDICATION if MBEDTLS_BUILTIN
 	select MBEDTLS_X509_CRL_PARSE_C
 	select MBEDTLS_TLS_VERSION_1_2
+	select NOT_SECURE
 	depends on !WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE
+	help
+	  Enable Enterprise Crypto support for WiFi. This feature
+	  is considered NOT SECURE due the lack of certificate
+	  validation.
 
+if WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
 config EAP_TLS
 	bool "EAP-TLS support"
 
@@ -256,7 +266,8 @@ config EAP_ALL
 	select EAP_GTC
 	select EAP_TTLS
 	select EAP_MSCHAPV2
-	default y if WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
+	default y
+endif # WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
 
 config WIFI_NM_WPA_SUPPLICANT_WPA3
 	bool "WPA3 support"
@@ -300,6 +311,7 @@ config WIFI_NM_HOSTAPD_CRYPTO_ENTERPRISE
 	bool "Hostapd crypto enterprise support"
 	depends on WIFI_NM_HOSTAPD_AP
 
+if WIFI_NM_HOSTAPD_CRYPTO_ENTERPRISE
 config EAP_SERVER_TLS
 	bool "EAP-TLS server support"
 
@@ -328,7 +340,9 @@ config EAP_SERVER_ALL
 	select EAP_SERVER_PEAP
 	select EAP_SERVER_GTC
 	select EAP_SERVER_TTLS
-	default y if WIFI_NM_HOSTAPD_CRYPTO_ENTERPRISE
+	default y
+
+endif # WIFI_NM_HOSTAPD_CRYPTO_ENTERPRISE
 
 config WIFI_NM_WPA_SUPPLICANT_BSS_MAX_IDLE_TIME
 	int "BSS max idle timeout in seconds"