qcacld-3.0: Add 20/40M check for vht when handle beacon

Add function wlan_mlme_convert_he_op_bw_to_phy_ch_width, check 80+80 or
160 with ccfs0 and ccfs1.
Add 20M/40M check for vht bw with prim chan id and ccfs0.

Change-Id: I01a407358d7c310f92c8a69004ebb002b615438a
CRs-Fixed: 3511291

components/mlme/dispatcher/inc/wlan_mlme_api.h

@@ -1070,13 +1070,34 @@ QDF_STATUS mlme_update_tgt_he_caps_in_cfg(struct wlan_objmgr_psoc *psoc,
 /**
  * wlan_mlme_convert_vht_op_bw_to_phy_ch_width() - convert channel width in VHT
  *                                                 operation IE to phy_ch_width
- * @channel_width: channel width in VHT operation IE. If it is 0, please use HT
- *                 information IE to check whether it is 20MHz or 40MHz.
+ * @channel_width: channel width in VHT operation IE.
+ * @chan_id: channel id
+ * @ccfs0: channel center frequency segment 0
+ * @ccfs0: channel center frequency segment 1
  *
  * Return: phy_ch_width
  */
-enum phy_ch_width wlan_mlme_convert_vht_op_bw_to_phy_ch_width(
-						uint8_t channel_width);
+enum phy_ch_width
+wlan_mlme_convert_vht_op_bw_to_phy_ch_width(uint8_t channel_width,
+					    uint8_t chan_id,
+					    uint8_t ccfs0,
+					    uint8_t ccfs1);
+
+/**
+ * wlan_mlme_convert_he_6ghz_op_bw_to_phy_ch_width() - convert channel width in
+ *                                          he 6ghz peration IE to phy_ch_width
+ * @channel_width: channel width in HE operation IE.
+ * @chan_id: channel id
+ * @ccfs0: channel center frequency segment 0
+ * @ccfs0: channel center frequency segment 1
+ *
+ * Return: phy_ch_width
+ */
+enum phy_ch_width
+wlan_mlme_convert_he_6ghz_op_bw_to_phy_ch_width(uint8_t channel_width,
+						uint8_t chan_id,
+						uint8_t ccfs0,
+						uint8_t ccfs1);
 
 /**
  * wlan_mlme_chan_stats_scan_event_cb() - process connected channel stats

components/mlme/dispatcher/src/wlan_mlme_api.c

@@ -6817,18 +6817,63 @@ wlan_mlme_send_ch_width_update_with_notify(struct wlan_objmgr_psoc *psoc,
 	return status;
 }
 
-enum phy_ch_width wlan_mlme_convert_vht_op_bw_to_phy_ch_width(
-						uint8_t channel_width)
+enum phy_ch_width
+wlan_mlme_convert_vht_op_bw_to_phy_ch_width(uint8_t channel_width,
+					    uint8_t chan_id,
+					    uint8_t ccfs0,
+					    uint8_t ccfs1)
+{
+	/** channel_width in vht op from 802.11-2020
+	 * Set to 0 for 20 MHz or 40 MHz BSS bandwidth.
+	 * Set to 1 for 80 MHz, 160 MHz or 80+80 MHz BSS
+	 * bandwidth.
+	 * Set to 2 for 160 MHz BSS bandwidth (deprecated).
+	 * Set to 3 for noncontiguous 80+80 MHz BSS
+	 * bandwidth (deprecated).
+	 * Values in the range 4 to 255 are reserved
+	 *
+	 * 80+80 not supported by MCC platform, so downgrade to 80
+	 */
+	enum phy_ch_width phy_bw = CH_WIDTH_20MHZ;
+
+	if (channel_width == WLAN_VHTOP_CHWIDTH_2040) {
+		phy_bw = CH_WIDTH_20MHZ;
+		if (abs(ccfs0 - chan_id) == 2)
+			phy_bw = CH_WIDTH_40MHZ;
+	} else if (channel_width == WLAN_VHTOP_CHWIDTH_80) {
+		if (ccfs1 && (abs(ccfs1 - ccfs0) == 8))
+			phy_bw = CH_WIDTH_160MHZ;
+		else
+			phy_bw = CH_WIDTH_80MHZ;
+	} else if (channel_width == WLAN_VHTOP_CHWIDTH_160) {
+		phy_bw = CH_WIDTH_160MHZ;
+	} else if (channel_width == WLAN_VHTOP_CHWIDTH_80_80) {
+		phy_bw = WLAN_VHTOP_CHWIDTH_80;
+	}
+
+	return phy_bw;
+}
+
+enum phy_ch_width
+wlan_mlme_convert_he_6ghz_op_bw_to_phy_ch_width(uint8_t channel_width,
+						uint8_t chan_id,
+						uint8_t ccfs0,
+						uint8_t ccfs1)
 {
-	enum phy_ch_width phy_bw = CH_WIDTH_40MHZ;
+	enum phy_ch_width phy_bw = CH_WIDTH_20MHZ;
 
-	if (channel_width == WLAN_VHTOP_CHWIDTH_80)
+	if (channel_width == WLAN_HE_6GHZ_CHWIDTH_20) {
+		phy_bw = CH_WIDTH_20MHZ;
+	} else if (channel_width == WLAN_HE_6GHZ_CHWIDTH_40) {
+		phy_bw = CH_WIDTH_40MHZ;
+	} else if (channel_width == WLAN_HE_6GHZ_CHWIDTH_80) {
 		phy_bw = CH_WIDTH_80MHZ;
-	else if (channel_width == WLAN_VHTOP_CHWIDTH_160)
+	} else if (channel_width == WLAN_HE_6GHZ_CHWIDTH_160_80_80) {
 		phy_bw = CH_WIDTH_160MHZ;
-	/* 80 + 80 not supported */
-	else if (channel_width == WLAN_VHTOP_CHWIDTH_80_80)
-		phy_bw = CH_WIDTH_80MHZ;
+		/* 80+80 not supported */
+		if (ccfs1 && abs(ccfs0 - ccfs1) > 8)
+			phy_bw = CH_WIDTH_80MHZ;
+	}
 
 	return phy_bw;
 }

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

