From 6d5bac846a9f44f723a0f0536fe0ba6930b7269c Mon Sep 17 00:00:00 2001 From: Abhishek Singh Date: Mon, 17 Feb 2020 13:08:32 +0530 Subject: [PATCH] qcacld-3.0: Optimize logs in STA disconnect path Optimize logs in STA disconnect path Change-Id: I3534f3ab89ebbdd919c02120328013e42d2894f4 CRs-Fixed: 2623124 --- components/p2p/core/src/wlan_p2p_main.c | 4 +- core/cds/src/cds_api.c | 2 +- core/hdd/src/wlan_hdd_assoc.c | 26 ++------- core/hdd/src/wlan_hdd_cfg80211.c | 18 ++----- core/hdd/src/wlan_hdd_wmm.c | 2 - core/mac/src/pe/lim/lim_assoc_utils.c | 33 ++---------- .../mac/src/pe/lim/lim_process_deauth_frame.c | 11 ++-- .../src/pe/lim/lim_process_disassoc_frame.c | 16 +++--- .../src/pe/lim/lim_process_mlm_req_messages.c | 26 --------- .../src/pe/lim/lim_process_mlm_rsp_messages.c | 7 +-- .../src/pe/lim/lim_process_sme_req_messages.c | 37 +++++-------- .../src/pe/lim/lim_send_management_frames.c | 14 +++-- core/mac/src/pe/lim/lim_session.c | 3 +- core/mac/src/pe/lim/lim_utils.c | 2 +- core/sme/src/csr/csr_api_roam.c | 54 ++++++++----------- core/wma/src/wma_dev_if.c | 1 - 16 files changed, 68 insertions(+), 188 deletions(-) diff --git a/components/p2p/core/src/wlan_p2p_main.c b/components/p2p/core/src/wlan_p2p_main.c index 4bb4bd585671..ce5f9ba47ebf 100644 --- a/components/p2p/core/src/wlan_p2p_main.c +++ b/components/p2p/core/src/wlan_p2p_main.c @@ -1437,10 +1437,8 @@ QDF_STATUS p2p_status_disconnect(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/cds/src/cds_api.c b/core/cds/src/cds_api.c index 8a6f2bf2fe6f..aec5b2fe7f3b 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -2295,7 +2295,7 @@ QDF_STATUS cds_flush_logs(uint32_t is_fatal, is_fatal, indicator, reason_code); if (dump_mac_trace) - qdf_trace_dump_all(p_cds_context->mac_context, 0, 0, 500, 0); + qdf_trace_dump_all(p_cds_context->mac_context, 0, 0, 100, 0); if (WLAN_LOG_INDICATOR_HOST_ONLY == indicator) { cds_wlan_flush_host_logs_for_fatal(); diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index 1f381d98ee0b..297fa39d053c 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -1748,7 +1748,6 @@ static QDF_STATUS hdd_dis_connect_handler(struct hdd_adapter *adapter, hdd_clear_roam_profile_ie(adapter); hdd_wmm_init(adapter); - hdd_debug("Invoking packetdump deregistration API"); wlan_deregister_txrx_packetdump(OL_TXRX_PDEV_ID); /* indicate 'disconnect' status to wpa_supplicant... */ @@ -1788,9 +1787,6 @@ static QDF_STATUS hdd_dis_connect_handler(struct hdd_adapter *adapter, reason_code, disconnect_ies.data, disconnect_ies.len); - - hdd_debug("sent disconnected event to nl80211, reason code %d", - reason); } /* update P2P connection status */ @@ -1807,8 +1803,7 @@ static QDF_STATUS hdd_dis_connect_handler(struct hdd_adapter *adapter, mac_handle = hdd_ctx->mac_handle; sme_ft_reset(mac_handle, adapter->vdev_id); sme_reset_key(mac_handle, adapter->vdev_id); - if (!hdd_remove_beacon_filter(adapter)) - hdd_debug("hdd_remove_beacon_filter() failed"); + hdd_remove_beacon_filter(adapter); if (sme_is_beacon_report_started(mac_handle, adapter->vdev_id)) { hdd_debug("Sending beacon pause indication to userspace"); @@ -1821,14 +1816,8 @@ static QDF_STATUS hdd_dis_connect_handler(struct hdd_adapter *adapter, vstatus = hdd_roam_deregister_sta(adapter, sta_ctx->conn_info.bssid); - if (!QDF_IS_STATUS_SUCCESS(vstatus)) { - hdd_err("hdd_roam_deregister_sta() failed for sta" - QDF_MAC_ADDR_STR " Status: %d [0x%x]", - QDF_MAC_ADDR_ARRAY( - sta_ctx->conn_info.bssid.bytes), - status, status); + if (QDF_IS_STATUS_ERROR(vstatus)) status = QDF_STATUS_E_FAILURE; - } /* Clear all the peer sta register with TL. */ for (i = 0; i < MAX_PEERS; i++) { @@ -1843,13 +1832,8 @@ static QDF_STATUS hdd_dis_connect_handler(struct hdd_adapter *adapter, vstatus = hdd_roam_deregister_sta(adapter, mac_addr); - if (!QDF_IS_STATUS_SUCCESS(vstatus)) { - hdd_err("hdd_roam_deregister_sta() failed sta " - QDF_MAC_ADDR_STR " Status: %d [0x%x]", - QDF_MAC_ADDR_ARRAY(mac_addr.bytes), - status, status); + if (QDF_IS_STATUS_ERROR(vstatus)) status = QDF_STATUS_E_FAILURE; - } /* set the peer mac as 0, all other * reset are done in hdd_conn_remove_connect_info. */ @@ -1858,8 +1842,6 @@ static QDF_STATUS hdd_dis_connect_handler(struct hdd_adapter *adapter, } } else { - hdd_debug("roam_result: %d", roam_result); - /* clear scan cache for Link Lost */ if (eCSR_ROAM_LOSTLINK == roam_status) { wlan_hdd_cfg80211_unlink_bss(adapter, @@ -1894,7 +1876,6 @@ static QDF_STATUS hdd_dis_connect_handler(struct hdd_adapter *adapter, } wlan_hdd_clear_link_layer_stats(adapter); - hdd_debug("check for SAP restart"); policy_mgr_check_concurrent_intf_and_restart_sap(hdd_ctx->psoc); adapter->hdd_stats.tx_rx_stats.cont_txtimeout_cnt = 0; @@ -4712,7 +4693,6 @@ hdd_sme_roam_callback(void *context, struct csr_roam_info *roam_info, break; case eCSR_ROAM_LOSTLINK: if (roam_result == eCSR_ROAM_RESULT_LOSTLINK) { - hdd_debug("Roaming started due to connection lost"); hdd_debug("Disabling queues"); wlan_hdd_netif_queue_control(adapter, WLAN_STOP_ALL_NETIF_QUEUE_N_CARRIER, diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 0e9bb2770d3b..5e85077b5fef 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -9088,7 +9088,7 @@ static int __wlan_hdd_cfg80211_wifi_logger_get_ring_data(struct wiphy *wiphy, status = cds_flush_logs(WLAN_LOG_TYPE_NON_FATAL, WLAN_LOG_INDICATOR_FRAMEWORK, WLAN_LOG_REASON_CODE_UNUSED, - true, false); + false, false); if (QDF_STATUS_SUCCESS != status) { hdd_err("Failed to trigger bug report"); return -EINVAL; @@ -20369,7 +20369,6 @@ int wlan_hdd_disconnect(struct hdd_adapter *adapter, u16 reason, /* Sending disconnect event to userspace for kernel version < 3.11 * is handled by __cfg80211_disconnect call to __cfg80211_disconnected */ - hdd_debug("Send disconnected event to userspace"); wlan_hdd_cfg80211_indicate_disconnect(adapter, true, mac_reason, NULL, 0); #endif @@ -20462,8 +20461,6 @@ static int __wlan_hdd_cfg80211_disconnect(struct wiphy *wiphy, struct wlan_objmgr_vdev *vdev; bool enable_deauth_to_disassoc_map; - hdd_enter(); - if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EINVAL; @@ -20477,10 +20474,6 @@ static int __wlan_hdd_cfg80211_disconnect(struct wiphy *wiphy, adapter->vdev_id, reason); hdd_print_netdev_txq_status(dev); - hdd_debug("Device_mode %s(%d) reason code(%d)", - qdf_opmode_str(adapter->device_mode), - adapter->device_mode, reason); - status = wlan_hdd_validate_context(hdd_ctx); if (0 != status) @@ -20543,13 +20536,11 @@ static int __wlan_hdd_cfg80211_disconnect(struct wiphy *wiphy, vdev = hdd_objmgr_get_vdev(adapter); if (!vdev) return -EINVAL; - if (ucfg_scan_get_vdev_status(vdev) != - SCAN_NOT_IN_PROGRESS) { - hdd_debug("Disconnect is in progress, Aborting Scan"); + if (ucfg_scan_get_vdev_status(vdev) != SCAN_NOT_IN_PROGRESS) wlan_abort_scan(hdd_ctx->pdev, INVAL_PDEV_ID, adapter->vdev_id, INVALID_SCAN_ID, false); - } + wlan_hdd_cleanup_remain_on_channel_ctx(adapter); /* First clean up the tdls peers if any */ hdd_notify_sta_disconnect(adapter->vdev_id, @@ -20557,7 +20548,8 @@ static int __wlan_hdd_cfg80211_disconnect(struct wiphy *wiphy, hdd_objmgr_put_vdev(vdev); hdd_info("%s(vdevid-%d): Disconnect from userspace; reason:%d (%s)", - dev->name, adapter->vdev_id, reason, hdd_ieee80211_reason_code_to_str(reason)); + dev->name, adapter->vdev_id, reason, + hdd_ieee80211_reason_code_to_str(reason)); status = wlan_hdd_disconnect(adapter, reasonCode, reason); if (0 != status) { hdd_err("wlan_hdd_disconnect failed, status: %d", status); diff --git a/core/hdd/src/wlan_hdd_wmm.c b/core/hdd/src/wlan_hdd_wmm.c index 759fdbd67f08..a250df673979 100644 --- a/core/hdd/src/wlan_hdd_wmm.c +++ b/core/hdd/src/wlan_hdd_wmm.c @@ -1561,8 +1561,6 @@ QDF_STATUS hdd_wmm_init(struct hdd_adapter *adapter) struct wlan_objmgr_psoc *psoc = adapter->hdd_ctx->psoc; QDF_STATUS status = QDF_STATUS_SUCCESS; - hdd_enter(); - if (!psoc) { hdd_err("Invalid psoc handle"); return QDF_STATUS_E_FAILURE; diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c index b648e6bc0dd1..24b2be10f20b 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.c +++ b/core/mac/src/pe/lim/lim_assoc_utils.c @@ -467,13 +467,6 @@ lim_send_del_sta_cnf(struct mac_context *mac, struct qdf_mac_addr sta_dsaddr, eLIM_LINK_MONITORING_DISASSOC) || (mlmStaContext.cleanupTrigger == eLIM_PROMISCUOUS_MODE_DISASSOC)) { - /** - * Host or LMM driven Disassociation. - * Issue Disassoc Confirm to SME. - */ - pe_debug("Lim Posting DISASSOC_CNF to Sme. Trigger: %d", - mlmStaContext.cleanupTrigger); - qdf_mem_copy((uint8_t *) &mlmDisassocCnf.peerMacAddr, (uint8_t *) sta_dsaddr.bytes, QDF_MAC_ADDR_SIZE); mlmDisassocCnf.resultCode = status_code; @@ -488,12 +481,6 @@ lim_send_del_sta_cnf(struct mac_context *mac, struct qdf_mac_addr sta_dsaddr, eLIM_HOST_DEAUTH) || (mlmStaContext.cleanupTrigger == eLIM_LINK_MONITORING_DEAUTH)) { - /** - * Host or LMM driven Deauthentication. - * Issue Deauth Confirm to SME. - */ - pe_debug("Lim Posting DEAUTH_CNF to Sme. Trigger: %d", - mlmStaContext.cleanupTrigger); qdf_copy_macaddr(&mlmDeauthCnf.peer_macaddr, &sta_dsaddr); mlmDeauthCnf.resultCode = status_code; mlmDeauthCnf.deauthTrigger = mlmStaContext.cleanupTrigger; @@ -506,12 +493,6 @@ lim_send_del_sta_cnf(struct mac_context *mac, struct qdf_mac_addr sta_dsaddr, } else if ((mlmStaContext.cleanupTrigger == eLIM_PEER_ENTITY_DISASSOC) || (mlmStaContext.cleanupTrigger == eLIM_PEER_ENTITY_DEAUTH)) { - /** - * Received Disassociation/Deauthentication from peer. - * Issue Purge Ind to SME. - */ - pe_debug("Lim Posting PURGE_STA_IND to Sme. Trigger: %d", - mlmStaContext.cleanupTrigger); qdf_mem_copy((uint8_t *) &mlmPurgeStaInd.peerMacAddr, (uint8_t *) sta_dsaddr.bytes, QDF_MAC_ADDR_SIZE); mlmPurgeStaInd.reasonCode = @@ -578,12 +559,6 @@ lim_send_del_sta_cnf(struct mac_context *mac, struct qdf_mac_addr sta_dsaddr, } } else if (mlmStaContext.cleanupTrigger == eLIM_DUPLICATE_ENTRY) { - /** - * LIM driven Disassociation. - * Issue Disassoc Confirm to SME. - */ - pe_debug("Lim Posting DISASSOC_CNF to Sme. Trigger: %d", - mlmStaContext.cleanupTrigger); qdf_mem_copy((uint8_t *) &mlmDisassocCnf.peerMacAddr, (uint8_t *) sta_dsaddr.bytes, QDF_MAC_ADDR_SIZE); @@ -3225,14 +3200,9 @@ lim_del_bss(struct mac_context *mac, tpDphHashNode sta, uint16_t bss_idx, lim_deactivate_and_change_timer(mac, eLIM_JOIN_FAIL_TIMER); } - pe_debug("Sessionid %d : Sending HAL_DELETE_BSS_REQ BSSID:" - QDF_MAC_ADDR_STR, - pe_session->peSessionId, - QDF_MAC_ADDR_ARRAY(pe_session->bssId)); /* we need to defer the message until we get the response back from HAL. */ SET_LIM_PROCESS_DEFD_MESGS(mac, false); - pe_debug("process_ho_fail = %d", pe_session->process_ho_fail); if (pe_session->process_ho_fail) msgQ.type = WMA_DELETE_BSS_HO_FAIL_REQ; else @@ -3241,6 +3211,9 @@ lim_del_bss(struct mac_context *mac, tpDphHashNode sta, uint16_t bss_idx, msgQ.bodyptr = NULL; msgQ.bodyval = pe_session->smeSessionId; + pe_debug("Sessionid %d : Sending HAL_DELETE_BSS_REQ BSSID:" QDF_MAC_ADDR_STR, + pe_session->peSessionId, + QDF_MAC_ADDR_ARRAY(pe_session->bssId)); MTRACE(mac_trace_msg_tx(mac, pe_session->peSessionId, msgQ.type)); retCode = wma_post_ctrl_msg(mac, &msgQ); diff --git a/core/mac/src/pe/lim/lim_process_deauth_frame.c b/core/mac/src/pe/lim/lim_process_deauth_frame.c index 2a866cde7949..7acb48c8d7f6 100644 --- a/core/mac/src/pe/lim/lim_process_deauth_frame.c +++ b/core/mac/src/pe/lim/lim_process_deauth_frame.c @@ -149,12 +149,11 @@ lim_process_deauth_frame(struct mac_context *mac, uint8_t *pRxPacketInfo, /* Get reasonCode from Deauthentication frame body */ reasonCode = sir_read_u16(pBody); - pe_nofl_info("Deauth from %pM for %pM mlm state = %d, sme state = %d systemrole = %d RSSI = %d reason %d", - pHdr->sa, pHdr->da, - pe_session->limMlmState, + pe_nofl_info("Deauth RX: vdev %d from %pM for %pM RSSI = %d reason %d mlm state = %d, sme state = %d systemrole = %d ", + pe_session->vdev_id, pHdr->sa, pHdr->da, frame_rssi, + reasonCode, pe_session->limMlmState, pe_session->limSmeState, - GET_LIM_SYSTEM_ROLE(pe_session), frame_rssi, - reasonCode); + GET_LIM_SYSTEM_ROLE(pe_session)); lim_diag_event_report(mac, WLAN_PE_DIAG_DEAUTH_FRAME_EVENT, pe_session, 0, reasonCode); @@ -315,7 +314,7 @@ lim_process_deauth_frame(struct mac_context *mac, uint8_t *pRxPacketInfo, cds_flush_logs(WLAN_LOG_TYPE_FATAL, WLAN_LOG_INDICATOR_HOST_DRIVER, WLAN_LOG_REASON_DISCONNECT, - true, false); + false, false); } } /*** end lim_process_deauth_frame() ***/ diff --git a/core/mac/src/pe/lim/lim_process_disassoc_frame.c b/core/mac/src/pe/lim/lim_process_disassoc_frame.c index 27e6a7ea18ca..d6afd50d76bf 100644 --- a/core/mac/src/pe/lim/lim_process_disassoc_frame.c +++ b/core/mac/src/pe/lim/lim_process_disassoc_frame.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2020 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -146,13 +146,11 @@ lim_process_disassoc_frame(struct mac_context *mac, uint8_t *pRxPacketInfo, /* Get reasonCode from Disassociation frame body */ reasonCode = sir_read_u16(pBody); - pe_debug("Received Disassoc frame for Addr: " QDF_MAC_ADDR_STR - "(mlm state=%s, sme state=%d RSSI=%d)," - "with reason code %d [%s] from " QDF_MAC_ADDR_STR, - QDF_MAC_ADDR_ARRAY(pHdr->da), - lim_mlm_state_str(pe_session->limMlmState), - pe_session->limSmeState, frame_rssi, reasonCode, - lim_dot11_reason_str(reasonCode), QDF_MAC_ADDR_ARRAY(pHdr->sa)); + pe_nofl_info("Disassoc RX: vdev %d from %pM for %pM RSSI = %d reason %d mlm state = %d, sme state = %d systemrole = %d ", + pe_session->vdev_id, pHdr->sa, pHdr->da, frame_rssi, + reasonCode, pe_session->limMlmState, + pe_session->limSmeState, + GET_LIM_SYSTEM_ROLE(pe_session)); lim_diag_event_report(mac, WLAN_PE_DIAG_DISASSOC_FRAME_EVENT, pe_session, 0, reasonCode); @@ -313,7 +311,7 @@ lim_process_disassoc_frame(struct mac_context *mac, uint8_t *pRxPacketInfo, cds_flush_logs(WLAN_LOG_TYPE_FATAL, WLAN_LOG_INDICATOR_HOST_DRIVER, WLAN_LOG_REASON_DISCONNECT, - true, false); + false, false); } } /*** end lim_process_disassoc_frame() ***/ diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c index 9d05db18473d..440d774431f8 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c @@ -928,12 +928,6 @@ lim_process_mlm_disassoc_req_ntf(struct mac_context *mac_ctx, goto end; } - pe_debug("Process DisAssoc Req on sessionID %d Systemrole %d" - "mlmstate %d from: " QDF_MAC_ADDR_STR, - mlm_disassocreq->sessionId, GET_LIM_SYSTEM_ROLE(session), - session->limMlmState, - QDF_MAC_ADDR_ARRAY(mlm_disassocreq->peer_macaddr.bytes)); - qdf_mem_copy(curr_bssid.bytes, session->bssId, QDF_MAC_ADDR_SIZE); switch (GET_LIM_SYSTEM_ROLE(session)) { @@ -1218,10 +1212,6 @@ lim_process_mlm_disassoc_req(struct mac_context *mac_ctx, uint32_t *msg_buf) } mlm_disassoc_req = (tLimMlmDisassocReq *) msg_buf; - pe_debug("Process disassoc req, sessionID %d from: "QDF_MAC_ADDR_STR, - mlm_disassoc_req->sessionId, - QDF_MAC_ADDR_ARRAY(mlm_disassoc_req->peer_macaddr.bytes)); - lim_process_mlm_disassoc_req_ntf(mac_ctx, QDF_STATUS_SUCCESS, (uint32_t *) msg_buf); } @@ -1264,12 +1254,6 @@ lim_process_mlm_deauth_req_ntf(struct mac_context *mac_ctx, qdf_mem_free(mlm_deauth_req); return; } - pe_debug("Process Deauth Req on sessionID %d Systemrole %d" - "mlmstate %d from: " QDF_MAC_ADDR_STR, - mlm_deauth_req->sessionId, - GET_LIM_SYSTEM_ROLE(session), - session->limMlmState, - QDF_MAC_ADDR_ARRAY(mlm_deauth_req->peer_macaddr.bytes)); sir_copy_mac_addr(curr_bssId, session->bssId); switch (GET_LIM_SYSTEM_ROLE(session)) { @@ -1304,11 +1288,6 @@ lim_process_mlm_deauth_req_ntf(struct mac_context *mac_ctx, return; } - pe_debug("send deauth rsp with ret code %d for" QDF_MAC_ADDR_STR, - eSIR_SME_DEAUTH_STATUS, - QDF_MAC_ADDR_ARRAY( - mlm_deauth_req->peer_macaddr.bytes)); - sme_deauth_rsp->messageType = eWNI_SME_DEAUTH_RSP; sme_deauth_rsp->length = @@ -1509,11 +1488,6 @@ void lim_process_mlm_deauth_req(struct mac_context *mac_ctx, uint32_t *msg_buf) } mlm_deauth_req = (tLimMlmDeauthReq *) msg_buf; - pe_debug("Process Deauth Req on sessionID %d from: " - QDF_MAC_ADDR_STR, - mlm_deauth_req->sessionId, - QDF_MAC_ADDR_ARRAY(mlm_deauth_req->peer_macaddr.bytes)); - session = pe_find_session_by_session_id(mac_ctx, mlm_deauth_req->sessionId); if (!session) { diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c index ba19d10fda51..dbc9c83fa83f 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c @@ -971,8 +971,6 @@ static void lim_process_mlm_deauth_ind(struct mac_context *mac_ctx, return; } role = GET_LIM_SYSTEM_ROLE(session); - pe_debug("*** Received Deauthentication from staId=%d role=%d***", - deauth_ind->aid, role); if (role == eLIM_STA_ROLE) { session->limSmeState = eLIM_SME_WT_DEAUTH_STATE; MTRACE(mac_trace(mac_ctx, TRACE_CODE_SME_STATE, @@ -1039,7 +1037,6 @@ void lim_process_mlm_deauth_cnf(struct mac_context *mac, uint32_t *msg_buf) } if (pMlmDeauthCnf->resultCode == eSIR_SME_SUCCESS) { pe_session->limSmeState = eLIM_SME_IDLE_STATE; - pe_debug("*** Deauthenticated with BSS ***"); } else pe_session->limSmeState = pe_session->limPrevSmeState; @@ -1564,7 +1561,6 @@ void lim_process_sta_mlm_del_bss_rsp(struct mac_context *mac, goto end; } if (vdev_stop_rsp->status == QDF_STATUS_SUCCESS) { - pe_debug("STA received the DEL_BSS_RSP"); if (!sta) { pe_err("DPH Entry for STA 1 missing"); status_code = eSIR_SME_REFUSED; @@ -1577,8 +1573,7 @@ void lim_process_sta_mlm_del_bss_rsp(struct mac_context *mac, status_code = eSIR_SME_REFUSED; goto end; } - pe_debug("STA AssocID %d MAC", sta->assocId); - lim_print_mac_addr(mac, sta->staAddr, LOGD); + pe_debug("STA AssocID %d MAC %pM", sta->assocId, sta->staAddr); } else { pe_err("DEL BSS failed!"); status_code = eSIR_SME_STOP_BSS_FAILURE; 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 d247d4aa0436..5a79df46c34e 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 @@ -2051,11 +2051,13 @@ static void __lim_process_sme_disassoc_req(struct mac_context *mac, disassocTrigger = eLIM_HOST_DISASSOC; goto sendDisassoc; } - pe_debug("received DISASSOC_REQ message on sessionid %d Systemrole %d Reason: %u SmeState: %d from: " - QDF_MAC_ADDR_STR, smesessionId, - GET_LIM_SYSTEM_ROLE(pe_session), smeDisassocReq.reasonCode, - mac->lim.gLimSmeState, - QDF_MAC_ADDR_ARRAY(smeDisassocReq.peer_macaddr.bytes)); + pe_debug("vdev %d (session %d) Systemrole %d Reason: %u SmeState: %d limMlmState %d ho fail %d send OTA %d from: " + QDF_MAC_ADDR_STR, pe_session->vdev_id, pe_session->peSessionId, + GET_LIM_SYSTEM_ROLE(pe_session), smeDisassocReq.reasonCode, + pe_session->limSmeState, pe_session->limMlmState, + smeDisassocReq.process_ho_fail, + smeDisassocReq.doNotSendOverTheAir, + QDF_MAC_ADDR_ARRAY(smeDisassocReq.peer_macaddr.bytes)); #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM /* FEATURE_WLAN_DIAG_SUPPORT */ lim_diag_event_report(mac, WLAN_PE_DIAG_DISASSOC_REQ_EVENT, pe_session, @@ -2063,7 +2065,6 @@ static void __lim_process_sme_disassoc_req(struct mac_context *mac, #endif /* FEATURE_WLAN_DIAG_SUPPORT */ pe_session->smeSessionId = smesessionId; - pe_debug("ho_fail: %d ", smeDisassocReq.process_ho_fail); pe_session->process_ho_fail = smeDisassocReq.process_ho_fail; switch (GET_LIM_SYSTEM_ROLE(pe_session)) { @@ -2071,8 +2072,6 @@ static void __lim_process_sme_disassoc_req(struct mac_context *mac, switch (pe_session->limSmeState) { case eLIM_SME_ASSOCIATED_STATE: case eLIM_SME_LINK_EST_STATE: - pe_debug("Rcvd SME_DISASSOC_REQ in limSmeState: %d ", - pe_session->limSmeState); pe_session->limPrevSmeState = pe_session->limSmeState; pe_session->limSmeState = eLIM_SME_WT_DISASSOC_STATE; @@ -2094,7 +2093,6 @@ static void __lim_process_sme_disassoc_req(struct mac_context *mac, (mac, TRACE_CODE_SME_STATE, pe_session->peSessionId, pe_session->limSmeState)); - pe_debug("Rcvd SME_DISASSOC_REQ while in SME_WT_DEAUTH_STATE"); break; case eLIM_SME_WT_DISASSOC_STATE: @@ -2107,12 +2105,10 @@ static void __lim_process_sme_disassoc_req(struct mac_context *mac, * It will send a disassoc, which is ok. However, we can use the global flag * sendDisassoc to not send disassoc frame. */ - pe_debug("Rcvd SME_DISASSOC_REQ while in SME_WT_DISASSOC_STATE"); break; case eLIM_SME_JOIN_FAILURE_STATE: { /* Already in Disconnected State, return success */ - pe_debug("Rcvd SME_DISASSOC_REQ while in eLIM_SME_JOIN_FAILURE_STATE"); if (mac->lim.gLimRspReqd) { retCode = eSIR_SME_SUCCESS; disassocTrigger = eLIM_HOST_DISASSOC; @@ -2163,14 +2159,8 @@ static void __lim_process_sme_disassoc_req(struct mac_context *mac, disassocTrigger = eLIM_HOST_DISASSOC; reasonCode = smeDisassocReq.reasonCode; - if (smeDisassocReq.doNotSendOverTheAir) { - pe_debug("do not send dissoc over the air"); + if (smeDisassocReq.doNotSendOverTheAir) send_disassoc_frame = 0; - } - /* Trigger Disassociation frame to peer MAC entity */ - pe_debug("Sending Disasscoc with disassoc Trigger" - " : %d, reasonCode : %d", - disassocTrigger, reasonCode); pMlmDisassocReq = qdf_mem_malloc(sizeof(tLimMlmDisassocReq)); if (!pMlmDisassocReq) @@ -2406,11 +2396,11 @@ static void __lim_process_sme_deauth_req(struct mac_context *mac_ctx, deauth_trigger = eLIM_HOST_DEAUTH; goto send_deauth; } - pe_debug("received DEAUTH_REQ vdev_id %d Systemrole %d reasoncode %u limSmestate %d from " - QDF_MAC_ADDR_STR, vdev_id, - GET_LIM_SYSTEM_ROLE(session_entry), sme_deauth_req.reasonCode, - session_entry->limSmeState, - QDF_MAC_ADDR_ARRAY(sme_deauth_req.peer_macaddr.bytes)); + pe_debug("vdev %d (session %d) Systemrole %d reasoncode %u limSmestate %d limMlmState %d from " + QDF_MAC_ADDR_STR, vdev_id, session_entry->peSessionId, + GET_LIM_SYSTEM_ROLE(session_entry), sme_deauth_req.reasonCode, + session_entry->limSmeState, session_entry->limMlmState, + QDF_MAC_ADDR_ARRAY(sme_deauth_req.peer_macaddr.bytes)); #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM /* FEATURE_WLAN_DIAG_SUPPORT */ lim_diag_event_report(mac_ctx, WLAN_PE_DIAG_DEAUTH_REQ_EVENT, session_entry, 0, sme_deauth_req.reasonCode); @@ -2449,7 +2439,6 @@ static void __lim_process_sme_deauth_req(struct mac_context *mac_ctx, * was sent for deauth/disassoc frame. */ session_entry->limSmeState = eLIM_SME_WT_DEAUTH_STATE; - pe_debug("Rcvd SME_DEAUTH_REQ while in SME_WT_DEAUTH_STATE"); break; default: /* 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 0644fd3daded..3fc0f4442426 100644 --- a/core/mac/src/pe/lim/lim_send_management_frames.c +++ b/core/mac/src/pe/lim/lim_send_management_frames.c @@ -3273,11 +3273,10 @@ lim_send_disassoc_mgmt_frame(struct mac_context *mac, &nPayload, discon_ie); mlme_free_self_disconnect_ies(pe_session->vdev); - pe_debug("***Sessionid %d Sending Disassociation frame with " - "reason %u and waitForAck %d to " QDF_MAC_ADDR_STR " ,From " - QDF_MAC_ADDR_STR, pe_session->peSessionId, nReason, - waitForAck, QDF_MAC_ADDR_ARRAY(pMacHdr->da), - QDF_MAC_ADDR_ARRAY(pe_session->self_mac_addr)); + pe_nofl_info("Disassoc TX: vdev %d seq %d reason %u and waitForAck %d to " QDF_MAC_ADDR_STR " From " QDF_MAC_ADDR_STR, + pe_session->vdev_id, mac->mgmtSeqNum, nReason, waitForAck, + QDF_MAC_ADDR_ARRAY(pMacHdr->da), + QDF_MAC_ADDR_ARRAY(pe_session->self_mac_addr)); if (wlan_reg_is_5ghz_ch_freq(pe_session->curr_op_freq) || pe_session->opmode == QDF_P2P_CLIENT_MODE || @@ -3462,9 +3461,8 @@ lim_send_deauth_mgmt_frame(struct mac_context *mac, &nPayload, discon_ie); mlme_free_self_disconnect_ies(pe_session->vdev); - pe_nofl_info("vdev %d Deauth TX seq_num %d reason %u to " QDF_MAC_ADDR_STR - " from " QDF_MAC_ADDR_STR, - pe_session->vdev_id, mac->mgmtSeqNum, nReason, + pe_nofl_info("Deauth TX: vdev %d seq_num %d reason %u waitForAck %d to " QDF_MAC_ADDR_STR " from " QDF_MAC_ADDR_STR, + pe_session->vdev_id, mac->mgmtSeqNum, nReason, waitForAck, QDF_MAC_ADDR_ARRAY(pMacHdr->da), QDF_MAC_ADDR_ARRAY(pe_session->self_mac_addr)); diff --git a/core/mac/src/pe/lim/lim_session.c b/core/mac/src/pe/lim/lim_session.c index ec6fa168185a..abc8b87b1b60 100644 --- a/core/mac/src/pe/lim/lim_session.c +++ b/core/mac/src/pe/lim/lim_session.c @@ -1035,8 +1035,7 @@ struct pe_session *pe_find_session_by_peer_sta(struct mac_context *mac, uint8_t } } - pe_debug("Session lookup fails for Peer StaId:"); - lim_print_mac_addr(mac, sa, LOGD); + pe_debug("Session lookup fails for Peer StaId: %pM", sa); return NULL; } diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index 85ec75f49003..a87313a711b9 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -710,7 +710,7 @@ uint8_t lim_write_deferred_msg_q(struct mac_context *mac_ctx, cds_flush_logs(WLAN_LOG_TYPE_NON_FATAL, WLAN_LOG_INDICATOR_HOST_DRIVER, WLAN_LOG_REASON_QUEUE_FULL, - true, false); + false, false); } else { mac_ctx->lim.deferredMsgCnt++; } diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index daf86e9908d0..18952a41e5dc 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -554,9 +554,10 @@ csr_roam_issue_disassociate(struct mac_context *mac, uint32_t sessionId, sizeof(struct qdf_mac_addr)); } - sme_debug("CSR Attempting to Disassociate Bssid=" QDF_MAC_ADDR_STR - " subState: %s reason: %d", QDF_MAC_ADDR_ARRAY(bssId.bytes), - mac_trace_getcsr_roam_sub_state(NewSubstate), reasonCode); + sme_debug("Disassociate Bssid " QDF_MAC_ADDR_STR " subState: %s reason: %d", + QDF_MAC_ADDR_ARRAY(bssId.bytes), + mac_trace_getcsr_roam_sub_state(NewSubstate), + reasonCode); csr_roam_substate_change(mac, NewSubstate, sessionId); @@ -1988,10 +1989,10 @@ void csr_roam_substate_change(struct mac_context *mac, } if (mac->roam.curSubState[sessionId] == NewSubstate) return; - sme_debug("CSR RoamSubstate: [ %s <== %s ]", - mac_trace_getcsr_roam_sub_state(NewSubstate), - mac_trace_getcsr_roam_sub_state(mac->roam. - curSubState[sessionId])); + sme_nofl_debug("CSR RoamSubstate: [ %s <== %s ]", + mac_trace_getcsr_roam_sub_state(NewSubstate), + mac_trace_getcsr_roam_sub_state(mac->roam. + curSubState[sessionId])); spin_lock(&mac->roam.roam_state_lock); mac->roam.curSubState[sessionId] = NewSubstate; spin_unlock(&mac->roam.roam_state_lock); @@ -2008,10 +2009,10 @@ enum csr_roam_state csr_roam_state_change(struct mac_context *mac, if (NewRoamState == mac->roam.curState[sessionId]) return PreviousState; - sme_debug("CSR RoamState[%d]: [ %s <== %s ]", sessionId, - mac_trace_getcsr_roam_state(NewRoamState), - mac_trace_getcsr_roam_state( - mac->roam.curState[sessionId])); + sme_nofl_debug("CSR RoamState[%d]: [ %s <== %s ]", sessionId, + mac_trace_getcsr_roam_state(NewRoamState), + mac_trace_getcsr_roam_state( + mac->roam.curState[sessionId])); /* * Whenever we transition OUT of the Roaming state, * clear the Roaming substate. @@ -4189,8 +4190,9 @@ csr_is_deauth_disassoc_already_active(struct mac_context *mac_ctx, vdev_id, peer_macaddr); - sme_debug("Deauth/Disassoc %s in progress for %pM", - (ret ? "already" : "not"), peer_macaddr.bytes); + if (ret) + sme_debug("Deauth/Disassoc already in progress for %pM", + peer_macaddr.bytes); return ret; } @@ -4298,7 +4300,7 @@ QDF_STATUS csr_roam_issue_deauth(struct mac_context *mac, uint32_t sessionId, qdf_mem_copy(bssId.bytes, pSession->pConnectBssDesc->bssId, sizeof(struct qdf_mac_addr)); } - sme_debug("CSR Attempting to Deauth Bssid= " QDF_MAC_ADDR_STR, + sme_debug("Deauth to Bssid " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(bssId.bytes)); csr_roam_substate_change(mac, NewSubstate, sessionId); @@ -7014,8 +7016,6 @@ static void csr_roam_process_results_default(struct mac_context *mac_ctx, prev_connect_info = &session->prev_assoc_ap_info; - sme_debug("receives no association indication; FILS %d", - session->is_fils_connection); sme_debug("Assoc ref count: %d", session->bRefAssocStartCnt); /* Update AP's assoc info in scan before removing connectedProfile */ @@ -8030,7 +8030,7 @@ static bool csr_roam_process_results(struct mac_context *mac_ctx, tSmeCmd *cmd, if (!roam_info) return false; - sme_debug("Processing ROAM results..."); + sme_debug("Result %d", res); switch (res) { case eCsrJoinSuccess: case eCsrReassocSuccess: @@ -9122,9 +9122,8 @@ QDF_STATUS csr_roam_issue_disassociate_cmd(struct mac_context *mac, } pCommand->command = eSmeCommandRoam; pCommand->vdev_id = (uint8_t) sessionId; - sme_debug( - "Disassociate reason: %d, sessionId: %d", - reason, sessionId); + sme_debug("Disassociate reason: %d, vdev_id: %d mac_reason %d", + reason, sessionId, mac_reason); switch (reason) { case eCSR_DISCONNECT_REASON_MIC_ERROR: pCommand->u.roamCmd.roamReason = @@ -9213,7 +9212,6 @@ QDF_STATUS csr_roam_disconnect_internal(struct mac_context *mac, uint32_t sessio || csr_is_bss_type_ibss(pSession->connectedProfile.BSSType) || csr_is_roam_command_waiting_for_session(mac, sessionId) || CSR_IS_CONN_NDI(&pSession->connectedProfile)) { - sme_debug("called"); status = csr_roam_issue_disassociate_cmd(mac, sessionId, reason, mac_reason); } else if (pSession->scan_info.profile) { @@ -9939,7 +9937,7 @@ static void csr_roam_roaming_state_reassoc_rsp_processor(struct mac_context *mac cds_flush_logs(WLAN_LOG_TYPE_FATAL, WLAN_LOG_INDICATOR_HOST_DRIVER, WLAN_LOG_REASON_ROAM_FAIL, - true, false); + false, false); if ((eSIR_SME_FT_REASSOC_TIMEOUT_FAILURE == pSmeJoinRsp->status_code) || (eSIR_SME_FT_REASSOC_FAILURE == @@ -10422,8 +10420,6 @@ static void csr_roam_roaming_state_deauth_rsp_processor(struct mac_context *mac, struct deauth_rsp *pSmeRsp) { tSirResultCodes status_code; - /* No one is sending eWNI_SME_DEAUTH_REQ to PE. */ - sme_debug("is no-op"); status_code = csr_get_de_auth_rsp_status_code(pSmeRsp); mac->roam.deauthRspStatus = status_code; if (CSR_IS_ROAM_SUBSTATE_DEAUTH_REQ(mac, pSmeRsp->sessionId)) { @@ -10435,10 +10431,6 @@ static void csr_roam_roaming_state_deauth_rsp_processor(struct mac_context *mac, /* */ sme_debug( "CSR SmeDeauthReq disassociated Successfully"); - } else { - sme_warn( - "SmeDeauthReq failed with status_code= 0x%08X", - status_code); } /* We are not done yet. Get the data and continue roaming */ csr_roam_reissue_roam_command(mac, pSmeRsp->sessionId); @@ -10564,10 +10556,6 @@ void csr_roaming_state_msg_processor(struct mac_context *mac, void *msg_buf) struct csr_roam_info *roam_info; pSmeRsp = (tSirSmeRsp *)msg_buf; - sme_debug("Message %d[0x%04X] received in substate %s", - pSmeRsp->messageType, pSmeRsp->messageType, - mac_trace_getcsr_roam_sub_state( - mac->roam.curSubState[pSmeRsp->vdev_id])); switch (pSmeRsp->messageType) { @@ -20360,7 +20348,7 @@ void csr_process_ho_fail_ind(struct mac_context *mac_ctx, void *msg_buf) cds_flush_logs(WLAN_LOG_TYPE_FATAL, WLAN_LOG_INDICATOR_HOST_DRIVER, WLAN_LOG_REASON_ROAM_HO_FAILURE, - true, false); + false, false); } #endif /* WLAN_FEATURE_ROAM_OFFLOAD */ diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index 4957138f62ff..55a3ab75383d 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -713,7 +713,6 @@ static void wma_remove_objmgr_peer(tp_wma_handle wma, uint8_t vdev_id, wlan_objmgr_peer_obj_delete(obj_peer); /* Unref to decrement ref happened in find_peer */ wlan_objmgr_peer_release_ref(obj_peer, WLAN_LEGACY_WMA_ID); - WMA_LOGD("Peer %pM deleted", peer_addr); } else { WMA_LOGE("Peer %pM not found", peer_addr); }