[nrf fromtree] drivers: nrf_wifi: Rejig band config

nRF71 supports tri-band, so, to cater both nRF70 and nRF71, rejig the
configuration and add a helper to convert from Kconfig to the interface
structs.

Signed-off-by: Chaitanya Tata <[email protected]>
(cherry picked from commit 9a13407)

Author: krish2718

drivers/wifi/nrf_wifi/Kconfig.nrfwifi

@@ -665,28 +665,27 @@ config WIFI_NRF70_SCAN_TIMEOUT_S
 	int "Scan timeout in seconds"
 	default 30
 
-menu "nRF Wi-Fi operation band(s)"
-	visible if !NRF70_2_4G_ONLY
+choice NRF_WIFI_OP_BAND
+	prompt "nRF Wi-Fi operation bands"
+	default NRF_WIFI_2G_BAND if NRF70_2_4G_ONLY
+	default NRF_WIFI_ALL_BAND
+
+config NRF_WIFI_ALL_BAND
+	bool "Set operation band to all supported bands"
 
 config NRF_WIFI_2G_BAND
 	bool "Set operation band to 2.4GHz"
-	default y if NRF70_2_4G_ONLY
 
 config NRF_WIFI_5G_BAND
 	bool "Set operation band to 5GHz"
-	depends on !NRF70_2_4G_ONLY
-
-config NRF_WIFI_OP_BAND
-	int "Options to set operation band"
-	default 1 if NRF_WIFI_2G_BAND
-	default 2 if NRF_WIFI_5G_BAND
-	default 3
-	help
-	  Set this option to select frequency band
-	  1 - 2.4GHz
-	  2 - 5GHz
-	  3 - All ( 2.4GHz and 5GHz )
-endmenu
+if NRF71_ON_IPC
+config NRF_WIFI_6G_BAND
+	bool "Set operation band to 6GHz"
+
+config NRF_WIFI_DUAL_BAND
+	bool "Set operation band to 2.4GHz and 5GHz"
+endif # NRF71_ON_IPC
+endchoice
 
 config NRF_WIFI_IFACE_MTU
 	int "MTU for Wi-Fi interface"

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

@@ -128,6 +128,25 @@ static int bytes_from_str(uint8_t *buf, int buf_len, const char *src)
 }
 #endif /* CONFIG_WIFI_FIXED_MAC_ADDRESS_ENABLED */
 
+static enum op_band get_nrf_wifi_op_band(void)
+{
+	if (IS_ENABLED(CONFIG_NRF_WIFI_2G_BAND)) {
+		return BAND_24G;
+	}
+#ifdef CONFIG_NRF71_ON_IPC
+	if (IS_ENABLED(CONFIG_NRF_WIFI_5G_BAND)) {
+		return BAND_5G;
+	}
+	if (IS_ENABLED(CONFIG_NRF_WIFI_6G_BAND)) {
+		return BAND_6G;
+	}
+	if (IS_ENABLED(CONFIG_NRF_WIFI_DUAL_BAND)) {
+		return BAND_DUAL;
+	}
+#endif /* CONFIG_NRF71_ON_IPC */
+	return BAND_ALL;
+}
+
 int nrf70_off_raw_tx_init(uint8_t *mac_addr, unsigned char *country_code)
 {
 	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
@@ -138,6 +157,7 @@ int nrf70_off_raw_tx_init(uint8_t *mac_addr, unsigned char *country_code)
 	struct nrf_wifi_board_params board_params;
 	unsigned int fw_ver = 0;
 	k_spinlock_key_t key;
+	enum op_band op_band = get_nrf_wifi_op_band();
 
 	/* The OSAL layer needs to be initialized before any other initialization
 	 * so that other layers (like FW IF,HW IF etc) have access to OS ops
@@ -202,7 +222,7 @@ int nrf70_off_raw_tx_init(uint8_t *mac_addr, unsigned char *country_code)
 						   HW_SLEEP_ENABLE,
 #endif /* CONFIG_NRF_WIFI_LOW_POWER */
 						   NRF_WIFI_DEF_PHY_CALIB,
-						   CONFIG_NRF_WIFI_OP_BAND,
+						   op_band,
 						   IS_ENABLED(CONFIG_NRF_WIFI_BEAMFORMING),
 						   &ctrl_params,
 						   &ceil_params,

drivers/wifi/nrf_wifi/src/fmac_main.c

@@ -587,12 +587,32 @@ void configure_board_dep_params(struct nrf_wifi_board_params *board_params)
 }
 #endif /* CONFIG_NRF71_ON_IPC */
 
+static enum op_band get_nrf_wifi_op_band(void)
+{
+	if (IS_ENABLED(CONFIG_NRF_WIFI_2G_BAND)) {
+		return BAND_24G;
+	}
+#ifdef CONFIG_NRF71_ON_IPC
+	if (IS_ENABLED(CONFIG_NRF_WIFI_5G_BAND)) {
+		return BAND_5G;
+	}
+
+	if (IS_ENABLED(CONFIG_NRF_WIFI_6G_BAND)) {
+		return BAND_6G;
+	}
+	if (IS_ENABLED(CONFIG_NRF_WIFI_DUAL_BAND)) {
+		return BAND_DUAL;
+	}
+#endif /* CONFIG_NRF71_ON_IPC */
+	return BAND_ALL;
+}
+
 enum nrf_wifi_status nrf_wifi_fmac_dev_add_zep(struct nrf_wifi_drv_priv_zep *drv_priv_zep)
 {
 	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
 	struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
 	void *rpu_ctx = NULL;
-	enum op_band op_band = CONFIG_NRF_WIFI_OP_BAND;
+	enum op_band op_band = get_nrf_wifi_op_band();
 #ifdef CONFIG_NRF_WIFI_LOW_POWER
 	int sleep_type = -1;