diff --git a/components/p2p/core/src/wlan_p2p_main.c b/components/p2p/core/src/wlan_p2p_main.c index 968e07e5d7ef..4bb4bd585671 100644 --- a/components/p2p/core/src/wlan_p2p_main.c +++ b/components/p2p/core/src/wlan_p2p_main.c @@ -1397,10 +1397,8 @@ QDF_STATUS p2p_status_connect(struct wlan_objmgr_vdev *vdev) } mode = wlan_vdev_mlme_get_opmode(vdev); - if (mode != QDF_P2P_CLIENT_MODE) { - p2p_debug("this is not P2P CLIENT, mode:%d", mode); + if (mode != QDF_P2P_CLIENT_MODE) return QDF_STATUS_SUCCESS; - } p2p_debug("connection status:%d", p2p_soc_obj->connection_status); switch (p2p_soc_obj->connection_status) { diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index 003159cdfadd..e2ec6cb01f37 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -2412,9 +2412,6 @@ static void hdd_send_re_assoc_event(struct net_device *dev, qdf_mem_copy(buf_ptr, &roam_profile.SSID.ssId[0], roam_profile.SSID.length); ssid_ie_len = 2 + roam_profile.SSID.length; - hdd_debug("SSIDIE:"); - QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_DEBUG, - buf_ssid_ie, ssid_ie_len); final_req_ie = qdf_mem_malloc(IW_GENERIC_IE_MAX); if (!final_req_ie) { if (bss) @@ -3158,10 +3155,6 @@ hdd_association_completion_handler(struct hdd_adapter *adapter, FT_ASSOC_RSP_IES_OFFSET; hdd_debug("assoc_rsp_len %d", assoc_rsp_len); - QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, - QDF_TRACE_LEVEL_DEBUG, - assoc_rsp, - assoc_rsp_len); } else { hdd_debug("AssocRsp is NULL"); assoc_rsp_len = 0; @@ -3178,11 +3171,6 @@ hdd_association_completion_handler(struct hdd_adapter *adapter, */ assoc_req += FT_ASSOC_REQ_IES_OFFSET; - hdd_debug("assoc_req is now at %02x%02x", - (unsigned int) - assoc_req[0], - (unsigned int) - assoc_req[1]); assoc_req_len = roam_info->nAssocReqLength - FT_ASSOC_REQ_IES_OFFSET; @@ -3194,12 +3182,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter, assoc_req_len = roam_info->nAssocReqLength; } - hdd_debug("assoc_req_len %d", assoc_req_len); - QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, - QDF_TRACE_LEVEL_DEBUG, - assoc_req, - assoc_req_len); } else { hdd_debug("AssocReq is NULL"); assoc_req_len = 0; @@ -3528,6 +3511,9 @@ hdd_association_completion_handler(struct hdd_adapter *adapter, (u8 *)(roam_info->pbFrames + roam_info->nBeaconLength + roam_info->nAssocReqLength); + hdd_debug("assoc_req_len %d assoc resp len %d", + roam_info->nAssocReqLength, + roam_info->nAssocRspLength); } hdd_err("send connect failure to nl80211: for bssid " QDF_MAC_ADDR_STR diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c index 63d5b440d83a..3a5e5f3ce97e 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -2089,9 +2089,6 @@ lim_roam_fill_bss_descr(struct mac_context *mac, roam_synch_ind_ptr->isBeacon, roam_synch_ind_ptr->bssid.bytes, mac_hdr->bssId); - QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, - bcn_proberesp_ptr, - roam_synch_ind_ptr->beaconProbeRespLength); status = lim_roam_gen_beacon_descr(mac, roam_synch_ind_ptr, @@ -2165,9 +2162,6 @@ lim_roam_fill_bss_descr(struct mac_context *mac, (uint8_t *)parsed_frm_ptr->mdie, SIR_MDIE_SIZE); } - pe_debug("LFR3: BssDescr Info:"); - QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, - bss_desc_ptr->bssId, sizeof(tSirMacAddr)); pe_debug("chan: %d rssi: %d ie_len %d", bss_desc_ptr->chan_freq, bss_desc_ptr->rssi, ie_len); @@ -2417,10 +2411,6 @@ pe_roam_synch_callback(struct mac_context *mac_ctx, roam_sync_ind_ptr->reassocRespOffset, mac_ctx->roam.reassocRespLen); - pe_debug("LFR3: Reassoc resp frame data:"); - QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, - mac_ctx->roam.pReassocResp, - mac_ctx->roam.reassocRespLen); ft_session_ptr->bRoamSynchInProgress = true; lim_process_assoc_rsp_frame(mac_ctx, mac_ctx->roam.pReassocResp, diff --git a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c index a8eb87bdee43..7af661c1be55 100644 --- a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c +++ b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c @@ -310,7 +310,6 @@ static void lim_update_ric_data(struct mac_context *mac_ctx, pe_err("RIC data not present"); } } else { - pe_debug("Ric is not present"); session_entry->RICDataLen = 0; session_entry->ricData = NULL; } @@ -356,7 +355,6 @@ static void lim_update_ese_tspec(struct mac_context *mac_ctx, } else { session_entry->tspecLen = 0; session_entry->tspecIes = NULL; - pe_debug("Tspec EID *NOT* present in assoc rsp"); } return; } @@ -587,33 +585,14 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx, struct csr_roam_session *roam_session; #endif uint8_t ap_nss; + int8_t rssi; - /* Initialize status code to success. */ - if (lim_is_roam_synch_in_progress(session_entry)) - hdr = (tpSirMacMgmtHdr) mac_ctx->roam.pReassocResp; - else - hdr = WMA_GET_RX_MAC_HEADER(rx_pkt_info); #ifdef WLAN_FEATURE_ROAM_OFFLOAD vdev_id = session_entry->vdev_id; #endif assoc_cnf.resultCode = eSIR_SME_SUCCESS; /* Update PE session Id */ assoc_cnf.sessionId = session_entry->peSessionId; - if (!hdr) { - pe_err("LFR3: Reassoc response packet header is NULL"); - return; - } - - pe_nofl_info("Assoc RX subtype %d vdev %d sys role %d lim state %d rssi %d from " QDF_MAC_ADDR_STR, - subtype, session_entry->vdev_id, - GET_LIM_SYSTEM_ROLE(session_entry), - session_entry->limMlmState, - WMA_GET_RX_RSSI_NORMALIZED(rx_pkt_info), - QDF_MAC_ADDR_ARRAY(hdr->sa)); - - beacon = qdf_mem_malloc(sizeof(tSchBeaconStruct)); - if (!beacon) - return; if (LIM_IS_AP_ROLE(session_entry)) { /* @@ -622,16 +601,36 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx, */ pe_err("Should not received Re/Assoc Response in role: %d", GET_LIM_SYSTEM_ROLE(session_entry)); - qdf_mem_free(beacon); return; } + if (lim_is_roam_synch_in_progress(session_entry)) { hdr = (tpSirMacMgmtHdr) mac_ctx->roam.pReassocResp; frame_len = mac_ctx->roam.reassocRespLen - SIR_MAC_HDR_LEN_3A; + rssi = 0; } else { hdr = WMA_GET_RX_MAC_HEADER(rx_pkt_info); frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_pkt_info); + rssi = WMA_GET_RX_RSSI_NORMALIZED(rx_pkt_info); } + + if (!hdr) { + pe_err("LFR3: Reassoc response packet header is NULL"); + return; + } + + pe_nofl_info("Assoc RX subtype %d vdev %d sys role %d lim state %d rssi %d from " QDF_MAC_ADDR_STR, + subtype, session_entry->vdev_id, + GET_LIM_SYSTEM_ROLE(session_entry), + session_entry->limMlmState, rssi, + QDF_MAC_ADDR_ARRAY(hdr->sa)); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, + (uint8_t *)hdr, frame_len + SIR_MAC_HDR_LEN_3A); + + beacon = qdf_mem_malloc(sizeof(tSchBeaconStruct)); + if (!beacon) + return; + if (((subtype == LIM_ASSOC) && (session_entry->limMlmState != eLIM_MLM_WT_ASSOC_RSP_STATE)) || ((subtype == LIM_REASSOC) && diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index 250a278ed580..97334d002fa8 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -3430,7 +3430,6 @@ lim_send_vdev_restart(struct mac_context *mac, pe_err("vdev component object is NULL"); return; } - pe_debug("pe_session->ssidHidden %d", pe_session->ssidHidden); mlme_obj->mgmt.ap.hidden_ssid = pe_session->ssidHidden ? true : false; diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c index 46149e1836d4..a410781ab68e 100644 --- a/core/mac/src/pe/lim/lim_send_management_frames.c +++ b/core/mac/src/pe/lim/lim_send_management_frames.c @@ -2049,26 +2049,15 @@ lim_send_assoc_req_mgmt_frame(struct mac_context *mac_ctx, mac_ctx->lim.htCapabilityPresentInBeacon) { pe_debug("Populate HT Caps in Assoc Request"); populate_dot11f_ht_caps(mac_ctx, pe_session, &frm->HTCaps); - QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, - &frm->HTCaps, sizeof(frm->HTCaps)); } else if (pe_session->he_with_wep_tkip) { pe_debug("Populate HT Caps in Assoc Request with WEP/TKIP"); populate_dot11f_ht_caps(mac_ctx, NULL, &frm->HTCaps); } - pe_debug("SupportedChnlWidth: %d, mimoPS: %d, GF: %d, short GI20:%d, shortGI40: %d, dsssCck: %d, AMPDU Param: %x", - frm->HTCaps.supportedChannelWidthSet, - frm->HTCaps.mimoPowerSave, - frm->HTCaps.greenField, frm->HTCaps.shortGI20MHz, - frm->HTCaps.shortGI40MHz, - frm->HTCaps.dsssCckMode40MHz, - frm->HTCaps.maxRxAMPDUFactor); if (pe_session->vhtCapability && pe_session->vhtCapabilityPresentInBeacon) { pe_debug("Populate VHT IEs in Assoc Request"); populate_dot11f_vht_caps(mac_ctx, pe_session, &frm->VHTCaps); - QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, - &frm->VHTCaps, sizeof(frm->VHTCaps)); vht_enabled = true; if (pe_session->enableHtSmps && !pe_session->supported_nss_1x1) { @@ -2217,9 +2206,6 @@ lim_send_assoc_req_mgmt_frame(struct mac_context *mac_ctx, goto end; } rsnx_ie_len = rsnx_ie[1] + 2; - pe_debug("RSNX_IE added to association request"); - QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, - rsnx_ie, rsnx_ie_len); } /* @@ -2429,9 +2415,10 @@ lim_send_assoc_req_mgmt_frame(struct mac_context *mac_ctx, MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, pe_session->peSessionId, mac_hdr->fc.subType)); - pe_nofl_info("Assoc TX vdev %d to %pM seq num %d", - pe_session->vdev_id, pe_session->bssId, - mac_ctx->mgmtSeqNum); + pe_nofl_info("Assoc TX vdev %d to %pM seq num %d", pe_session->vdev_id, + pe_session->bssId, mac_ctx->mgmtSeqNum); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, + frame, (uint16_t)(sizeof(tSirMacMgmtHdr) + payload)); min_rid = lim_get_min_session_txrate(pe_session); lim_diag_event_report(mac_ctx, WLAN_PE_DIAG_ASSOC_START_EVENT, diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index 6af106752236..67bc16749d99 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -5985,9 +5985,6 @@ QDF_STATUS lim_strip_supp_op_class_update_struct(struct mac_context *mac_ctx, pe_err("dot11f_unpack Parse Error"); return QDF_STATUS_E_FAILURE; } - if (dst->num_classes) - QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, - &dst->classes[0], dst->num_classes); return QDF_STATUS_SUCCESS; } @@ -6942,174 +6939,99 @@ void lim_log_he_cap(struct mac_context *mac, tDot11fIEhe_cap *he_cap) if (!he_cap->present) return; - pe_debug("HE Capabilities:"); + pe_nofl_debug("HE Capabilities: htc_he 0x%x twt_req 0x%x twt_res 0x%x fragmentation 0x%x max frag msdu amsdu 0x%x min frag 0x%x", + he_cap->htc_he, he_cap->twt_request, + he_cap->twt_responder, he_cap->fragmentation, + he_cap->max_num_frag_msdu_amsdu_exp, + he_cap->min_frag_size); + pe_nofl_debug("\ttrig frm mac pad 0x%x multi tid aggr supp 0x%x link adaptaion 0x%x all ack 0x%x trigd_rsp_sched 0x%x a_bsr 0x%x", + he_cap->trigger_frm_mac_pad, + he_cap->multi_tid_aggr_rx_supp, + he_cap->he_link_adaptation, he_cap->all_ack, + he_cap->trigd_rsp_sched, he_cap->a_bsr); + pe_nofl_debug("\tBC twt 0x%x ba_32bit_bitmap supp 0x%x mu_cascade 0x%x ack_enabled_multitid 0x%x omi_a_ctrl 0x%x ofdma_ra 0x%x", + he_cap->broadcast_twt, he_cap->ba_32bit_bitmap, + he_cap->mu_cascade, he_cap->ack_enabled_multitid, + he_cap->omi_a_ctrl, he_cap->ofdma_ra); + pe_nofl_debug("\tmax_ampdu_len exp ext 0x%x amsdu_frag 0x%x flex_twt_sched 0x%x rx_ctrl frm 0x%x bsrp_ampdu_aggr 0x%x qtp 0x%x a_bqr 0x%x", + he_cap->max_ampdu_len_exp_ext, he_cap->amsdu_frag, + he_cap->flex_twt_sched, he_cap->rx_ctrl_frame, + he_cap->bsrp_ampdu_aggr, he_cap->qtp, he_cap->a_bqr); + pe_nofl_debug("\tSR Reponder 0x%x ndp_feedback 0x%x ops_supp 0x%x amsdu_in_ampdu 0x%x multi_tid_aggr_tx 0x%x he_sub_ch_sel_tx 0x%x", + he_cap->spatial_reuse_param_rspder, + he_cap->ndp_feedback_supp, + he_cap->ops_supp, he_cap->amsdu_in_ampdu, + he_cap->multi_tid_aggr_tx_supp, + he_cap->he_sub_ch_sel_tx_supp); + + pe_nofl_debug("\tul_2x996_tone_ru 0x%x om_ctrl_ul_mu_data_dis_rx 0x%x dynamic_smps 0x%x punctured_sounding 0x%x ht_vht_trg_frm_rx 0x%x", + he_cap->ul_2x996_tone_ru_supp, + he_cap->om_ctrl_ul_mu_data_dis_rx, + he_cap->he_dynamic_smps, he_cap->punctured_sounding_supp, + he_cap->ht_vht_trg_frm_rx_supp); - /* HE MAC capabilities */ - pe_debug("\tHTC-HE conrol: 0x%01x", he_cap->htc_he); - pe_debug("\tTWT Requestor support: 0x%01x", - he_cap->twt_request); - pe_debug("\tTWT Responder support: 0x%01x", - he_cap->twt_responder); - pe_debug("\tFragmentation support: 0x%02x", - he_cap->fragmentation); - pe_debug("\tMax no.of frag MSDUs: 0x%03x", - he_cap->max_num_frag_msdu_amsdu_exp); - pe_debug("\tMin. frag size: 0x%02x", he_cap->min_frag_size); - pe_debug("\tTrigger MAC pad duration: 0x%02x", - he_cap->trigger_frm_mac_pad); - pe_debug("\tMulti-TID aggr Rx support: 0x%03x", - he_cap->multi_tid_aggr_rx_supp); - pe_debug("\tLink adaptation: 0x%02x", - he_cap->he_link_adaptation); - pe_debug("\tAll ACK support: 0x%01x", he_cap->all_ack); - pe_debug("\tTriggered resp. scheduling: 0x%01x", - he_cap->trigd_rsp_sched); - pe_debug("\tA-Buff status report: 0x%01x", he_cap->a_bsr); - pe_debug("\tBroadcast TWT support: 0x%01x", - he_cap->broadcast_twt); - pe_debug("\t32bit BA bitmap support: 0x%01x", - he_cap->ba_32bit_bitmap); - pe_debug("\tMU Cascading support: 0x%01x", - he_cap->mu_cascade); - pe_debug("\tACK enabled Multi-TID: 0x%01x", - he_cap->ack_enabled_multitid); - pe_debug("\tOMI A-Control support: 0x%01x", - he_cap->omi_a_ctrl); - pe_debug("\tOFDMA RA support: 0x%01x", he_cap->ofdma_ra); - pe_debug("\tMax A-MPDU Length: 0x%02x", - he_cap->max_ampdu_len_exp_ext); - pe_debug("\tA-MSDU Fragmentation: 0x%01x", - he_cap->amsdu_frag); - pe_debug("\tFlex. TWT sched support: 0x%01x", - he_cap->flex_twt_sched); - pe_debug("\tRx Ctrl frame to MBSS: 0x%01x", - he_cap->rx_ctrl_frame); - pe_debug("\tBSRP A-MPDU Aggregation: 0x%01x", - he_cap->bsrp_ampdu_aggr); - pe_debug("\tQuite Time Period support: 0x%01x", he_cap->qtp); - pe_debug("\tA-BQR support: 0x%01x", he_cap->a_bqr); - pe_debug("\tSR Reponder support: 0x%01x", - he_cap->spatial_reuse_param_rspder); - pe_debug("\tNDP Feedback support: 0x%01x", he_cap->ndp_feedback_supp); - pe_debug("\tOPS support: 0x%01x", he_cap->ops_supp); - pe_debug("\tAMSDU in AMPDU: 0x%01x", he_cap->amsdu_in_ampdu); - pe_debug("\tMulti-TID aggr Tx support: 0x%03x", - he_cap->multi_tid_aggr_tx_supp); - pe_debug("\tHE sub ch sel tx supp: 0x%01x", - he_cap->he_sub_ch_sel_tx_supp); - pe_debug("\tUL 2x996 tone RU supp: 0x%01x", - he_cap->ul_2x996_tone_ru_supp); - pe_debug("\tOM ctrl UL MU data dis rx supp: 0x%01x", - he_cap->om_ctrl_ul_mu_data_dis_rx); - pe_debug("\tHE dynamic SMPS supp: 0x%01x", - he_cap->he_dynamic_smps); - pe_debug("\tPunctured sounding supp: 0x%01x", - he_cap->punctured_sounding_supp); - pe_debug("\tHT VHT Trigger frame Rx supp: 0x%01x", - he_cap->ht_vht_trg_frm_rx_supp); - /* HE PHY capabilities */ chan_width = HE_CH_WIDTH_COMBINE(he_cap->chan_width_0, he_cap->chan_width_1, he_cap->chan_width_2, he_cap->chan_width_3, he_cap->chan_width_4, he_cap->chan_width_5, he_cap->chan_width_6); - pe_debug("\tChannel width support: 0x%07x", chan_width); - pe_debug("\tPreamble puncturing Rx: 0x%04x", - he_cap->rx_pream_puncturing); - pe_debug("\tClass of device: 0x%01x", he_cap->device_class); - pe_debug("\tLDPC coding support: 0x%01x", - he_cap->ldpc_coding); - pe_debug("\tLTF and GI for HE PPDUs: 0x%02x", - he_cap->he_1x_ltf_800_gi_ppdu); - pe_debug("\tMidamble TX Rx MAX NSTS: 0x%02x", - he_cap->midamble_tx_rx_max_nsts); - pe_debug("\tLTF and GI for NDP: 0x%02x", - he_cap->he_4x_ltf_3200_gi_ndp); - pe_debug("\tSTBC Tx support (<= 80MHz): 0x%01x", - he_cap->tb_ppdu_tx_stbc_lt_80mhz); - pe_debug("\tSTBC Rx support (<= 80MHz): 0x%01x", - he_cap->rx_stbc_lt_80mhz); - pe_debug("\tDoppler support: 0x%02x", he_cap->doppler); - pe_debug("\tUL MU: 0x%02x", he_cap->ul_mu); - pe_debug("\tDCM encoding Tx: 0x%03x", he_cap->dcm_enc_tx); - pe_debug("\tDCM encoding Rx: 0x%03x", he_cap->dcm_enc_rx); - pe_debug("\tHE MU PPDU payload support: 0x%01x", - he_cap->ul_he_mu); - pe_debug("\tSU Beamformer: 0x%01x", he_cap->su_beamformer); - pe_debug("\tSU Beamformee: 0x%01x", he_cap->su_beamformee); - pe_debug("\tMU Beamformer: 0x%01x", he_cap->mu_beamformer); - pe_debug("\tBeamformee STS for <= 80Mhz: 0x%03x", - he_cap->bfee_sts_lt_80); - pe_debug("\tBeamformee STS for > 80Mhz: 0x%03x", - he_cap->bfee_sts_gt_80); - pe_debug("\tNo. of sounding dim <= 80Mhz: 0x%03x", - he_cap->num_sounding_lt_80); - pe_debug("\tNo. of sounding dim > 80Mhz: 0x%03x", - he_cap->num_sounding_gt_80); - pe_debug("\tNg=16 for SU feedback support: 0x%01x", - he_cap->su_feedback_tone16); - pe_debug("\tNg=16 for MU feedback support: 0x%01x", - he_cap->mu_feedback_tone16); - pe_debug("\tCodebook size for SU: 0x%01x", - he_cap->codebook_su); - pe_debug("\tCodebook size for MU: 0x%01x ", - he_cap->codebook_mu); - pe_debug("\tBeamforming trigger w/ Trigger: 0x%01x", - he_cap->beamforming_feedback); - pe_debug("\tHE ER SU PPDU payload: 0x%01x", - he_cap->he_er_su_ppdu); - pe_debug("\tDL MUMIMO on partial BW: 0x%01x", - he_cap->dl_mu_mimo_part_bw); - pe_debug("\tPPET present: 0x%01x", he_cap->ppet_present); - pe_debug("\tSRP based SR-support: 0x%01x", he_cap->srp); - pe_debug("\tPower boost factor: 0x%01x", he_cap->power_boost); - pe_debug("\t4x HE LTF support: 0x%01x", he_cap->he_ltf_800_gi_4x); - pe_debug("\tSTBC Tx support (> 80MHz): 0x%01x", - he_cap->tb_ppdu_tx_stbc_gt_80mhz); - pe_debug("\tSTBC Rx support (> 80MHz): 0x%01x", - he_cap->rx_stbc_gt_80mhz); - pe_debug("\tMax Nc: 0x%03x", he_cap->max_nc); - pe_debug("\tER 4x HE LTF support: 0x%01x", he_cap->er_he_ltf_800_gi_4x); - pe_debug("\tHE ppdu 20 in 40M in 2.4G: 0x%01x", - he_cap->he_ppdu_20_in_40Mhz_2G); - pe_debug("\tHE ppdu 20 in 160 and 80p80: 0x%01x", - he_cap->he_ppdu_20_in_160_80p80Mhz); - pe_debug("\tHE ppdu 80 in 160 and 80p80: 0x%01x", - he_cap->he_ppdu_80_in_160_80p80Mhz); - pe_debug("\tER 1x HE LTF GI support: 0x%01x", - he_cap->er_1x_he_ltf_gi); - pe_debug("\tmidamble txrx 1x he LTF: 0x%01x", - he_cap->midamble_tx_rx_1x_he_ltf); - pe_debug("\tDCM max BW: 0x%02x", - he_cap->dcm_max_bw); - pe_debug("\tlonger_than_16_he_sigb_ofdm_sym: 0x%01x", - he_cap->longer_than_16_he_sigb_ofdm_sym); - pe_debug("\tnon_trig_cqi_feedback: 0x%01x", - he_cap->non_trig_cqi_feedback); - pe_debug("\ttx_1024_qam_lt_242_tone_ru: 0x%01x", - he_cap->tx_1024_qam_lt_242_tone_ru); - pe_debug("\trx_1024_qam_lt_242_tone_ru: 0x%01x", - he_cap->rx_1024_qam_lt_242_tone_ru); - pe_debug("\trx_full_bw_su_he_mu_compress_sigb: 0x%01x", - he_cap->rx_full_bw_su_he_mu_compress_sigb); - pe_debug("\trx_full_bw_su_he_mu_non_cmpr_sigb: 0x%01x", - he_cap->rx_full_bw_su_he_mu_non_cmpr_sigb); - pe_debug("\tRx MCS map for <= 80 Mhz: 0x%04x", - he_cap->rx_he_mcs_map_lt_80); - pe_debug("\tTx MCS map for <= 80 Mhz: 0x%04x", - he_cap->tx_he_mcs_map_lt_80); - pe_debug("\tRx MCS map for <= 160 Mhz: 0x%04x", - *((uint16_t *)he_cap->rx_he_mcs_map_160)); - pe_debug("\tTx MCS map for <= 160 Mhz: 0x%04x", - *((uint16_t *)he_cap->tx_he_mcs_map_160)); - pe_debug("\tRx MCS map for <= 80+80 Mhz: 0x%04x", - *((uint16_t *)he_cap->rx_he_mcs_map_80_80)); - pe_debug("\tTx MCS map for <= 80+80 Mhz: 0x%04x", - *((uint16_t *)he_cap->tx_he_mcs_map_80_80)); + pe_nofl_debug("\tchan width %d rx_pream_puncturing 0x%x device_class 0x%x ldpc_coding 0x%x 1x_ltf_800_gi_ppdu 0x%x midamble_tx_rx_max_nsts 0x%x", + chan_width, he_cap->rx_pream_puncturing, + he_cap->device_class, + he_cap->ldpc_coding, he_cap->he_1x_ltf_800_gi_ppdu, + he_cap->midamble_tx_rx_max_nsts); + + pe_nofl_debug("\t4x_ltf_3200_gi_ndp 0x%x tb_ppdu_tx_stbc_lt_80mhz 0x%x rx_stbc_lt_80mhz 0x%x doppler 0x%x ul_mu 0x%x dcm_enc_tx 0x%x dcm_enc_rx 0x%x", + he_cap->he_4x_ltf_3200_gi_ndp, + he_cap->tb_ppdu_tx_stbc_lt_80mhz, + he_cap->rx_stbc_lt_80mhz, he_cap->doppler, he_cap->ul_mu, + he_cap->dcm_enc_tx, he_cap->dcm_enc_rx); + + pe_nofl_debug("\tul_he_mu 0x%x su_bfer 0x%x su_fee 0x%x mu_bfer 0x%x bfee_sts_lt_80 0x%x bfee_sts_gt_80 0x%x num_sd_lt_80 0x%x num_sd_gt_80 0x%x", + he_cap->ul_he_mu, he_cap->su_beamformer, + he_cap->su_beamformee, + he_cap->mu_beamformer, he_cap->bfee_sts_lt_80, + he_cap->bfee_sts_gt_80, he_cap->num_sounding_lt_80, + he_cap->num_sounding_gt_80); + + pe_nofl_debug("\tsu_fb_tone16 0x%x mu_fb_tone16 0x%x codebook_su 0x%x codebook_mu 0x%x bforming_feedback 0x%x he_er_su_ppdu 0x%x dl_mu_mimo_part_bw 0x%x", + he_cap->su_feedback_tone16, he_cap->mu_feedback_tone16, + he_cap->codebook_su, he_cap->codebook_mu, + he_cap->beamforming_feedback, he_cap->he_er_su_ppdu, + he_cap->dl_mu_mimo_part_bw); + + pe_nofl_debug("\tppet_present 0x%x srp 0x%x power_boost 0x%x ltf_800_gi_4x 0x%x tb_ppdu_tx_stbc_gt_80mhz 0x%x rx_stbc_gt_80mhz 0x%x max_nc 0x%x", + he_cap->ppet_present, he_cap->srp, + he_cap->power_boost, he_cap->he_ltf_800_gi_4x, + he_cap->tb_ppdu_tx_stbc_gt_80mhz, + he_cap->rx_stbc_gt_80mhz, he_cap->max_nc); + + pe_nofl_debug("\ter_ltf_800_gi_4x 0x%x ppdu_20_in_40Mhz_2G 0x%x ppdu_20_in_160_80p80Mhz 0x%x ppdu_80_in_160_80p80Mhz 0x%x er_1x_ltf_gi 0x%x", + he_cap->er_he_ltf_800_gi_4x, + he_cap->he_ppdu_20_in_40Mhz_2G, + he_cap->he_ppdu_20_in_160_80p80Mhz, + he_cap->he_ppdu_80_in_160_80p80Mhz, + he_cap->er_1x_he_ltf_gi); + + pe_nofl_debug("\tmidamble_tx_rx_1x_ltf 0x%x dcm_max_bw 0x%x longer_than_16_he_sigb_ofdm_sym 0x%x non_trig_cqi_feedback 0x%x tx_1024_qam_lt_242_tone_ru 0x%x", + he_cap->midamble_tx_rx_1x_he_ltf, he_cap->dcm_max_bw, + he_cap->longer_than_16_he_sigb_ofdm_sym, + he_cap->non_trig_cqi_feedback, + he_cap->tx_1024_qam_lt_242_tone_ru); + + pe_nofl_debug("\trx_1024_qam_lt_242_tone_ru 0x%x rx_full_bw_su_he_mu_compress_sigb 0x%x rx_he_mcs_map_lt_80 0x%x tx_he_mcs_map_lt_80 0x%x", + he_cap->rx_1024_qam_lt_242_tone_ru, + he_cap->rx_full_bw_su_he_mu_compress_sigb, + he_cap->rx_he_mcs_map_lt_80, + he_cap->tx_he_mcs_map_lt_80); hdr = (struct ppet_hdr *)&he_cap->ppet; - pe_debug("\t ppe_th:: nss_count: %d, ru_idx_msk: %d", - hdr->nss, hdr->ru_idx_mask); + pe_nofl_debug("\tRx MCS map 160 Mhz: 0x%x Tx MCS map 160 Mhz: 0x%x Rx MCS map 80+80 Mhz: 0x%x Tx MCS map 80+80 Mhz: 0x%x ppe_th:: nss_count: %d, ru_idx_msk: %d", + *((uint16_t *)he_cap->rx_he_mcs_map_160), + *((uint16_t *)he_cap->tx_he_mcs_map_160), + *((uint16_t *)he_cap->rx_he_mcs_map_80_80), + *((uint16_t *)he_cap->tx_he_mcs_map_80_80), + hdr->nss, hdr->ru_idx_mask); QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, &he_cap->ppet, HE_MAX_PPET_SIZE); @@ -7118,16 +7040,14 @@ void lim_log_he_cap(struct mac_context *mac, tDot11fIEhe_cap *he_cap) void lim_log_he_op(struct mac_context *mac, tDot11fIEhe_op *he_ops, struct pe_session *session) { - pe_debug("bss_color: %0x, default_pe_duration: %0x, twt_required: %0x, txop_rts_threshold: %0x, vht_oper_present: %0x", + pe_debug("bss_color 0x%0x, default_pe_dur 0x%0x, twt_req 0x%0x, txop_rts_thres 0x%0x, vht_op 0x%0x", he_ops->bss_color, he_ops->default_pe, he_ops->twt_required, he_ops->txop_rts_threshold, he_ops->vht_oper_present); - pe_debug("\tpart_bss_color %0x, Co-located BSS %0x, BSS color dis %0x", + pe_debug("\tpart_bss_color 0x%0x, Co-located BSS 0x%0x, BSS color dis 0x%0x basic mcs nss: 0x0x%x", he_ops->partial_bss_col, he_ops->co_located_bss, - he_ops->bss_col_disabled); - - pe_debug("he basic mcs nss: 0x%04x", - *((uint16_t *)he_ops->basic_mcs_nss)); + he_ops->bss_col_disabled, + *((uint16_t *)he_ops->basic_mcs_nss)); if (!session->he_6ghz_band) { if (!he_ops->vht_oper_present) @@ -8635,9 +8555,6 @@ QDF_STATUS lim_pre_vdev_start(struct mac_context *mac, mlme_obj->mgmt.chainmask_info.num_rx_chain = 1; mlme_obj->mgmt.chainmask_info.num_tx_chain = 1; } - pe_debug("dot11_mode:%d nss value:%d ht %d vht %d", session->dot11mode, - session->nss, mlme_obj->proto.ht_info.allow_ht, - mlme_obj->proto.vht_info.allow_vht); wlan_vdev_mlme_set_ssid(mlme_obj->vdev, session->ssId.ssId, session->ssId.length); diff --git a/core/mac/src/sys/legacy/src/utils/src/parser_api.c b/core/mac/src/sys/legacy/src/utils/src/parser_api.c index 4ac47104b70a..7685a0e9f311 100644 --- a/core/mac/src/sys/legacy/src/utils/src/parser_api.c +++ b/core/mac/src/sys/legacy/src/utils/src/parser_api.c @@ -6110,8 +6110,6 @@ QDF_STATUS populate_dot11f_he_caps(struct mac_context *mac_ctx, struct pe_sessio he_cap->ppet.ppe_threshold.num_ppe_th = 0; } - lim_log_he_cap(mac_ctx, he_cap); - return QDF_STATUS_SUCCESS; } diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 0328fd19d432..a7da2ce26a5d 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -19439,11 +19439,6 @@ csr_roam_offload_scan(struct mac_context *mac_ctx, uint8_t session_id, else if (command == ROAM_SCAN_OFFLOAD_STOP) csr_update_11k_offload_params(mac_ctx, session, req_buf, FALSE); - QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, - "Assoc IE buffer:"); - QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, - req_buf->assoc_ie.addIEdata, req_buf->assoc_ie.length); - prev_roaming_state = mlme_get_roam_state(mac_ctx->psoc, session_id); policy_mgr_set_pcl_for_existing_combo(mac_ctx->psoc, PM_STA_MODE);