qcacld-3.0: Set max supported BW for STA

Set MAX supported BW for STA so that the device can connect
to APs which are advertizing 20 MHz in beacons but increases
in association response and next beacon.

Change-Id: I8ed418382f696c7461235996c4e90201cafafcb3
CRs-Fixed: 3415718

components/mlme/dispatcher/inc/wlan_mlme_api.h

@@ -4337,4 +4337,14 @@ wlan_mlme_get_src_addr_from_frame(struct element_info *frame);
  */
 bool
 wlan_mlme_get_sap_ps_with_twt(struct wlan_objmgr_psoc *psoc);
+
+/**
+ * wlan_mlme_get_max_bw() - Get max supported bandwidth
+ *
+ * Extract max supported bandwidth
+ *
+ * Return: enum phy_ch_width
+ *
+ */
+enum phy_ch_width wlan_mlme_get_max_bw(void);
 #endif /* _WLAN_MLME_API_H_ */

components/mlme/dispatcher/src/wlan_mlme_api.c

@@ -1215,6 +1215,35 @@ void wlan_mlme_set_usr_disable_sta_eht(struct wlan_objmgr_psoc *psoc,
 	mlme_obj->cfg.sta.usr_disable_eht = disable;
 }
 
+enum phy_ch_width wlan_mlme_get_max_bw(void)
+{
+	uint32_t max_bw = wma_get_eht_ch_width();
+
+	if (max_bw == WNI_CFG_EHT_CHANNEL_WIDTH_320MHZ)
+		return CH_WIDTH_320MHZ;
+	else if (max_bw == WNI_CFG_VHT_CHANNEL_WIDTH_160MHZ)
+		return CH_WIDTH_160MHZ;
+	else if (max_bw == WNI_CFG_VHT_CHANNEL_WIDTH_80_PLUS_80MHZ)
+		return CH_WIDTH_80P80MHZ;
+	else if (max_bw == WNI_CFG_VHT_CHANNEL_WIDTH_80MHZ)
+		return CH_WIDTH_80MHZ;
+	else
+		return CH_WIDTH_40MHZ;
+}
+#else
+enum phy_ch_width wlan_mlme_get_max_bw(void)
+{
+	uint32_t max_bw = wma_get_vht_ch_width();
+
+	if (max_bw == WNI_CFG_VHT_CHANNEL_WIDTH_160MHZ)
+		return CH_WIDTH_160MHZ;
+	else if (max_bw == WNI_CFG_VHT_CHANNEL_WIDTH_80_PLUS_80MHZ)
+		return CH_WIDTH_80P80MHZ;
+	else if (max_bw == WNI_CFG_VHT_CHANNEL_WIDTH_80MHZ)
+		return CH_WIDTH_80MHZ;
+	else
+		return CH_WIDTH_40MHZ;
+}
 #endif
 
 #ifdef WLAN_FEATURE_11BE_MLO
