qcacmn: Clean up logs in STATS path

Clean up logs in STATS request and response path.

Change-Id: I45135233eb4c10793dc9c62f28d91c49183a0a09
CRs-Fixed: 2618310

os_if/linux/cp_stats/src/wlan_cfg80211_mc_cp_stats.c

@@ -61,8 +61,6 @@ static void wlan_cfg80211_mc_cp_stats_dealloc(void *priv)
 {
 	struct stats_event *stats = priv;
 
-	osif_debug("Enter");
-
 	if (!stats) {
 		osif_err("stats is NULL");
 		return;
@@ -75,7 +73,6 @@ static void wlan_cfg80211_mc_cp_stats_dealloc(void *priv)
 	qdf_mem_free(stats->vdev_chain_rssi);
 	qdf_mem_free(stats->peer_adv_stats);
 	wlan_free_mib_stats(stats);
-	osif_debug("Exit");
 }
 
 /**
@@ -448,8 +445,6 @@ static void get_station_stats_cb(struct stats_event *ev, void *cookie)
 	struct osif_request *request;
 	uint32_t summary_size, rssi_size, peer_adv_size;
 
-	osif_debug("Enter");
-
 	request = osif_request_get(cookie);
 	if (!request) {
 		osif_err("Obsolete request");
@@ -497,8 +492,6 @@ static void get_station_stats_cb(struct stats_event *ev, void *cookie)
 station_stats_cb_fail:
 	osif_request_complete(request);
 	osif_request_put(request);
-
-	osif_debug("Exit");
 }
 
 struct stats_event *

target_if/cp_stats/src/target_if_mc_cp_stats.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-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
@@ -228,16 +228,13 @@ static QDF_STATUS target_if_cp_stats_extract_cca_stats(
 	struct wmi_host_congestion_stats stats = {0};
 
 	status = wmi_extract_cca_stats(wmi_hdl, data, &stats);
-	if (QDF_IS_STATUS_ERROR(status)) {
-		cp_stats_debug("no congestion stats");
+	if (QDF_IS_STATUS_ERROR(status))
 		return QDF_STATUS_SUCCESS;
-	}
 
 	ev->cca_stats = qdf_mem_malloc(sizeof(*ev->cca_stats));
 	if (!ev->cca_stats)
 		return QDF_STATUS_E_NOMEM;
 
-
 	ev->cca_stats->vdev_id = stats.vdev_id;
 	ev->cca_stats->congestion = stats.congestion;
 
@@ -415,11 +412,22 @@ static QDF_STATUS target_if_cp_stats_extract_event(struct wmi_unified *wmi_hdl,
 		cp_stats_err("stats param extract failed: %d", status);
 		return status;
 	}
-	cp_stats_debug("num: pdev: %d, vdev: %d, peer: %d, rssi: %d, mib %d, mib_extd %d",
-		       stats_param.num_pdev_stats, stats_param.num_vdev_stats,
-		       stats_param.num_peer_stats, stats_param.num_rssi_stats,
+	cp_stats_debug("num: pdev: %d, pdev_extd: %d, vdev: %d, peer: %d,"
+		       "peer_extd: %d rssi: %d, mib %d, mib_extd %d, "
+		       "bcnflt: %d, channel: %d, bcn: %d, peer_extd2: %d,"
+		       "last_event: %x",
+		       stats_param.num_pdev_stats,
+		       stats_param.num_pdev_ext_stats,
+		       stats_param.num_vdev_stats,
+		       stats_param.num_peer_stats,
+		       stats_param.num_peer_extd_stats,
+		       stats_param.num_rssi_stats,
 		       stats_param.num_mib_stats,
-		       stats_param.num_mib_extd_stats);
+		       stats_param.num_mib_extd_stats,
+		       stats_param.num_bcnflt_stats,
+		       stats_param.num_chan_stats,
+		       stats_param.num_bcn_stats,
+		       stats_param.num_peer_adv_stats, stats_param.last_event);
 
 	ev->last_event = stats_param.last_event;
 	status = target_if_cp_stats_extract_pdev_stats(wmi_hdl, &stats_param,

umac/cp_stats/dispatcher/inc/wlan_cp_stats_utils_api.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2018,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
@@ -34,7 +34,8 @@
 		QDF_TRACE_DEBUG(QDF_MODULE_ID_CP_STATS, ## args)
 #define cp_stats_err(args ...) \
 		QDF_TRACE_ERROR(QDF_MODULE_ID_CP_STATS, ## args)
-
+#define cp_stats_nofl_debug(args ...) \
+		QDF_TRACE_DEBUG_NO_FL(QDF_MODULE_ID_CP_STATS, ## args)
 /**
  * enum wlan_cp_stats_cfg_state - State of Object configuration to
  * indicate whether object has to be attached/detached in cp stats

umac/cp_stats/dispatcher/src/wlan_cp_stats_mc_tgt_api.c

@@ -38,7 +38,6 @@ static bool tgt_mc_cp_stats_is_last_event(struct stats_event *ev,
 
 	if (IS_MSB_SET(ev->last_event)) {
 		is_last_event = IS_LSB_SET(ev->last_event);
-		cp_stats_debug("is_last_event %d", is_last_event);
 	} else {
 		if (stats_type == TYPE_CONNECTION_TX_POWER) {
 			cp_stats_debug("FW does not support last event bit");
@@ -48,6 +47,10 @@ static bool tgt_mc_cp_stats_is_last_event(struct stats_event *ev,
 			is_last_event = !!ev->peer_stats;
 		}
 	}
+
+	if (is_last_event)
+		cp_stats_debug("Last stats event");
+
 	return is_last_event;
 }
 
@@ -70,10 +73,8 @@ static void tgt_mc_cp_stats_extract_tx_power(struct wlan_objmgr_psoc *psoc,
 	struct pdev_mc_cp_stats *pdev_mc_stats;
 	struct pdev_cp_stats *pdev_cp_stats_priv;
 
-	if (!ev->pdev_stats) {
-		cp_stats_debug("no pdev stats");
+	if (!ev->pdev_stats)
 		return;
-	}
 
 	if (is_station_stats)
 		status = ucfg_mc_cp_stats_get_pending_req(psoc,
@@ -345,9 +346,9 @@ tgt_mc_cp_stats_update_peer_stats(struct wlan_objmgr_psoc *psoc,
 		peer_mc_stats->rx_rate = peer_stats->rx_rate;
 	if (peer_stats->peer_rssi)
 		peer_mc_stats->peer_rssi = peer_stats->peer_rssi;
-	cp_stats_debug("peer_mac=%pM, tx_rate=%u, rx_rate=%u, peer_rssi=%d",
-		       peer_mc_stats->peer_macaddr, peer_mc_stats->tx_rate,
-		       peer_mc_stats->rx_rate, peer_mc_stats->peer_rssi);
+	cp_stats_nofl_debug("PEER STATS: peer_mac=%pM, tx_rate=%u, rx_rate=%u, peer_rssi=%d",
+			    peer_mc_stats->peer_macaddr, peer_mc_stats->tx_rate,
+			    peer_mc_stats->rx_rate, peer_mc_stats->peer_rssi);
 	wlan_cp_stats_peer_obj_unlock(peer_cp_stats_priv);
 
 end:
@@ -481,10 +482,8 @@ static void tgt_mc_cp_stats_extract_peer_stats(struct wlan_objmgr_psoc *psoc,
 		return;
 	}
 
-	if (!ev->peer_stats) {
-		cp_stats_debug("no peer stats");
+	if (!ev->peer_stats)
 		goto extd2_stats;
-	}
 
 	selected = ev->num_peer_stats;
 	for (i = 0; i < ev->num_peer_stats; i++) {
@@ -510,10 +509,9 @@ static void tgt_mc_cp_stats_extract_peer_stats(struct wlan_objmgr_psoc *psoc,
 
 extd2_stats:
 
-	if (!ev->peer_adv_stats) {
-		cp_stats_debug("no peer_extd2 stats");
+	if (!ev->peer_adv_stats)
 		goto complete;
-	}
+
 	selected = ev->num_peer_adv_stats;
 	for (i = 0; i < ev->num_peer_adv_stats; i++) {
 		status = tgt_mc_cp_stats_update_peer_adv_stats(
@@ -629,10 +627,8 @@ static void tgt_mc_cp_stats_extract_vdev_summary_stats(
 	struct peer_cp_stats *peer_cp_stats_priv;
 	struct vdev_cp_stats *vdev_cp_stats_priv;
 
-	if (!ev->vdev_summary_stats) {
-		cp_stats_debug("no summary stats");
+	if (!ev->vdev_summary_stats)
 		return;
-	}
 
 	status = ucfg_mc_cp_stats_get_pending_req(psoc,
 						 TYPE_STATION_STATS,
@@ -707,10 +703,8 @@ static void tgt_mc_cp_stats_extract_vdev_chain_rssi_stats(
 	struct vdev_mc_cp_stats *vdev_mc_stats;
 	struct vdev_cp_stats *vdev_cp_stats_priv;
 
-	if (!ev->vdev_chain_rssi) {
-		cp_stats_debug("no vdev chain rssi stats");
+	if (!ev->vdev_chain_rssi)
 		return;
-	}
 
 	status = ucfg_mc_cp_stats_get_pending_req(psoc,
 						  TYPE_STATION_STATS,

wmi/src/wmi_unified_tlv.c

@@ -8362,10 +8362,8 @@ static QDF_STATUS extract_cca_stats_tlv(wmi_unified_t wmi_handle,
 
 	param_buf = (WMI_UPDATE_STATS_EVENTID_param_tlvs *)evt_buf;
 	congestion_stats = param_buf->congestion_stats;
-	if (!congestion_stats) {
-		WMI_LOGD("%s: no cca stats in event buffer", __func__);
+	if (!congestion_stats)
 		return QDF_STATUS_E_INVAL;
-	}
 
 	out_buff->vdev_id = congestion_stats->vdev_id;
 	out_buff->congestion = congestion_stats->congestion;