From d5712927b25153a63846d997b46546997a1395be Mon Sep 17 00:00:00 2001 From: Abhishek Singh Date: Mon, 24 Feb 2020 12:24:02 +0530 Subject: [PATCH] qcacld-3.0: Improve logging in driver Improve logging in driver by avoiding unnecessary error prints and combining logs. Change-Id: Ibab9067aa1bce992f36fca22a5aed88e8d85ba25 CRs-Fixed: 2627549 --- .../policy_mgr/src/wlan_policy_mgr_action.c | 2 +- core/hdd/src/wlan_hdd_wmm.c | 4 ---- core/mac/src/pe/lim/lim_api.c | 13 ++++++------ .../src/pe/lim/lim_send_management_frames.c | 5 ++++- core/mac/src/pe/sch/sch_beacon_process.c | 19 +++++------------ .../src/sys/legacy/src/utils/src/parser_api.c | 21 ++++++++----------- core/sme/src/csr/csr_api_roam.c | 6 +++--- core/wma/src/wma_data.c | 2 -- 8 files changed, 28 insertions(+), 44 deletions(-) diff --git a/components/cmn_services/policy_mgr/src/wlan_policy_mgr_action.c b/components/cmn_services/policy_mgr/src/wlan_policy_mgr_action.c index e03bb3fc8174..0fa5d0c51276 100644 --- a/components/cmn_services/policy_mgr/src/wlan_policy_mgr_action.c +++ b/components/cmn_services/policy_mgr/src/wlan_policy_mgr_action.c @@ -215,7 +215,7 @@ enum policy_mgr_conc_next_action policy_mgr_need_opportunistic_upgrade( } if (policy_mgr_is_hw_dbs_capable(psoc) == false) { - policy_mgr_err("driver isn't dbs capable, no further action needed"); + policy_mgr_rl_debug("driver isn't dbs capable, no further action needed"); goto exit; } diff --git a/core/hdd/src/wlan_hdd_wmm.c b/core/hdd/src/wlan_hdd_wmm.c index da94fa43c9db..b1a5abb80c18 100644 --- a/core/hdd/src/wlan_hdd_wmm.c +++ b/core/hdd/src/wlan_hdd_wmm.c @@ -2269,8 +2269,6 @@ QDF_STATUS hdd_wmm_connect(struct hdd_adapter *adapter, uint8_t acm_mask; mac_handle_t mac_handle; - hdd_enter(); - if ((eCSR_BSS_TYPE_INFRASTRUCTURE == bss_type) && roam_info && roam_info->u.pConnectedProfile) { qap = roam_info->u.pConnectedProfile->qap; @@ -2330,8 +2328,6 @@ QDF_STATUS hdd_wmm_connect(struct hdd_adapter *adapter, } - hdd_exit(); - return QDF_STATUS_SUCCESS; } diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c index a3613fd8c20c..0554748fb056 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -1472,13 +1472,6 @@ lim_enc_type_matched(struct mac_context *mac_ctx, if (!bcn || !session) return false; - pe_debug("Beacon/Probe:: Privacy: %d WPA Present: %d RSN Present: %d", - bcn->capabilityInfo.privacy, bcn->wpaPresent, bcn->rsnPresent); - pe_debug("session:: Privacy: %d EncyptionType: %d OSEN: %d WPS: %d", - SIR_MAC_GET_PRIVACY(session->limCurrentBssCaps), - session->encryptType, session->isOSENConnection, - session->wps_registration); - /* * This is handled by sending probe req due to IOT issues so * return TRUE @@ -1529,6 +1522,12 @@ lim_enc_type_matched(struct mac_context *mac_ctx, session->wps_registration) return true; + pe_debug("AP:: Privacy %d WPA %d RSN %d, SELF:: Privacy %d Enc %d OSEN %d WPS %d", + bcn->capabilityInfo.privacy, bcn->wpaPresent, bcn->rsnPresent, + SIR_MAC_GET_PRIVACY(session->limCurrentBssCaps), + session->encryptType, session->isOSENConnection, + session->wps_registration); + return 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 231300ec71e9..aa423728b46c 100644 --- a/core/mac/src/pe/lim/lim_send_management_frames.c +++ b/core/mac/src/pe/lim/lim_send_management_frames.c @@ -319,7 +319,6 @@ lim_send_probe_req_mgmt_frame(struct mac_context *mac_ctx, if (IS_DOT11_MODE_HE(dot11mode) && pesession) lim_update_session_he_capable(mac_ctx, pesession); - pe_debug("Populate HE IEs"); populate_dot11f_he_caps(mac_ctx, pesession, &pr.he_cap); populate_dot11f_he_6ghz_cap(mac_ctx, pesession, &pr.he_6ghz_band_cap); @@ -411,6 +410,10 @@ lim_send_probe_req_mgmt_frame(struct mac_context *mac_ctx, additional_ie, addn_ielen); payload += addn_ielen; } + pe_nofl_debug("Probe req TX: vdev %d seq num %d to " QDF_MAC_ADDR_STR " len %d", + vdev_id, mac_ctx->mgmtSeqNum, + QDF_MAC_ADDR_ARRAY(bssid), + (int)sizeof(tSirMacMgmtHdr) + payload); /* If this probe request is sent during P2P Search State, then we need * to send it at OFDM rate. diff --git a/core/mac/src/pe/sch/sch_beacon_process.c b/core/mac/src/pe/sch/sch_beacon_process.c index 0d8ac476f548..fe0f38b90d1b 100644 --- a/core/mac/src/pe/sch/sch_beacon_process.c +++ b/core/mac/src/pe/sch/sch_beacon_process.c @@ -861,16 +861,12 @@ static void __sch_beacon_process_for_session(struct mac_context *mac_ctx, if (mac_ctx->mlme_cfg->sta.allow_tpc_from_ap) { get_local_power_constraint_beacon(bcn, &local_constraint); - pe_debug("ESE localPowerConstraint = %d,", - local_constraint); if (mac_ctx->rrm.rrmPEContext.rrmEnable && bcn->powerConstraintPresent) { local_constraint = regMax; local_constraint -= bcn->localPowerConstraint.localPowerConstraints; - pe_debug("localPowerConstraint = %d,", - local_constraint); } } @@ -881,14 +877,11 @@ static void __sch_beacon_process_for_session(struct mac_context *mac_ctx, maxTxPower = lim_get_max_tx_power(mac_ctx, &tx_pwr_attr); - pe_debug("RegMax = %d, MaxTx pwr = %d", - regMax, maxTxPower); - /* If maxTxPower is increased or decreased */ if (maxTxPower != session->maxTxPower) { - pe_debug( - FL("Local power constraint change, Updating new maxTx power %d from old pwr %d"), - maxTxPower, session->maxTxPower); + pe_debug("Local power constraint change, Updating new maxTx power %d from old pwr %d (regMax %d local %d)", + maxTxPower, session->maxTxPower, regMax, + local_constraint); if (lim_send_set_max_tx_power_req(mac_ctx, maxTxPower, session) == QDF_STATUS_SUCCESS) session->maxTxPower = maxTxPower; @@ -913,10 +906,8 @@ static void __sch_beacon_process_for_session(struct mac_context *mac_ctx, if ((false == mac_ctx->sap.SapDfsInfo.is_dfs_cac_timer_running) && beaconParams.paramChangeBitmap) { - pe_debug("Beacon for session[%d] got changed.", - session->peSessionId); - pe_debug("sending beacon param change bitmap: 0x%x", - beaconParams.paramChangeBitmap); + pe_debug("Beacon for session[%d] got changed param change bitmap: 0x%x", + session->peSessionId, beaconParams.paramChangeBitmap); lim_send_beacon_params(mac_ctx, &beaconParams, session); } 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 d729625231c4..af0fa162255c 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 @@ -920,18 +920,15 @@ static void lim_log_qos_map_set(struct mac_context *mac, pe_debug("num of dscp exceptions: %d", pQosMapSet->num_dscp_exceptions); - for (i = 0; i < pQosMapSet->num_dscp_exceptions; i++) { - pe_debug("dscp value: %d", - pQosMapSet->dscp_exceptions[i][0]); - pe_debug("User priority value: %d", - pQosMapSet->dscp_exceptions[i][1]); - } - for (i = 0; i < 8; i++) { - pe_debug("dscp low for up %d: %d", i, - pQosMapSet->dscp_range[i][0]); - pe_debug("dscp high for up %d: %d", i, - pQosMapSet->dscp_range[i][1]); - } + for (i = 0; i < pQosMapSet->num_dscp_exceptions; i++) + pe_nofl_debug("dscp value: %d, User priority value: %d", + pQosMapSet->dscp_exceptions[i][0], + pQosMapSet->dscp_exceptions[i][1]); + + for (i = 0; i < 8; i++) + pe_nofl_debug("For up %d: dscp low: %d, dscp high: %d", i, + pQosMapSet->dscp_range[i][0], + pQosMapSet->dscp_range[i][1]); } QDF_STATUS diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 1a2641b31479..7706d9425d79 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -8803,9 +8803,9 @@ static void csr_roam_print_candidate_aps(tScanResultHandle results) while (entry) { bss_desc = GET_BASE_ADDR(entry, struct tag_csrscan_result, Link); - sme_debug(QDF_MAC_ADDR_STR " score: %d", - QDF_MAC_ADDR_ARRAY(bss_desc->Result.BssDescriptor.bssId), - bss_desc->bss_score); + sme_nofl_debug(QDF_MAC_ADDR_STR " score: %d", + QDF_MAC_ADDR_ARRAY(bss_desc->Result.BssDescriptor.bssId), + bss_desc->bss_score); entry = csr_ll_next(&bss_list->List, entry, LL_ACCESS_NOLOCK); diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c index b37b38960fc3..43a4ee960995 100644 --- a/core/wma/src/wma_data.c +++ b/core/wma/src/wma_data.c @@ -2736,8 +2736,6 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, chanfreq = 0; } - WMA_LOGD("%s: chan freq %d vdev:%d subType:%d", - __func__, chanfreq, vdev_id, pFc->subType); if (mac->mlme_cfg->gen.debug_packet_log & 0x1) { if ((pFc->type == SIR_MAC_MGMT_FRAME) && (pFc->subType != SIR_MAC_MGMT_PROBE_REQ) &&