qcacmn: Clean up logs in STATS path
Clean up logs in STATS request and response path. Change-Id: I45135233eb4c10793dc9c62f28d91c49183a0a09 CRs-Fixed: 2618310
This commit is contained in:

committed by
nshrivas

parent
f4149ccaa2
commit
9fae7f7537
@@ -61,8 +61,6 @@ static void wlan_cfg80211_mc_cp_stats_dealloc(void *priv)
|
|||||||
{
|
{
|
||||||
struct stats_event *stats = priv;
|
struct stats_event *stats = priv;
|
||||||
|
|
||||||
osif_debug("Enter");
|
|
||||||
|
|
||||||
if (!stats) {
|
if (!stats) {
|
||||||
osif_err("stats is NULL");
|
osif_err("stats is NULL");
|
||||||
return;
|
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->vdev_chain_rssi);
|
||||||
qdf_mem_free(stats->peer_adv_stats);
|
qdf_mem_free(stats->peer_adv_stats);
|
||||||
wlan_free_mib_stats(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;
|
struct osif_request *request;
|
||||||
uint32_t summary_size, rssi_size, peer_adv_size;
|
uint32_t summary_size, rssi_size, peer_adv_size;
|
||||||
|
|
||||||
osif_debug("Enter");
|
|
||||||
|
|
||||||
request = osif_request_get(cookie);
|
request = osif_request_get(cookie);
|
||||||
if (!request) {
|
if (!request) {
|
||||||
osif_err("Obsolete 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:
|
station_stats_cb_fail:
|
||||||
osif_request_complete(request);
|
osif_request_complete(request);
|
||||||
osif_request_put(request);
|
osif_request_put(request);
|
||||||
|
|
||||||
osif_debug("Exit");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
struct stats_event *
|
struct stats_event *
|
||||||
|
@@ -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
|
* Permission to use, copy, modify, and/or distribute this software for
|
||||||
* any purpose with or without fee is hereby granted, provided that the
|
* 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};
|
struct wmi_host_congestion_stats stats = {0};
|
||||||
|
|
||||||
status = wmi_extract_cca_stats(wmi_hdl, data, &stats);
|
status = wmi_extract_cca_stats(wmi_hdl, data, &stats);
|
||||||
if (QDF_IS_STATUS_ERROR(status)) {
|
if (QDF_IS_STATUS_ERROR(status))
|
||||||
cp_stats_debug("no congestion stats");
|
|
||||||
return QDF_STATUS_SUCCESS;
|
return QDF_STATUS_SUCCESS;
|
||||||
}
|
|
||||||
|
|
||||||
ev->cca_stats = qdf_mem_malloc(sizeof(*ev->cca_stats));
|
ev->cca_stats = qdf_mem_malloc(sizeof(*ev->cca_stats));
|
||||||
if (!ev->cca_stats)
|
if (!ev->cca_stats)
|
||||||
return QDF_STATUS_E_NOMEM;
|
return QDF_STATUS_E_NOMEM;
|
||||||
|
|
||||||
|
|
||||||
ev->cca_stats->vdev_id = stats.vdev_id;
|
ev->cca_stats->vdev_id = stats.vdev_id;
|
||||||
ev->cca_stats->congestion = stats.congestion;
|
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);
|
cp_stats_err("stats param extract failed: %d", status);
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
cp_stats_debug("num: pdev: %d, vdev: %d, peer: %d, rssi: %d, mib %d, mib_extd %d",
|
cp_stats_debug("num: pdev: %d, pdev_extd: %d, vdev: %d, peer: %d,"
|
||||||
stats_param.num_pdev_stats, stats_param.num_vdev_stats,
|
"peer_extd: %d rssi: %d, mib %d, mib_extd %d, "
|
||||||
stats_param.num_peer_stats, stats_param.num_rssi_stats,
|
"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_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;
|
ev->last_event = stats_param.last_event;
|
||||||
status = target_if_cp_stats_extract_pdev_stats(wmi_hdl, &stats_param,
|
status = target_if_cp_stats_extract_pdev_stats(wmi_hdl, &stats_param,
|
||||||
|
@@ -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
|
* Permission to use, copy, modify, and/or distribute this software for
|
||||||
* any purpose with or without fee is hereby granted, provided that the
|
* 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)
|
QDF_TRACE_DEBUG(QDF_MODULE_ID_CP_STATS, ## args)
|
||||||
#define cp_stats_err(args ...) \
|
#define cp_stats_err(args ...) \
|
||||||
QDF_TRACE_ERROR(QDF_MODULE_ID_CP_STATS, ## 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
|
* enum wlan_cp_stats_cfg_state - State of Object configuration to
|
||||||
* indicate whether object has to be attached/detached in cp stats
|
* indicate whether object has to be attached/detached in cp stats
|
||||||
|
@@ -38,7 +38,6 @@ static bool tgt_mc_cp_stats_is_last_event(struct stats_event *ev,
|
|||||||
|
|
||||||
if (IS_MSB_SET(ev->last_event)) {
|
if (IS_MSB_SET(ev->last_event)) {
|
||||||
is_last_event = IS_LSB_SET(ev->last_event);
|
is_last_event = IS_LSB_SET(ev->last_event);
|
||||||
cp_stats_debug("is_last_event %d", is_last_event);
|
|
||||||
} else {
|
} else {
|
||||||
if (stats_type == TYPE_CONNECTION_TX_POWER) {
|
if (stats_type == TYPE_CONNECTION_TX_POWER) {
|
||||||
cp_stats_debug("FW does not support last event bit");
|
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;
|
is_last_event = !!ev->peer_stats;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (is_last_event)
|
||||||
|
cp_stats_debug("Last stats event");
|
||||||
|
|
||||||
return is_last_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_mc_cp_stats *pdev_mc_stats;
|
||||||
struct pdev_cp_stats *pdev_cp_stats_priv;
|
struct pdev_cp_stats *pdev_cp_stats_priv;
|
||||||
|
|
||||||
if (!ev->pdev_stats) {
|
if (!ev->pdev_stats)
|
||||||
cp_stats_debug("no pdev stats");
|
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
if (is_station_stats)
|
if (is_station_stats)
|
||||||
status = ucfg_mc_cp_stats_get_pending_req(psoc,
|
status = ucfg_mc_cp_stats_get_pending_req(psoc,
|
||||||
@@ -345,7 +346,7 @@ tgt_mc_cp_stats_update_peer_stats(struct wlan_objmgr_psoc *psoc,
|
|||||||
peer_mc_stats->rx_rate = peer_stats->rx_rate;
|
peer_mc_stats->rx_rate = peer_stats->rx_rate;
|
||||||
if (peer_stats->peer_rssi)
|
if (peer_stats->peer_rssi)
|
||||||
peer_mc_stats->peer_rssi = 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",
|
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->peer_macaddr, peer_mc_stats->tx_rate,
|
||||||
peer_mc_stats->rx_rate, peer_mc_stats->peer_rssi);
|
peer_mc_stats->rx_rate, peer_mc_stats->peer_rssi);
|
||||||
wlan_cp_stats_peer_obj_unlock(peer_cp_stats_priv);
|
wlan_cp_stats_peer_obj_unlock(peer_cp_stats_priv);
|
||||||
@@ -481,10 +482,8 @@ static void tgt_mc_cp_stats_extract_peer_stats(struct wlan_objmgr_psoc *psoc,
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!ev->peer_stats) {
|
if (!ev->peer_stats)
|
||||||
cp_stats_debug("no peer stats");
|
|
||||||
goto extd2_stats;
|
goto extd2_stats;
|
||||||
}
|
|
||||||
|
|
||||||
selected = ev->num_peer_stats;
|
selected = ev->num_peer_stats;
|
||||||
for (i = 0; i < ev->num_peer_stats; i++) {
|
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:
|
extd2_stats:
|
||||||
|
|
||||||
if (!ev->peer_adv_stats) {
|
if (!ev->peer_adv_stats)
|
||||||
cp_stats_debug("no peer_extd2 stats");
|
|
||||||
goto complete;
|
goto complete;
|
||||||
}
|
|
||||||
selected = ev->num_peer_adv_stats;
|
selected = ev->num_peer_adv_stats;
|
||||||
for (i = 0; i < ev->num_peer_adv_stats; i++) {
|
for (i = 0; i < ev->num_peer_adv_stats; i++) {
|
||||||
status = tgt_mc_cp_stats_update_peer_adv_stats(
|
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 peer_cp_stats *peer_cp_stats_priv;
|
||||||
struct vdev_cp_stats *vdev_cp_stats_priv;
|
struct vdev_cp_stats *vdev_cp_stats_priv;
|
||||||
|
|
||||||
if (!ev->vdev_summary_stats) {
|
if (!ev->vdev_summary_stats)
|
||||||
cp_stats_debug("no summary stats");
|
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
status = ucfg_mc_cp_stats_get_pending_req(psoc,
|
status = ucfg_mc_cp_stats_get_pending_req(psoc,
|
||||||
TYPE_STATION_STATS,
|
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_mc_cp_stats *vdev_mc_stats;
|
||||||
struct vdev_cp_stats *vdev_cp_stats_priv;
|
struct vdev_cp_stats *vdev_cp_stats_priv;
|
||||||
|
|
||||||
if (!ev->vdev_chain_rssi) {
|
if (!ev->vdev_chain_rssi)
|
||||||
cp_stats_debug("no vdev chain rssi stats");
|
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
status = ucfg_mc_cp_stats_get_pending_req(psoc,
|
status = ucfg_mc_cp_stats_get_pending_req(psoc,
|
||||||
TYPE_STATION_STATS,
|
TYPE_STATION_STATS,
|
||||||
|
@@ -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;
|
param_buf = (WMI_UPDATE_STATS_EVENTID_param_tlvs *)evt_buf;
|
||||||
congestion_stats = param_buf->congestion_stats;
|
congestion_stats = param_buf->congestion_stats;
|
||||||
if (!congestion_stats) {
|
if (!congestion_stats)
|
||||||
WMI_LOGD("%s: no cca stats in event buffer", __func__);
|
|
||||||
return QDF_STATUS_E_INVAL;
|
return QDF_STATUS_E_INVAL;
|
||||||
}
|
|
||||||
|
|
||||||
out_buff->vdev_id = congestion_stats->vdev_id;
|
out_buff->vdev_id = congestion_stats->vdev_id;
|
||||||
out_buff->congestion = congestion_stats->congestion;
|
out_buff->congestion = congestion_stats->congestion;
|
||||||
|
Reference in New Issue
Block a user