qcacld-3.0: Remove redundant ML log prints

Optimize and remove redundant ML log prints and also
pe_session logging.

CRs-Fixed: 3625951
Change-Id: I969a0a7e4c077889e390643b84e47cdff485ee14

components/action_oui/core/src/wlan_action_oui_parse.c

@@ -952,18 +952,13 @@ action_oui_is_empty(struct action_oui_psoc_priv *psoc_priv,
 	qdf_list_t *extension_list;
 
 	oui_priv = psoc_priv->oui_priv[action_id];
-	if (!oui_priv) {
-		action_oui_debug("action oui for id %d is empty",
-				 action_id);
+	if (!oui_priv)
 		return true;
-	}
 
 	extension_list = &oui_priv->extension_list;
 	qdf_mutex_acquire(&oui_priv->extension_lock);
 	if (qdf_list_empty(extension_list)) {
 		qdf_mutex_release(&oui_priv->extension_lock);
-		action_oui_debug("action oui for id %d list is empty",
-				 action_id);
 		return true;
 	}
 	qdf_mutex_release(&oui_priv->extension_lock);

components/umac/mlme/mlo_mgr/src/wlan_t2lm_api.c

@@ -450,61 +450,52 @@ wlan_t2lm_validate_candidate(struct cnx_mgr *cm_ctx,
 	uint16_t established_tid_mapped_link_id = 0;
 	uint16_t upcoming_tid_mapped_link_id = 0;
 
-	if (!scan_entry)
-		return QDF_STATUS_E_NULL_VALUE;
-
-	if (!cm_ctx || !cm_ctx->vdev)
+	if (!scan_entry || !cm_ctx || !cm_ctx->vdev)
 		return QDF_STATUS_E_NULL_VALUE;
 
 	vdev = cm_ctx->vdev;
 
-	if (wlan_vdev_mlme_is_mlo_link_vdev(vdev)) {
-		mlme_debug("Skip t2lm validation for link vdev");
+	/*
+	 * Skip T2LM validation for following cases:
+	 *  - Is link VDEV
+	 *  - Is not STA VDEV
+	 *  - T2LM IE not present in scan entry
+	 */
+	if (wlan_vdev_mlme_is_mlo_link_vdev(vdev) ||
+	    wlan_vdev_mlme_get_opmode(vdev) != QDF_STA_MODE ||
+	    !scan_entry->ie_list.t2lm[0]) {
 		return QDF_STATUS_SUCCESS;
 	}
 
-	if ((wlan_vdev_mlme_get_opmode(vdev) == QDF_STA_MODE) &&
-	    scan_entry->ie_list.t2lm[0]) {
-		status = wlan_mlo_parse_bcn_prbresp_t2lm_ie(&t2lm_ctx,
-						scan_entry->ie_list.t2lm[0]);
-		if (QDF_IS_STATUS_ERROR(status))
-			goto end;
-
-		status =
-		   t2lm_find_tid_mapped_link_id(&t2lm_ctx.established_t2lm.t2lm,
-					       &established_tid_mapped_link_id);
-		if (QDF_IS_STATUS_ERROR(status))
-			goto end;
-
-		status =
-		      t2lm_find_tid_mapped_link_id(&t2lm_ctx.upcoming_t2lm.t2lm,
-						  &upcoming_tid_mapped_link_id);
-		if (QDF_IS_STATUS_ERROR(status))
-			goto end;
-		t2lm_debug("established_tid_mapped_link_id %x, upcoming_tid_mapped_link_id %x",
-			   established_tid_mapped_link_id,
-			   upcoming_tid_mapped_link_id);
-
-		tid_map_link_id =
-		   established_tid_mapped_link_id & upcoming_tid_mapped_link_id;
-		if (!tid_map_link_id)
-			tid_map_link_id = established_tid_mapped_link_id;
-
-		if (tid_map_link_id == scan_entry->ml_info.self_link_id) {
-			t2lm_debug("self link id %d, tid map link id %d match",
-				   scan_entry->ml_info.self_link_id,
-				   tid_map_link_id);
-			status = QDF_STATUS_SUCCESS;
-		} else {
-			t2lm_debug("self link id %d, tid map link id %d do not match",
-				   scan_entry->ml_info.self_link_id,
-				   tid_map_link_id);
-			status = QDF_STATUS_E_FAILURE;
-		}
-	} else {
-		t2lm_debug("T2LM IE is not present in scan entry");
+	status = wlan_mlo_parse_bcn_prbresp_t2lm_ie(&t2lm_ctx,
+						    scan_entry->ie_list.t2lm[0]);
+	if (QDF_IS_STATUS_ERROR(status))
+		goto end;
+
+	status = t2lm_find_tid_mapped_link_id(&t2lm_ctx.established_t2lm.t2lm,
+					      &established_tid_mapped_link_id);
+	if (QDF_IS_STATUS_ERROR(status))
+		goto end;
+
+	status = t2lm_find_tid_mapped_link_id(&t2lm_ctx.upcoming_t2lm.t2lm,
+					      &upcoming_tid_mapped_link_id);
+	if (QDF_IS_STATUS_ERROR(status))
+		goto end;
+
+	t2lm_debug("self link id %d established_tid_mapped_link_id %x upcoming_tid_mapped_link_id %x",
+		   scan_entry->ml_info.self_link_id,
+		   established_tid_mapped_link_id, upcoming_tid_mapped_link_id);
+
+	tid_map_link_id =
+		established_tid_mapped_link_id & upcoming_tid_mapped_link_id;
+
+	if (!tid_map_link_id)
+		tid_map_link_id = established_tid_mapped_link_id;
+
+	if (tid_map_link_id == scan_entry->ml_info.self_link_id)
 		status = QDF_STATUS_SUCCESS;
-	}
+	else
+		status = QDF_STATUS_E_FAILURE;
 
 end:
 	return status;

core/mac/src/pe/include/lim_session.h

@@ -1176,6 +1176,53 @@ struct pe_session *pe_find_session_by_scan_id(struct mac_context *mac_ctx,
 				       uint32_t scan_id);
 
 uint8_t pe_get_active_session_count(struct mac_context *mac_ctx);
+
+/**
+ * lim_dump_session_info() - Dump the key parameters of PE session
+ * @mac_ctx: Global MAC context
+ * @pe_session: PE session
+ *
+ * Dumps the fields from the @pe_session for debugging.
+ *
+ * Return: void
+ */
+void lim_dump_session_info(struct mac_context *mac_ctx,
+			   struct pe_session *pe_session);
+
+#ifdef WLAN_FEATURE_11AX
+/**
+ * lim_dump_he_info() - Dump HE fields in PE session
+ * @mac: Global MAC context
+ * @session: PE session
+ *
+ * Dumps the fields related to HE from the @session for debugging
+ *
+ * Return: void
+ */
+void lim_dump_he_info(struct mac_context *mac, struct pe_session *session);
+#else
+static inline void lim_dump_he_info(struct mac_context *mac,
+				    struct pe_session *session)
+{
+}
+#endif
+
+#ifdef WLAN_FEATURE_11BE_MLO
+/**
+ * lim_dump_eht_info() - Dump EHT fields in PE session
+ * @session: PE session
+ *
+ * Dumps the fields related to EHT from @session for debugging
+ *
+ * Return: void
+ */
+void lim_dump_eht_info(struct pe_session *session);
+#else
+static inline void lim_dump_eht_info(struct pe_session *session)
+{
+}
+#endif
+
 #ifdef WLAN_FEATURE_FILS_SK
 /**
  * pe_delete_fils_info: API to delete fils session info

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

@@ -1400,19 +1400,13 @@ bool lim_is_emlsr_band_supported(struct pe_session *session)
 		partner_info = &session->lim_join_req->partner_info;
 	}
 
-	if (wlan_reg_is_24ghz_ch_freq(session->curr_op_freq)) {
-		pe_debug("Pri link freq: %d, EMLSR mode not allowed",
-			 session->curr_op_freq);
+	if (wlan_reg_is_24ghz_ch_freq(session->curr_op_freq))
 		return false;
-	}
 
 	for (i = 0; i < partner_info->num_partner_links; i++) {
 		freq = partner_info->partner_link_info[i].chan_freq;
-		if (wlan_reg_is_24ghz_ch_freq(freq)) {
-			pe_debug("Partner link freq: %d, EMLSR mode not allwed",
-				 freq);
+		if (wlan_reg_is_24ghz_ch_freq(freq))
 			return false;
-		}
 	}
 
 	return true;

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

@@ -554,9 +554,6 @@ static void lim_set_privacy(struct mac_context *mac_ctx,
 	mac_ctx->mlme_cfg->feature_flags.enable_rsn = rsn_enabled;
 	mac_ctx->mlme_cfg->wep_params.is_privacy_enabled = privacy;
 	mac_ctx->mlme_cfg->wep_params.wep_default_key_id = 0;
-	pe_debug("rsn_enabled %d privacy %d ucast_cipher %x auth_mode %x akm %x auth_type %d",
-		 rsn_enabled, privacy, ucast_cipher, auth_mode, akm,
-		 mac_ctx->mlme_cfg->wep_params.auth_type);
 }
 
 /**
@@ -722,7 +719,6 @@ static void lim_revise_req_vht_cap_per_band(struct pe_session *session)
 	vht_config = &session->vht_config;
 	/* Disable shortgi160 and 80 for 2.4Ghz BSS*/
 	if (wlan_reg_is_24ghz_ch_freq(session->curr_op_freq)) {
-		pe_debug("Disable shortgi ie for 80MHz & 160MHz in 2G band");
 		vht_config->shortgi80 = 0;
 		vht_config->shortgi160and80plus80 = 0;
 	}
@@ -1075,8 +1071,6 @@ __lim_handle_sme_start_bss_request(struct mac_context *mac_ctx, uint32_t *msg_bu
 						 WLAN_CRYPTO_PARAM_RSN_CAP);
 		session->limRmfEnabled =
 			rsn_caps & WLAN_CRYPTO_RSN_CAP_MFP_ENABLED ? 1 : 0;
-		pe_debug("RMF enabled: %d rsn_caps 0x%x",
-			 session->limRmfEnabled, rsn_caps);
 
 		qdf_mem_copy((void *)&session->rateSet,
 			     (void *)&sme_start_bss_req->operationalRateSet,
@@ -1241,12 +1235,10 @@ __lim_handle_sme_start_bss_request(struct mac_context *mac_ctx, uint32_t *msg_bu
 		session->limPrevSmeState = session->limSmeState;
 		session->limSmeState = eLIM_SME_WT_START_BSS_STATE;
 
-		pe_debug("Freq %d width %d freq0 %d freq1 %d, dot11mode %d nss %d vendor vht %d",
-			 session->curr_op_freq, session->ch_width,
-			 session->ch_center_freq_seg0,
-			 session->ch_center_freq_seg1,
-			 session->dot11mode, session->vdev_nss,
-			 session->vendor_vht_sap);
+		lim_dump_session_info(mac_ctx, session);
+		lim_dump_he_info(mac_ctx, session);
+		lim_dump_eht_info(session);
+
 		MTRACE(mac_trace
 			(mac_ctx, TRACE_CODE_SME_STATE,
 			session->peSessionId,
@@ -1514,12 +1506,6 @@ static void lim_join_req_update_ht_vht_caps(struct mac_context *mac,
 	session->ht_config = ht_caps.ht_caps;
 
 	if (session->opmode == QDF_STA_MODE) {
-		pe_debug("AP capability shortGI20MHz %d shortGI40MHz %d ini capability short_gi_20_mhz %d short_gi_40_mhz %d",
-			bcn_ie->HTCaps.shortGI20MHz,
-			bcn_ie->HTCaps.shortGI40MHz,
-			session->ht_config.short_gi_20_mhz,
-			session->ht_config.short_gi_40_mhz);
-
 		if (session->ht_config.short_gi_20_mhz)
 			session->ht_config.short_gi_20_mhz =
 						bcn_ie->HTCaps.shortGI20MHz;
@@ -1530,8 +1516,9 @@ static void lim_join_req_update_ht_vht_caps(struct mac_context *mac,
 	}
 
 	lim_revise_req_vht_cap_per_band(session);
-	pe_debug("HT capability 0x%x VHT capability 0x%x",
-		 ht_caps.caps, vht_config.caps);
+	pe_debug("HT cap 0x%x VHT cap 0x%x, AP cap sgi_20 %d sgi_40 %d",
+		 ht_caps.caps, vht_config.caps,
+		 bcn_ie->HTCaps.shortGI20MHz, bcn_ie->HTCaps.shortGI40MHz);
 }
 
 bool
@@ -1564,10 +1551,6 @@ lim_get_vdev_rmf_capable(struct mac_context *mac, struct pe_session *session)
 
 	wlan_objmgr_vdev_release_ref(vdev, WLAN_LEGACY_SME_ID);
 
-	pe_debug("vdev %d peer_rmf_capable %d rsn_caps 0x%x",
-		 session->vdev_id, peer_rmf_capable,
-		 rsn_caps);
-
 	return peer_rmf_capable;
 }
 
@@ -1757,8 +1740,6 @@ lim_update_eht_caps_mcs(struct mac_context *mac, struct pe_session *session)
 		return;
 	}
 
-	pe_debug("tx_nss: %u rx_nss: %u", tx_nss, rx_nss);
-
 	eht_config->bw_20_rx_max_nss_for_mcs_0_to_7 = rx_nss;
 	eht_config->bw_20_tx_max_nss_for_mcs_0_to_7 = tx_nss;
 	eht_config->bw_20_rx_max_nss_for_mcs_8_and_9 = rx_nss;
@@ -2062,9 +2043,6 @@ lim_get_self_dot11_mode(struct mac_context *mac_ctx, enum QDF_OPMODE opmode,
 	vdev_dot11_mode = vdev_mlme->proto.vdev_dot11_mode;
 	wlan_objmgr_vdev_release_ref(vdev, WLAN_MLME_OBJMGR_ID);
 
-	pe_debug("self_dot11_mode %d, vdev_dot11 %d, dev_mode %d",
-		  self_dot11_mode, vdev_dot11_mode, opmode);
-
 	if (vdev_dot11_mode == MLME_VDEV_DOT11_MODE_AUTO)
 		return self_dot11_mode;
 
@@ -2161,11 +2139,6 @@ lim_get_bss_dot11_mode(struct mac_context *mac_ctx,
 	    lim_get_bss_11be_mode_allowed(mac_ctx, bss_desc, ie_struct))
 		bss_dot11_mode = MLME_DOT11_MODE_11BE;
 
-	pe_debug("bss HT %d VHT %d HE %d EHT %d nw_type %d bss dot11_mode %d",
-		 ie_struct->HTCaps.present, ie_struct->VHTCaps.present,
-		 ie_struct->he_cap.present, ie_struct->eht_cap.present,
-		 bss_desc->nwType, bss_dot11_mode);
-
 	return bss_dot11_mode;
 }
 
@@ -2765,10 +2738,6 @@ lim_fill_dot11_mode(struct mac_context *mac_ctx, struct pe_session *session,
 
 	bss_dot11_mode = lim_get_bss_dot11_mode(mac_ctx, bss_desc, ie_struct);
 
-	pe_debug("vdev id %d opmode %d self dot11mode %d bss_dot11 mode %d",
-		 session->vdev_id, session->opmode, self_dot11_mode,
-		 bss_dot11_mode);
-
 	status = lim_get_intersected_dot11_mode_sta_ap(mac_ctx, self_dot11_mode,
 						       bss_dot11_mode,
 						       &intersected_mode,
@@ -2777,6 +2746,9 @@ lim_fill_dot11_mode(struct mac_context *mac_ctx, struct pe_session *session,
 		return status;
 
 	session->dot11mode = intersected_mode;
+	pe_debug("vdev id %d opmode %d self dot11mode %d bss_dot11 mode %d intersected %d",
+		 session->vdev_id, session->opmode, self_dot11_mode,
+		 bss_dot11_mode, intersected_mode);
 
 	lim_verify_dot11_mode_with_crypto(session);
 
@@ -2890,8 +2862,6 @@ static void lim_get_mld_peer(struct wlan_objmgr_vdev *vdev,
 		return;
 
 	qdf_mem_copy(bssid->bytes, peer->mldaddr, QDF_MAC_ADDR_SIZE);
-	pe_debug("Retrieve PMKSA for peer MLD: " QDF_MAC_ADDR_FMT,
-		 QDF_MAC_ADDR_REF(bssid->bytes));
 }
 #else
 static void lim_get_mld_peer(struct wlan_objmgr_vdev *vdev,
@@ -3120,7 +3090,6 @@ static void lim_reset_self_ocv_caps(struct pe_session *session)
 	if (self_rsn_cap == -1)
 		return;
 
-	pe_debug("self RSN cap: %d", self_rsn_cap);
 	self_rsn_cap &= ~WLAN_CRYPTO_RSN_CAP_OCV_SUPPORTED;
 
 	/* Update the new rsn caps */
@@ -3241,10 +3210,9 @@ lim_fill_pe_session(struct mac_context *mac_ctx, struct pe_session *session,
 	cb_mode = wlan_get_cb_mode(mac_ctx, session->curr_op_freq, ie_struct,
 				   session);
 	if (WLAN_REG_IS_24GHZ_CH_FREQ(bss_desc->chan_freq) &&
-	    session->force_24ghz_in_ht20) {
+	    session->force_24ghz_in_ht20)
 		cb_mode = PHY_SINGLE_CHANNEL_CENTERED;
-		pe_debug("force_24ghz_in_ht20 is set so set cbmode to 0");
-	}
+
 	status = wlan_get_rate_set(mac_ctx, ie_struct, session);
 	if (QDF_IS_STATUS_ERROR(status)) {
 		pe_err("Get rate failed vdev id %d", session->vdev_id);
@@ -3484,12 +3452,10 @@ lim_fill_pe_session(struct mac_context *mac_ctx, struct pe_session *session,
 	 * set maxTxPower non-zero value, that firmware can calc a non-zero
 	 * tx power, and update to host driver.
 	 */
-	if (LIM_IS_STA_ROLE(session) && session->maxTxPower == 0) {
+	if (LIM_IS_STA_ROLE(session) && session->maxTxPower == 0)
 		session->maxTxPower =
 			wlan_reg_get_channel_reg_power_for_freq(mac_ctx->pdev,
 							session->curr_op_freq);
-		pe_debug("session->maxTxPower %u", session->maxTxPower);
-	}
 
 	session->limRFBand = lim_get_rf_band(session->curr_op_freq);
 
@@ -3576,8 +3542,6 @@ lim_fill_pe_session(struct mac_context *mac_ctx, struct pe_session *session,
 	}
 
 	if (session->gLimCurrentBssUapsd) {
-		pe_debug("UAPSD flag for all AC - 0x%2x",
-			 session->gUapsdPerAcBitmask);
 		/* resetting the dynamic uapsd mask  */
 		session->gUapsdPerAcDeliveryEnableMask = 0;
 		session->gUapsdPerAcTriggerEnableMask = 0;
@@ -4394,17 +4358,14 @@ static void lim_fill_ml_info(struct cm_vdev_join_req *req,
 	struct mlo_partner_info *partner_info = NULL;
 
 	partner_info = &pe_join_req->partner_info;
-	if (!partner_info) {
-		pe_err("Partner link info not present");
+	if (!partner_info)
 		return;
-	}
 
 	num_links = req->partner_info.num_partner_links;
 	if (num_links > WLAN_UMAC_MLO_MAX_VDEVS)
 		num_links = WLAN_UMAC_MLO_MAX_VDEVS;
 
 	partner_info->num_partner_links = num_links;
-	pe_debug("MLO: num_links:%d", num_links);
 
 	for (idx = 0; idx < num_links; idx++) {
 		partner_info->partner_link_info[idx].link_id =
@@ -4412,10 +4373,6 @@ static void lim_fill_ml_info(struct cm_vdev_join_req *req,
 		qdf_copy_macaddr(
 			&partner_info->partner_link_info[idx].link_addr,
 			&req->partner_info.partner_link_info[idx].link_addr);
-		pe_debug("MLO: link_id:%d " QDF_MAC_ADDR_FMT,
-			 partner_info->partner_link_info[idx].link_id,
-			 QDF_MAC_ADDR_REF(partner_info->partner_link_info[idx].
-					  link_addr.bytes));
 		partner_info->partner_link_info[idx].chan_freq =
 			req->partner_info.partner_link_info[idx].chan_freq;
 	}
@@ -4448,8 +4405,6 @@ void lim_set_emlsr_caps(struct mac_context *mac_ctx, struct pe_session *session)
 		wlan_vdev_mlme_cap_clear(session->vdev, WLAN_VDEV_C_EMLSR_CAP);
 		wlan_vdev_obj_unlock(session->vdev);
 	}
-
-	pe_debug("eMLSR vdev cap: %d", emlsr_allowed);
 }
 #else
 static void lim_fill_ml_info(struct cm_vdev_join_req *req,
@@ -4622,6 +4577,8 @@ lim_fill_session_params(struct mac_context *mac_ctx,
 	if (eht_capab && wlan_vdev_mlme_is_mlo_vdev(session->vdev))
 		lim_fill_ml_info(req, pe_join_req);
 
+	lim_set_emlsr_caps(mac_ctx, session);
+
 	return QDF_STATUS_SUCCESS;
 }
 
@@ -4656,26 +4613,9 @@ lim_cm_handle_join_req(struct cm_vdev_join_req *req)
 	if (QDF_IS_STATUS_ERROR(status))
 		goto fail;
 
-	pe_debug("Freq %d width %d freq0 %d freq1 %d, Smps %d: mode %d action %d, nss 1x1 %d vdev_nss %d nss %d cbMode %d dot11mode %d subfer %d subfee %d csn %d is_cisco %d WPS %d OSEN %d fils %d akm %d",
-		 pe_session->curr_op_freq, pe_session->ch_width,
-		 pe_session->ch_center_freq_seg0,
-		 pe_session->ch_center_freq_seg1,
-		 mac_ctx->mlme_cfg->ht_caps.enable_smps,
-		 mac_ctx->mlme_cfg->ht_caps.smps,
-		 pe_session->send_smps_action, pe_session->supported_nss_1x1,
-		 pe_session->vdev_nss, pe_session->nss,
-		 pe_session->htSupportedChannelWidthSet,
-		 pe_session->dot11mode,
-		 pe_session->vht_config.su_beam_former,
-		 pe_session->vht_config.su_beam_formee,
-		 pe_session->vht_config.csnof_beamformer_antSup,
-		 pe_session->isCiscoVendorAP,
-		 pe_session->wps_registration,
-		 pe_session->isOSENConnection,
-		 lim_is_fils_connection(pe_session),
-		 pe_session->connected_akm);
-
-	lim_set_emlsr_caps(mac_ctx, pe_session);
+	lim_dump_session_info(mac_ctx, pe_session);
+	lim_dump_he_info(mac_ctx, pe_session);
+	lim_dump_eht_info(pe_session);
 
 	status = lim_send_connect_req_to_mlm(pe_session);
 	if (QDF_IS_STATUS_ERROR(status)) {
@@ -5159,7 +5099,6 @@ static void lim_handle_reassoc_req(struct cm_vdev_join_req *req)
 			mac_ctx->mlme_cfg->vht_caps.vht_cap_info.enable_paid;
 		session_entry->enableVhtGid =
 			mac_ctx->mlme_cfg->vht_caps.vht_cap_info.enable_gid;
-		pe_debug("vht su bformer [%d]", session_entry->vht_config.su_beam_former);
 	}
 
 	if (session_entry->nss == 1)
@@ -5189,18 +5128,9 @@ static void lim_handle_reassoc_req(struct cm_vdev_join_req *req)
 					lim_enable_twt(mac_ctx, ie_struct);
 
 	qdf_mem_free(ie_struct);
-	pe_debug("vhtCapability: %d su_beam_formee: %d su_tx_bformer %d",
-		session_entry->vhtCapability,
-		session_entry->vht_config.su_beam_formee,
-		session_entry->vht_config.su_beam_former);
 
 	session_entry->send_smps_action =
 		mac_ctx->roam.configParam.send_smps_action;
-	pe_debug("enableHtSmps: %d htSmps: %d send action: %d supported nss 1x1: %d",
-		mac_ctx->mlme_cfg->ht_caps.enable_smps,
-		mac_ctx->mlme_cfg->ht_caps.smps,
-		session_entry->send_smps_action,
-		session_entry->supported_nss_1x1);
 	session_entry->lim_join_req = NULL;
 
 	/* Reassociate request is expected in link established state only. */
@@ -5232,6 +5162,10 @@ static void lim_handle_reassoc_req(struct cm_vdev_join_req *req)
 				goto end;
 			}
 
+			lim_dump_session_info(mac_ctx, session_entry);
+			lim_dump_he_info(mac_ctx, session_entry);
+			lim_dump_eht_info(session_entry);
+
 			/* Update PE sessionId */
 			mlm_reassoc_req->sessionId = session_entry->peSessionId;
 			status = lim_send_ft_reassoc_req(session_entry,
@@ -5313,10 +5247,6 @@ static void lim_handle_reassoc_req(struct cm_vdev_join_req *req)
 		}
 	}
 
-	if (session_entry->gLimCurrentBssUapsd)
-		pe_debug("UAPSD flag for all AC - 0x%2x",
-			session_entry->gUapsdPerAcBitmask);
-
 	mlm_reassoc_req = qdf_mem_malloc(sizeof(tLimMlmReassocReq));
 	if (!mlm_reassoc_req) {
 		ret_code = eSIR_SME_RESOURCES_UNAVAILABLE;
@@ -5368,6 +5298,10 @@ static void lim_handle_reassoc_req(struct cm_vdev_join_req *req)
 	MTRACE(mac_trace(mac_ctx, TRACE_CODE_SME_STATE, session_entry->peSessionId,
 			 session_entry->limSmeState));
 
+	lim_dump_session_info(mac_ctx, session_entry);
+	lim_dump_he_info(mac_ctx, session_entry);
+	lim_dump_eht_info(session_entry);
+
 	status = lim_send_reassoc_req(session_entry, mlm_reassoc_req);
 	if (QDF_IS_STATUS_ERROR(status)) {
 		qdf_mem_free(mlm_reassoc_req);
@@ -5448,8 +5382,8 @@ lim_fill_preauth_req_dot11_mode(struct mac_context *mac_ctx,
 	}
 
 	req->dot11mode = intersected_mode;
-	pe_debug("self dot11mode %d bss_dot11 mode %d intersected_mode %d",
-		 self_dot11_mode, bss_dot11_mode, intersected_mode);
+	pe_debug("vdev %d self dot11mode %d bss_dot11 mode %d intersected_mode %d",
+		 vdev_id, self_dot11_mode, bss_dot11_mode, intersected_mode);
 
 	qdf_mem_free(ie_struct);
 	return status;
@@ -9497,6 +9431,10 @@ static void lim_process_sme_channel_change_request(struct mac_context *mac_ctx,
 		     sizeof(session_entry->extRateSet));
 	lim_change_channel(mac_ctx, session_entry);
 	lim_check_conc_power_for_csa(mac_ctx, session_entry);
+
+	lim_dump_session_info(mac_ctx, session_entry);
+	lim_dump_he_info(mac_ctx, session_entry);
+	lim_dump_eht_info(session_entry);
 }
 
 /******************************************************************************

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

@@ -111,17 +111,13 @@ static void lim_extract_he_op(struct pe_session *session,
 	if (!session->he_capable)
 		return;
 	if (!beacon_struct->he_op.present) {
-		pe_debug("HE op not present in beacon");
 		return;
 	}
 	qdf_mem_copy(&session->he_op, &beacon_struct->he_op,
 			sizeof(session->he_op));
-	pe_debug("he_op.bss_color %d", session->he_op.bss_color);
-	pe_debug("he_op.default_pe %d", session->he_op.default_pe);
 	if (!session->he_6ghz_band)
 		return;
 	if (!session->he_op.oper_info_6g_present) {
-		pe_debug("6GHz op not present in 6G beacon");
 		session->ap_defined_power_type_6g = REG_CURRENT_MAX_AP_TYPE;
 		return;
 	}
@@ -215,14 +211,12 @@ static void lim_check_is_he_mcs_valid(struct pe_session *session,
 			return;
 	}
 	session->he_capable = false;
-	pe_err("AP does not have valid MCS map");
-	if (session->vhtCapability) {
+	if (session->vhtCapability)
 		session->dot11mode = MLME_DOT11_MODE_11AC;
-		pe_debug("Update dot11mode to 11ac");
-	} else {
+	else
 		session->dot11mode = MLME_DOT11_MODE_11N;
-		pe_debug("Update dot11mode to 11N");
-	}
+	pe_err("vdev %d: Invalid LT80 MCS map 0x%x with NSS %d, falback to dot11mode %d",
+	       session->vdev_id, mcs_map, session->nss, session->dot11mode);
 }
 
 void lim_update_he_bw_cap_mcs(struct pe_session *session,
@@ -353,15 +347,11 @@ static void lim_extract_eht_op(struct pe_session *session,
 	if (!session->eht_capable)
 		return;
 
-	if (!beacon_struct->eht_op.present) {
-		pe_debug("EHT OP not present in beacon");
+	if (!beacon_struct->eht_op.present)
 		return;
-	}
 
-	if (!beacon_struct->eht_op.eht_op_information_present) {
-		pe_debug("EHT Operation Information Present not set");
+	if (!beacon_struct->eht_op.eht_op_information_present)
 		return;
-	}
 
 	qdf_mem_copy(&session->eht_op, &beacon_struct->eht_op,
 		     sizeof(session->eht_op));
@@ -397,9 +387,6 @@ static void lim_extract_eht_op(struct pe_session *session,
 
 	session->ch_center_freq_seg0 = session->eht_op.ccfs0;
 	session->ch_center_freq_seg1 = session->eht_op.ccfs1;
-
-	pe_debug("session ch_width %d ccfs0 %d ccfs1 %d", session->ch_width,
-		 session->ch_center_freq_seg0, session->ch_center_freq_seg1);
 }
 
 void lim_update_eht_bw_cap_mcs(struct pe_session *session,
@@ -411,15 +398,11 @@ void lim_update_eht_bw_cap_mcs(struct pe_session *session,
 	if ((session->opmode == QDF_STA_MODE ||
 	     session->opmode == QDF_P2P_CLIENT_MODE) &&
 	    beacon && beacon->eht_cap.present) {
-		if (!beacon->eht_cap.support_320mhz_6ghz) {
-			pe_debug("Session 6G 320M unsupported");
+		if (!beacon->eht_cap.support_320mhz_6ghz)
 			session->eht_config.support_320mhz_6ghz = 0;
-		}
 		if (!beacon->eht_cap.support_320mhz_6ghz ||
-		    !beacon->eht_cap.su_beamformer) {
-			pe_debug("Session 320 MHz Sounding Dimensions unsupported");
+		    !beacon->eht_cap.su_beamformer)
 			session->eht_config.num_sounding_dim_320mhz = 0;
-		}
 	}
 }
 #else

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

@@ -40,6 +40,7 @@
 #include "lim_send_messages.h"
 #include "cfg_ucfg_api.h"
 #include <lim_assoc_utils.h>
+#include <lim_process_fils.h>
 
 #ifdef WLAN_ALLOCATE_GLOBAL_BUFFERS_DYNAMICALLY
 static struct sDphHashNode *g_dph_node_array;
@@ -286,7 +287,6 @@ pe_init_pmf_comeback_timer(tpAniSirGlobal mac_ctx, struct pe_session *session)
 	if (session->opmode != QDF_STA_MODE)
 		return;
 
-	pe_debug("init pmf comeback timer for vdev %d", session->vdev_id);
 	session->pmf_retry_timer_info.mac = mac_ctx;
 	session->pmf_retry_timer_info.vdev_id = session->vdev_id;
 	session->pmf_retry_timer_info.retried = false;
@@ -427,8 +427,8 @@ void lim_set_bcn_probe_filter(struct mac_context *mac_ctx,
 	bssid = &session->bssId;
 
 	if (session_id >= WLAN_MAX_VDEVS) {
-		pe_err("Invalid session_id %d of type %d",
-			session_id, bss_type);
+		pe_err("vdev %d Invalid session_id %d of type %d",
+		       session->vdev_id, session_id, bss_type);
 		return;
 	}
 
@@ -437,22 +437,14 @@ void lim_set_bcn_probe_filter(struct mac_context *mac_ctx,
 	if (eSIR_INFRASTRUCTURE_MODE == bss_type) {
 		filter->num_sta_sessions++;
 		sir_copy_mac_addr(filter->sta_bssid[session_id], *bssid);
-		pe_debug("Set filter for STA Session %d bssid "QDF_MAC_ADDR_FMT,
-			session_id, QDF_MAC_ADDR_REF(*bssid));
 	} else if (eSIR_INFRA_AP_MODE == bss_type) {
 		if (!sap_channel) {
-			pe_err("SAP Type with invalid channel");
-			goto done;
+			pe_err("vdev %d with invalid chan", session->vdev_id);
+			return;
 		}
 		filter->num_sap_sessions++;
 		filter->sap_channel[session_id] = sap_channel;
-		pe_debug("Set filter for SAP session %d channel %d",
-			session_id, sap_channel);
 	}
-
-done:
-	pe_debug("sta %d sap %d", filter->num_sta_sessions,
-		 filter->num_sap_sessions);
 }
 
 void lim_reset_bcn_probe_filter(struct mac_context *mac_ctx,
@@ -1098,6 +1090,101 @@ struct pe_session *pe_find_session_by_scan_id(struct mac_context *mac_ctx,
 	return NULL;
 }
 
+void lim_dump_session_info(struct mac_context *mac_ctx,
+			   struct pe_session *pe_session)
+{
+	if (!mac_ctx || !pe_session)
+		return;
+
+	pe_nofl_debug("vdev_id %d freq %d ch_bw %d freq0 %d freq1 %d, smps %d mode %d action %d, nss_1x1 %d vdev_nss %d nss %d, cbMode %d, dot11Mode %d, subfer %d subfee %d csn %d, is_cisco %d, WPS %d OSEN %d FILS %d AKM %d",
+		      pe_session->vdev_id, pe_session->curr_op_freq,
+		      pe_session->ch_width, pe_session->ch_center_freq_seg0,
+		      pe_session->ch_center_freq_seg1,
+		      mac_ctx->mlme_cfg->ht_caps.enable_smps,
+		      mac_ctx->mlme_cfg->ht_caps.smps,
+		      pe_session->send_smps_action,
+		      pe_session->supported_nss_1x1, pe_session->vdev_nss,
+		      pe_session->nss, pe_session->htSupportedChannelWidthSet,
+		      pe_session->dot11mode,
+		      pe_session->vht_config.su_beam_former,
+		      pe_session->vht_config.su_beam_formee,
+		      pe_session->vht_config.csnof_beamformer_antSup,
+		      pe_session->isCiscoVendorAP, pe_session->wps_registration,
+		      pe_session->isOSENConnection,
+		      lim_is_fils_connection(pe_session),
+		      pe_session->connected_akm);
+
+	pe_nofl_debug(" MaxTxPwr %d RMF %d force_20_24 %d UAPSD flag 0x%2x auth type %d privacy %d",
+		      pe_session->maxTxPower, pe_session->limRmfEnabled,
+		      pe_session->force_24ghz_in_ht20,
+		      pe_session->gUapsdPerAcBitmask,
+		      mac_ctx->mlme_cfg->wep_params.auth_type,
+		      mac_ctx->mlme_cfg->wep_params.is_privacy_enabled);
+}
+
+#ifdef WLAN_FEATURE_11AX
+void lim_dump_he_info(struct mac_context *mac, struct pe_session *session)
+{
+	struct mlme_legacy_priv *mlme_priv;
+
+	if (!session->he_capable)
+		return;
+
+	mlme_priv = wlan_vdev_mlme_get_ext_hdl(session->vdev);
+	if (!mlme_priv)
+		return;
+
+	pe_nofl_debug(" HE info: bss_color %d default_pe %d ul mu %d, rx_pream_puncturing %d MCS LT_80: tx: 0x%x, rx: 0x%x, 160: tx: 0x%x, rx: 0x%x",
+		      session->he_op.bss_color, session->he_op.default_pe,
+		      session->he_config.ul_mu,
+		      mac->he_cap_5g.rx_pream_puncturing,
+		      mlme_priv->he_config.tx_he_mcs_map_lt_80,
+		      mlme_priv->he_config.rx_he_mcs_map_lt_80,
+		      *(uint16_t *)mlme_priv->he_config.tx_he_mcs_map_160,
+		      *(uint16_t *)mlme_priv->he_config.rx_he_mcs_map_160);
+}
+#endif
+
+#ifdef WLAN_FEATURE_11BE_MLO
+void lim_dump_eht_info(struct pe_session *session)
+{
+	bool is_emlsr;
+	struct mlo_partner_info *partner_info;
+	struct qdf_mac_addr mld_addr = {0};
+	uint8_t buffer[100] = {0};
+	uint8_t idx, len = 0, buf_len = QDF_ARRAY_SIZE(buffer);
+
+	if (!session->eht_capable)
+		return;
+
+	wlan_vdev_obj_lock(session->vdev);
+	is_emlsr = wlan_vdev_mlme_cap_get(session->vdev, WLAN_VDEV_C_EMLSR_CAP);
+	wlan_vdev_obj_unlock(session->vdev);
+
+	wlan_vdev_get_bss_peer_mld_mac(session->vdev, &mld_addr);
+
+	if (!session->lim_join_req)
+		return;
+
+	partner_info =  &session->lim_join_req->partner_info;
+	for (idx = 0; idx < partner_info->num_partner_links; idx++) {
+		if (len >= buf_len)
+			break;
+
+		len += qdf_scnprintf(buffer + len, buf_len - len, "Link %d: " QDF_MAC_ADDR_FMT,
+				     partner_info->partner_link_info[idx].link_id,
+				     QDF_MAC_ADDR_REF(partner_info->partner_link_info[idx].link_addr.bytes));
+	}
+
+	pe_nofl_debug(" 802.11be D-3.0, MLD: " QDF_MAC_ADDR_FMT " 320MHz %d num_sounding_dim_320 %d, eMLSR %d, partner_links %d, %s",
+		      QDF_MAC_ADDR_REF(mld_addr.bytes),
+		      session->eht_config.support_320mhz_6ghz,
+		      session->eht_config.num_sounding_dim_320mhz, is_emlsr,
+		      partner_info->num_partner_links,
+		      len ? buffer : '\0');
+}
+#endif
+
 /**
  * pe_get_active_session_count() - function to return active pe session count
  *

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

@@ -7398,8 +7398,7 @@ void lim_update_he_caps_mcs(struct mac_context *mac, struct pe_session *session)
 		tx_mcs_map = HE_SET_MCS_4_NSS(tx_mcs_map, mcs_map, 2);
 		rx_mcs_map = HE_SET_MCS_4_NSS(rx_mcs_map, mcs_map, 2);
 	}
-	pe_debug("new HE Nss MCS MAP: Rx 0x%0X, Tx: 0x%0X",
-		 rx_mcs_map, tx_mcs_map);
+
 	mlme_priv->he_config.tx_he_mcs_map_lt_80 = tx_mcs_map;
 	mlme_priv->he_config.rx_he_mcs_map_lt_80 = rx_mcs_map;
 	*((uint16_t *)mlme_priv->he_config.tx_he_mcs_map_160) = tx_mcs_map;
@@ -7408,11 +7407,6 @@ void lim_update_he_caps_mcs(struct mac_context *mac, struct pe_session *session)
 		     sizeof(u_int16_t));
 	qdf_mem_copy(mlme_priv->he_config.rx_he_mcs_map_160, &rx_mcs_map,
 		     sizeof(u_int16_t));
-
-	pe_debug("new HE80 mcs map tx: 0x%x, rx: 0x%x", tx_mcs_map, rx_mcs_map);
-	pe_debug("new HE160 mcs map tx: 0x%x, rx: 0x%x",
-		 *(uint16_t *)mlme_priv->he_config.tx_he_mcs_map_160,
-		 *(uint16_t *)mlme_priv->he_config.rx_he_mcs_map_160);
 }
 
 static void
@@ -7731,10 +7725,6 @@ void lim_update_session_he_capable(struct mac_context *mac, struct pe_session *s
 		session->he_config.rx_pream_puncturing =
 					mac->he_cap_5g.rx_pream_puncturing;
 	}
-
-	pe_debug("he_capable: %d ul mu %d, rx_pream_puncturing %d",
-		 session->he_capable, session->he_config.ul_mu,
-		 mac->he_cap_5g.rx_pream_puncturing);
 }
 
 void lim_update_session_he_capable_chan_switch(struct mac_context *mac,
@@ -8697,13 +8687,10 @@ lim_revise_req_eht_cap_per_band(struct mlme_legacy_priv *mlme_priv,
 {
 	struct mac_context *mac = session->mac_ctx;
 
-	if (wlan_reg_is_24ghz_ch_freq(session->curr_op_freq)) {
+	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");
-	} else {
+	else
 		mlme_priv->eht_config = mac->eht_cap_5g;
-		pe_debug("revise 5G eht cap");
-	}
 }
 
 /**
@@ -8833,8 +8820,6 @@ void lim_update_session_eht_capable(struct mac_context *mac,
 				    struct pe_session *session)
 {
 	session->eht_capable = true;
-	pe_debug("eht_capable: %d", session->eht_capable);
-	pe_debug("Draft 3.0 support enabled");
 }
 
 void lim_add_bss_eht_cfg(struct bss_params *add_bss, struct pe_session *session)

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

@@ -9835,7 +9835,6 @@ populate_dot11f_probe_req_mlo_ie(struct mac_context *mac,
 		pe_debug("Do not populate sta profile in MLO IE");
 		goto no_sta_prof;
 	}
-	pe_debug("Populate sta profile in MLO IE");
 
 	partner_info = session->lim_join_req->partner_info;
 	for (link = 0; link < partner_info.num_partner_links; link++) {
@@ -12478,8 +12477,6 @@ QDF_STATUS populate_dot11f_mlo_ie(struct mac_context *mac_ctx,
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	pe_debug("Populate MLO common IEs");
-
 	mlo_ie->type = 0;
 	mlo_ie->common_info_length = WLAN_ML_BV_CINFO_LENGTH_SIZE;
 	mld_addr =
@@ -12586,11 +12583,6 @@ QDF_STATUS populate_dot11f_mlo_ie(struct mac_context *mac_ctx,
 		len_remaining -= WLAN_ML_BV_CINFO_EMLCAP_SIZE;
 	}
 
-	pe_debug("EMLSR support: %d, padding delay: %d, transition delay: %d",
-		 mlo_ie->eml_capabilities_info.emlsr_support,
-		 mlo_ie->eml_capabilities_info.emlsr_padding_delay,
-		 mlo_ie->eml_capabilities_info.emlsr_transition_delay);
-
 	if (mlo_ie->mld_capab_and_op_present) {
 		QDF_SET_BITS(*(uint16_t *)p_ml_ie,
 			     WLAN_ML_BV_CINFO_MLDCAPANDOP_MAXSIMULLINKS_IDX,
@@ -12605,7 +12597,11 @@ QDF_STATUS populate_dot11f_mlo_ie(struct mac_context *mac_ctx,
 	}
 
 	mlo_ie->num_data = p_ml_ie - mlo_ie->data;
-	pe_debug("MLO common IEs total len: %d", mlo_ie->num_data);
+	pe_debug("VDEV %d ML-IE common info len %d eMLSR support %d pad_delay %d, trans_delay %d",
+		 wlan_vdev_get_id(vdev), mlo_ie->num_data,
+		 mlo_ie->eml_capabilities_info.emlsr_support,
+		 mlo_ie->eml_capabilities_info.emlsr_padding_delay,
+		 mlo_ie->eml_capabilities_info.emlsr_transition_delay);
 
 	return QDF_STATUS_SUCCESS;
 }