From ab0666a1bd88a5a45c11a45feb1a9da1d5ce8e4f Mon Sep 17 00:00:00 2001 From: Ashish Kumar Dhanotiya Date: Mon, 17 Feb 2020 16:55:06 +0530 Subject: [PATCH] qcacld-3.0: Reduce regulatory logging As part of logging optimization, reduce the logging from regulatory. Change-Id: I5f8e5e752370db98ff7ffd935acc17d017f56e04 CRs-Fixed: 2623898 --- core/sme/src/csr/csr_api_roam.c | 37 +++++++++++++++------------------ core/sme/src/csr/csr_api_scan.c | 14 +------------ core/wma/src/wma_scan_roam.c | 5 ----- 3 files changed, 18 insertions(+), 38 deletions(-) diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 44ecd17144..718284b0e3 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -1410,6 +1410,8 @@ QDF_STATUS csr_update_channel_list(struct mac_context *mac) uint32_t channel_freq; bool is_unsafe_chan; bool is_same_band; + bool is_5mhz_enabled; + bool is_10mhz_enabled; enum scm_scan_status scan_status; QDF_STATUS lock_status; @@ -1451,6 +1453,13 @@ QDF_STATUS csr_update_channel_list(struct mac_context *mac) if (!pChanList) return QDF_STATUS_E_NOMEM; + is_5mhz_enabled = cds_is_5_mhz_enabled(); + if (is_5mhz_enabled) + sme_nofl_debug("quarter_rate enabled"); + is_10mhz_enabled = cds_is_10_mhz_enabled(); + if (is_10mhz_enabled) + sme_nofl_debug("half_rate enabled"); + for (i = 0; i < pScan->base_channels.numChannels; i++) { struct csr_sta_roam_policy_params *roam_policy = &mac->roam.configParam.sta_roam_policy; @@ -1539,18 +1548,13 @@ QDF_STATUS csr_update_channel_list(struct mac_context *mac) else pChanList->chanParam[num_channel].dfsSet = true; - if (cds_is_5_mhz_enabled()) - pChanList->chanParam[num_channel].quarter_rate - = 1; - else if (cds_is_10_mhz_enabled()) - pChanList->chanParam[num_channel].half_rate = 1; - QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, - "Freq:%d, pwr=%d, DFS=%d qrate %d hrate %d ", - pChanList->chanParam[num_channel].freq, - pChanList->chanParam[num_channel].pwr, - pChanList->chanParam[num_channel].dfsSet, - pChanList->chanParam[num_channel].quarter_rate, - pChanList->chanParam[num_channel].half_rate); + + pChanList->chanParam[num_channel].quarter_rate = + is_5mhz_enabled; + + pChanList->chanParam[num_channel].half_rate = + is_10mhz_enabled; + num_channel++; } } @@ -20372,15 +20376,13 @@ csr_update_op_class_array(struct mac_context *mac_ctx, uint8_t num_channels = channel_info->numChannels; uint8_t ch_num; - sme_debug("Num of %s channels, %d", ch_name, num_channels); + sme_debug("Num %s channels, %d", ch_name, num_channels); for (idx = 0; idx < num_channels && *i < (REG_MAX_SUPP_OPER_CLASSES - 1); idx++) { wlan_reg_freq_to_chan_op_class( mac_ctx->pdev, channel_info->channel_freq_list[idx], false, BIT(BEHAV_NONE), &class, &ch_num); - sme_debug("for chan freq %d, op class: %d", - channel_info->channel_freq_list[idx], class); found = false; for (j = 0; j < REG_MAX_SUPP_OPER_CLASSES - 1; j++) { @@ -20433,11 +20435,6 @@ static void csr_init_operating_classes(struct mac_context *mac) } } - sme_debug("Number of unique supported op classes %d", - numClasses); - for (i = 0; i < numClasses; i++) - sme_debug("supported opClasses[%d] = %d", i, opClasses[i]); - /* Set the ordered list of op classes in regdomain * for use by other modules */ diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c index 69bcbec2d9..70b1ae5583 100644 --- a/core/sme/src/csr/csr_api_scan.c +++ b/core/sme/src/csr/csr_api_scan.c @@ -1553,16 +1553,10 @@ static void csr_save_tx_power_to_cfg(struct mac_context *mac, for (idx = 0; idx < ch_set->numChannels; idx++) { ch_pwr_set->first_freq = ch_set->first_chan_freq; - sme_debug( - "Setting Channel freq %d", - ch_pwr_set->first_freq); ch_pwr_set->numChannels = 1; ch_pwr_set->maxTxPower = QDF_MIN(ch_set->txPower, mac->mlme_cfg->power.max_tx_power); - sme_debug( - "Setting Max Transmit Power %d", - ch_pwr_set->maxTxPower); cbLen += sizeof(tSirMacChanInfo); ch_pwr_set++; count++; @@ -1578,14 +1572,9 @@ static void csr_save_tx_power_to_cfg(struct mac_context *mac, break; } ch_pwr_set->first_freq = ch_set->first_chan_freq; - sme_debug("Setting Channel Freq %d", ch_pwr_set->first_freq); ch_pwr_set->numChannels = ch_set->numChannels; ch_pwr_set->maxTxPower = QDF_MIN(ch_set->txPower, mac->mlme_cfg->power.max_tx_power); - sme_debug( - "Setting Max Tx Power %d, nTxPower %d", - ch_pwr_set->maxTxPower, - mac->mlme_cfg->power.max_tx_power); cbLen += sizeof(tSirMacChanInfo); ch_pwr_set++; count++; @@ -1624,7 +1613,7 @@ static void csr_set_cfg_country_code(struct mac_context *mac, uint8_t cc[CFG_COUNTRY_CODE_LEN]; /* v_REGDOMAIN_t DomainId */ - sme_debug("Setting Country Code in Cfg %s", countryCode); + sme_debug("Set Country in Cfg %s", countryCode); qdf_mem_copy(cc, countryCode, CFG_COUNTRY_CODE_LEN); /* @@ -1650,7 +1639,6 @@ static void csr_set_cfg_country_code(struct mac_context *mac, */ qdf_mem_copy(mac->mlme_cfg->reg.country_code, cc, CFG_COUNTRY_CODE_LEN); mac->mlme_cfg->reg.country_code_len = CFG_COUNTRY_CODE_LEN; - sme_debug("CFG_COUNTRY_CODE changed"); sch_edca_profile_update_all(mac); /* * Need to let HALPHY know about the current domain so it can apply some diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index 3804957a68..ddb9de23bd 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -162,11 +162,6 @@ QDF_STATUS wma_update_channel_list(WMA_HANDLE handle, wma_handle->saved_chan.ch_freq_list[i] = chan_list->chanParam[i].freq; - WMA_LOGD("chan[%d] = freq:%u DFS:%d tx power:%d", - i, chan_p->mhz, - chan_list->chanParam[i].dfsSet, - chan_list->chanParam[i].pwr); - if (chan_list->chanParam[i].dfsSet) { chan_p->is_chan_passive = 1; chan_p->dfs_set = 1;