qcacld-3.0: Fix no EHT cap in MLO link per sta profile

There is only 1 global var to save EHT cap in psoc cfg for both 2 GHz and
5 GHz band, it is propagated to vdev/pe session/frames without revising by
band, so EHT cap of 2 GHz and 5 GHz are same, EHT cap of assoc link and
partner link are same, so no EHT cap in ML-Link Info(per STA Profile) in
assoc request while connecting to EHT MLO AP.

To fix it, revise EHT cap when band is selected, get EHT cap by band when
assemble assoc req MLO link per sta profile, get correct 2 GHz cap by
checking supported bands when get MAC/PHY cap from firmware, copy supported
MCS set from firmware to EHT cap of 2 GHz and 5 GHz too.

Change-Id: Ie97e71ee141f023248fb49f9977e7345e21003f6
CRs-Fixed: 3200199

core/mac/src/include/parser_api.h

@@ -1267,6 +1267,19 @@ void update_fils_data(struct sir_fils_indication *fils_ind,
 #ifdef WLAN_FEATURE_11AX
 QDF_STATUS populate_dot11f_he_caps(struct mac_context *, struct pe_session *,
 				   tDot11fIEhe_cap *);
+
+/**
+ * populate_dot11f_he_caps_by_band() - pouldate HE Capability IE by band
+ * @mac_ctx: Global MAC context
+ * @is_2g: is 2G band
+ * @eht_cap: pointer to HE capability IE
+ *
+ * Populate the HE capability IE based on band.
+ */
+QDF_STATUS
+populate_dot11f_he_caps_by_band(struct mac_context *mac_ctx,
+				bool is_2g,
+				tDot11fIEhe_cap *he_cap);
 QDF_STATUS populate_dot11f_he_operation(struct mac_context *, struct pe_session *,
 					tDot11fIEhe_op *);
 /**
@@ -1301,6 +1314,14 @@ static inline QDF_STATUS populate_dot11f_he_caps(struct mac_context *mac_ctx,
 	return QDF_STATUS_SUCCESS;
 }
 
+static inline QDF_STATUS
+populate_dot11f_he_caps_by_band(struct mac_context *mac_ctx,
+				bool is_2g,
+				tDot11fIEhe_cap *he_cap)
+{
+	return QDF_STATUS_SUCCESS;
+}
+
 static inline QDF_STATUS populate_dot11f_he_operation(struct mac_context *mac_ctx,
 			struct pe_session *session, tDot11fIEhe_op *he_op)
 {
@@ -1447,6 +1468,19 @@ QDF_STATUS populate_dot11f_eht_caps(struct mac_context *mac_ctx,
 				    struct pe_session *session,
 				    tDot11fIEeht_cap *eht_cap);
 
+/**
+ * populate_dot11f_eht_caps_by_band() - pouldate EHT Capability IE by band
+ * @mac_ctx: Global MAC context
+ * @is_2g: is 2G band
+ * @eht_cap: pointer to EHT capability IE
+ *
+ * Populate the EHT capability IE based on band.
+ */
+QDF_STATUS
+populate_dot11f_eht_caps_by_band(struct mac_context *mac_ctx,
+				 bool is_2g,
+				 tDot11fIEeht_cap *eht_cap);
+
 /**
  * populate_dot11f_eht_operation() - pouldate EHT Operation IE
  * @mac_ctx: Global MAC context
@@ -1499,6 +1533,14 @@ populate_dot11f_eht_caps(struct mac_context *mac_ctx,
 	return QDF_STATUS_SUCCESS;
 }
 
+static inline QDF_STATUS
+populate_dot11f_eht_caps_by_band(struct mac_context *mac_ctx,
+				 bool is_2g,
+				 tDot11fIEeht_cap *eht_cap)
+{
+	return QDF_STATUS_SUCCESS;
+}
+
 static inline QDF_STATUS
 populate_dot11f_eht_operation(struct mac_context *mac_ctx,
 			      struct pe_session *session,

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

@@ -8373,6 +8373,12 @@ static void
 lim_revise_req_eht_cap_per_band(struct mlme_legacy_priv *mlme_priv,
 				struct pe_session *session)
 {
+	struct mac_context *mac = session->mac_ctx;
+
+	if (wlan_reg_is_24ghz_ch_freq(session->curr_op_freq)) {
+		mlme_priv->eht_config = mac->eht_cap_2g;
+		pe_debug("revise 2G eht cap");
+	}
 }
 
 void lim_copy_bss_eht_cap(struct pe_session *session)
@@ -8394,6 +8400,7 @@ void lim_copy_join_req_eht_cap(struct pe_session *session)
 	mlme_priv = wlan_vdev_mlme_get_ext_hdl(session->vdev);
 	if (!mlme_priv)
 		return;
+	lim_revise_req_eht_cap_per_band(mlme_priv, session);
 	qdf_mem_copy(&session->eht_config, &mlme_priv->eht_config,
 		     sizeof(session->eht_config));
 }

core/mac/src/sys/legacy/src/utils/src/parser_api.c

@@ -6773,6 +6773,19 @@ QDF_STATUS populate_dot11f_he_caps(struct mac_context *mac_ctx, struct pe_sessio
 	return QDF_STATUS_SUCCESS;
 }
 
+QDF_STATUS
+populate_dot11f_he_caps_by_band(struct mac_context *mac_ctx,
+				bool is_2g,
+				tDot11fIEhe_cap *he_cap)
+{
+	if (is_2g)
+		qdf_mem_copy(he_cap, &mac_ctx->he_cap_2g, sizeof(*he_cap));
+	else
+		qdf_mem_copy(he_cap, &mac_ctx->he_cap_5g, sizeof(*he_cap));
+
+	return QDF_STATUS_SUCCESS;
+}
+
 /**
  * populate_dot11f_he_operation() - pouldate HE Operation IE
  * @mac_ctx: Global MAC context
@@ -8240,6 +8253,23 @@ QDF_STATUS populate_dot11f_eht_caps(struct mac_context *mac_ctx,
 	return QDF_STATUS_SUCCESS;
 }
 
+QDF_STATUS
+populate_dot11f_eht_caps_by_band(struct mac_context *mac_ctx,
+				 bool is_2g,
+				 tDot11fIEeht_cap *eht_cap)
+{
+	if (is_2g)
+		qdf_mem_copy(eht_cap,
+			     &mac_ctx->eht_cap_2g,
+			     sizeof(tDot11fIEeht_cap));
+	else
+		qdf_mem_copy(eht_cap,
+			     &mac_ctx->eht_cap_5g,
+			     sizeof(tDot11fIEeht_cap));
+
+	return QDF_STATUS_SUCCESS;
+}
+
 QDF_STATUS populate_dot11f_eht_operation(struct mac_context *mac_ctx,
 					 struct pe_session *session,
 					 tDot11fIEeht_op *eht_op)
@@ -10088,6 +10118,7 @@ QDF_STATUS populate_dot11f_assoc_req_mlo_ie(struct mac_context *mac_ctx,
 	tDot11fIEeht_cap eht_caps;
 	tDot11fIESuppRates supp_rates;
 	tDot11fIEExtSuppRates ext_supp_rates;
+	bool is_2g;
 
 	if (!frm)
 		return QDF_STATUS_E_NULL_VALUE;
@@ -10244,7 +10275,8 @@ QDF_STATUS populate_dot11f_assoc_req_mlo_ie(struct mac_context *mac_ctx,
 		}
 		chan_freq = wlan_reg_chan_opclass_to_freq(chan, op_class,
 							  false);
-		if (WLAN_REG_IS_24GHZ_CH_FREQ(chan_freq)) {
+		is_2g = WLAN_REG_IS_24GHZ_CH_FREQ(chan_freq);
+		if (is_2g) {
 			wlan_populate_basic_rates(&b_rates, false, true);
 			wlan_populate_basic_rates(&e_rates, true, false);
 		} else {
@@ -10330,7 +10362,7 @@ QDF_STATUS populate_dot11f_assoc_req_mlo_ie(struct mac_context *mac_ctx,
 						DOT11F_EID_VHTCAPS;
 		}
 
-		populate_dot11f_he_caps(mac_ctx, NULL, &he_caps);
+		populate_dot11f_he_caps_by_band(mac_ctx, is_2g, &he_caps);
 		if ((he_caps.present && frm->he_cap.present &&
 		     qdf_mem_cmp(&he_caps, &frm->he_cap, sizeof(he_caps))) ||
 		     (he_caps.present && !frm->he_cap.present)) {
@@ -10364,8 +10396,7 @@ QDF_STATUS populate_dot11f_assoc_req_mlo_ie(struct mac_context *mac_ctx,
 			non_inher_ext_ie_lists[non_inher_ext_len++] =
 						WLAN_EXTN_ELEMID_HE_6G_CAP;
 		}
-
-		populate_dot11f_eht_caps(mac_ctx, NULL, &eht_caps);
+		populate_dot11f_eht_caps_by_band(mac_ctx, is_2g, &eht_caps);
 		if ((eht_caps.present && frm->eht_cap.present &&
 		     qdf_mem_cmp(&eht_caps, &frm->eht_cap, sizeof(eht_caps))) ||
 		     (eht_caps.present && !frm->eht_cap.present)) {

core/sme/src/common/sme_api.c

@@ -10671,11 +10671,11 @@ void sme_update_tgt_eht_cap(mac_handle_t mac_handle,
 	struct mac_context *mac_ctx = MAC_CONTEXT(mac_handle);
 
 	qdf_mem_copy(&mac_ctx->eht_cap_2g,
-		     &cfg->eht_cap,
+		     &cfg->eht_cap_2g,
 		     sizeof(tDot11fIEeht_cap));
 
 	qdf_mem_copy(&mac_ctx->eht_cap_5g,
-		     &cfg->eht_cap,
+		     &cfg->eht_cap_5g,
 		     sizeof(tDot11fIEeht_cap));
 }
 

core/wma/src/wma_eht.c

@@ -261,17 +261,14 @@ void wma_update_target_ext_eht_cap(struct target_psoc_info *tgt_hdl,
 		return;
 	}
 
-	supported_bands = host_cap->supported_bands;
 	for (i = 0; i < total_mac_phy_cnt; i++) {
+		supported_bands = host_cap[i].supported_bands;
 		qdf_mem_zero(&eht_cap_mac, sizeof(tDot11fIEeht_cap));
 		mac_phy_caps2 = &mac_phy_cap[i];
 		if (supported_bands & WLAN_2G_CAPABILITY) {
 			wma_convert_eht_cap(&eht_cap_mac,
 					    mac_phy_caps2->eht_cap_info_2G,
 					    mac_phy_caps2->eht_cap_phy_info_2G);
-			wma_convert_eht_cap(eht_cap_2g,
-					    mac_phy_caps2->eht_cap_info_2G,
-					    mac_phy_caps2->eht_cap_phy_info_2G);
 				/* TODO: PPET */
 			/* WMI_EHT_SUPP_MCS_20MHZ_ONLY */
 			mcs_supp = &mac_phy_caps2->eht_supp_mcs_ext_2G[0];
@@ -279,6 +276,9 @@ void wma_update_target_ext_eht_cap(struct target_psoc_info *tgt_hdl,
 			/* WMI_EHT_SUPP_MCS_LE_80MHZ */
 			mcs_supp = &mac_phy_caps2->eht_supp_mcs_ext_2G[1];
 			wma_update_eht_le_80mhz_mcs(mcs_supp, &eht_cap_mac);
+
+			qdf_mem_copy(eht_cap_2g, &eht_cap_mac,
+				     sizeof(tDot11fIEeht_cap));
 		}
 
 		if (supported_bands & WLAN_5G_CAPABILITY) {
@@ -286,9 +286,6 @@ void wma_update_target_ext_eht_cap(struct target_psoc_info *tgt_hdl,
 			wma_convert_eht_cap(&eht_cap_mac,
 					    mac_phy_caps2->eht_cap_info_5G,
 					    mac_phy_caps2->eht_cap_phy_info_5G);
-			wma_convert_eht_cap(eht_cap_5g,
-					    mac_phy_caps2->eht_cap_info_5G,
-					    mac_phy_caps2->eht_cap_phy_info_5G);
 
 			/* WMI_EHT_SUPP_MCS_20MHZ_ONLY */
 			mcs_supp = &mac_phy_caps2->eht_supp_mcs_ext_5G[0];
@@ -298,11 +295,14 @@ void wma_update_target_ext_eht_cap(struct target_psoc_info *tgt_hdl,
 			wma_update_eht_le_80mhz_mcs(mcs_supp, &eht_cap_mac);
 
 			/* WMI_EHT_SUPP_MCS_160MHZ */
-			mcs_supp = &mac_phy_caps2->eht_supp_mcs_ext_5G[1];
+			mcs_supp = &mac_phy_caps2->eht_supp_mcs_ext_5G[2];
 			wma_update_eht_160mhz_mcs(mcs_supp, &eht_cap_mac);
 			/* WMI_EHT_SUPP_MCS_320MHZ */
-			mcs_supp = &mac_phy_caps2->eht_supp_mcs_ext_5G[2];
+			mcs_supp = &mac_phy_caps2->eht_supp_mcs_ext_5G[3];
 			wma_update_eht_320mhz_mcs(mcs_supp, &eht_cap_mac);
+
+			qdf_mem_copy(eht_cap_5g, &eht_cap_mac,
+				     sizeof(tDot11fIEeht_cap));
 		}
 	}
 	qdf_mem_copy(eht_cap, &eht_cap_mac, sizeof(tDot11fIEeht_cap));