From 65415d12d985550e658e4e397dd93b85a20f29e9 Mon Sep 17 00:00:00 2001 From: sheenam monga Date: Fri, 7 Feb 2020 14:39:15 +0530 Subject: [PATCH] qcacld-3.0: Log optimization for NCHO Currently there are unnecessary/duplicate logging. Identify and reduce those logs that are not necessary. Change-Id: I648b84786f9009d45e54fa67c21c834a1eae1608 CRs-Fixed: 2617648 --- core/hdd/src/wlan_hdd_cfg80211.c | 19 ++++++------------- core/hdd/src/wlan_hdd_stats.c | 9 --------- core/wma/src/wma_utils.c | 25 +++++++++++-------------- 3 files changed, 17 insertions(+), 36 deletions(-) diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 6f74c7c1ec66..8ef2167119ae 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -4706,7 +4706,6 @@ hdd_set_roam_with_control_config(struct hdd_context *hdd_ctx, } if (tb2[QCA_ATTR_ROAM_CONTROL_TRIGGERS]) { - hdd_debug("Parse and send roam triggers to firmware"); value = nla_get_u32(tb2[QCA_ATTR_ROAM_CONTROL_TRIGGERS]); hdd_debug("Received roam trigger bitmap: 0x%x", value); status = hdd_send_roam_triggers_to_sme(hdd_ctx, @@ -4718,16 +4717,17 @@ hdd_set_roam_with_control_config(struct hdd_context *hdd_ctx, attr = tb2[QCA_ATTR_ROAM_CONTROL_ENABLE]; if (attr) { - hdd_debug("Parse and send roam control enable/disable"); status = sme_set_roam_config_enable(hdd_ctx->mac_handle, vdev_id, nla_get_u8(attr)); if (QDF_IS_STATUS_ERROR(status)) hdd_err("failed to enable/disable roam control config"); + hdd_debug("Parse and send roam control %s:", + nla_get_u8(attr) ? "Enable" : "Disable"); + attr = tb2[QCA_ATTR_ROAM_CONTROL_SCAN_PERIOD]; if (attr) { - hdd_debug("Parse and send scan period to firmware"); /* Default value received as part of Roam control enable * Set this only if user hasn't configured any value so * far. @@ -4742,7 +4742,6 @@ hdd_set_roam_with_control_config(struct hdd_context *hdd_ctx, attr = tb2[QCA_ATTR_ROAM_CONTROL_FULL_SCAN_PERIOD]; if (attr) { - hdd_debug("Parse and send full scan period to firmware"); value = nla_get_u32(attr); /* Default value received as part of Roam control enable * Set this only if user hasn't configured any value so @@ -4758,7 +4757,6 @@ hdd_set_roam_with_control_config(struct hdd_context *hdd_ctx, } else { attr = tb2[QCA_ATTR_ROAM_CONTROL_SCAN_PERIOD]; if (attr) { - hdd_debug("Parse and send scan period to firmware"); /* User configured value, cache the value directly */ value = nla_get_u32(attr); status = hdd_send_roam_scan_period_to_sme(hdd_ctx, @@ -4770,7 +4768,6 @@ hdd_set_roam_with_control_config(struct hdd_context *hdd_ctx, attr = tb2[QCA_ATTR_ROAM_CONTROL_FULL_SCAN_PERIOD]; if (attr) { - hdd_debug("Parse and send full scan period to firmware"); value = nla_get_u32(attr); /* User configured value, cache the value directly */ status = hdd_send_roam_full_scan_period_to_sme(hdd_ctx, @@ -4785,7 +4782,6 @@ hdd_set_roam_with_control_config(struct hdd_context *hdd_ctx, /* Scoring and roam candidate selection criteria */ attr = tb2[QCA_ATTR_ROAM_CONTROL_SELECTION_CRITERIA]; if (attr) { - hdd_debug("Send candidate selection criteria to firmware"); status = hdd_send_roam_cand_sel_criteria_to_sme(hdd_ctx, vdev_id, attr); if (QDF_IS_STATUS_ERROR(status)) @@ -4903,8 +4899,10 @@ hdd_roam_control_config_fill_data(struct hdd_context *hdd_ctx, uint8_t vdev_id, uint32_t full_roam_scan_period; config = nla_nest_start(skb, PARAM_ROAM_CONTROL_CONFIG); - if (!config) + if (!config) { + hdd_err("nla nest start failure"); return -EINVAL; + } if (tb[QCA_ATTR_ROAM_CONTROL_STATUS]) { status = sme_get_roam_config_status(hdd_ctx->mac_handle, @@ -4961,7 +4959,6 @@ hdd_send_roam_control_config(struct hdd_context *hdd_ctx, uint16_t skb_len; int status; - hdd_enter(); skb_len = hdd_roam_control_config_buf_size(hdd_ctx, tb); if (!skb_len) { hdd_err("No data requested"); @@ -4979,7 +4976,6 @@ hdd_send_roam_control_config(struct hdd_context *hdd_ctx, if (status) goto fail; - hdd_exit(); return cfg80211_vendor_cmd_reply(skb); fail: @@ -5003,7 +4999,6 @@ static int hdd_get_roam_control_config(struct hdd_context *hdd_ctx, QDF_STATUS status; struct nlattr *tb2[QCA_ATTR_ROAM_CONTROL_MAX + 1]; - hdd_enter(); /* The command must carry PARAM_ROAM_CONTROL_CONFIG */ if (!tb[PARAM_ROAM_CONTROL_CONFIG]) { hdd_err("Attribute CONTROL_CONFIG is not present"); @@ -5218,8 +5213,6 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy, struct roam_ext_params *roam_params = NULL; int ret; - hdd_enter_dev(dev); - if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; diff --git a/core/hdd/src/wlan_hdd_stats.c b/core/hdd/src/wlan_hdd_stats.c index 4b74a5187279..9c504eb70b30 100644 --- a/core/hdd/src/wlan_hdd_stats.c +++ b/core/hdd/src/wlan_hdd_stats.c @@ -627,8 +627,6 @@ static void hdd_link_layer_process_peer_stats(struct hdd_adapter *adapter, struct nlattr *peers; int num_rate; - hdd_enter(); - status = wlan_hdd_validate_context(hdd_ctx); if (0 != status) return; @@ -707,7 +705,6 @@ static void hdd_link_layer_process_peer_stats(struct hdd_adapter *adapter, } cfg80211_vendor_cmd_reply(vendor_event); - hdd_exit(); } /** @@ -731,8 +728,6 @@ hdd_link_layer_process_iface_stats(struct hdd_adapter *adapter, struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter); int status; - hdd_enter(); - status = wlan_hdd_validate_context(hdd_ctx); if (0 != status) return; @@ -767,7 +762,6 @@ hdd_link_layer_process_iface_stats(struct hdd_adapter *adapter, } cfg80211_vendor_cmd_reply(vendor_event); - hdd_exit(); } /** @@ -967,14 +961,11 @@ hdd_link_layer_process_radio_stats(struct hdd_adapter *adapter, struct wifi_radio_stats *radio_stat_save = radio_stat; struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter); - hdd_enter(); status = wlan_hdd_validate_context(hdd_ctx); if (0 != status) return; - hdd_debug("LL_STATS_RADIO: number of radios: %u", num_radio); - for (i = 0; i < num_radio; i++) { hdd_debug("LL_STATS_RADIO" " radio: %u on_time: %u tx_time: %u rx_time: %u" diff --git a/core/wma/src/wma_utils.c b/core/wma/src/wma_utils.c index 69ba6c0807b2..12b391d08aa3 100644 --- a/core/wma/src/wma_utils.c +++ b/core/wma/src/wma_utils.c @@ -2044,23 +2044,20 @@ static int wma_unified_link_radio_stats_event_handler(void *handle, return -EINVAL; } - WMA_LOGD("Radio stats Fixed Param:"); - WMA_LOGD("req_id: %u num_radio: %u more_radio_events: %u", + WMA_LOGD("Radio stats Fixed Param: req_id: %u num_radio: %u more_radio_events: %u", fixed_param->request_id, fixed_param->num_radio, fixed_param->more_radio_events); - WMA_LOGD("Radio Info: radio_id: %u on_time: %u tx_time: %u rx_time: %u on_time_scan: %u", - radio_stats->radio_id, radio_stats->on_time, - radio_stats->tx_time, radio_stats->rx_time, - radio_stats->on_time_scan); - WMA_LOGD("on_time_nbd: %u on_time_gscan: %u on_time_roam_scan: %u", - radio_stats->on_time_nbd, - radio_stats->on_time_gscan, radio_stats->on_time_roam_scan); - WMA_LOGD("on_time_pno_scan: %u on_time_hs20: %u num_channels: %u", - radio_stats->on_time_pno_scan, radio_stats->on_time_hs20, - radio_stats->num_channels); - WMA_LOGD("on_time_host_scan: %u, on_time_lpi_scan: %u", - radio_stats->on_time_host_scan, radio_stats->on_time_lpi_scan); + WMA_LOGD("Radio Info: radio_id: %u on_time: %u tx_time: %u rx_time: %u on_time_scan: %u on_time_nbd: %u on_time_gscan: %u on_time_roam_scan: %u", + radio_stats->radio_id, radio_stats->on_time, + radio_stats->tx_time, radio_stats->rx_time, + radio_stats->on_time_scan, radio_stats->on_time_nbd, + radio_stats->on_time_gscan, radio_stats->on_time_roam_scan); + + WMA_LOGD("on_time_pno_scan: %u on_time_hs20: %u num_channels: %u on_time_host_scan: %u, on_time_lpi_scan: %u", + radio_stats->on_time_pno_scan, radio_stats->on_time_hs20, + radio_stats->num_channels, radio_stats->on_time_host_scan, + radio_stats->on_time_lpi_scan); results = (uint8_t *) link_stats_results->results; t_radio_stats = (uint8_t *) radio_stats;