qcacld-3.0: Fix the wrong HE 160MHz mcs map in assoc request

Populate HE 160MHz mcs map only from 5G band mac-phy capabilities.
Session bandwith is checked to disable HE mcs for 160MHz, but session
bandwidth is updated after the MCS is disabled. Update HE 160MHz
MCS map after session bandwidth is derived.

Change-Id: I94813ae269856b34cf1ea6c6a13013738909c674
CRs-Fixed: 2556457

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

@@ -150,6 +150,41 @@ static void lim_check_he_ldpc_cap(struct pe_session *session,
 		}
 	}
 }
+
+static void lim_update_he_bw_cap_mcs(struct pe_session *session)
+{
+	if (!session->he_capable)
+		return;
+
+	if (session->ch_width <= CH_WIDTH_80MHZ) {
+		*(uint16_t *)session->he_config.rx_he_mcs_map_160 =
+							HE_MCS_ALL_DISABLED;
+		*(uint16_t *)session->he_config.tx_he_mcs_map_160 =
+							HE_MCS_ALL_DISABLED;
+		*(uint16_t *)session->he_config.rx_he_mcs_map_80_80 =
+							HE_MCS_ALL_DISABLED;
+		*(uint16_t *)session->he_config.tx_he_mcs_map_80_80 =
+							HE_MCS_ALL_DISABLED;
+	} else if (session->ch_width == CH_WIDTH_160MHZ) {
+		*(uint16_t *)session->he_config.rx_he_mcs_map_80_80 =
+							HE_MCS_ALL_DISABLED;
+		*(uint16_t *)session->he_config.tx_he_mcs_map_80_80 =
+							HE_MCS_ALL_DISABLED;
+	}
+	/* Reset the > 20MHz caps for 20MHz connection */
+	if (session->ch_width == CH_WIDTH_20MHZ) {
+		session->he_config.chan_width_0 = 0;
+		session->he_config.chan_width_1 = 0;
+		session->he_config.chan_width_2 = 0;
+		session->he_config.chan_width_3 = 0;
+		session->he_config.chan_width_4 = 0;
+		session->he_config.chan_width_5 = 0;
+		session->he_config.chan_width_6 = 0;
+		session->he_config.he_ppdu_20_in_40Mhz_2G = 0;
+		session->he_config.he_ppdu_20_in_160_80p80Mhz = 0;
+		session->he_config.he_ppdu_80_in_160_80p80Mhz = 0;
+	}
+}
 #else
 static inline void lim_extract_he_op(struct pe_session *session,
 		tSirProbeRespBeacon *beacon_struct)
