qcacld-3.0: Don't populate twt_res bit for non assoc link

In MLO STA case, even though twt_responder ini is disable but
still this bit is getting populated in he_cap for non assoc link.
Reason:
1. twt_res is getting set from populate_dot11f_twt_he_cap()
for assoc link. For non assoc link, it's getting set from
mac context.
2. populate_dot11f_twt_he_cap() api doesn't have the interseted
value of ini and firmware caps according to twt component api.

As part of fix,
1. twt_req and twt_res should have intersected value in
populate_dot11f_twt_he_cap()
2. Update twt_res from populate_dot11f_twt_he_cap() for non
assoc link also as it will update the intersection of ini and
fw caps

Change-Id: I6ef34723f879aead4517c28cf6cfad2fa11165fe
CRs-Fixed: 3524903

components/umac/twt/dispatcher/inc/wlan_twt_cfg_ext_api.h

@@ -96,6 +96,29 @@ wlan_twt_get_responder_cfg(struct wlan_objmgr_psoc *psoc, bool *val);
 QDF_STATUS
 wlan_twt_get_rtwt_support(struct wlan_objmgr_psoc *psoc, bool *val);
 
+/**
+ * wlan_twt_get_bcast_requestor_cfg() - Get requestor broadcast TWT
+ * configuration
+ * @psoc: Pointer to psoc object
+ * @val: Pointer to value
+ *
+ * Return: QDF_STATUS
+ */
+QDF_STATUS
+wlan_twt_get_bcast_requestor_cfg(struct wlan_objmgr_psoc *psoc, bool *val);
+
+/**
+ * wlan_twt_get_bcast_responder_cfg() - Get responder broadcast TWT
+ * configuration
+ * @psoc: Pointer to psoc object
+ * @val: Pointer to value
+ *
+ * Return: QDF_STATUS
+ */
+
+QDF_STATUS
+wlan_twt_get_bcast_responder_cfg(struct wlan_objmgr_psoc *psoc, bool *val);
+
 #ifdef FEATURE_SET
 /**
  * wlan_twt_get_feature_info() - Get TWT feature set information
@@ -146,5 +169,18 @@ wlan_twt_get_responder_cfg(struct wlan_objmgr_psoc *psoc, bool *val)
 {
 	return QDF_STATUS_SUCCESS;
 }
+
+static inline QDF_STATUS
+wlan_twt_get_bcast_requestor_cfg(struct wlan_objmgr_psoc *psoc, bool *val)
+{
+	return QDF_STATUS_SUCCESS;
+}
+
+static inline QDF_STATUS
+wlan_twt_get_bcast_responder_cfg(struct wlan_objmgr_psoc *psoc, bool *val)
+{
+	return QDF_STATUS_SUCCESS;
+}
+
 #endif
 #endif

components/umac/twt/dispatcher/src/wlan_twt_cfg_ext_api.c

@@ -61,6 +61,18 @@ wlan_twt_get_rtwt_support(struct wlan_objmgr_psoc *psoc, bool *val)
 	return wlan_twt_get_restricted_support(psoc, val);
 }
 
+QDF_STATUS
+wlan_twt_get_bcast_requestor_cfg(struct wlan_objmgr_psoc *psoc, bool *val)
+{
+	return wlan_twt_cfg_get_bcast_requestor(psoc, val);
+}
+
+QDF_STATUS
+wlan_twt_get_bcast_responder_cfg(struct wlan_objmgr_psoc *psoc, bool *val)
+{
+	return wlan_twt_cfg_get_bcast_responder(psoc, val);
+}
+
 #ifdef FEATURE_SET
 void wlan_twt_get_feature_info(struct wlan_objmgr_psoc *psoc,
 			       struct wlan_twt_features *twt_feature_set)

core/mac/src/include/parser_api.h

@@ -1283,13 +1283,15 @@ QDF_STATUS populate_dot11f_he_caps(struct mac_context *, struct pe_session *,
  * @mac_ctx: Global MAC context
  * @is_2g: is 2G band
  * @eht_cap: pointer to HE capability IE
+ * @session: pointer to pe session
  *
  * 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);
+				tDot11fIEhe_cap *he_cap,
+				struct pe_session *session);
 
 /**
  * populate_dot11f_he_operation() - populate he operation IE

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

@@ -7749,7 +7749,8 @@ void lim_set_he_caps(struct mac_context *mac, struct pe_session *session,
 	if (band == CDS_BAND_2GHZ)
 		is_band_2g = true;
 
-	populate_dot11f_he_caps_by_band(mac, is_band_2g, &dot11_cap);
+	populate_dot11f_he_caps_by_band(mac, is_band_2g, &dot11_cap,
+					session);
 	lim_log_he_cap(mac, &dot11_cap);
 	ie = wlan_get_ext_ie_ptr_from_ext_id(HE_CAP_OUI_TYPE,
 			HE_CAP_OUI_SIZE, ie_start, num_bytes);
@@ -8934,7 +8935,8 @@ void lim_set_eht_caps(struct mac_context *mac, struct pe_session *session,
 		is_band_2g = true;
 
 	populate_dot11f_eht_caps_by_band(mac, is_band_2g, &dot11_cap);
-	populate_dot11f_he_caps_by_band(mac, is_band_2g, &dot11_he_cap);
+	populate_dot11f_he_caps_by_band(mac, is_band_2g, &dot11_he_cap,
+					session);
 	lim_log_eht_cap(mac, &dot11_cap);
 
 	if (is_band_2g) {

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

@@ -7328,23 +7328,25 @@ populate_dot11f_twt_he_cap(struct mac_context *mac,
 			   struct pe_session *session,
 			   tDot11fIEhe_cap *he_cap)
 {
-	bool bcast_requestor =
-		mac->mlme_cfg->twt_cfg.is_bcast_requestor_enabled &&
-		!mac->mlme_cfg->twt_cfg.disable_btwt_usr_cfg;
-	bool bcast_responder =
-		mac->mlme_cfg->twt_cfg.is_bcast_responder_enabled;
+	bool twt_requestor = false;
+	bool twt_responder = false;
+	bool bcast_requestor = false;
+	bool bcast_responder = false;
+
+	wlan_twt_get_bcast_requestor_cfg(mac->psoc, &bcast_requestor);
+	bcast_requestor = bcast_requestor &&
+			  !mac->mlme_cfg->twt_cfg.disable_btwt_usr_cfg;
+	wlan_twt_get_bcast_responder_cfg(mac->psoc, &bcast_responder);
+	wlan_twt_get_requestor_cfg(mac->psoc, &twt_requestor);
+	wlan_twt_get_responder_cfg(mac->psoc, &twt_responder);
 
 	he_cap->broadcast_twt = 0;
-	if (session->opmode == QDF_STA_MODE &&
-	    !twt_get_requestor_flag(mac)) {
-		/* Set twt_request as 0 if any SCC/MCC concurrency exist */
-		he_cap->twt_request = 0;
-		return;
-	} else if (session->opmode == QDF_SAP_MODE &&
-		   !twt_get_responder_flag(mac)) {
-		/** Set twt_responder as 0 if any SCC/MCC concurrency exist */
-		he_cap->twt_responder = 0;
-		return;
+	if (session->opmode == QDF_STA_MODE ||
+	    session->opmode == QDF_SAP_MODE) {
+		he_cap->twt_request =
+			twt_requestor && twt_get_requestor_flag(mac);
+		he_cap->twt_responder =
+			twt_responder && twt_get_responder_flag(mac);
 	}
 
 	if (session->opmode == QDF_STA_MODE) {
@@ -7423,13 +7425,17 @@ QDF_STATUS populate_dot11f_he_caps(struct mac_context *mac_ctx, struct pe_sessio
 QDF_STATUS
 populate_dot11f_he_caps_by_band(struct mac_context *mac_ctx,
 				bool is_2g,
-				tDot11fIEhe_cap *he_cap)
+				tDot11fIEhe_cap *he_cap,
+				struct pe_session *session)
 {
 	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));
 
+	if (session)
+		populate_dot11f_twt_he_cap(mac_ctx, session, he_cap);
+
 	return QDF_STATUS_SUCCESS;
 }
 
@@ -12050,7 +12056,8 @@ QDF_STATUS populate_dot11f_assoc_req_mlo_ie(struct mac_context *mac_ctx,
 						DOT11F_EID_VHTCAPS;
 		}
 
-		populate_dot11f_he_caps_by_band(mac_ctx, is_2g, &he_caps);
+		populate_dot11f_he_caps_by_band(mac_ctx, is_2g, &he_caps,
+						pe_session);
 		if (he_caps.ppet_present) {
 			value = WNI_CFG_HE_PPET_LEN;
 			if (!is_2g)