qcacmn: Remove unused and duplicate members from vdev_start_params

Remove the unused fields from WMI unified vdev_start_params structure.
The channel information duplicated in vdev_start_params and
it sub structure channel is removed and all implementations
can use the channel sub structure directly.

Change-Id: I47cf4c4223111b6f564ec8336dbfcda4592e8e0c
CRs-Fixed: 2350505

wmi/inc/wmi_unified_param.h

@@ -744,56 +744,31 @@ enum wmi_bcn_tx_rate_code {
 /**
  * struct vdev_start_params - vdev start cmd parameter
  * @vdev_id: vdev id
- * @chan_freq: channel frequency
- * @chan_mode: channel mode
- * @band_center_freq1: center freq 1
- * @band_center_freq2: center freq 2
  * @flags: flags to set like pmf_enabled etc.
- * @is_dfs: flag to check if dfs enabled
  * @beacon_intval: beacon interval
  * @dtim_period: dtim period
- * @max_txpow: max tx power
  * @is_restart: flag to check if it is vdev
- * @ssid: ssid and ssid length info
+ * @disable_hw_ack: to update disable hw ack flag
+ * @hidden_ssid: hidden ssid
+ * @pmf_enabled: pmf enabled
+ * @ssid: ssid MAC
+ * @num_noa_descriptors: number of noa descriptors
  * @preferred_tx_streams: preferred tx streams
  * @preferred_rx_streams: preferred rx streams
- * @intr_update: flag to check if need to update
- *               required wma interface params
- * @intr_ssid: pointer to wma interface ssid
- * @intr_flags: pointer to wma interface flags
- * @requestor_id: to update requestor id
- * @disable_hw_ack: to update disable hw ack flag
- * @info: to update channel info
- * @reg_info_1: to update min power, max power,
- *              reg power and reg class id
- * @reg_info_2: to update antennamax
  * @cac_duration_ms: cac duration in milliseconds
  * @regdomain: Regulatory domain
- * @oper_mode: Operating mode
+ * @he_ops: HE ops
- * @dfs_pri_multiplier: DFS primary multiplier
- *    allow pulse if they are within multiple of PRI for the radar type
- * @dot11_mode: Phy mode (VHT20/VHT80...)
- * @disable_hw_ack: Disable hw ack if chan is dfs channel for cac
  * @channel_param: Channel params required by target.
  * @bcn_tx_rate_code: Beacon tx rate code.
  * @ldpc_rx_enabled: Enable/Disable LDPC RX for this vdev
  */
 struct vdev_start_params {
 	uint8_t vdev_id;
-	uint32_t chan_freq;
-	uint32_t chan_mode;
-	uint32_t band_center_freq1;
-	uint32_t band_center_freq2;
 	uint32_t flags;
-	bool is_dfs;
 	uint32_t beacon_intval;
 	uint32_t dtim_period;
-	int32_t max_txpow;
 	bool is_restart;
-	bool is_half_rate;
+	uint32_t disable_hw_ack;
-	bool is_quarter_rate;
-	uint32_t dis_hw_ack;
-	uint32_t flag_dfs;
 	uint8_t hidden_ssid;
 	uint8_t pmf_enabled;
 	struct mac_ssid ssid;
@@ -803,13 +778,7 @@ struct vdev_start_params {
 	uint32_t cac_duration_ms;
 	uint32_t regdomain;
 	uint32_t he_ops;
-#ifndef CONFIG_MCL
-	uint8_t oper_mode;
-	int32_t dfs_pri_multiplier;
-	uint8_t dot11_mode;
-	uint8_t disable_hw_ack;
 	struct channel_param channel;
-#endif
 	enum wmi_bcn_tx_rate_code bcn_tx_rate_code;
 	bool ldpc_rx_enabled;
 };

wmi/src/wmi_unified_ocb_ut.c

@@ -403,10 +403,11 @@ static QDF_STATUS fake_vdev_start_cmd_tlv(wmi_unified_t wmi_handle,
 		"beacon interval %d dtim %d center_chan %d center_freq2 %d "
 		"max_txpow: 0x%x "
 		"Tx SS %d, Rx SS %d, ldpc_rx: %d, cac %d, regd %d, HE ops: %d",
-		__func__, (int)req->vdev_id, req->chan_freq, req->chan_mode,
+		__func__, (int)req->vdev_id, req->channel.mhz,
-		(int)req->is_dfs, req->beacon_intval, req->dtim_period,
+		req->channel.phy_mode,
-		req->band_center_freq1, req->band_center_freq2,
+		(int)req->channel.dfs_set, req->beacon_intval, req->dtim_period,
-		req->max_txpow,
+		req->channel.cfreq1, req->channel.cfreq2,
+		req->channel.maxregpower,
 		req->preferred_tx_streams, req->preferred_rx_streams,
 		(int)req->ldpc_rx_enabled, req->cac_duration_ms,
 		req->regdomain, req->he_ops);

wmi/src/wmi_unified_tlv.c

@@ -409,34 +409,6 @@ static QDF_STATUS send_vdev_down_cmd_tlv(wmi_unified_t wmi, uint8_t vdev_id)
 	return 0;
 }
 
-#ifdef CONFIG_MCL
-static inline void copy_channel_info(
-		wmi_vdev_start_request_cmd_fixed_param * cmd,
-		wmi_channel *chan,
-		struct vdev_start_params *req)
-{
-	chan->mhz = req->chan_freq;
-
-	WMI_SET_CHANNEL_MODE(chan, req->chan_mode);
-
-	chan->band_center_freq1 = req->band_center_freq1;
-	chan->band_center_freq2 = req->band_center_freq2;
-
-	if (req->is_half_rate)
-		WMI_SET_CHANNEL_FLAG(chan, WMI_CHAN_FLAG_HALF_RATE);
-	else if (req->is_quarter_rate)
-		WMI_SET_CHANNEL_FLAG(chan, WMI_CHAN_FLAG_QUARTER_RATE);
-
-	if (req->is_dfs && req->flag_dfs) {
-		WMI_SET_CHANNEL_FLAG(chan, req->flag_dfs);
-		cmd->disable_hw_ack = req->dis_hw_ack;
-	}
-
-	WMI_SET_CHANNEL_REG_POWER(chan, req->max_txpow);
-	WMI_SET_CHANNEL_MAX_TX_POWER(chan, req->max_txpow);
-
-}
-#else
 static inline void copy_channel_info(
 		wmi_vdev_start_request_cmd_fixed_param * cmd,
 		wmi_channel *chan,
@@ -448,15 +420,12 @@ static inline void copy_channel_info(
 
 	chan->band_center_freq1 = req->channel.cfreq1;
 	chan->band_center_freq2 = req->channel.cfreq2;
-	WMI_LOGI("%s: req->channel.phy_mode: %d ", req->channel.phy_mode);
 
 	if (req->channel.half_rate)
 		WMI_SET_CHANNEL_FLAG(chan, WMI_CHAN_FLAG_HALF_RATE);
 	else if (req->channel.quarter_rate)
 		WMI_SET_CHANNEL_FLAG(chan, WMI_CHAN_FLAG_QUARTER_RATE);
 
-	WMI_LOGI("%s: req->channel.dfs_set: %d ", req->channel.dfs_set);
-
 	if (req->channel.dfs_set) {
 		WMI_SET_CHANNEL_FLAG(chan, WMI_CHAN_FLAG_DFS);
 		cmd->disable_hw_ack = req->disable_hw_ack;
@@ -477,7 +446,7 @@ static inline void copy_channel_info(
 	WMI_SET_CHANNEL_MAX_TX_POWER(chan, req->channel.maxregpower);
 
 }
-#endif
+
 /**
  * send_vdev_start_cmd_tlv() - send vdev start request to fw
  * @wmi_handle: wmi handle
@@ -560,14 +529,14 @@ static QDF_STATUS send_vdev_start_cmd_tlv(wmi_unified_t wmi_handle,
 		"reg_info_1: 0x%x reg_info_2: 0x%x, req->max_txpow: 0x%x "
 		"Tx SS %d, Rx SS %d, ldpc_rx: %d, cac %d, regd %d, HE ops: %d"
 		"req->dis_hw_ack: %d ", __func__, req->vdev_id,
-		chan->mhz, req->chan_mode, chan->info,
+		chan->mhz, req->channel.phy_mode, chan->info,
-		req->is_dfs, req->beacon_intval, cmd->dtim_period,
+		req->channel.dfs_set, req->beacon_intval, cmd->dtim_period,
 		chan->band_center_freq1, chan->band_center_freq2,
-		chan->reg_info_1, chan->reg_info_2, req->max_txpow,
+		chan->reg_info_1, chan->reg_info_2, req->channel.maxregpower,
 		req->preferred_tx_streams, req->preferred_rx_streams,
 		req->ldpc_rx_enabled, req->cac_duration_ms,
 		req->regdomain, req->he_ops,
-		req->dis_hw_ack);
+		req->disable_hw_ack);
 
 	if (req->is_restart) {
 		wmi_mtrace(WMI_VDEV_RESTART_REQUEST_CMDID, cmd->vdev_id, 0);