drivers: wifi: nrf7002: Add config to enable dual vif context

Enable dual Virtual Interface (VIF) support for the nRF7002 Wi-Fi driver
by introducing a new Kconfig option: CONFIG_NRF70_WIFI_ENABLE_DUAL_VIF.

Signed-off-by: Hanan Arshad <hananarshad619@gmail.com>

Author: hanan619

drivers/wifi/nrf_wifi/Kconfig.nrfwifi

@@ -88,15 +88,15 @@ config NRF70_AP_MODE
 	depends on WIFI_NM_WPA_SUPPLICANT_AP
 	default y if WIFI_NM_WPA_SUPPLICANT_AP
 
-config NRF70_STA_AP_MODE
-	bool "Simultaneous STA and AP mode"
-	depends on WIFI_NRF7002
-	select NRF70_AP_MODE
-	select NRF70_STA_MODE
-	default n
-	help
-	  Select this option to operate both STA an AP mode simultaneously 
-
+config NRF70_WIFI_ENABLE_DUAL_VIF
+    bool "Enable dual virtual Wi-Fi interfaces"
+    default y if WIFI_NM_MAX_MANAGED_INTERFACES = 2
+    default n
+    depends on WIFI_NRF7002 && NET_L2_ETHERNET
+    help
+      Enable support for two virtual Wi-Fi interfaces (VIFs).
+      When enabled, the driver can operate two VIFs simultaneously,
+      allowing use cases such as one interface in AP mode and another in STA mode.
 
 config NRF70_P2P_MODE
 	bool "P2P support in driver"

drivers/wifi/nrf_wifi/inc/fmac_main.h

@@ -112,7 +112,6 @@ struct nrf_wifi_ctx_zep {
 	bool rf_test_run;
 	unsigned char rf_test;
 #else /* CONFIG_NRF70_RADIO_TEST */
-	unsigned int vif_ctx_cnt;	// Variable to keep track for multiple interfaces
 	struct nrf_wifi_vif_ctx_zep vif_ctx_zep[MAX_NUM_VIFS];
 #ifdef CONFIG_NRF70_UTIL
 	struct rpu_conf_params conf_params;

drivers/wifi/nrf_wifi/src/fmac_main.c

@@ -130,7 +130,6 @@ const char *nrf_wifi_get_drv_version(void)
 	return NRF70_DRIVER_VERSION;
 }
 
-/* If the interface is not Wi-Fi then errors are expected, so, fail silently */
 struct nrf_wifi_vif_ctx_zep *nrf_wifi_get_vif_ctx_by_idx(int index)
 {
 	struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL;
@@ -140,7 +139,7 @@ struct nrf_wifi_vif_ctx_zep *nrf_wifi_get_vif_ctx_by_idx(int index)
 		return NULL;
 	}
 
