[nrf fromlist] drivers: nrf_wifi: Convert utility shell to a sub shell

Convert the utility shell for nRF70 to a sub-shell under a nRF70
specific shell.

Upstream PR #: 87823

Signed-off-by: Sachin D Kulkarni <[email protected]>

Author: sachinthegreen

drivers/wifi/nrf_wifi/CMakeLists.txt

@@ -58,12 +58,17 @@ zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
 zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
   src/wpa_supp_if.c)
 
-zephyr_library_sources_ifdef(CONFIG_NRF70_UTIL
-  src/wifi_util.c
+if(CONFIG_NRF70_UTIL_SHELL OR CONFIG_NRF70_DEBUG_SHELL)
+  zephyr_library_sources(
+  src/shell.c
+)
+endif()
+
+zephyr_library_sources_ifdef(CONFIG_NRF70_UTIL_SHELL
+  src/util_shell.c
 )
 
 zephyr_library_sources_ifdef(CONFIG_NRF70_DEBUG_SHELL
-  src/shell.c
   src/debug_shell.c
 )
 

drivers/wifi/nrf_wifi/Kconfig.nrfwifi

@@ -194,7 +194,7 @@ config NRF70_MAX_TX_PENDING_QLEN
 	int "Maximum number of pending TX packets"
 	default 18
 
-config NRF70_UTIL
+config NRF70_UTIL_SHELL
 	depends on SHELL
 	bool "Utility shell in nRF70 driver"
 

drivers/wifi/nrf_wifi/inc/fmac_main.h

@@ -104,9 +104,9 @@ struct nrf_wifi_ctx_zep {
 	unsigned char rf_test;
 #else /* CONFIG_NRF70_RADIO_TEST */
 	struct nrf_wifi_vif_ctx_zep vif_ctx_zep[MAX_NUM_VIFS];
-#ifdef CONFIG_NRF70_UTIL
+#ifdef CONFIG_NRF70_UTIL_SHELL
 	struct rpu_conf_params conf_params;
-#endif /* CONFIG_NRF70_UTIL */
+#endif /* CONFIG_NRF70_UTIL_SHELL */
 #endif /* CONFIG_NRF70_RADIO_TEST */
 	unsigned char *extended_capa, *extended_capa_mask;
 	unsigned int extended_capa_len;

drivers/wifi/nrf_wifi/src/wifi_util.c renamed to drivers/wifi/nrf_wifi/src/util_shell.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Nordic Semiconductor ASA
+ * Copyright (c) 2025 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -12,7 +12,7 @@
 #include "common/fmac_util.h"
 #include "system/fmac_api.h"
 #include "fmac_main.h"
-#include "wifi_util.h"
+#include "util_shell.h"
 
 extern struct nrf_wifi_drv_priv_zep rpu_drv_priv_zep;
 struct nrf_wifi_ctx_zep *ctx = &rpu_drv_priv_zep.rpu_ctx_zep;
@@ -964,7 +964,7 @@ static int nrf_wifi_util_rpu_recovery_info(const struct shell *sh,
 #endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
 
 SHELL_STATIC_SUBCMD_SET_CREATE(
-	nrf_wifi_util_subcmds,
+	nrf70_util,
 	SHELL_CMD_ARG(he_ltf,
 		      NULL,
 		      "0 - 1x HE LTF\n"
@@ -1069,11 +1069,10 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 	SHELL_SUBCMD_SET_END);
 
 
-SHELL_CMD_REGISTER(wifi_util,
-		   &nrf_wifi_util_subcmds,
-		   "nRF Wi-Fi utility shell commands",
-		   NULL);
-
+SHELL_SUBCMD_ADD((nrf70), util, &nrf70_util,
+		   "nRF70 utility commands\n",
+		   NULL,
+		   0, 0);
 
 static int nrf_wifi_util_init(void)
 {

drivers/wifi/nrf_wifi/src/wifi_util.h renamed to drivers/wifi/nrf_wifi/src/util_shell.h

@@ -67,7 +67,7 @@ tests:
       - nucleo_h723zg
   sample.net.wifi.nrf7002eb:
     extra_args:
-      - CONFIG_NRF70_UTIL=y
+      - CONFIG_NRF70_UTIL_SHELL=y
       - CONFIG_BUILD_ONLY_NO_BLOBS=y
       - SHIELD=nrf7002eb
     platform_allow:

samples/net/wifi/shell/sample.yaml

@@ -19,7 +19,7 @@ CONFIG_NVS=n
 CONFIG_SETTINGS=n
 
 # Debugging
-CONFIG_NRF70_UTIL=y
+CONFIG_NRF70_UTIL_SHELL=y
 CONFIG_SYS_HEAP_RUNTIME_STATS=y
 CONFIG_NET_STATISTICS=y
 CONFIG_NET_STATISTICS_WIFI=y