From 41b912cfff5ec9c7862298ed975362db0d9e080f Mon Sep 17 00:00:00 2001 From: Houston Hoffman Date: Wed, 30 Aug 2017 14:27:51 -0700 Subject: [PATCH] qcacmn: DP logging adjustments (1) Adjust logging to reduce printing to the console by datapath. Change-Id: I9354cf939a6edcf6cd6fc66dbeb4638b517f30da CRs-Fixed: 2117150 --- dp/wifi3.0/dp_htt.c | 2 +- dp/wifi3.0/dp_main.c | 23 +++++++++-------------- dp/wifi3.0/dp_peer.c | 2 +- dp/wifi3.0/dp_rx.c | 8 ++++---- dp/wifi3.0/dp_rx_mon_dest.c | 4 ++-- dp/wifi3.0/dp_rx_mon_status.c | 4 ++-- dp/wifi3.0/dp_tx.c | 26 +++++++++++++------------- 7 files changed, 32 insertions(+), 37 deletions(-) diff --git a/dp/wifi3.0/dp_htt.c b/dp/wifi3.0/dp_htt.c index c6daacdd8ee7..32c20cbc9fe3 100644 --- a/dp/wifi3.0/dp_htt.c +++ b/dp/wifi3.0/dp_htt.c @@ -221,7 +221,7 @@ htt_htc_misc_pkt_pool_free(struct htt_soc *soc) qdf_nbuf_unmap(soc->osdev, netbuf, QDF_DMA_TO_DEVICE); soc->stats.htc_pkt_free++; - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_LOW, "%s: Pkt free count %d\n", __func__, soc->stats.htc_pkt_free); diff --git a/dp/wifi3.0/dp_main.c b/dp/wifi3.0/dp_main.c index ba4a6998b85c..61f6717fbf17 100644 --- a/dp/wifi3.0/dp_main.c +++ b/dp/wifi3.0/dp_main.c @@ -391,7 +391,7 @@ static void dp_srng_msi_setup(struct dp_soc *soc, struct hal_srng_params msi_group_number = dp_srng_calculate_msi_group(soc, ring_type, ring_num); if (msi_group_number < 0) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_LOW, FL("ring not part of an ext_group; ring_type: %d,ring_num %d"), ring_type, ring_num); ring_params->msi_addr = 0; @@ -485,7 +485,7 @@ static int dp_srng_setup(struct dp_soc *soc, struct dp_srng *srng, * See if these settings need to passed from DP layer */ ring_params.flags = 0; - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_LOW, FL("Ring type: %d, num:%d"), ring_type, ring_num); num_entries = (num_entries > max_entries) ? max_entries : num_entries; @@ -2071,12 +2071,12 @@ static void dp_lro_hash_setup(struct dp_soc *soc) lro_hash.lro_enable = 1; lro_hash.tcp_flag = QDF_TCPHDR_ACK; lro_hash.tcp_flag_mask = QDF_TCPHDR_FIN | QDF_TCPHDR_SYN | - QDF_TCPHDR_RST | QDF_TCPHDR_ACK | QDF_TCPHDR_URG | - QDF_TCPHDR_ECE | QDF_TCPHDR_CWR; + QDF_TCPHDR_RST | QDF_TCPHDR_ACK | QDF_TCPHDR_URG | + QDF_TCPHDR_ECE | QDF_TCPHDR_CWR; } - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, FL("enabled")); - qdf_get_random_bytes(lro_hash.toeplitz_hash_ipv4, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_LOW, FL("enabled")); + qdf_get_random_bytes(lro_hash.toeplitz_hash_ipv4, (sizeof(lro_hash.toeplitz_hash_ipv4[0]) * LRO_IPV4_SEED_ARR_SZ)); @@ -2084,22 +2084,17 @@ static void dp_lro_hash_setup(struct dp_soc *soc) (sizeof(lro_hash.toeplitz_hash_ipv6[0]) * LRO_IPV6_SEED_ARR_SZ)); - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - "lro_hash: lro_enable: 0x%x" - "lro_hash: tcp_flag 0x%x tcp_flag_mask 0x%x", + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_LOW, + "lro_hash: lro_enable: 0x%x tcp_flag 0x%x tcp_flag_mask 0x%x", lro_hash.lro_enable, lro_hash.tcp_flag, lro_hash.tcp_flag_mask); - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - FL("lro_hash: toeplitz_hash_ipv4:")); qdf_trace_hex_dump(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, (void *)lro_hash.toeplitz_hash_ipv4, (sizeof(lro_hash.toeplitz_hash_ipv4[0]) * LRO_IPV4_SEED_ARR_SZ)); - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - FL("lro_hash: toeplitz_hash_ipv6:")); qdf_trace_hex_dump(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, (void *)lro_hash.toeplitz_hash_ipv6, @@ -3009,7 +3004,7 @@ static void dp_vdev_register_wifi3(struct cdp_vdev *vdev_handle, /* TODO: Enable the following once Tx code is integrated */ txrx_ops->tx.tx = dp_tx_send; - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_LOW, "DP Vdev Register success"); } diff --git a/dp/wifi3.0/dp_peer.c b/dp/wifi3.0/dp_peer.c index b5d7cb2b345e..4347e27dde0f 100644 --- a/dp/wifi3.0/dp_peer.c +++ b/dp/wifi3.0/dp_peer.c @@ -1135,7 +1135,7 @@ static void dp_rx_tid_delete_cb(struct dp_soc *soc, void *cb_ctxt, freedesc->rx_tid.tid); } - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_LOW, "%s: rx_tid: %d status: %d\n", __func__, freedesc->rx_tid.tid, reo_status->rx_queue_status.header.status); diff --git a/dp/wifi3.0/dp_rx.c b/dp/wifi3.0/dp_rx.c index b3fe70179b9e..b6f5adc373ae 100644 --- a/dp/wifi3.0/dp_rx.c +++ b/dp/wifi3.0/dp_rx.c @@ -288,14 +288,14 @@ dp_get_vdev_from_peer(struct dp_soc *soc, vdev_id = DP_PEER_METADATA_ID_GET( mpdu_desc_info.peer_meta_data); QDF_TRACE(QDF_MODULE_ID_DP, - QDF_TRACE_LEVEL_ERROR, + QDF_TRACE_LEVEL_DEBUG, FL("PeerID %d not found use vdevID %d"), peer_id, vdev_id); vdev = dp_get_vdev_from_soc_vdev_id_wifi3(soc, vdev_id); } else { QDF_TRACE(QDF_MODULE_ID_DP, - QDF_TRACE_LEVEL_ERROR, + QDF_TRACE_LEVEL_DEBUG, FL("Invalid PeerID %d"), peer_id); return NULL; @@ -320,7 +320,7 @@ dp_get_vdev_from_peer(struct dp_soc *soc, { if (unlikely(!peer)) { QDF_TRACE(QDF_MODULE_ID_DP, - QDF_TRACE_LEVEL_ERROR, + QDF_TRACE_LEVEL_DEBUG, FL("Peer not found for peerID %d"), peer_id); return NULL; @@ -1004,7 +1004,7 @@ dp_rx_process(struct dp_intr *int_ctx, void *hal_ring, uint32_t quota) mpdu_desc_info); if (!vdev) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_LOW, FL("vdev is NULL")); DP_STATS_INC(soc, rx.err.invalid_vdev, 1); qdf_nbuf_free(rx_desc->nbuf); diff --git a/dp/wifi3.0/dp_rx_mon_dest.c b/dp/wifi3.0/dp_rx_mon_dest.c index dd63f4916ae7..38df3fe227a4 100644 --- a/dp/wifi3.0/dp_rx_mon_dest.c +++ b/dp/wifi3.0/dp_rx_mon_dest.c @@ -810,7 +810,7 @@ dp_rx_pdev_mon_buf_attach(struct dp_pdev *pdev) { rx_desc_pool = &soc->rx_desc_mon[pdev_id]; - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_LOW, "%s: Mon RX Desc Pool[%d] allocation size=%d\n" , __func__, pdev_id, rxdma_entries*3); @@ -822,7 +822,7 @@ dp_rx_pdev_mon_buf_attach(struct dp_pdev *pdev) { return status; } - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_LOW, "%s: Mon RX Buffers Replenish pdev_id=%d\n", __func__, pdev_id); diff --git a/dp/wifi3.0/dp_rx_mon_status.c b/dp/wifi3.0/dp_rx_mon_status.c index 719412d994cd..64d88daa4446 100644 --- a/dp/wifi3.0/dp_rx_mon_status.c +++ b/dp/wifi3.0/dp_rx_mon_status.c @@ -570,7 +570,7 @@ dp_rx_pdev_mon_status_attach(struct dp_pdev *pdev) { rx_desc_pool = &soc->rx_desc_status[pdev_id]; - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_LOW, "%s: Mon RX Status Pool[%d] allocation size=%d\n", __func__, pdev_id, rxdma_entries); @@ -582,7 +582,7 @@ dp_rx_pdev_mon_status_attach(struct dp_pdev *pdev) { return status; } - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_LOW, "%s: Mon RX Status Buffers Replenish pdev_id=%d\n", __func__, pdev_id); diff --git a/dp/wifi3.0/dp_tx.c b/dp/wifi3.0/dp_tx.c index 0575e7791e84..5323799de778 100644 --- a/dp/wifi3.0/dp_tx.c +++ b/dp/wifi3.0/dp_tx.c @@ -75,7 +75,7 @@ static inline void dp_tx_get_queue(struct dp_vdev *vdev, queue->desc_pool_id = DP_TX_GET_DESC_POOL_ID(vdev); queue->ring_id = DP_TX_GET_RING_ID(vdev); - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, "%s, pool_id:%d ring_id: %d\n", __func__, queue->desc_pool_id, queue->ring_id); @@ -171,7 +171,7 @@ dp_tx_desc_release(struct dp_tx_desc_s *tx_desc, uint8_t desc_pool_id) else comp_status = HAL_TX_COMP_RELEASE_REASON_FW; - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, "Tx Completion Release desc %d status %d outstanding %d\n", tx_desc->id, comp_status, qdf_atomic_read(&pdev->num_tx_outstanding)); @@ -1488,7 +1488,7 @@ qdf_nbuf_t dp_tx_send(void *vap_dev, qdf_nbuf_t nbuf) nbuf_mesh = dp_tx_extract_mesh_meta_data(vdev, nbuf, &msdu_info); if (nbuf_mesh == NULL) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, "Extracting mesh metadata failed\n"); return nbuf; } @@ -1535,7 +1535,7 @@ qdf_nbuf_t dp_tx_send(void *vap_dev, qdf_nbuf_t nbuf) qdf_nbuf_len(nbuf)); if (dp_tx_prepare_tso(vdev, nbuf, &msdu_info)) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, "%s tso_prepare fail vdev_id:%d\n", __func__, vdev->vdev_id); DP_STATS_INC(vdev, tx_i.tso.dropped_host, 1); @@ -1646,14 +1646,14 @@ void dp_tx_reinject_handler(struct dp_tx_desc_s *tx_desc, uint8_t *status) dp_tx_get_queue(vdev, nbuf, &msdu_info.tx_queue); - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, "%s Tx reinject path\n", __func__); DP_STATS_INC_PKT(vdev, tx_i.reinject_pkts, 1, qdf_nbuf_len(tx_desc->nbuf)); if (!vdev->osif_proxy_arp) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, "function pointer to proxy arp not present\n"); return; } @@ -1671,8 +1671,8 @@ void dp_tx_reinject_handler(struct dp_tx_desc_s *tx_desc, uint8_t *status) if (!nbuf_copy) { QDF_TRACE(QDF_MODULE_ID_DP, - QDF_TRACE_LEVEL_ERROR, - FL("nbuf copy failed")); + QDF_TRACE_LEVEL_DEBUG, + FL("nbuf copy failed")); break; } @@ -1688,7 +1688,7 @@ void dp_tx_reinject_handler(struct dp_tx_desc_s *tx_desc, uint8_t *status) if (nbuf_copy) { QDF_TRACE(QDF_MODULE_ID_DP, - QDF_TRACE_LEVEL_ERROR, + QDF_TRACE_LEVEL_DEBUG, FL("pkt send failed")); qdf_nbuf_free(nbuf_copy); } @@ -1800,12 +1800,12 @@ void dp_tx_mec_handler(struct dp_vdev *vdev, uint8_t *status) qdf_spin_unlock_bh(&soc->peer_ref_mutex); if (!peer) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, FL("peer is NULL")); return; } - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, "%s Tx MEC Handler\n", __func__); @@ -1879,7 +1879,7 @@ void dp_tx_process_htt_completion(struct dp_tx_desc_s *tx_desc, uint8_t *status) break; } default: - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, "%s Invalid HTT tx_status %d\n", __func__, tx_status); break; @@ -2024,7 +2024,7 @@ static inline void dp_tx_comp_process_tx_status(struct dp_tx_desc_s *tx_desc, struct dp_peer *peer = NULL; hal_tx_comp_get_status(&tx_desc->comp, &ts); - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_HIGH, "-------------------- \n" "Tx Completion Stats: \n" "-------------------- \n"