-	for (int i = 0; i < rpu_ctx_zep->vif_ctx_cnt; i++) {
+	for (int i = 0; i < ARRAY_SIZE(rpu_ctx_zep->vif_ctx_zep); i++) {
 		if (rpu_ctx_zep->vif_ctx_zep[i].vif_idx == index) {
 			vif_ctx_zep = &rpu_ctx_zep->vif_ctx_zep[i];
 			break;
@@ -154,15 +153,15 @@ struct nrf_wifi_vif_ctx_zep *nrf_wifi_get_vif_ctx_by_idx(int index)
 struct nrf_wifi_vif_ctx_zep *nrf_wifi_get_vif_ctx(struct net_if *iface)
 {
 	struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL;
-	struct nrf_wifi_ctx_zep *rpu_ctx_zep = &rpu_drv_priv_zep.rpu_ctx_zep;
+	struct nrf_wifi_ctx_zep *rpu_ctx = &rpu_drv_priv_zep.rpu_ctx_zep;
 
-	if (!iface || !rpu_ctx_zep || !rpu_ctx_zep->rpu_ctx) {
+	if (!iface || !rpu_ctx || !rpu_ctx->rpu_ctx) {
 		return NULL;
 	}
 
-	for (int i = 0; i < rpu_ctx_zep->vif_ctx_cnt; i++) {
-		if (rpu_ctx_zep->vif_ctx_zep[i].zep_net_if_ctx == iface) {
-			vif_ctx_zep = &rpu_ctx_zep->vif_ctx_zep[i];
+	for (int i = 0; i < ARRAY_SIZE(rpu_ctx->vif_ctx_zep); i++) {
+		if (rpu_ctx->vif_ctx_zep[i].zep_net_if_ctx == iface) {
+			vif_ctx_zep = &rpu_ctx->vif_ctx_zep[i];
 			break;
 		}
 	}
@@ -441,6 +440,7 @@ void nrf_wifi_event_proc_cookie_rsp(void *vif_ctx,
 	struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL;
 	struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
 	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = NULL;
+	unsigned int vif_ctx_cnt = 0;
 
 	vif_ctx_zep = vif_ctx;
 
@@ -451,6 +451,7 @@ void nrf_wifi_event_proc_cookie_rsp(void *vif_ctx,
 
 	rpu_ctx_zep = vif_ctx_zep->rpu_ctx_zep;
 	fmac_dev_ctx = rpu_ctx_zep->rpu_ctx;
+	vif_ctx_cnt = nrf_wifi_fmac_get_num_vifs(rpu_ctx_zep->rpu_ctx);
 
 	LOG_DBG("%s: cookie_rsp_event->cookie = %llx", __func__, cookie_rsp_event->cookie);
 	LOG_DBG("%s: host_cookie = %llx", __func__, cookie_rsp_event->host_cookie);
@@ -462,8 +463,11 @@ void nrf_wifi_event_proc_cookie_rsp(void *vif_ctx,
 		cookie_rsp_event->mac_addr[4],
 		cookie_rsp_event->mac_addr[5]);
 
-	for(int i = 0; i < rpu_ctx_zep->vif_ctx_cnt; ++i) {
-		rpu_ctx_zep->vif_ctx_zep[i].cookie_resp_received = true;
+	/* Notify all vif */
+	for(int idx = 0; idx < vif_ctx_cnt; ++idx) {
+		vif_ctx_zep = nrf_wifi_get_vif_ctx_by_idx(idx);
+		if(vif_ctx_zep)
+			vif_ctx_zep->cookie_resp_received = true;
 	}	
 	/* TODO: When supp_callbk_fns.mgmt_tx_status is implemented, add logic
 	 * here to use the cookie and host_cookie to map requests to responses.
@@ -737,16 +741,14 @@ static int nrf_wifi_drv_main_zep(const struct device *dev)
 	struct rx_buf_pool_params rx_buf_pools[MAX_NUM_OF_RX_QUEUES];
 	struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = dev->data;
 	struct nrf_wifi_ctx_zep *rpu_ctx_zep = &rpu_drv_priv_zep.rpu_ctx_zep;
+	unsigned int vif_ctx_cnt = nrf_wifi_fmac_get_num_vifs(rpu_ctx_zep->rpu_ctx);
 
-	vif_ctx_zep->rpu_ctx_zep = rpu_ctx_zep;
-
-	if(rpu_ctx_zep->vif_ctx_cnt >= MAX_NUM_VIFS){
+	if(vif_ctx_cnt >= MAX_NUM_VIFS){
 		LOG_ERR("%s: Max number of VIFs reached", __func__);
 		return -ENOMEM;
-	}	
+	}
 
-	rpu_ctx_zep->vif_ctx_cnt++;
-	if (rpu_ctx_zep->vif_ctx_cnt > 1) {
+	if (vif_ctx_cnt > 1) {
 		// FMAC is already initialized for VIF-0
 		return 0;
 	}
@@ -976,7 +978,7 @@ ETH_NET_DEVICE_DT_INST_DEFINE(0,
 		    CONFIG_WIFI_INIT_PRIORITY, /* prio */
 		    &wifi_offload_ops, /* api */
 		    CONFIG_NRF_WIFI_IFACE_MTU); /*mtu */
-#ifdef CONFIG_NRF70_STA_AP_MODE
+#ifdef CONFIG_NRF70_WIFI_ENABLE_DUAL_VIF
 // Register second interface
 ETH_NET_DEVICE_DT_INST_DEFINE(1,
 				nrf_wifi_drv_main_zep, /* init_fn */