@@ -6750,6 +6779,7 @@ static QDF_STATUS wlan_mlme_update_ch_width(struct wlan_objmgr_vdev *vdev,
 	uint16_t curr_op_freq;
 	struct ch_params ch_params = {0};
 	struct wlan_objmgr_pdev *pdev;
+	QDF_STATUS status;
 
 	des_chan = wlan_vdev_mlme_get_des_chan(vdev);
 	if (!des_chan)
@@ -6778,6 +6808,12 @@ static QDF_STATUS wlan_mlme_update_ch_width(struct wlan_objmgr_vdev *vdev,
 	des_chan->ch_cfreq1 = ch_params.mhz_freq_seg0;
 	des_chan->ch_cfreq2 = ch_params.mhz_freq_seg1;
 
+	status = wlan_update_peer_phy_mode(des_chan, vdev);
+	if (QDF_IS_STATUS_ERROR(status)) {
+		mlme_err("Failed to update phymode");
+		return QDF_STATUS_E_INVAL;
+	}
+
 	qdf_mem_copy(bss_chan, des_chan, sizeof(struct wlan_channel));
 
 	mlme_legacy_debug("vdev id %d freq %d seg0 %d seg1 %d ch_width %d mhz seg0 %d mhz seg1 %d",

components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_api.h

@@ -2096,4 +2096,17 @@ wlan_cm_roam_is_mlo_ap(struct wlan_objmgr_vdev *vdev)
 	return false;
 }
 #endif /* WLAN_FEATURE_11BE_MLO && WLAN_FEATURE_ROAM_OFFLOAD */
+
+/**
+ * wlan_update_peer_phy_mode() - update phymode in peer object
+ * @des_chan: wlan_channel pointer contain new ch_freq
+ * @vdev: vdev pointer
+ *
+ * Return: QDF_STATUS_SUCCESS if peer object phymode is set otherwise
+ *         QDF_STATUS_E_INVAL
+ */
+QDF_STATUS
+wlan_update_peer_phy_mode(struct wlan_channel *des_chan,
+			  struct wlan_objmgr_vdev *vdev);
+
 #endif  /* WLAN_CM_ROAM_API_H__ */

core/hdd/src/wlan_hdd_cfg80211.c

@@ -26592,6 +26592,10 @@ static int __wlan_hdd_cfg80211_get_channel(struct wiphy *wiphy,
 	uint32_t chan_freq;
 	struct wlan_hdd_link_info *link_info;
 	uint8_t vdev_id;
+	enum phy_ch_width ch_width;
+	enum wlan_phymode peer_phymode;
+	struct hdd_station_ctx *sta_ctx;
+	struct ch_params ch_params = {0};
 
 	hdd_enter_dev(wdev->netdev);
 
@@ -26604,7 +26608,6 @@ static int __wlan_hdd_cfg80211_get_channel(struct wiphy *wiphy,
 
 	if ((adapter->device_mode == QDF_STA_MODE) ||
 	    (adapter->device_mode == QDF_P2P_CLIENT_MODE)) {
-		struct hdd_station_ctx *sta_ctx;
 
 		if (!hdd_cm_is_vdev_associated(adapter->deflink))
 			return -EINVAL;
@@ -26658,7 +26661,25 @@ static int __wlan_hdd_cfg80211_get_channel(struct wiphy *wiphy,
 	chandef->center_freq2 = 0;
 	chandef->chan = ieee80211_get_channel(wiphy, chan_freq);
 
-	switch (vdev->vdev_mlme.des_chan->ch_width) {
+	ch_width = vdev->vdev_mlme.des_chan->ch_width;
+	if (adapter->device_mode == QDF_STA_MODE ||
+	    adapter->device_mode == QDF_P2P_CLIENT_MODE) {
+		/* For STA/P2P CLI get the peer pymode as, in some IOT
+		 * cases VDEV BW will not be same as peer BW
+		 */
+		mlme_get_peer_phymode(hdd_ctx->psoc,
+				      sta_ctx->conn_info.bssid.bytes,
+				      &peer_phymode);
+		ch_width = wlan_mlme_get_ch_width_from_phymode(peer_phymode);
+	}
+
+	ch_params.ch_width = ch_width;
+	wlan_reg_set_channel_params_for_pwrmode(hdd_ctx->pdev,
+						chan_freq, 0, &ch_params,
+						REG_CURRENT_PWR_MODE);
+	chandef->center_freq1 = ch_params.mhz_freq_seg0;
+
+	switch (ch_width) {
 	case CH_WIDTH_20MHZ:
 		if (is_legacy_phymode)
 			chandef->width = NL80211_CHAN_WIDTH_20_NOHT;

core/mac/src/pe/lim/lim_prop_exts_utils.c

@@ -70,6 +70,7 @@ static void get_local_power_constraint_probe_response(
 /**
  * get_ese_version_ie_probe_response() - extracts ESE version IE
  * from probe response
+ * @mac_ctx: MAC context
  * @beacon_struct: beacon structure
  * @session: A pointer to session entry.
  *
@@ -548,10 +549,9 @@ static void lim_check_peer_ldpc_and_update(struct pe_session *session,
 {}
 #endif
 
-static
-void lim_update_ch_width_for_p2p_client(struct mac_context *mac,
-					struct pe_session *session,
-					uint32_t ch_freq)
+static void lim_upgrade_ch_width(struct mac_context *mac,
+				 struct pe_session *session,
+				 uint32_t ch_freq)
 {
 	struct ch_params ch_params = {0};
 
@@ -564,12 +564,13 @@ void lim_update_ch_width_for_p2p_client(struct mac_context *mac,
 	 * Start the vdev with max supported ch_width in order to support this.
 	 * It'll be downgraded to appropriate ch_width or the same would be
 	 * continued based on assoc resp.
-	 * Restricting this check for p2p client and 5G only and this may be
-	 * extended to STA based on wider testing results with multiple AP's.
-	 * Limit it to 80MHz as 80+80 is channel specific and 160MHz is not
-	 * supported in p2p.
+	 * For P2P-CLI, BW limited to 80MHz as 80+80 is channel specific and
+	 * 160MHz is not supported.
 	 */
-	ch_params.ch_width = CH_WIDTH_80MHZ;
+	if (session->opmode == QDF_P2P_CLIENT_MODE)
+		ch_params.ch_width = CH_WIDTH_80MHZ;
+	else
+		ch_params.ch_width = wlan_mlme_get_max_bw();
 
 	wlan_reg_set_channel_params_for_pwrmode(mac->pdev, ch_freq, 0,
 						&ch_params,
@@ -583,9 +584,10 @@ void lim_update_ch_width_for_p2p_client(struct mac_context *mac,
 	session->ch_width = ch_params.ch_width;
 	session->ch_center_freq_seg0 = ch_params.center_freq_seg0;
 	session->ch_center_freq_seg1 = ch_params.center_freq_seg1;
-	pe_debug("Start P2P_CLI in ch freq %d max supported ch_width: %u cbmode: %u seg0: %u, seg1: %u",
-		 ch_freq, ch_params.ch_width, ch_params.sec_ch_offset,
-		 session->ch_center_freq_seg0, session->ch_center_freq_seg1);
+	pe_debug("Start mode %d ch freq %d max supported ch_width: %u cbmode: %u seg0: %u, seg1: %u",
+		 session->opmode, ch_freq, ch_params.ch_width,
+		 ch_params.sec_ch_offset, session->ch_center_freq_seg0,
+		 session->ch_center_freq_seg1);
 }
 
 void lim_extract_ap_capability(struct mac_context *mac_ctx, uint8_t *p_ie,
@@ -660,11 +662,9 @@ void lim_extract_ap_capability(struct mac_context *mac_ctx, uint8_t *p_ie,
 		if (!mac_ctx->mlme_cfg->vht_caps.vht_cap_info.enable_txbf_20mhz)
 			session->vht_config.su_beam_formee = 0;
 
-		if (session->opmode == QDF_P2P_CLIENT_MODE &&
-		    !wlan_reg_is_24ghz_ch_freq(beacon_struct->chan_freq))
-			lim_update_ch_width_for_p2p_client(
-					mac_ctx, session,
-					beacon_struct->chan_freq);
+		if (!wlan_reg_is_24ghz_ch_freq(beacon_struct->chan_freq))
+			lim_upgrade_ch_width(mac_ctx, session,
+					     beacon_struct->chan_freq);
 
 	} else if (session->vhtCapabilityPresentInBeacon &&
 			vht_op->chanWidth) {
@@ -884,6 +884,7 @@ void lim_extract_ap_capability(struct mac_context *mac_ctx, uint8_t *p_ie,
  * This routing provides the translation of Airgo Enum to HT enum for determining
  * secondary channel offset.
  * Airgo Enum is required for backward compatibility purposes.
+ * @aniCBMode: Phy Channel bond state
  *
  *
  ***NOTE:

core/wma/inc/wma_internal.h

@@ -1794,4 +1794,17 @@ uint16_t wma_mcs_rate_match(uint16_t raw_rate, bool is_he,
 QDF_STATUS
 wma_update_edca_pifs_param(WMA_HANDLE handle,
 			   struct edca_pifs_vparam *edca_pifs_param);
+
+/**
+ * wma_update_bss_peer_phy_mode() - Update phymode of peer object
+ * @des_chan: des_chan object which has channel information
+ * @vdev: pointer to vdev object
+ *
+ * This is a helper function to update phymode of peer object
+ *
+ * Return: QDF_STATUS
+ */
+QDF_STATUS
+wma_update_bss_peer_phy_mode(struct wlan_channel *des_chan,
+			     struct wlan_objmgr_vdev *vdev);
 #endif

core/wma/src/wma_mgmt.c

@@ -1036,12 +1036,22 @@ wma_fw_to_host_phymode_11be(WMI_HOST_WLAN_PHY_MODE phymode)
 	}
 	return WLAN_PHYMODE_AUTO;
 }
+
+static inline bool wma_is_phymode_eht(enum wlan_phymode phymode)
+{
+	return IS_WLAN_PHYMODE_EHT(phymode);
+}
 #else
 static enum wlan_phymode
 wma_fw_to_host_phymode_11be(WMI_HOST_WLAN_PHY_MODE phymode)
 {
 	return WLAN_PHYMODE_AUTO;
 }
+
+static inline bool wma_is_phymode_eht(enum wlan_phymode phymode)
+{
+	return false;
+}
 #endif
 
 #ifdef CONFIG_160MHZ_SUPPORT
@@ -4176,3 +4186,65 @@ wma_update_edca_pifs_param(WMA_HANDLE handle,
 	return status;
 }
 #endif
+
+QDF_STATUS
+wma_update_bss_peer_phy_mode(struct wlan_channel *des_chan,
+			     struct wlan_objmgr_vdev *vdev)
+{
+	struct wlan_objmgr_peer *bss_peer;
+	enum wlan_phymode old_peer_phymode, new_phymode;
+	tSirNwType nw_type;
+	struct vdev_mlme_obj *mlme_obj;
+
+	bss_peer = wlan_objmgr_vdev_try_get_bsspeer(vdev, WLAN_LEGACY_WMA_ID);
+	if (!bss_peer) {
+		wma_err("not able to find bss peer for vdev %d",
+			wlan_vdev_get_id(vdev));
+		return QDF_STATUS_E_INVAL;
+	}
+
+	old_peer_phymode = wlan_peer_get_phymode(bss_peer);
+
+	if (WLAN_REG_IS_24GHZ_CH_FREQ(des_chan->ch_freq)) {
+		if (des_chan->ch_phymode == WLAN_PHYMODE_11B ||
+		    old_peer_phymode == WLAN_PHYMODE_11B)
+			nw_type = eSIR_11B_NW_TYPE;
+		else
+			nw_type = eSIR_11G_NW_TYPE;
+	} else {
+		nw_type = eSIR_11A_NW_TYPE;
+	}
+
+	new_phymode = wma_peer_phymode(nw_type, STA_ENTRY_PEER,
+				       IS_WLAN_PHYMODE_HT(old_peer_phymode),
+				       des_chan->ch_width,
+				       IS_WLAN_PHYMODE_VHT(old_peer_phymode),
+				       IS_WLAN_PHYMODE_HE(old_peer_phymode),
+				       wma_is_phymode_eht(old_peer_phymode));
+
+	if (new_phymode == old_peer_phymode) {
+		wma_debug("Ignore update, old %d and new %d phymode are same, vdev_id : %d",
+			  old_peer_phymode, new_phymode,
+			  wlan_vdev_get_id(vdev));
+		wlan_objmgr_peer_release_ref(bss_peer, WLAN_LEGACY_WMA_ID);
+		return QDF_STATUS_SUCCESS;
+	}
+
+	mlme_obj = wlan_vdev_mlme_get_cmpt_obj(vdev);
+	if (!mlme_obj) {
+		wma_err("not able to get mlme_obj");
+		wlan_objmgr_peer_release_ref(bss_peer, WLAN_LEGACY_WMA_ID);
+		return QDF_STATUS_E_INVAL;
+	}
+
+	wlan_peer_obj_lock(bss_peer);
+	wlan_peer_set_phymode(bss_peer, new_phymode);
+	wlan_peer_obj_unlock(bss_peer);
+
+	wlan_objmgr_peer_release_ref(bss_peer, WLAN_LEGACY_WMA_ID);
+
+	mlme_obj->mgmt.generic.phy_mode = wma_host_to_fw_phymode(new_phymode);
+	des_chan->ch_phymode = new_phymode;
+
+	return QDF_STATUS_SUCCESS;
+}

core/wma/src/wma_scan_roam.c

@@ -3186,3 +3186,10 @@ wlan_cm_fw_to_host_phymode(WMI_HOST_WLAN_PHY_MODE phymode)
 	return wma_fw_to_host_phymode(phymode);
 }
 #endif
+
+QDF_STATUS
+wlan_update_peer_phy_mode(struct wlan_channel *des_chan,
+			  struct wlan_objmgr_vdev *vdev)
+{
+	return wma_update_bss_peer_phy_mode(des_chan, vdev);
+}