From 00227110046e2c9fcb4e8f30f63e89b54ede7faa Mon Sep 17 00:00:00 2001 From: Houston Hoffman Date: Mon, 14 Aug 2017 23:58:18 -0700 Subject: [PATCH] qcacld-3.0: Reduce log flooding in __hdd_tx_timeout Reduce log flooding in __hdd_tx_timeout. The single __hdd_tx_timeout error log printed by TX_TIMEOUT_TRACE should be sufficient to identify the error. The debugging effort should use the driver logs. This will ease debugging of other subsystems in the case that the root cause is a system instability. Change-Id: Iee3ba3c7d8d7dcd72a3a71ea4f8e4ae8d3bc17b6 CRs-Fixed: 2092183 --- core/dp/txrx/ol_txrx_flow_control.c | 24 ++++++++++++------------ core/hdd/src/wlan_hdd_main.c | 6 +++--- core/hdd/src/wlan_hdd_tx_rx.c | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/core/dp/txrx/ol_txrx_flow_control.c b/core/dp/txrx/ol_txrx_flow_control.c index 405ed382f6c37..f3e9ca58a0b87 100644 --- a/core/dp/txrx/ol_txrx_flow_control.c +++ b/core/dp/txrx/ol_txrx_flow_control.c @@ -282,21 +282,21 @@ void ol_tx_dump_flow_pool_info(void *ctx) struct ol_tx_flow_pool_t *pool = NULL, *pool_prev = NULL; struct ol_tx_flow_pool_t tmp_pool; - ol_txrx_info("Global Pool"); + ol_txrx_dbg("Global Pool"); if (!pdev) { ol_txrx_err("ERROR: pdev NULL"); QDF_ASSERT(0); /* traceback */ return; } - ol_txrx_info("Total %d :: Available %d", + ol_txrx_dbg("Total %d :: Available %d", pdev->tx_desc.pool_size, pdev->tx_desc.num_free); - ol_txrx_info("Invalid flow_pool %d", + ol_txrx_dbg("Invalid flow_pool %d", pdev->tx_desc.num_invalid_bin); - ol_txrx_info("No of pool map received %d", + ol_txrx_dbg("No of pool map received %d", pdev->pool_stats.pool_map_count); - ol_txrx_info("No of pool unmap received %d", + ol_txrx_dbg("No of pool unmap received %d", pdev->pool_stats.pool_unmap_count); - ol_txrx_info( + ol_txrx_dbg( "Pkt dropped due to unavailablity of pool %d", pdev->pool_stats.pkt_drop_no_pool); @@ -317,21 +317,21 @@ void ol_tx_dump_flow_pool_info(void *ctx) if (pool_prev) ol_tx_dec_pool_ref(pool_prev, false); - ol_txrx_info("\n"); - ol_txrx_info( + ol_txrx_dbg("\n"); + ol_txrx_dbg( "Flow_pool_id %d :: status %d", tmp_pool.flow_pool_id, tmp_pool.status); - ol_txrx_info( + ol_txrx_dbg( "Total %d :: Available %d :: Deficient %d", tmp_pool.flow_pool_size, tmp_pool.avail_desc, tmp_pool.deficient_desc); - ol_txrx_info( + ol_txrx_dbg( "Start threshold %d :: Stop threshold %d", tmp_pool.start_th, tmp_pool.stop_th); - ol_txrx_info( + ol_txrx_dbg( "Member flow_id %d :: flow_type %d", tmp_pool.member_flow_id, tmp_pool.flow_type); - ol_txrx_info( + ol_txrx_dbg( "Pkt dropped due to unavailablity of descriptors %d", tmp_pool.pkt_drop_no_desc); diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 5edc42787ef89..c4c49bfb18e84 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -6601,7 +6601,7 @@ void wlan_hdd_display_tx_rx_histogram(hdd_context_t *hdd_ctx) for (i = 0; i < NUM_TX_RX_HISTOGRAM; i++) { /* using hdd_log to avoid printing function name */ if (hdd_ctx->hdd_txrx_hist[i].qtime > 0) - hdd_log(QDF_TRACE_LEVEL_ERROR, + hdd_log(QDF_TRACE_LEVEL_DEBUG, "[%3d][%15llu]: %6llu, %6llu, %s, %s, %s", i, hdd_ctx->hdd_txrx_hist[i].qtime, hdd_ctx->hdd_txrx_hist[i].interval_rx, @@ -6679,7 +6679,7 @@ void wlan_hdd_display_netif_queue_history(hdd_context_t *hdd_ctx) pause_delta = delta; /* using hdd_log to avoid printing function name */ - hdd_log(QDF_TRACE_LEVEL_ERROR, + hdd_log(QDF_TRACE_LEVEL_DEBUG, "%s: %d: %d: %ums", hdd_reason_type_to_string(i), adapter->queue_oper_stats[i].pause_count, @@ -6699,7 +6699,7 @@ void wlan_hdd_display_netif_queue_history(hdd_context_t *hdd_ctx) /* using hdd_log to avoid printing function name */ if (adapter->queue_oper_history[i].time == 0) continue; - hdd_log(QDF_TRACE_LEVEL_ERROR, + hdd_log(QDF_TRACE_LEVEL_DEBUG, "%d: %u: %s: %s: %x", i, qdf_system_ticks_to_msecs( adapter->queue_oper_history[i].time), diff --git a/core/hdd/src/wlan_hdd_tx_rx.c b/core/hdd/src/wlan_hdd_tx_rx.c index fdc3d826d9791..6e2790cd94e9d 100644 --- a/core/hdd/src/wlan_hdd_tx_rx.c +++ b/core/hdd/src/wlan_hdd_tx_rx.c @@ -885,7 +885,7 @@ static void __hdd_tx_timeout(struct net_device *dev) i, netif_tx_queue_stopped(txq), txq->trans_start); } - QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_DEBUG, "carrier state: %d", netif_carrier_ok(dev)); hdd_ctx = WLAN_HDD_GET_CTX(adapter); wlan_hdd_display_netif_queue_history(hdd_ctx);