diff --git a/dp/wifi3.0/dp_main.c b/dp/wifi3.0/dp_main.c index 33c469a1a3..472d0d6b44 100644 --- a/dp/wifi3.0/dp_main.c +++ b/dp/wifi3.0/dp_main.c @@ -804,16 +804,13 @@ static uint32_t dp_service_srngs(void *dp_ctx, uint32_t dp_budget) /* Process Tx completion interrupts first to return back buffers */ while (tx_mask) { if (tx_mask & 0x1) { - work_done = - dp_tx_comp_handler(soc, + work_done = dp_tx_comp_handler(soc, soc->tx_comp_ring[ring].hal_srng, remaining_quota); - QDF_TRACE(QDF_MODULE_ID_DP, - QDF_TRACE_LEVEL_INFO, - "tx mask 0x%x ring %d," - "budget %d, work_done %d", - tx_mask, ring, budget, work_done); + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, + "tx mask 0x%x ring %d, budget %d, work_done %d", + tx_mask, ring, budget, work_done); budget -= work_done; if (budget <= 0) @@ -832,9 +829,9 @@ static uint32_t dp_service_srngs(void *dp_ctx, uint32_t dp_budget) soc->reo_exception_ring.hal_srng, remaining_quota); - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, - "REO Exception Ring: work_done %d budget %d", - work_done, budget); + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, + "REO Exception Ring: work_done %d budget %d", + work_done, budget); budget -= work_done; if (budget <= 0) { @@ -848,9 +845,9 @@ static uint32_t dp_service_srngs(void *dp_ctx, uint32_t dp_budget) work_done = dp_rx_wbm_err_process(soc, soc->rx_rel_ring.hal_srng, remaining_quota); - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, - "WBM Release Ring: work_done %d budget %d", - work_done, budget); + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, + "WBM Release Ring: work_done %d budget %d", + work_done, budget); budget -= work_done; if (budget <= 0) { @@ -863,17 +860,13 @@ static uint32_t dp_service_srngs(void *dp_ctx, uint32_t dp_budget) if (rx_mask) { for (ring = 0; ring < soc->num_reo_dest_rings; ring++) { if (rx_mask & (1 << ring)) { - work_done = - dp_rx_process(int_ctx, + work_done = dp_rx_process(int_ctx, soc->reo_dest_ring[ring].hal_srng, remaining_quota); - QDF_TRACE(QDF_MODULE_ID_DP, - QDF_TRACE_LEVEL_INFO, - "rx mask 0x%x ring %d," - "work_done %d budget %d", - rx_mask, ring, work_done, - budget); + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, + "rx mask 0x%x ring %d, work_done %d budget %d", + rx_mask, ring, work_done, budget); budget -= work_done; if (budget <= 0) @@ -891,15 +884,13 @@ static uint32_t dp_service_srngs(void *dp_ctx, uint32_t dp_budget) if (soc->pdev_list[ring] == NULL) continue; if (int_ctx->rx_mon_ring_mask & (1 << ring)) { - work_done = - dp_mon_process(soc, ring, remaining_quota); + work_done = dp_mon_process(soc, ring, remaining_quota); budget -= work_done; remaining_quota = budget; } if (int_ctx->rxdma2host_ring_mask & (1 << ring)) { - work_done = - dp_rxdma_err_process(soc, ring, + work_done = dp_rxdma_err_process(soc, ring, remaining_quota); budget -= work_done; } diff --git a/dp/wifi3.0/dp_rx.c b/dp/wifi3.0/dp_rx.c index 19a6e3826e..8c3228aa8a 100644 --- a/dp/wifi3.0/dp_rx.c +++ b/dp/wifi3.0/dp_rx.c @@ -207,6 +207,7 @@ QDF_STATUS dp_rx_buffers_replenish(struct dp_soc *dp_soc, uint32_t mac_id, "successfully replenished %d buffers", num_req_buffers); QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, "%d rx desc added back to free list", num_desc_to_free); + DP_STATS_INC(dp_pdev, buf_freelist, num_desc_to_free); DP_STATS_INC_PKT(dp_pdev, replenish.pkts, num_req_buffers, (RX_BUFFER_SIZE * num_req_buffers)); @@ -593,7 +594,7 @@ struct dp_vdev *dp_rx_nac_filter(struct dp_pdev *pdev, if (qdf_mem_cmp(&peer->neighbour_peers_macaddr.raw[0], wh->i_addr2, DP_MAC_ADDR_LEN) == 0) { QDF_TRACE( - QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, + QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, FL("NAC configuration matched for mac-%2x:%2x:%2x:%2x:%2x:%2x"), peer->neighbour_peers_macaddr.raw[0], peer->neighbour_peers_macaddr.raw[1], @@ -697,27 +698,27 @@ uint8_t dp_rx_process_invalid_peer(struct dp_soc *soc, qdf_nbuf_t mpdu) #if defined(FEATURE_LRO) static void dp_rx_print_lro_info(uint8_t *rx_tlv) { - QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, FL("----------------------RX DESC LRO----------------------\n")); - QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, FL("lro_eligible 0x%x"), HAL_RX_TLV_GET_LRO_ELIGIBLE(rx_tlv)); - QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, FL("pure_ack 0x%x"), HAL_RX_TLV_GET_TCP_PURE_ACK(rx_tlv)); - QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, FL("chksum 0x%x"), HAL_RX_TLV_GET_TCP_CHKSUM(rx_tlv)); - QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, FL("TCP seq num 0x%x"), HAL_RX_TLV_GET_TCP_SEQ(rx_tlv)); - QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, FL("TCP ack num 0x%x"), HAL_RX_TLV_GET_TCP_ACK(rx_tlv)); - QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, FL("TCP window 0x%x"), HAL_RX_TLV_GET_TCP_WIN(rx_tlv)); - QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, FL("TCP protocol 0x%x"), HAL_RX_TLV_GET_TCP_PROTO(rx_tlv)); - QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, FL("TCP offset 0x%x"), HAL_RX_TLV_GET_TCP_OFFSET(rx_tlv)); - QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, FL("toeplitz 0x%x"), HAL_RX_TLV_GET_FLOW_ID_TOEPLITZ(rx_tlv)); - QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, FL("---------------------------------------------------------\n")); } @@ -736,7 +737,7 @@ static void dp_rx_lro(uint8_t *rx_tlv, struct dp_peer *peer, qdf_nbuf_t msdu, qdf_lro_ctx_t ctx) { if (!peer || !peer->vdev || !peer->vdev->lro_enable) { - QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_DEBUG, FL("no peer, no vdev or LRO disabled")); QDF_NBUF_CB_RX_LRO_ELIGIBLE(msdu) = 0; return; @@ -1193,7 +1194,7 @@ done: mcs = hal_rx_msdu_start_rate_mcs_get(rx_tlv_hdr); tid = hal_rx_mpdu_start_tid_get(rx_tlv_hdr); - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, "%s: %d, SGI: %d, tid: %d", __func__, __LINE__, sgi, tid); @@ -1271,7 +1272,7 @@ done: * the buffer beginning where the L2 header * begins. */ - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, FL("rxhash: flow id toeplitz: 0x%x\n"), hal_rx_msdu_start_toeplitz_get(rx_tlv_hdr)); diff --git a/dp/wifi3.0/dp_rx_mon_status.c b/dp/wifi3.0/dp_rx_mon_status.c index b053058470..cc87364a6d 100644 --- a/dp/wifi3.0/dp_rx_mon_status.c +++ b/dp/wifi3.0/dp_rx_mon_status.c @@ -434,7 +434,7 @@ QDF_STATUS dp_rx_mon_status_buffers_replenish(struct dp_soc *dp_soc, qdf_assert(rxdma_srng); - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, "[%s][%d] requested %d buffers for replenish\n", __func__, __LINE__, num_req_buffers); @@ -456,9 +456,10 @@ QDF_STATUS dp_rx_mon_status_buffers_replenish(struct dp_soc *dp_soc, return QDF_STATUS_E_NOMEM; } - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, "[%s][%d] %d rx desc allocated\n", __func__, __LINE__, num_alloc_desc); + num_req_buffers = num_alloc_desc; } @@ -466,7 +467,7 @@ QDF_STATUS dp_rx_mon_status_buffers_replenish(struct dp_soc *dp_soc, num_entries_avail = hal_srng_src_num_avail(dp_soc->hal_soc, rxdma_srng, sync_hw_ptr); - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, "[%s][%d] no of availble entries in rxdma ring: %d\n", __func__, __LINE__, num_entries_avail); @@ -514,13 +515,13 @@ QDF_STATUS dp_rx_mon_status_buffers_replenish(struct dp_soc *dp_soc, hal_srng_access_end(dp_soc->hal_soc, rxdma_srng); - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, "successfully replenished %d buffers\n", num_req_buffers); - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, "%d rx desc added back to free list\n", num_desc_to_free); - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, "[%s][%d] desc_list=%p, tail=%p rx_desc=%p, cookie=%d\n", __func__, __LINE__, desc_list, tail, &(*desc_list)->rx_desc, (*desc_list)->rx_desc.cookie); diff --git a/dp/wifi3.0/dp_tx.c b/dp/wifi3.0/dp_tx.c index 2639639441..2a0716ce0b 100644 --- a/dp/wifi3.0/dp_tx.c +++ b/dp/wifi3.0/dp_tx.c @@ -1958,7 +1958,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_INFO, + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, "-------------------- \n" "Tx Completion Stats: \n" "-------------------- \n" diff --git a/hal/wifi3.0/hal_srng.c b/hal/wifi3.0/hal_srng.c index 93760e4f9d..99383b63de 100644 --- a/hal/wifi3.0/hal_srng.c +++ b/hal/wifi3.0/hal_srng.c @@ -825,7 +825,7 @@ static inline void hal_srng_src_hw_init(struct hal_soc *hal, uint32_t reg_val = 0; uint64_t tp_addr = 0; - HIF_INFO("%s: hw_init srng %d", __func__, srng->ring_id); + HIF_DBG("%s: hw_init srng %d", __func__, srng->ring_id); if (srng->flags & HAL_SRNG_MSI_INTR) { SRNG_SRC_REG_WRITE(srng, MSI1_BASE_LSB, @@ -991,7 +991,7 @@ static inline void hal_srng_dst_hw_init(struct hal_soc *hal, uint32_t reg_val = 0; uint64_t hp_addr = 0; - HIF_INFO("%s: hw_init srng %d", __func__, srng->ring_id); + HIF_DBG("%s: hw_init srng %d", __func__, srng->ring_id); if (srng->flags & HAL_SRNG_MSI_INTR) { SRNG_DST_REG_WRITE(srng, MSI1_BASE_LSB,