@@ -44,6 +44,8 @@
 #include "wlan_mlo_mgr_sta.h"
 #include "wlan_cm_api.h"
 #include "wlan_mlme_api.h"
+#include "wlan_objmgr_vdev_obj.h"
+#include "wlan_reg_services_api.h"
 #ifdef WLAN_FEATURE_11BE_MLO
 #include <cds_ieee80211_common.h>
 #endif
@@ -265,7 +267,7 @@ void lim_process_beacon_eht_op(struct pe_session *session,
 	tDot11fIEeht_op *eht_op;
 	tDot11fIEhe_op *he_op;
 	uint8_t  ch_width;
-	uint8_t center_freq_diff;
+	uint8_t chan_id;
 
 	if (!bcn_ptr || !session || !session->mac_ctx || !session->vdev) {
 		pe_err("invalid input parameters");
@@ -277,6 +279,9 @@ void lim_process_beacon_eht_op(struct pe_session *session,
 	mac_ctx = session->mac_ctx;
 	vdev = session->vdev;
 
+	chan_id = wlan_reg_freq_to_chan(wlan_vdev_get_pdev(vdev),
+					bcn_ptr->chan_freq);
+
 	if (wlan_reg_is_24ghz_ch_freq(session->curr_op_freq)) {
 		if (session->force_24ghz_in_ht20)
 			cb_mode = WNI_CFG_CHANNEL_BONDING_MODE_DISABLE;
@@ -310,30 +315,33 @@ void lim_process_beacon_eht_op(struct pe_session *session,
 		ccfs1 = eht_op->ccfs1;
 	} else if (he_op->vht_oper_present) {
 		ch_width = he_op->vht_oper.info.chan_width;
-		ori_bw = wlan_mlme_convert_vht_op_bw_to_phy_ch_width(ch_width);
 		ccfs0 = he_op->vht_oper.info.center_freq_seg0;
 		ccfs1 = he_op->vht_oper.info.center_freq_seg1;
+		ori_bw = wlan_mlme_convert_vht_op_bw_to_phy_ch_width(ch_width,
+								     chan_id,
+								     ccfs0,
+								     ccfs1);
 	} else if (he_op->oper_info_6g_present) {
 		ch_width = he_op->oper_info_6g.info.ch_width;
-		ori_bw = wlan_mlme_convert_eht_op_bw_to_phy_ch_width(ch_width);
 		ccfs0 = he_op->oper_info_6g.info.center_freq_seg0;
 		ccfs1 = he_op->oper_info_6g.info.center_freq_seg1;
+		ori_bw = wlan_mlme_convert_he_6ghz_op_bw_to_phy_ch_width(ch_width,
+									 chan_id,
+									 ccfs0,
+									 ccfs1);
 	} else if (bcn_ptr->VHTOperation.present) {
 		ch_width = bcn_ptr->VHTOperation.chanWidth;
-		ori_bw = wlan_mlme_convert_vht_op_bw_to_phy_ch_width(ch_width);
 		ccfs0 = bcn_ptr->VHTOperation.chan_center_freq_seg0;
 		ccfs1 = bcn_ptr->VHTOperation.chan_center_freq_seg1;
-
+		ori_bw = wlan_mlme_convert_vht_op_bw_to_phy_ch_width(ch_width,
+								     chan_id,
+								     ccfs0,
+								     ccfs1);
 	} else {
 		pe_err("Invalid operation");
 		return;
 	}
 
-	if (!eht_op->eht_op_information_present) {
-		center_freq_diff = abs(ccfs0 - ccfs1);
-		if (center_freq_diff == 8)
-			ori_bw = CH_WIDTH_160MHZ;
-	}
 	status = lim_get_update_eht_bw_puncture_allow(session, ori_bw,
 						      &new_bw,
 						      &update_allow);

core/wma/src/wma_features.c

@@ -1547,11 +1547,14 @@ int wma_csa_offload_handler(void *handle, uint8_t *event, uint32_t len)
 	if (csa_event->ies_present_flag & WMI_WBW_IE_PRESENT) {
 		wb_ie = (struct ieee80211_ie_wide_bw_switch *)
 						(&csa_event->wb_ie[0]);
-		csa_offload_event->new_ch_width =
-			wlan_mlme_convert_vht_op_bw_to_phy_ch_width(
-				wb_ie->new_ch_width);
 		csa_offload_event->new_ch_freq_seg1 = wb_ie->new_ch_freq_seg1;
 		csa_offload_event->new_ch_freq_seg2 = wb_ie->new_ch_freq_seg2;
+		csa_offload_event->new_ch_width =
+			wlan_mlme_convert_vht_op_bw_to_phy_ch_width(wb_ie->new_ch_width,
+								    csa_offload_event->channel,
+								    wb_ie->new_ch_freq_seg1,
+								    wb_ie->new_ch_freq_seg2);
+
 		csa_offload_event->ies_present_flag |= MLME_WBW_IE_PRESENT;
 	} else if (csa_event->ies_present_flag &
 		   WMI_CSWRAP_IE_EXTENDED_PRESENT) {
@@ -1560,13 +1563,15 @@ int wma_csa_offload_handler(void *handle, uint8_t *event, uint32_t len)
 				(uint8_t *)&csa_event->cswrap_ie_extended,
 				WLAN_ELEMID_WIDE_BAND_CHAN_SWITCH, 0);
 		if (wb_ie) {
-			csa_offload_event->new_ch_width =
-				wlan_mlme_convert_vht_op_bw_to_phy_ch_width(
-					wb_ie->new_ch_width);
 			csa_offload_event->new_ch_freq_seg1 =
 						wb_ie->new_ch_freq_seg1;
 			csa_offload_event->new_ch_freq_seg2 =
 						wb_ie->new_ch_freq_seg2;
+			csa_offload_event->new_ch_width =
+				wlan_mlme_convert_vht_op_bw_to_phy_ch_width(wb_ie->new_ch_width,
+									    csa_offload_event->channel,
+									    wb_ie->new_ch_freq_seg1,
+									    wb_ie->new_ch_freq_seg2);
 			csa_event->ies_present_flag |= WMI_WBW_IE_PRESENT;
 			csa_offload_event->ies_present_flag |=
 				MLME_WBW_IE_PRESENT;