Merge "cnss2: modify bus width type and current_bw_vote"

drivers/net/wireless/cnss2/main.h

@@ -193,14 +193,12 @@ struct cnss_bus_bw_info {
  * struct cnss_interconnect_cfg - CNSS platform interconnect config
  * @list_head: List of interconnect path bandwidth configs
  * @path_count: Count of interconnect path configured in device tree
- * @current_bw_vote: WLAN driver provided bandwidth vote
  * @bus_bw_cfg_count: Number of bandwidth configs for voting. It is the array
  *                    size of struct cnss_bus_bw_info.cfg_table
  */
 struct cnss_interconnect_cfg {
 	struct list_head list_head;
 	u32 path_count;
-	int current_bw_vote;
 	u32 bus_bw_cfg_count;
 };
 
@@ -524,6 +522,8 @@ struct cnss_plat_data {
 	bool adsp_pc_enabled;
 	u64 feature_list;
 	u8 charger_mode;
+	/* WLAN driver provided bandwidth vote */
+	int current_bw_vote;
 };
 
 #if IS_ENABLED(CONFIG_ARCH_QCOM)

drivers/net/wireless/cnss2/pci.c

@@ -842,7 +842,7 @@ static int cnss_setup_bus_bandwidth(struct cnss_plat_data *plat_priv,
 		}
 	}
 	if (ret == 0 && save)
-		plat_priv->icc.current_bw_vote = bw;
+		plat_priv->current_bw_vote = bw;
 	return ret;
 }
 
@@ -3463,7 +3463,7 @@ int cnss_auto_resume(struct device *dev)
 	cnss_pci_set_auto_suspended(pci_priv, 0);
 	mutex_unlock(&pci_priv->bus_lock);
 
-	cnss_request_bus_bandwidth(dev, plat_priv->icc.current_bw_vote);
+	cnss_request_bus_bandwidth(dev, plat_priv->current_bw_vote);
 
 	return 0;
 }

include/net/cnss2.h

@@ -23,6 +23,8 @@ enum cnss_bus_width_type {
 	CNSS_BUS_WIDTH_MEDIUM,
 	CNSS_BUS_WIDTH_HIGH,
 	CNSS_BUS_WIDTH_VERY_HIGH,
+	CNSS_BUS_WIDTH_ULTRA_HIGH,
+	CNSS_BUS_WIDTH_MAX,
 	CNSS_BUS_WIDTH_LOW_LATENCY
 };