@@ -157,6 +192,9 @@ static inline void lim_extract_he_op(struct pe_session *session,
 static void lim_check_he_ldpc_cap(struct pe_session *session,
 		tSirProbeRespBeacon *beacon_struct)
 {}
+
+static void lim_update_he_bw_cap_mcs(struct pe_session *session)
+{}
 #endif
 
 void lim_objmgr_update_vdev_nss(struct wlan_objmgr_psoc *psoc,
@@ -406,6 +444,7 @@ void lim_extract_ap_capability(struct mac_context *mac_ctx, uint8_t *p_ie,
 	}
 	lim_check_he_ldpc_cap(session, beacon_struct);
 	lim_extract_he_op(session, beacon_struct);
+	lim_update_he_bw_cap_mcs(session);
 	/* Extract the UAPSD flag from WMM Parameter element */
 	if (beacon_struct->wmeEdcaPresent)
 		*uapsd = beacon_struct->edcaParams.qosInfo.uapsd;

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

@@ -6850,30 +6850,6 @@ void lim_copy_join_req_he_cap(struct pe_session *session,
 {
 	qdf_mem_copy(&(session->he_config), &(sme_join_req->he_config),
 		     sizeof(session->he_config));
-
-	if (session->ch_width <= CH_WIDTH_80MHZ) {
-		*(uint16_t *)session->he_config.rx_he_mcs_map_160 =
-							HE_MCS_ALL_DISABLED;
-		*(uint16_t *)session->he_config.tx_he_mcs_map_160 =
-							HE_MCS_ALL_DISABLED;
-		*(uint16_t *)session->he_config.rx_he_mcs_map_80_80 =
-							HE_MCS_ALL_DISABLED;
-		*(uint16_t *)session->he_config.tx_he_mcs_map_80_80 =
-							HE_MCS_ALL_DISABLED;
-	}
-	/* Reset the > 20MHz caps for 20MHz connection */
-	if (session->ch_width == CH_WIDTH_20MHZ) {
-		session->he_config.chan_width_0 = 0;
-		session->he_config.chan_width_1 = 0;
-		session->he_config.chan_width_2 = 0;
-		session->he_config.chan_width_3 = 0;
-		session->he_config.chan_width_4 = 0;
-		session->he_config.chan_width_5 = 0;
-		session->he_config.chan_width_6 = 0;
-		session->he_config.he_ppdu_20_in_40Mhz_2G = 0;
-		session->he_config.he_ppdu_20_in_160_80p80Mhz = 0;
-		session->he_config.he_ppdu_80_in_160_80p80Mhz = 0;
-	}
 }
 
 void lim_log_he_cap(struct mac_context *mac, tDot11fIEhe_cap *he_cap)

core/wma/src/wma_he.c

@@ -346,7 +346,8 @@ static void wma_convert_he_cap(tDot11fIEhe_cap *he_cap, uint32_t *mac_cap,
  * Return: none
  */
 static void wma_derive_ext_he_cap(tDot11fIEhe_cap *he_cap,
-				  tDot11fIEhe_cap *new_cap)
+				  tDot11fIEhe_cap *new_cap,
+				  bool is_5g_cap)
 {
 	uint16_t mcs_1, mcs_2;
 
@@ -516,22 +517,24 @@ static void wma_derive_ext_he_cap(tDot11fIEhe_cap *he_cap,
 	mcs_1 = he_cap->tx_he_mcs_map_lt_80;
 	mcs_2 = new_cap->tx_he_mcs_map_lt_80;
 	he_cap->tx_he_mcs_map_lt_80 = HE_INTERSECT_MCS(mcs_1, mcs_2);
-	mcs_1 = *((uint16_t *)he_cap->rx_he_mcs_map_160);
-	mcs_2 = *((uint16_t *)new_cap->rx_he_mcs_map_160);
-	*((uint16_t *)he_cap->rx_he_mcs_map_160) =
-		HE_INTERSECT_MCS(mcs_1, mcs_2);
-	mcs_1 = *((uint16_t *)he_cap->tx_he_mcs_map_160);
-	mcs_2 = *((uint16_t *)new_cap->tx_he_mcs_map_160);
-	*((uint16_t *)he_cap->tx_he_mcs_map_160) =
-		HE_INTERSECT_MCS(mcs_1, mcs_2);
-	mcs_1 = *((uint16_t *)he_cap->rx_he_mcs_map_80_80);
-	mcs_2 = *((uint16_t *)new_cap->rx_he_mcs_map_80_80);
-	*((uint16_t *)he_cap->rx_he_mcs_map_80_80) =
-		HE_INTERSECT_MCS(mcs_1, mcs_2);
-	mcs_1 = *((uint16_t *)he_cap->tx_he_mcs_map_80_80);
-	mcs_2 = *((uint16_t *)new_cap->tx_he_mcs_map_80_80);
-	*((uint16_t *)he_cap->tx_he_mcs_map_80_80) =
-		HE_INTERSECT_MCS(mcs_1, mcs_2);
+	if (is_5g_cap) {
+		mcs_1 = *((uint16_t *)he_cap->rx_he_mcs_map_160);
+		mcs_2 = *((uint16_t *)new_cap->rx_he_mcs_map_160);
+		*((uint16_t *)he_cap->rx_he_mcs_map_160) =
+			HE_INTERSECT_MCS(mcs_1, mcs_2);
+		mcs_1 = *((uint16_t *)he_cap->tx_he_mcs_map_160);
+		mcs_2 = *((uint16_t *)new_cap->tx_he_mcs_map_160);
+		*((uint16_t *)he_cap->tx_he_mcs_map_160) =
+			HE_INTERSECT_MCS(mcs_1, mcs_2);
+		mcs_1 = *((uint16_t *)he_cap->rx_he_mcs_map_80_80);
+		mcs_2 = *((uint16_t *)new_cap->rx_he_mcs_map_80_80);
+		*((uint16_t *)he_cap->rx_he_mcs_map_80_80) =
+			HE_INTERSECT_MCS(mcs_1, mcs_2);
+		mcs_1 = *((uint16_t *)he_cap->tx_he_mcs_map_80_80);
+		mcs_2 = *((uint16_t *)new_cap->tx_he_mcs_map_80_80);
+		*((uint16_t *)he_cap->tx_he_mcs_map_80_80) =
+			HE_INTERSECT_MCS(mcs_1, mcs_2);
+	}
 }
 
 void wma_print_he_cap(tDot11fIEhe_cap *he_cap)
@@ -898,6 +901,7 @@ void wma_update_target_ext_he_cap(struct target_psoc_info *tgt_hdl,
 	struct wlan_psoc_host_mac_phy_caps *mac_cap, *mac_phy_cap;
 	tDot11fIEhe_cap he_cap_mac;
 	tDot11fIEhe_cap tmp_he_cap = {0};
+	bool is_5g_cap;
 
 	qdf_mem_zero(&tgt_cfg->he_cap_2g, sizeof(tgt_cfg->he_cap_2g));
 	qdf_mem_zero(&tgt_cfg->he_cap_5g, sizeof(tgt_cfg->he_cap_5g));
@@ -921,6 +925,7 @@ void wma_update_target_ext_he_cap(struct target_psoc_info *tgt_hdl,
 		qdf_mem_zero(&he_cap_mac,
 				sizeof(tDot11fIEhe_cap));
 		mac_cap = &mac_phy_cap[i];
+		is_5g_cap = false;
 		if (mac_cap->supported_bands & WLAN_2G_CAPABILITY) {
 			wma_convert_he_cap(&he_cap_mac,
 					mac_cap->he_cap_info_2G,
@@ -938,9 +943,11 @@ void wma_update_target_ext_he_cap(struct target_psoc_info *tgt_hdl,
 
 		if (he_cap_mac.present) {
 			wma_derive_ext_he_cap(&tmp_he_cap,
-					      &he_cap_mac);
+					      &he_cap_mac,
+					      is_5g_cap);
 			wma_derive_ext_he_cap(&tgt_cfg->he_cap_2g,
-					      &he_cap_mac);
+					      &he_cap_mac,
+					      is_5g_cap);
 		}
 
 		qdf_mem_zero(&he_cap_mac,
@@ -953,17 +960,20 @@ void wma_update_target_ext_he_cap(struct target_psoc_info *tgt_hdl,
 					mac_cap->tx_chain_mask_5G,
 					mac_cap->rx_chain_mask_5G);
 			WMA_LOGD(FL("5g phy: nss: %d, ru_idx_msk: %d"),
-					mac_cap->he_ppet2G.numss_m1,
-					mac_cap->he_ppet2G.ru_bit_mask);
+					mac_cap->he_ppet5G.numss_m1,
+					mac_cap->he_ppet5G.ru_bit_mask);
 			wma_convert_he_ppet(tgt_cfg->ppet_5g,
 					(struct wmi_host_ppe_threshold *)
 					&mac_cap->he_ppet5G);
+			is_5g_cap = true;
 		}
 		if (he_cap_mac.present) {
 			wma_derive_ext_he_cap(&tmp_he_cap,
-					      &he_cap_mac);
+					      &he_cap_mac,
+					      is_5g_cap);
 			wma_derive_ext_he_cap(&tgt_cfg->he_cap_5g,
-					      &he_cap_mac);
+					      &he_cap_mac,
+					      is_5g_cap);
 		}
 	}