qcacld-3.0: Post disconnection DUT should connect in max BW

Scenarios are:
    1. Connect to AP in HE80/HE160
    2. Set the bandwidth to 20 MHz (SET_MAX_BANDWIDTH 1)
    3. Disconnect from AP
    4. Reconnect to AP.
    5. AP should be connected to the max bandwidth.

To fix this, host should update channel bandwidth to
the max supported bandwidth on disconnection.

Change-Id: I139d082ca4e4950d760f1da074dbcc021fb8a9e1
CRs-Fixed: 3491677

components/umac/mlme/connection_mgr/core/src/wlan_cm_vdev_disconnect.c

@@ -252,7 +252,6 @@ cm_disconnect_complete_ind(struct wlan_objmgr_vdev *vdev,
 	wlan_tdls_notify_sta_disconnect(vdev_id, false, false, vdev);
 	policy_mgr_decr_session_set_pcl(psoc, op_mode, vdev_id);
 	wlan_clear_mlo_sta_link_removed_flag(vdev);
-	cm_update_associated_ch_width(vdev, false);
 
 	return QDF_STATUS_SUCCESS;
 }

core/hdd/src/wlan_hdd_cfg.c

@@ -2224,7 +2224,7 @@ int hdd_update_channel_width(struct hdd_adapter *adapter,
 	struct hdd_context *hdd_ctx;
 	struct sme_config_params *sme_config;
 	int ret;
-	enum phy_ch_width ch_width;
+	enum phy_ch_width ch_width = CH_WIDTH_INVALID;
 	QDF_STATUS status;
 
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
@@ -2233,7 +2233,8 @@ int hdd_update_channel_width(struct hdd_adapter *adapter,
 		return -EINVAL;
 	}
 
-	if (ucfg_mlme_is_chwidth_with_notify_supported(hdd_ctx->psoc)) {
+	if (ucfg_mlme_is_chwidth_with_notify_supported(hdd_ctx->psoc) &&
+	    hdd_cm_is_vdev_connected(adapter)) {
 		ch_width = hdd_convert_chwidth_to_phy_chwidth(chwidth);
 		hdd_debug("vdev %d : process update ch width request to %d",
 			  adapter->deflink->vdev_id, ch_width);
@@ -2261,10 +2262,6 @@ int hdd_update_channel_width(struct hdd_adapter *adapter,
 			  adapter->deflink->vdev_id, chwidth);
 	sme_set_eht_bw_cap(hdd_ctx->mac_handle,
 			   adapter->deflink->vdev_id, chwidth);
-	sme_set_vdev_ies_per_band(hdd_ctx->mac_handle,
-				  adapter->deflink->vdev_id,
-				  adapter->device_mode);
-
 free_config:
 	qdf_mem_free(sme_config);
 	return ret;

core/hdd/src/wlan_hdd_cm_disconnect.c

@@ -50,6 +50,7 @@
 #include "wma_api.h"
 #include "wlan_hdd_hostapd.h"
 #include "wlan_dp_ucfg_api.h"
+#include "wma.h"
 
 void hdd_handle_disassociation_event(struct hdd_adapter *adapter,
 				     struct qdf_mac_addr *peer_macaddr)
@@ -457,6 +458,72 @@ static void hdd_cm_reset_udp_qos_upgrade_config(struct hdd_adapter *adapter)
 	}
 }
 
+#ifdef WLAN_FEATURE_11BE
+static inline enum eSirMacHTChannelWidth get_max_bw(void)
+{
+	uint32_t max_bw = wma_get_eht_ch_width();
+
+	if (max_bw == WNI_CFG_EHT_CHANNEL_WIDTH_320MHZ)
+		return eHT_CHANNEL_WIDTH_320MHZ;
+	else if (max_bw == WNI_CFG_VHT_CHANNEL_WIDTH_160MHZ)
+		return eHT_CHANNEL_WIDTH_160MHZ;
+	else if (max_bw == WNI_CFG_VHT_CHANNEL_WIDTH_80_PLUS_80MHZ)
+		return eHT_CHANNEL_WIDTH_80P80MHZ;
+	else if (max_bw == WNI_CFG_VHT_CHANNEL_WIDTH_80MHZ)
+		return eHT_CHANNEL_WIDTH_80MHZ;
+	else
+		return eHT_CHANNEL_WIDTH_40MHZ;
+}
+#else
+static inline enum eSirMacHTChannelWidth get_max_bw(void)
+{
+	uint32_t max_bw = wma_get_vht_ch_width();
+
+	if (max_bw == WNI_CFG_VHT_CHANNEL_WIDTH_160MHZ)
+		return eHT_CHANNEL_WIDTH_160MHZ;
+	else if (max_bw == WNI_CFG_VHT_CHANNEL_WIDTH_80_PLUS_80MHZ)
+		return eHT_CHANNEL_WIDTH_80P80MHZ;
+	else if (max_bw == WNI_CFG_VHT_CHANNEL_WIDTH_80MHZ)
+		return eHT_CHANNEL_WIDTH_80MHZ;
+	else
+		return eHT_CHANNEL_WIDTH_40MHZ;
+}
+#endif
+
+static void hdd_cm_restore_ch_width(struct wlan_objmgr_vdev *vdev,
+				    struct hdd_adapter *adapter)
+{
+	struct mlme_legacy_priv *mlme_priv;
+	enum eSirMacHTChannelWidth max_bw;
+	struct wlan_channel *des_chan;
+	int ret;
+	uint8_t vdev_id = wlan_vdev_get_id(vdev);
+
+	mlme_priv = wlan_vdev_mlme_get_ext_hdl(vdev);
+	if (!mlme_priv)
+		return;
+
+	des_chan = wlan_vdev_mlme_get_des_chan(vdev);
+	if (!des_chan)
+		return;
+
+	if (mlme_priv->connect_info.ch_width_orig == CH_WIDTH_INVALID ||
+	    mlme_priv->connect_info.ch_width_orig == des_chan->ch_width)
+		return;
+
+	cm_update_associated_ch_width(vdev, false);
+
+	max_bw = get_max_bw();
+	ret = hdd_set_mac_chan_width(adapter, max_bw);
+	if (ret) {
+		hdd_err("vdev %d : fail to set max ch width", vdev_id);
+		return;
+	}
+
+	hdd_debug("vdev %d : updated ch width to: %d on disconnection", vdev_id,
+		  max_bw);
+}
+
 static QDF_STATUS
 hdd_cm_disconnect_complete_post_user_update(struct wlan_objmgr_vdev *vdev,
 					    struct wlan_cm_discon_rsp *rsp)
@@ -481,6 +548,13 @@ hdd_cm_disconnect_complete_post_user_update(struct wlan_objmgr_vdev *vdev,
 				adapter, FTM_TIME_SYNC_STA_DISCONNECTED);
 	}
 
+	/*
+	 * via the SET_MAX_BANDWIDTH command, the upper layer can update channel
+	 * width. The host should update channel bandwidth to the max supported
+	 * bandwidth on disconnection so that post disconnection DUT can
+	 * connect in max BW.
+	 */
+	hdd_cm_restore_ch_width(vdev, adapter);
 	hdd_cm_set_default_wlm_mode(adapter);
 	__hdd_cm_disconnect_handler_post_user_update(adapter, vdev);
 	wlan_twt_concurrency_update(hdd_ctx);