diff --git a/dp/wifi3.0/dp_internal.h b/dp/wifi3.0/dp_internal.h
index 0e10e710516f..4a6d98ba2d7d 100644
--- a/dp/wifi3.0/dp_internal.h
+++ b/dp/wifi3.0/dp_internal.h
@@ -790,7 +790,40 @@ uint32_t dp_pdev_tid_stats_display(void *pdev_handle,
 void dp_update_delay_stats(struct dp_pdev *pdev, uint32_t delay,
 			   uint8_t tid, uint8_t mode);
 
-/*
+/**
+ * dp_print_ring_stats(): Print tail and head pointer
+ * @pdev: DP_PDEV handle
+ *
+ * Return:void
+ */
+void dp_print_ring_stats(struct dp_pdev *pdev);
+
+/**
+ * dp_print_pdev_cfg_params() - Print the pdev cfg parameters
+ * @pdev_handle: DP pdev handle
+ *
+ * Return - void
+ */
+void dp_print_pdev_cfg_params(struct dp_pdev *pdev);
+
+/**
+ * dp_print_soc_cfg_params()- Dump soc wlan config parameters
+ * @soc_handle: Soc handle
+ *
+ * Return: void
+ */
+void dp_print_soc_cfg_params(struct dp_soc *soc);
+
+/**
+ * dp_srng_get_str_from_ring_type() - Return string name for a ring
+ * @ring_type: Ring
+ *
+ * Return: char const pointer
+ */
+const
+char *dp_srng_get_str_from_hal_ring_type(enum hal_ring_type ring_type);
+
+/**
  * dp_get_mac_id_for_pdev() -  Return mac corresponding to pdev for mac
  *
  * @mac_id: MAC id
diff --git a/dp/wifi3.0/dp_main.c b/dp/wifi3.0/dp_main.c
index 9c77ca605dd6..aa8b71482eb7 100644
--- a/dp/wifi3.0/dp_main.c
+++ b/dp/wifi3.0/dp_main.c
@@ -114,7 +114,6 @@ bool is_dp_verbose_debug_enabled;
 #define DP_MU_GROUP_LENGTH (6 * DP_MU_GROUP_SHOW)
 
 #define DP_RXDMA_ERR_LENGTH (6*HAL_RXDMA_ERR_MAX)
-#define DP_MAX_INT_CONTEXTS_STRING_LENGTH (6 * WLAN_CFG_INT_NUM_CONTEXTS)
 #define DP_REO_ERR_LENGTH (6*HAL_REO_ERR_MAX)
 #define DP_MAX_MCS_STRING_LEN 30
 #define DP_CURR_FW_STATS_AVAIL 19
@@ -7035,13 +7034,7 @@ dp_print_soc_rx_stats(struct dp_soc *soc)
 	DP_PRINT_STATS("REO Error(0-14):%s", reo_error);
 }
 
-/**
- * dp_srng_get_str_from_ring_type() - Return string name for a ring
- * @ring_type: Ring
- *
- * Return: char const pointer
- */
-static inline const
+const
 char *dp_srng_get_str_from_hal_ring_type(enum hal_ring_type ring_type)
 {
 	switch (ring_type) {
@@ -7082,44 +7075,6 @@ char *dp_srng_get_str_from_hal_ring_type(enum hal_ring_type ring_type)
 	return "Invalid";
 }
 
-/**
- * dp_print_ring_stat_from_hal(): Print hal level ring stats
- * @soc: DP_SOC handle
- * @srng: DP_SRNG handle
- * @ring_name: SRNG name
- * @ring_type: srng src/dst ring
- *
- * Return: void
- */
-static void
-dp_print_ring_stat_from_hal(struct dp_soc *soc,  struct dp_srng *srng,
-			    enum hal_ring_type ring_type)
-{
-	uint32_t tailp;
-	uint32_t headp;
-	int32_t hw_headp = -1;
-	int32_t hw_tailp = -1;
-	const char *ring_name;
-	struct hal_soc *hal_soc;
-
-	if (soc && srng && srng->hal_srng) {
-		hal_soc = (struct hal_soc *)soc->hal_soc;
-		ring_name = dp_srng_get_str_from_hal_ring_type(ring_type);
-
-		hal_get_sw_hptp(soc->hal_soc, srng->hal_srng, &tailp, &headp);
-
-		DP_PRINT_STATS("%s:SW:Head pointer = %d Tail Pointer = %d\n",
-			       ring_name, headp, tailp);
-
-		hal_get_hw_hptp(soc->hal_soc, srng->hal_srng, &hw_headp,
-				&hw_tailp, ring_type);
-
-		DP_PRINT_STATS("%s:HW:Head pointer = %d Tail Pointer = %d\n",
-			       ring_name, hw_headp, hw_tailp);
-	}
-
-}
-
 /*
  * dp_print_napi_stats(): NAPI stats
  * @soc - soc handle
@@ -7129,106 +7084,6 @@ static void dp_print_napi_stats(struct dp_soc *soc)
 	hif_print_napi_stats(soc->hif_handle);
 }
 
-/**
- * dp_print_mon_ring_stats_from_hal() - Print stat for monitor rings based
- *					on target
- * @pdev: physical device handle
- * @mac_id: mac id
- *
- * Return: void
- */
-static inline
-void dp_print_mon_ring_stat_from_hal(struct dp_pdev *pdev, uint8_t mac_id)
-{
-	if (pdev->soc->wlan_cfg_ctx->rxdma1_enable) {
-		dp_print_ring_stat_from_hal(pdev->soc,
-					    &pdev->rxdma_mon_buf_ring[mac_id],
-					    RXDMA_MONITOR_BUF);
-		dp_print_ring_stat_from_hal(pdev->soc,
-					    &pdev->rxdma_mon_dst_ring[mac_id],
-					    RXDMA_MONITOR_DST);
-		dp_print_ring_stat_from_hal(pdev->soc,
-					    &pdev->rxdma_mon_desc_ring[mac_id],
-					    RXDMA_MONITOR_DESC);
-	}
-
-	dp_print_ring_stat_from_hal(pdev->soc,
-				    &pdev->rxdma_mon_status_ring[mac_id],
-				    RXDMA_MONITOR_STATUS);
-}
-
-/**
- * dp_print_ring_stats(): Print tail and head pointer
- * @pdev: DP_PDEV handle
- *
- * Return:void
- */
-static inline void
-dp_print_ring_stats(struct dp_pdev *pdev)
-{
-	uint32_t i;
-	int mac_id;
-
-	dp_print_ring_stat_from_hal(pdev->soc,
-				    &pdev->soc->reo_exception_ring,
-				    REO_EXCEPTION);
-	dp_print_ring_stat_from_hal(pdev->soc,
-				    &pdev->soc->reo_reinject_ring,
-				    REO_REINJECT);
-	dp_print_ring_stat_from_hal(pdev->soc,
-				    &pdev->soc->reo_cmd_ring,
-				    REO_CMD);
-	dp_print_ring_stat_from_hal(pdev->soc,
-				    &pdev->soc->reo_status_ring,
-				    REO_STATUS);
-	dp_print_ring_stat_from_hal(pdev->soc,
-				    &pdev->soc->rx_rel_ring,
-				    WBM2SW_RELEASE);
-	dp_print_ring_stat_from_hal(pdev->soc,
-				    &pdev->soc->tcl_cmd_ring,
-				    TCL_CMD);
-	dp_print_ring_stat_from_hal(pdev->soc,
-				    &pdev->soc->tcl_status_ring,
-				    TCL_STATUS);
-	dp_print_ring_stat_from_hal(pdev->soc,
-				    &pdev->soc->wbm_desc_rel_ring,
-				    SW2WBM_RELEASE);
-	for (i = 0; i < MAX_REO_DEST_RINGS; i++)
-		dp_print_ring_stat_from_hal(pdev->soc,
-					    &pdev->soc->reo_dest_ring[i],
-					    REO_DST);
-
-	for (i = 0; i < pdev->soc->num_tcl_data_rings; i++)
-		dp_print_ring_stat_from_hal(pdev->soc,
-					    &pdev->soc->tcl_data_ring[i],
-					    TCL_DATA);
-	for (i = 0; i < MAX_TCL_DATA_RINGS; i++)
-		dp_print_ring_stat_from_hal(pdev->soc,
-					    &pdev->soc->tx_comp_ring[i],
-					    WBM2SW_RELEASE);
-
-	dp_print_ring_stat_from_hal(pdev->soc,
-				    &pdev->rx_refill_buf_ring,
-				    RXDMA_BUF);
-
-	dp_print_ring_stat_from_hal(pdev->soc,
-				    &pdev->rx_refill_buf_ring2,
-				    RXDMA_BUF);
-
-	for (i = 0; i < MAX_RX_MAC_RINGS; i++)
-		dp_print_ring_stat_from_hal(pdev->soc,
-					    &pdev->rx_mac_buf_ring[i],
-					    RXDMA_BUF);
-
-	for (mac_id = 0; mac_id < NUM_RXDMA_RINGS_PER_PDEV; mac_id++)
-		dp_print_mon_ring_stat_from_hal(pdev, mac_id);
-
-	for (i = 0; i < NUM_RXDMA_RINGS_PER_PDEV; i++)
-		dp_print_ring_stat_from_hal(pdev->soc,
-					    &pdev->rxdma_err_dst_ring[i],
-					    RXDMA_DST);
-}
-
 /**
  * dp_txrx_host_stats_clr(): Reinitialize the txrx stats
  * @vdev: DP_VDEV handle
@@ -7675,250 +7530,6 @@ dp_get_host_peer_stats(struct cdp_pdev *pdev_handle, char *mac_addr)
 	dp_peer_rxtid_stats(peer, dp_rx_tid_stats_cb, NULL);
 }
 
-/**
- * dp_print_soc_cfg_params()- Dump soc wlan config parameters
- * @soc_handle: Soc handle
- *
- * Return: void
- */
-static void
-dp_print_soc_cfg_params(struct dp_soc *soc)
-{
-	struct wlan_cfg_dp_soc_ctxt *soc_cfg_ctx;
-	uint8_t index = 0, i = 0;
-	char ring_mask[DP_MAX_INT_CONTEXTS_STRING_LENGTH];
-	int num_of_int_contexts;
-
-	if (!soc) {
-		dp_err("Context is null");
-		return;
-	}
-
-	soc_cfg_ctx = soc->wlan_cfg_ctx;
-
-	if (!soc_cfg_ctx) {
-		dp_err("Context is null");
-		return;
-	}
-
-	num_of_int_contexts =
-			wlan_cfg_get_num_contexts(soc_cfg_ctx);
-
-	DP_TRACE_STATS(DEBUG, "No. of interrupt contexts: %u",
-		       soc_cfg_ctx->num_int_ctxts);
-	DP_TRACE_STATS(DEBUG, "Max clients: %u",
-		       soc_cfg_ctx->max_clients);
-	DP_TRACE_STATS(DEBUG, "Max alloc size: %u ",
-		       soc_cfg_ctx->max_alloc_size);
-	DP_TRACE_STATS(DEBUG, "Per pdev tx ring: %u ",
-		       soc_cfg_ctx->per_pdev_tx_ring);
-	DP_TRACE_STATS(DEBUG, "Num tcl data rings: %u ",
-		       soc_cfg_ctx->num_tcl_data_rings);
-	DP_TRACE_STATS(DEBUG, "Per pdev rx ring: %u ",
-		       soc_cfg_ctx->per_pdev_rx_ring);
-	DP_TRACE_STATS(DEBUG, "Per pdev lmac ring: %u ",
-		       soc_cfg_ctx->per_pdev_lmac_ring);
-	DP_TRACE_STATS(DEBUG, "Num of reo dest rings: %u ",
-		       soc_cfg_ctx->num_reo_dest_rings);
-	DP_TRACE_STATS(DEBUG, "Num tx desc pool: %u ",
-		       soc_cfg_ctx->num_tx_desc_pool);
-	DP_TRACE_STATS(DEBUG, "Num tx ext desc pool: %u ",
-		       soc_cfg_ctx->num_tx_ext_desc_pool);
-	DP_TRACE_STATS(DEBUG, "Num tx desc: %u ",
-		       soc_cfg_ctx->num_tx_desc);
-	DP_TRACE_STATS(DEBUG, "Num tx ext desc: %u ",
-		       soc_cfg_ctx->num_tx_ext_desc);
-	DP_TRACE_STATS(DEBUG, "Htt packet type: %u ",
-		       soc_cfg_ctx->htt_packet_type);
-	DP_TRACE_STATS(DEBUG, "Max peer_ids: %u ",
-		       soc_cfg_ctx->max_peer_id);
-	DP_TRACE_STATS(DEBUG, "Tx ring size: %u ",
-		       soc_cfg_ctx->tx_ring_size);
-	DP_TRACE_STATS(DEBUG, "Tx comp ring size: %u ",
-		       soc_cfg_ctx->tx_comp_ring_size);
-	DP_TRACE_STATS(DEBUG, "Tx comp ring size nss: %u ",
-		       soc_cfg_ctx->tx_comp_ring_size_nss);
-	DP_TRACE_STATS(DEBUG, "Int batch threshold tx: %u ",
-		       soc_cfg_ctx->int_batch_threshold_tx);
-	DP_TRACE_STATS(DEBUG, "Int timer threshold tx: %u ",
-		       soc_cfg_ctx->int_timer_threshold_tx);
-	DP_TRACE_STATS(DEBUG, "Int batch threshold rx: %u ",
-		       soc_cfg_ctx->int_batch_threshold_rx);
-	DP_TRACE_STATS(DEBUG, "Int timer threshold rx: %u ",
-		       soc_cfg_ctx->int_timer_threshold_rx);
-	DP_TRACE_STATS(DEBUG, "Int batch threshold other: %u ",
-		       soc_cfg_ctx->int_batch_threshold_other);
-	DP_TRACE_STATS(DEBUG, "Int timer threshold other: %u ",
-		       soc_cfg_ctx->int_timer_threshold_other);
-
-	for (i = 0; i < num_of_int_contexts; i++) {
-		index += qdf_snprint(&ring_mask[index],
-				     DP_MAX_INT_CONTEXTS_STRING_LENGTH - index,
-				     " %d",
-				     soc_cfg_ctx->int_tx_ring_mask[i]);
-	}
-
-	DP_TRACE_STATS(DEBUG, "Tx ring mask (0-%d):%s",
-		       num_of_int_contexts, ring_mask);
-
-	index = 0;
-	for (i = 0; i < num_of_int_contexts; i++) {
-		index += qdf_snprint(&ring_mask[index],
-				     DP_MAX_INT_CONTEXTS_STRING_LENGTH - index,
-				     " %d",
-				     soc_cfg_ctx->int_rx_ring_mask[i]);
-	}
-
-	DP_TRACE_STATS(DEBUG, "Rx ring mask (0-%d):%s",
-		       num_of_int_contexts, ring_mask);
-
-	index = 0;
-	for (i = 0; i < num_of_int_contexts; i++) {
-		index += qdf_snprint(&ring_mask[index],
-				     DP_MAX_INT_CONTEXTS_STRING_LENGTH - index,
-				     " %d",
-				     soc_cfg_ctx->int_rx_mon_ring_mask[i]);
-	}
-
-	DP_TRACE_STATS(DEBUG, "Rx mon ring mask (0-%d):%s",
-		       num_of_int_contexts, ring_mask);
-
-	index = 0;
-	for (i = 0; i < num_of_int_contexts; i++) {
-		index += qdf_snprint(&ring_mask[index],
-				     DP_MAX_INT_CONTEXTS_STRING_LENGTH - index,
-				     " %d",
-				     soc_cfg_ctx->int_rx_err_ring_mask[i]);
-	}
-
-	DP_TRACE_STATS(DEBUG, "Rx err ring mask (0-%d):%s",
-		       num_of_int_contexts, ring_mask);
-
-	index = 0;
-	for (i = 0; i < num_of_int_contexts; i++) {
-		index += qdf_snprint(&ring_mask[index],
-				     DP_MAX_INT_CONTEXTS_STRING_LENGTH - index,
-				     " %d",
-				     soc_cfg_ctx->int_rx_wbm_rel_ring_mask[i]);
-	}
-
-	DP_TRACE_STATS(DEBUG, "Rx wbm rel ring mask (0-%d):%s",
-		       num_of_int_contexts, ring_mask);
-
-	index = 0;
-	for (i = 0; i < num_of_int_contexts; i++) {
-		index += qdf_snprint(&ring_mask[index],
-				     DP_MAX_INT_CONTEXTS_STRING_LENGTH - index,
-				     " %d",
-				     soc_cfg_ctx->int_reo_status_ring_mask[i]);
-	}
-
-	DP_TRACE_STATS(DEBUG, "Reo ring mask (0-%d):%s",
-		       num_of_int_contexts, ring_mask);
-
-	index = 0;
-	for (i = 0; i < num_of_int_contexts; i++) {
-		index += qdf_snprint(&ring_mask[index],
-				     DP_MAX_INT_CONTEXTS_STRING_LENGTH - index,
-				     " %d",
-				     soc_cfg_ctx->int_rxdma2host_ring_mask[i]);
-	}
-
-	DP_TRACE_STATS(DEBUG, "Rxdma2host ring mask (0-%d):%s",
-		       num_of_int_contexts, ring_mask);
-
-	index = 0;
-	for (i = 0; i < num_of_int_contexts; i++) {
-		index += qdf_snprint(&ring_mask[index],
-				     DP_MAX_INT_CONTEXTS_STRING_LENGTH - index,
-				     " %d",
-				     soc_cfg_ctx->int_host2rxdma_ring_mask[i]);
-	}
-
-	DP_TRACE_STATS(DEBUG, "Host2rxdma ring mask (0-%d):%s",
-		       num_of_int_contexts, ring_mask);
-
-	DP_TRACE_STATS(DEBUG, "Rx hash: %u ",
-		       soc_cfg_ctx->rx_hash);
-	DP_TRACE_STATS(DEBUG, "Tso enabled: %u ",
-		       soc_cfg_ctx->tso_enabled);
-	DP_TRACE_STATS(DEBUG, "Lro enabled: %u ",
-		       soc_cfg_ctx->lro_enabled);
-	DP_TRACE_STATS(DEBUG, "Sg enabled: %u ",
-		       soc_cfg_ctx->sg_enabled);
-	DP_TRACE_STATS(DEBUG, "Gro enabled: %u ",
-		       soc_cfg_ctx->gro_enabled);
-	DP_TRACE_STATS(DEBUG, "rawmode enabled: %u ",
-		       soc_cfg_ctx->rawmode_enabled);
-	DP_TRACE_STATS(DEBUG, "peer flow ctrl enabled: %u ",
-		       soc_cfg_ctx->peer_flow_ctrl_enabled);
-	DP_TRACE_STATS(DEBUG, "napi enabled: %u ",
-		       soc_cfg_ctx->napi_enabled);
-	DP_TRACE_STATS(DEBUG, "Tcp Udp checksum offload: %u ",
-		       soc_cfg_ctx->tcp_udp_checksumoffload);
-	DP_TRACE_STATS(DEBUG, "Defrag timeout check: %u ",
-		       soc_cfg_ctx->defrag_timeout_check);
-	DP_TRACE_STATS(DEBUG, "Rx defrag min timeout: %u ",
-		       soc_cfg_ctx->rx_defrag_min_timeout);
-	DP_TRACE_STATS(DEBUG, "WBM release ring: %u ",
-		       soc_cfg_ctx->wbm_release_ring);
-	DP_TRACE_STATS(DEBUG, "TCL CMD ring: %u ",
-		       soc_cfg_ctx->tcl_cmd_ring);
-	DP_TRACE_STATS(DEBUG, "TCL Status ring: %u ",
-		       soc_cfg_ctx->tcl_status_ring);
-	DP_TRACE_STATS(DEBUG, "REO Reinject ring: %u ",
-		       soc_cfg_ctx->reo_reinject_ring);
-	DP_TRACE_STATS(DEBUG, "RX release ring: %u ",
-		       soc_cfg_ctx->rx_release_ring);
-	DP_TRACE_STATS(DEBUG, "REO Exception ring: %u ",
-		       soc_cfg_ctx->reo_exception_ring);
-	DP_TRACE_STATS(DEBUG, "REO CMD ring: %u ",
-		       soc_cfg_ctx->reo_cmd_ring);
-	DP_TRACE_STATS(DEBUG, "REO STATUS ring: %u ",
-		       soc_cfg_ctx->reo_status_ring);
-	DP_TRACE_STATS(DEBUG, "RXDMA refill ring: %u ",
-		       soc_cfg_ctx->rxdma_refill_ring);
-	DP_TRACE_STATS(DEBUG, "RXDMA err dst ring: %u ",
-		       soc_cfg_ctx->rxdma_err_dst_ring);
-}
-
-/**
- * dp_print_vdev_cfg_params() - Print the pdev cfg parameters
- * @pdev_handle: DP pdev handle
- *
- * Return - void
- */
-static void
-dp_print_pdev_cfg_params(struct dp_pdev *pdev)
-{
-	struct wlan_cfg_dp_pdev_ctxt *pdev_cfg_ctx;
-
-	if (!pdev) {
-		dp_err("Context is null");
-		return;
-	}
-
-	pdev_cfg_ctx = pdev->wlan_cfg_ctx;
-
-	if (!pdev_cfg_ctx) {
-		dp_err("Context is null");
-		return;
-	}
-
-	DP_TRACE_STATS(DEBUG, "Rx dma buf ring size: %d ",
-		       pdev_cfg_ctx->rx_dma_buf_ring_size);
-	DP_TRACE_STATS(DEBUG, "DMA Mon buf ring size: %d ",
-		       pdev_cfg_ctx->dma_mon_buf_ring_size);
-	DP_TRACE_STATS(DEBUG, "DMA Mon dest ring size: %d ",
-		       pdev_cfg_ctx->dma_mon_dest_ring_size);
-	DP_TRACE_STATS(DEBUG, "DMA Mon status ring size: %d ",
-		       pdev_cfg_ctx->dma_mon_status_ring_size);
-	DP_TRACE_STATS(DEBUG, "Rxdma monitor desc ring: %d",
-		       pdev_cfg_ctx->rxdma_monitor_desc_ring);
-	DP_TRACE_STATS(DEBUG, "Num mac rings: %d ",
-		       pdev_cfg_ctx->num_mac_rings);
-}
-
 /**
  * dp_txrx_stats_help() - Helper function for Txrx_Stats
  *
diff --git a/dp/wifi3.0/dp_stats.c b/dp/wifi3.0/dp_stats.c
index 27acc3f98d0b..56e534b62694 100644
--- a/dp/wifi3.0/dp_stats.c
+++ b/dp/wifi3.0/dp_stats.c
@@ -49,6 +49,8 @@
 #define DP_HTT_PEER_NUM_SS HTT_RX_PEER_STATS_NUM_SPATIAL_STREAMS
 #define DP_HTT_PDEV_TX_GI_LEN HTT_TX_PDEV_STATS_NUM_GI_COUNTERS
 
+#define DP_MAX_INT_CONTEXTS_STRING_LENGTH (6 * WLAN_CFG_INT_NUM_CONTEXTS)
+
 #ifdef CONFIG_WIN
 const char *fw_to_hw_delay_bucket[CDP_DELAY_BUCKET_MAX + 1] = {
 	"0 to 10 ms", "11 to 20 ms",
@@ -99,13 +101,13 @@ static inline void dp_print_stats_string_tlv(uint32_t *tag_buf)
 		return;
 	}
 
-	DP_TRACE_STATS(FATAL, "HTT_STATS_STRING_TLV:");
+	DP_PRINT_STATS("HTT_STATS_STRING_TLV:");
 	for (i = 0; i <  tag_len; i++) {
 		index += qdf_snprint(&data[index],
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i, dp_stats_buf->data[i]);
 	}
-	DP_TRACE_STATS(FATAL, "data = %s\n", data);
+	DP_PRINT_STATS("data = %s\n", data);
 	qdf_mem_free(data);
 }
 
@@ -120,87 +122,87 @@ static inline void dp_print_tx_pdev_stats_cmn_tlv(uint32_t *tag_buf)
 	htt_tx_pdev_stats_cmn_tlv *dp_stats_buf =
 		(htt_tx_pdev_stats_cmn_tlv *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_PDEV_STATS_CMN_TLV:");
-	DP_TRACE_STATS(FATAL, "mac_id__word = %u",
-			dp_stats_buf->mac_id__word);
-	DP_TRACE_STATS(FATAL, "hw_queued = %u",
-			dp_stats_buf->hw_queued);
-	DP_TRACE_STATS(FATAL, "hw_reaped = %u",
-			dp_stats_buf->hw_reaped);
-	DP_TRACE_STATS(FATAL, "underrun = %u",
-			dp_stats_buf->underrun);
-	DP_TRACE_STATS(FATAL, "hw_paused = %u",
-			dp_stats_buf->hw_paused);
-	DP_TRACE_STATS(FATAL, "hw_flush = %u",
-			dp_stats_buf->hw_flush);
-	DP_TRACE_STATS(FATAL, "hw_filt = %u",
-			dp_stats_buf->hw_filt);
-	DP_TRACE_STATS(FATAL, "tx_abort = %u",
-			dp_stats_buf->tx_abort);
-	DP_TRACE_STATS(FATAL, "mpdu_requeued = %u",
-			dp_stats_buf->mpdu_requed);
-	DP_TRACE_STATS(FATAL, "tx_xretry = %u",
-			dp_stats_buf->tx_xretry);
-	DP_TRACE_STATS(FATAL, "data_rc = %u",
-			dp_stats_buf->data_rc);
-	DP_TRACE_STATS(FATAL, "mpdu_dropped_xretry = %u",
-			dp_stats_buf->mpdu_dropped_xretry);
-	DP_TRACE_STATS(FATAL, "illegal_rate_phy_err = %u",
-			dp_stats_buf->illgl_rate_phy_err);
-	DP_TRACE_STATS(FATAL, "cont_xretry = %u",
-			dp_stats_buf->cont_xretry);
-	DP_TRACE_STATS(FATAL, "tx_timeout = %u",
-			dp_stats_buf->tx_timeout);
-	DP_TRACE_STATS(FATAL, "pdev_resets = %u",
-			dp_stats_buf->pdev_resets);
-	DP_TRACE_STATS(FATAL, "phy_underrun = %u",
-			dp_stats_buf->phy_underrun);
-	DP_TRACE_STATS(FATAL, "txop_ovf = %u",
-			dp_stats_buf->txop_ovf);
-	DP_TRACE_STATS(FATAL, "seq_posted = %u",
-			dp_stats_buf->seq_posted);
-	DP_TRACE_STATS(FATAL, "seq_failed_queueing = %u",
-			dp_stats_buf->seq_failed_queueing);
-	DP_TRACE_STATS(FATAL, "seq_completed = %u",
-			dp_stats_buf->seq_completed);
-	DP_TRACE_STATS(FATAL, "seq_restarted = %u",
-			dp_stats_buf->seq_restarted);
-	DP_TRACE_STATS(FATAL, "mu_seq_posted = %u",
-			dp_stats_buf->mu_seq_posted);
-	DP_TRACE_STATS(FATAL, "seq_switch_hw_paused = %u",
-			dp_stats_buf->seq_switch_hw_paused);
-	DP_TRACE_STATS(FATAL, "next_seq_posted_dsr = %u",
-			dp_stats_buf->next_seq_posted_dsr);
-	DP_TRACE_STATS(FATAL, "seq_posted_isr = %u",
-			dp_stats_buf->seq_posted_isr);
-	DP_TRACE_STATS(FATAL, "seq_ctrl_cached = %u",
-			dp_stats_buf->seq_ctrl_cached);
-	DP_TRACE_STATS(FATAL, "mpdu_count_tqm = %u",
-			dp_stats_buf->mpdu_count_tqm);
-	DP_TRACE_STATS(FATAL, "msdu_count_tqm = %u",
-			dp_stats_buf->msdu_count_tqm);
-	DP_TRACE_STATS(FATAL, "mpdu_removed_tqm = %u",
-			dp_stats_buf->mpdu_removed_tqm);
-	DP_TRACE_STATS(FATAL, "msdu_removed_tqm = %u",
-			dp_stats_buf->msdu_removed_tqm);
-	DP_TRACE_STATS(FATAL, "mpdus_sw_flush = %u",
-			dp_stats_buf->mpdus_sw_flush);
-	DP_TRACE_STATS(FATAL, "mpdus_hw_filter = %u",
-			dp_stats_buf->mpdus_hw_filter);
-	DP_TRACE_STATS(FATAL, "mpdus_truncated = %u",
-			dp_stats_buf->mpdus_truncated);
-	DP_TRACE_STATS(FATAL, "mpdus_ack_failed = %u",
-			dp_stats_buf->mpdus_ack_failed);
-	DP_TRACE_STATS(FATAL, "mpdus_expired = %u",
-			dp_stats_buf->mpdus_expired);
-	DP_TRACE_STATS(FATAL, "mpdus_seq_hw_retry = %u",
-			dp_stats_buf->mpdus_seq_hw_retry);
-	DP_TRACE_STATS(FATAL, "ack_tlv_proc = %u",
-			dp_stats_buf->ack_tlv_proc);
-	DP_TRACE_STATS(FATAL, "coex_abort_mpdu_cnt_valid = %u",
-			dp_stats_buf->coex_abort_mpdu_cnt_valid);
-	DP_TRACE_STATS(FATAL, "coex_abort_mpdu_cnt = %u\n",
-			dp_stats_buf->coex_abort_mpdu_cnt);
+	DP_PRINT_STATS("HTT_TX_PDEV_STATS_CMN_TLV:");
+	DP_PRINT_STATS("mac_id__word = %u",
+		       dp_stats_buf->mac_id__word);
+	DP_PRINT_STATS("hw_queued = %u",
+		       dp_stats_buf->hw_queued);
+	DP_PRINT_STATS("hw_reaped = %u",
+		       dp_stats_buf->hw_reaped);
+	DP_PRINT_STATS("underrun = %u",
+		       dp_stats_buf->underrun);
+	DP_PRINT_STATS("hw_paused = %u",
+		       dp_stats_buf->hw_paused);
+	DP_PRINT_STATS("hw_flush = %u",
+		       dp_stats_buf->hw_flush);
+	DP_PRINT_STATS("hw_filt = %u",
+		       dp_stats_buf->hw_filt);
+	DP_PRINT_STATS("tx_abort = %u",
+		       dp_stats_buf->tx_abort);
+	DP_PRINT_STATS("mpdu_requeued = %u",
+		       dp_stats_buf->mpdu_requed);
+	DP_PRINT_STATS("tx_xretry = %u",
+		       dp_stats_buf->tx_xretry);
+	DP_PRINT_STATS("data_rc = %u",
+		       dp_stats_buf->data_rc);
+	DP_PRINT_STATS("mpdu_dropped_xretry = %u",
+		       dp_stats_buf->mpdu_dropped_xretry);
+	DP_PRINT_STATS("illegal_rate_phy_err = %u",
+		       dp_stats_buf->illgl_rate_phy_err);
+	DP_PRINT_STATS("cont_xretry = %u",
+		       dp_stats_buf->cont_xretry);
+	DP_PRINT_STATS("tx_timeout = %u",
+		       dp_stats_buf->tx_timeout);
+	DP_PRINT_STATS("pdev_resets = %u",
+		       dp_stats_buf->pdev_resets);
+	DP_PRINT_STATS("phy_underrun = %u",
+		       dp_stats_buf->phy_underrun);
+	DP_PRINT_STATS("txop_ovf = %u",
+		       dp_stats_buf->txop_ovf);
+	DP_PRINT_STATS("seq_posted = %u",
+		       dp_stats_buf->seq_posted);
+	DP_PRINT_STATS("seq_failed_queueing = %u",
+		       dp_stats_buf->seq_failed_queueing);
+	DP_PRINT_STATS("seq_completed = %u",
+		       dp_stats_buf->seq_completed);
+	DP_PRINT_STATS("seq_restarted = %u",
+		       dp_stats_buf->seq_restarted);
+	DP_PRINT_STATS("mu_seq_posted = %u",
+		       dp_stats_buf->mu_seq_posted);
+	DP_PRINT_STATS("seq_switch_hw_paused = %u",
+		       dp_stats_buf->seq_switch_hw_paused);
+	DP_PRINT_STATS("next_seq_posted_dsr = %u",
+		       dp_stats_buf->next_seq_posted_dsr);
+	DP_PRINT_STATS("seq_posted_isr = %u",
+		       dp_stats_buf->seq_posted_isr);
+	DP_PRINT_STATS("seq_ctrl_cached = %u",
+		       dp_stats_buf->seq_ctrl_cached);
+	DP_PRINT_STATS("mpdu_count_tqm = %u",
+		       dp_stats_buf->mpdu_count_tqm);
+	DP_PRINT_STATS("msdu_count_tqm = %u",
+		       dp_stats_buf->msdu_count_tqm);
+	DP_PRINT_STATS("mpdu_removed_tqm = %u",
+		       dp_stats_buf->mpdu_removed_tqm);
+	DP_PRINT_STATS("msdu_removed_tqm = %u",
+		       dp_stats_buf->msdu_removed_tqm);
+	DP_PRINT_STATS("mpdus_sw_flush = %u",
+		       dp_stats_buf->mpdus_sw_flush);
+	DP_PRINT_STATS("mpdus_hw_filter = %u",
+		       dp_stats_buf->mpdus_hw_filter);
+	DP_PRINT_STATS("mpdus_truncated = %u",
+		       dp_stats_buf->mpdus_truncated);
+	DP_PRINT_STATS("mpdus_ack_failed = %u",
+		       dp_stats_buf->mpdus_ack_failed);
+	DP_PRINT_STATS("mpdus_expired = %u",
+		       dp_stats_buf->mpdus_expired);
+	DP_PRINT_STATS("mpdus_seq_hw_retry = %u",
+		       dp_stats_buf->mpdus_seq_hw_retry);
+	DP_PRINT_STATS("ack_tlv_proc = %u",
+		       dp_stats_buf->ack_tlv_proc);
+	DP_PRINT_STATS("coex_abort_mpdu_cnt_valid = %u",
+		       dp_stats_buf->coex_abort_mpdu_cnt_valid);
+	DP_PRINT_STATS("coex_abort_mpdu_cnt = %u\n",
+		       dp_stats_buf->coex_abort_mpdu_cnt);
 }
 
 /*
@@ -225,13 +227,13 @@ static inline void dp_print_tx_pdev_stats_urrn_tlv_v(uint32_t *tag_buf)
 	}
 
 	tag_len = qdf_min(tag_len, (uint32_t)HTT_TX_PDEV_MAX_URRN_STATS);
-	DP_TRACE_STATS(FATAL, "HTT_TX_PDEV_STATS_URRN_TLV_V:");
+	DP_PRINT_STATS("HTT_TX_PDEV_STATS_URRN_TLV_V:");
 	for (i = 0; i <  tag_len; i++) {
 		index += qdf_snprint(&urrn_stats[index],
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i, dp_stats_buf->urrn_stats[i]);
 	}
-	DP_TRACE_STATS(FATAL, "urrn_stats = %s\n", urrn_stats);
+	DP_PRINT_STATS("urrn_stats = %s\n", urrn_stats);
 	qdf_mem_free(urrn_stats);
 }
 
@@ -259,13 +261,13 @@ static inline void dp_print_tx_pdev_stats_flush_tlv_v(uint32_t *tag_buf)
 	tag_len = qdf_min(tag_len,
 			(uint32_t)HTT_TX_PDEV_MAX_FLUSH_REASON_STATS);
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_PDEV_STATS_FLUSH_TLV_V:");
+	DP_PRINT_STATS("HTT_TX_PDEV_STATS_FLUSH_TLV_V:");
 	for (i = 0; i <  tag_len; i++) {
 		index += qdf_snprint(&flush_errs[index],
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i, dp_stats_buf->flush_errs[i]);
 	}
-	DP_TRACE_STATS(FATAL, "flush_errs = %s\n", flush_errs);
+	DP_PRINT_STATS("flush_errs = %s\n", flush_errs);
 	qdf_mem_free(flush_errs);
 }
 
@@ -292,13 +294,13 @@ static inline void dp_print_tx_pdev_stats_sifs_tlv_v(uint32_t *tag_buf)
 
 	tag_len = qdf_min(tag_len, (uint32_t)HTT_TX_PDEV_MAX_SIFS_BURST_STATS);
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_PDEV_STATS_SIFS_TLV_V:");
+	DP_PRINT_STATS("HTT_TX_PDEV_STATS_SIFS_TLV_V:");
 	for (i = 0; i <  tag_len; i++) {
 		index += qdf_snprint(&sifs_status[index],
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i, dp_stats_buf->sifs_status[i]);
 	}
-	DP_TRACE_STATS(FATAL, "sifs_status = %s\n", sifs_status);
+	DP_PRINT_STATS("sifs_status = %s\n", sifs_status);
 	qdf_mem_free(sifs_status);
 }
 
@@ -325,13 +327,13 @@ static inline void dp_print_tx_pdev_stats_phy_err_tlv_v(uint32_t *tag_buf)
 
 	tag_len = qdf_min(tag_len, (uint32_t)HTT_TX_PDEV_MAX_PHY_ERR_STATS);
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_PDEV_STATS_PHY_ERR_TLV_V:");
+	DP_PRINT_STATS("HTT_TX_PDEV_STATS_PHY_ERR_TLV_V:");
 	for (i = 0; i <  tag_len; i++) {
 		index += qdf_snprint(&phy_errs[index],
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i, dp_stats_buf->phy_errs[i]);
 	}
-	DP_TRACE_STATS(FATAL, "phy_errs = %s\n", phy_errs);
+	DP_PRINT_STATS("phy_errs = %s\n", phy_errs);
 	qdf_mem_free(phy_errs);
 }
 
@@ -355,17 +357,17 @@ static inline void dp_print_hw_stats_intr_misc_tlv(uint32_t *tag_buf)
 		return;
 	}
 
-	DP_TRACE_STATS(FATAL, "HTT_HW_STATS_INTR_MISC_TLV:");
+	DP_PRINT_STATS("HTT_HW_STATS_INTR_MISC_TLV:");
 	for (i = 0; i <  DP_HTT_HW_INTR_NAME_LEN; i++) {
 		index += qdf_snprint(&hw_intr_name[index],
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i, dp_stats_buf->hw_intr_name[i]);
 	}
-	DP_TRACE_STATS(FATAL, "hw_intr_name = %s ", hw_intr_name);
-	DP_TRACE_STATS(FATAL, "mask = %u",
-			dp_stats_buf->mask);
-	DP_TRACE_STATS(FATAL, "count = %u\n",
-			dp_stats_buf->count);
+	DP_PRINT_STATS("hw_intr_name = %s ", hw_intr_name);
+	DP_PRINT_STATS("mask = %u",
+		       dp_stats_buf->mask);
+	DP_PRINT_STATS("count = %u\n",
+		       dp_stats_buf->count);
 	qdf_mem_free(hw_intr_name);
 }
 
@@ -389,15 +391,15 @@ static inline void dp_print_hw_stats_wd_timeout_tlv(uint32_t *tag_buf)
 		return;
 	}
 
-	DP_TRACE_STATS(FATAL, "HTT_HW_STATS_WD_TIMEOUT_TLV:");
+	DP_PRINT_STATS("HTT_HW_STATS_WD_TIMEOUT_TLV:");
 	for (i = 0; i <  DP_HTT_HW_MODULE_NAME_LEN; i++) {
 		index += qdf_snprint(&hw_module_name[index],
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i, dp_stats_buf->hw_module_name[i]);
 	}
-	DP_TRACE_STATS(FATAL, "hw_module_name = %s ", hw_module_name);
-	DP_TRACE_STATS(FATAL, "count = %u",
-			dp_stats_buf->count);
+	DP_PRINT_STATS("hw_module_name = %s ", hw_module_name);
+	DP_PRINT_STATS("count = %u",
+		       dp_stats_buf->count);
 	qdf_mem_free(hw_module_name);
 }
 
@@ -412,29 +414,29 @@ static inline void dp_print_hw_stats_pdev_errs_tlv(uint32_t *tag_buf)
 	htt_hw_stats_pdev_errs_tlv *dp_stats_buf =
 		(htt_hw_stats_pdev_errs_tlv *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_HW_STATS_PDEV_ERRS_TLV:");
-	DP_TRACE_STATS(FATAL, "mac_id__word = %u",
-			dp_stats_buf->mac_id__word);
-	DP_TRACE_STATS(FATAL, "tx_abort = %u",
-			dp_stats_buf->tx_abort);
-	DP_TRACE_STATS(FATAL, "tx_abort_fail_count = %u",
-			dp_stats_buf->tx_abort_fail_count);
-	DP_TRACE_STATS(FATAL, "rx_abort = %u",
-			dp_stats_buf->rx_abort);
-	DP_TRACE_STATS(FATAL, "rx_abort_fail_count = %u",
-			dp_stats_buf->rx_abort_fail_count);
-	DP_TRACE_STATS(FATAL, "warm_reset = %u",
-			dp_stats_buf->warm_reset);
-	DP_TRACE_STATS(FATAL, "cold_reset = %u",
-			dp_stats_buf->cold_reset);
-	DP_TRACE_STATS(FATAL, "tx_flush = %u",
-			dp_stats_buf->tx_flush);
-	DP_TRACE_STATS(FATAL, "tx_glb_reset = %u",
-			dp_stats_buf->tx_glb_reset);
-	DP_TRACE_STATS(FATAL, "tx_txq_reset = %u",
-			dp_stats_buf->tx_txq_reset);
-	DP_TRACE_STATS(FATAL, "rx_timeout_reset = %u\n",
-			dp_stats_buf->rx_timeout_reset);
+	DP_PRINT_STATS("HTT_HW_STATS_PDEV_ERRS_TLV:");
+	DP_PRINT_STATS("mac_id__word = %u",
+		       dp_stats_buf->mac_id__word);
+	DP_PRINT_STATS("tx_abort = %u",
+		       dp_stats_buf->tx_abort);
+	DP_PRINT_STATS("tx_abort_fail_count = %u",
+		       dp_stats_buf->tx_abort_fail_count);
+	DP_PRINT_STATS("rx_abort = %u",
+		       dp_stats_buf->rx_abort);
+	DP_PRINT_STATS("rx_abort_fail_count = %u",
+		       dp_stats_buf->rx_abort_fail_count);
+	DP_PRINT_STATS("warm_reset = %u",
+		       dp_stats_buf->warm_reset);
+	DP_PRINT_STATS("cold_reset = %u",
+		       dp_stats_buf->cold_reset);
+	DP_PRINT_STATS("tx_flush = %u",
+		       dp_stats_buf->tx_flush);
+	DP_PRINT_STATS("tx_glb_reset = %u",
+		       dp_stats_buf->tx_glb_reset);
+	DP_PRINT_STATS("tx_txq_reset = %u",
+		       dp_stats_buf->tx_txq_reset);
+	DP_PRINT_STATS("rx_timeout_reset = %u\n",
+		       dp_stats_buf->rx_timeout_reset);
 }
 
 /*
@@ -448,21 +450,21 @@ static inline void dp_print_msdu_flow_stats_tlv(uint32_t *tag_buf)
 	htt_msdu_flow_stats_tlv *dp_stats_buf =
 		(htt_msdu_flow_stats_tlv *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_MSDU_FLOW_STATS_TLV:");
-	DP_TRACE_STATS(FATAL, "last_update_timestamp = %u",
-			dp_stats_buf->last_update_timestamp);
-	DP_TRACE_STATS(FATAL, "last_add_timestamp = %u",
-			dp_stats_buf->last_add_timestamp);
-	DP_TRACE_STATS(FATAL, "last_remove_timestamp = %u",
-			dp_stats_buf->last_remove_timestamp);
-	DP_TRACE_STATS(FATAL, "total_processed_msdu_count = %u",
-			dp_stats_buf->total_processed_msdu_count);
-	DP_TRACE_STATS(FATAL, "cur_msdu_count_in_flowq = %u",
-			dp_stats_buf->cur_msdu_count_in_flowq);
-	DP_TRACE_STATS(FATAL, "sw_peer_id = %u",
-			dp_stats_buf->sw_peer_id);
-	DP_TRACE_STATS(FATAL, "tx_flow_no__tid_num__drop_rule = %u\n",
-			dp_stats_buf->tx_flow_no__tid_num__drop_rule);
+	DP_PRINT_STATS("HTT_MSDU_FLOW_STATS_TLV:");
+	DP_PRINT_STATS("last_update_timestamp = %u",
+		       dp_stats_buf->last_update_timestamp);
+	DP_PRINT_STATS("last_add_timestamp = %u",
+		       dp_stats_buf->last_add_timestamp);
+	DP_PRINT_STATS("last_remove_timestamp = %u",
+		       dp_stats_buf->last_remove_timestamp);
+	DP_PRINT_STATS("total_processed_msdu_count = %u",
+		       dp_stats_buf->total_processed_msdu_count);
+	DP_PRINT_STATS("cur_msdu_count_in_flowq = %u",
+		       dp_stats_buf->cur_msdu_count_in_flowq);
+	DP_PRINT_STATS("sw_peer_id = %u",
+		       dp_stats_buf->sw_peer_id);
+	DP_PRINT_STATS("tx_flow_no__tid_num__drop_rule = %u\n",
+		       dp_stats_buf->tx_flow_no__tid_num__drop_rule);
 }
 
 /*
@@ -485,39 +487,39 @@ static inline void dp_print_tx_tid_stats_tlv(uint32_t *tag_buf)
 		return;
 	}
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_TID_STATS_TLV:");
+	DP_PRINT_STATS("HTT_TX_TID_STATS_TLV:");
 	for (i = 0; i <  DP_HTT_TID_NAME_LEN; i++) {
 		index += qdf_snprint(&tid_name[index],
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i, dp_stats_buf->tid_name[i]);
 	}
-	DP_TRACE_STATS(FATAL, "tid_name = %s ", tid_name);
-	DP_TRACE_STATS(FATAL, "sw_peer_id__tid_num = %u",
-			dp_stats_buf->sw_peer_id__tid_num);
-	DP_TRACE_STATS(FATAL, "num_sched_pending__num_ppdu_in_hwq = %u",
-			dp_stats_buf->num_sched_pending__num_ppdu_in_hwq);
-	DP_TRACE_STATS(FATAL, "tid_flags = %u",
-			dp_stats_buf->tid_flags);
-	DP_TRACE_STATS(FATAL, "hw_queued = %u",
-			dp_stats_buf->hw_queued);
-	DP_TRACE_STATS(FATAL, "hw_reaped = %u",
-			dp_stats_buf->hw_reaped);
-	DP_TRACE_STATS(FATAL, "mpdus_hw_filter = %u",
-			dp_stats_buf->mpdus_hw_filter);
-	DP_TRACE_STATS(FATAL, "qdepth_bytes = %u",
-			dp_stats_buf->qdepth_bytes);
-	DP_TRACE_STATS(FATAL, "qdepth_num_msdu = %u",
-			dp_stats_buf->qdepth_num_msdu);
-	DP_TRACE_STATS(FATAL, "qdepth_num_mpdu = %u",
-			dp_stats_buf->qdepth_num_mpdu);
-	DP_TRACE_STATS(FATAL, "last_scheduled_tsmp = %u",
-			dp_stats_buf->last_scheduled_tsmp);
-	DP_TRACE_STATS(FATAL, "pause_module_id = %u",
-			dp_stats_buf->pause_module_id);
-	DP_TRACE_STATS(FATAL, "block_module_id = %u\n",
-			dp_stats_buf->block_module_id);
-	DP_TRACE_STATS(FATAL, "tid_tx_airtime = %u\n",
-			dp_stats_buf->tid_tx_airtime);
+	DP_PRINT_STATS("tid_name = %s ", tid_name);
+	DP_PRINT_STATS("sw_peer_id__tid_num = %u",
+		       dp_stats_buf->sw_peer_id__tid_num);
+	DP_PRINT_STATS("num_sched_pending__num_ppdu_in_hwq = %u",
+		       dp_stats_buf->num_sched_pending__num_ppdu_in_hwq);
+	DP_PRINT_STATS("tid_flags = %u",
+		       dp_stats_buf->tid_flags);
+	DP_PRINT_STATS("hw_queued = %u",
+		       dp_stats_buf->hw_queued);
+	DP_PRINT_STATS("hw_reaped = %u",
+		       dp_stats_buf->hw_reaped);
+	DP_PRINT_STATS("mpdus_hw_filter = %u",
+		       dp_stats_buf->mpdus_hw_filter);
+	DP_PRINT_STATS("qdepth_bytes = %u",
+		       dp_stats_buf->qdepth_bytes);
+	DP_PRINT_STATS("qdepth_num_msdu = %u",
+		       dp_stats_buf->qdepth_num_msdu);
+	DP_PRINT_STATS("qdepth_num_mpdu = %u",
+		       dp_stats_buf->qdepth_num_mpdu);
+	DP_PRINT_STATS("last_scheduled_tsmp = %u",
+		       dp_stats_buf->last_scheduled_tsmp);
+	DP_PRINT_STATS("pause_module_id = %u",
+		       dp_stats_buf->pause_module_id);
+	DP_PRINT_STATS("block_module_id = %u\n",
+		       dp_stats_buf->block_module_id);
+	DP_PRINT_STATS("tid_tx_airtime = %u\n",
+		       dp_stats_buf->tid_tx_airtime);
 	qdf_mem_free(tid_name);
 }
 
@@ -599,23 +601,23 @@ static inline void dp_print_rx_tid_stats_tlv(uint32_t *tag_buf)
 		return;
 	}
 
-	DP_TRACE_STATS(FATAL, "HTT_RX_TID_STATS_TLV:");
-	DP_TRACE_STATS(FATAL, "sw_peer_id__tid_num = %u",
-			dp_stats_buf->sw_peer_id__tid_num);
+	DP_PRINT_STATS("HTT_RX_TID_STATS_TLV:");
+	DP_PRINT_STATS("sw_peer_id__tid_num = %u",
+		       dp_stats_buf->sw_peer_id__tid_num);
 	for (i = 0; i <  DP_HTT_TID_NAME_LEN; i++) {
 		index += qdf_snprint(&tid_name[index],
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i, dp_stats_buf->tid_name[i]);
 	}
-	DP_TRACE_STATS(FATAL, "tid_name = %s ", tid_name);
-	DP_TRACE_STATS(FATAL, "dup_in_reorder = %u",
-			dp_stats_buf->dup_in_reorder);
-	DP_TRACE_STATS(FATAL, "dup_past_outside_window = %u",
-			dp_stats_buf->dup_past_outside_window);
-	DP_TRACE_STATS(FATAL, "dup_past_within_window = %u",
-			dp_stats_buf->dup_past_within_window);
-	DP_TRACE_STATS(FATAL, "rxdesc_err_decrypt = %u\n",
-			dp_stats_buf->rxdesc_err_decrypt);
+	DP_PRINT_STATS("tid_name = %s ", tid_name);
+	DP_PRINT_STATS("dup_in_reorder = %u",
+		       dp_stats_buf->dup_in_reorder);
+	DP_PRINT_STATS("dup_past_outside_window = %u",
+		       dp_stats_buf->dup_past_outside_window);
+	DP_PRINT_STATS("dup_past_within_window = %u",
+		       dp_stats_buf->dup_past_within_window);
+	DP_PRINT_STATS("rxdesc_err_decrypt = %u\n",
+		       dp_stats_buf->rxdesc_err_decrypt);
 	qdf_mem_free(tid_name);
 }
 
@@ -639,15 +641,15 @@ static inline void dp_print_counter_tlv(uint32_t *tag_buf)
 		return;
 	}
 
-	DP_TRACE_STATS(FATAL, "HTT_COUNTER_TLV:");
+	DP_PRINT_STATS("HTT_COUNTER_TLV:");
 	for (i = 0; i <  DP_HTT_COUNTER_NAME_LEN; i++) {
 		index += qdf_snprint(&counter_name[index],
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i, dp_stats_buf->counter_name[i]);
 	}
-	DP_TRACE_STATS(FATAL, "counter_name = %s ", counter_name);
-	DP_TRACE_STATS(FATAL, "count = %u\n",
-			dp_stats_buf->count);
+	DP_PRINT_STATS("counter_name = %s ", counter_name);
+	DP_PRINT_STATS("count = %u\n",
+		       dp_stats_buf->count);
 	qdf_mem_free(counter_name);
 }
 
@@ -662,20 +664,20 @@ static inline void dp_print_peer_stats_cmn_tlv(uint32_t *tag_buf)
 	htt_peer_stats_cmn_tlv *dp_stats_buf =
 		(htt_peer_stats_cmn_tlv *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_PEER_STATS_CMN_TLV:");
-	DP_TRACE_STATS(FATAL, "ppdu_cnt = %u",
-			dp_stats_buf->ppdu_cnt);
-	DP_TRACE_STATS(FATAL, "mpdu_cnt = %u",
-			dp_stats_buf->mpdu_cnt);
-	DP_TRACE_STATS(FATAL, "msdu_cnt = %u",
-			dp_stats_buf->msdu_cnt);
-	DP_TRACE_STATS(FATAL, "pause_bitmap = %u",
-			dp_stats_buf->pause_bitmap);
-	DP_TRACE_STATS(FATAL, "block_bitmap = %u",
-			dp_stats_buf->block_bitmap);
-	DP_TRACE_STATS(FATAL, "current_timestamp = %u\n",
-			dp_stats_buf->current_timestamp);
-	DP_TRACE_STATS(FATAL, "inactive_time = %u",
+	DP_PRINT_STATS("HTT_PEER_STATS_CMN_TLV:");
+	DP_PRINT_STATS("ppdu_cnt = %u",
+		       dp_stats_buf->ppdu_cnt);
+	DP_PRINT_STATS("mpdu_cnt = %u",
+		       dp_stats_buf->mpdu_cnt);
+	DP_PRINT_STATS("msdu_cnt = %u",
+		       dp_stats_buf->msdu_cnt);
+	DP_PRINT_STATS("pause_bitmap = %u",
+		       dp_stats_buf->pause_bitmap);
+	DP_PRINT_STATS("block_bitmap = %u",
+		       dp_stats_buf->block_bitmap);
+	DP_PRINT_STATS("current_timestamp = %u\n",
+		       dp_stats_buf->current_timestamp);
+	DP_PRINT_STATS("inactive_time = %u",
 		       dp_stats_buf->inactive_time);
 }
 
@@ -690,21 +692,21 @@ static inline void dp_print_peer_details_tlv(uint32_t *tag_buf)
 	htt_peer_details_tlv *dp_stats_buf =
 		(htt_peer_details_tlv *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_PEER_DETAILS_TLV:");
-	DP_TRACE_STATS(FATAL, "peer_type = %u",
-			dp_stats_buf->peer_type);
-	DP_TRACE_STATS(FATAL, "sw_peer_id = %u",
-			dp_stats_buf->sw_peer_id);
-	DP_TRACE_STATS(FATAL, "vdev_pdev_ast_idx = %u",
-			dp_stats_buf->vdev_pdev_ast_idx);
-	DP_TRACE_STATS(FATAL, "mac_addr(upper 4 bytes) = %u",
-			dp_stats_buf->mac_addr.mac_addr31to0);
-	DP_TRACE_STATS(FATAL, "mac_addr(lower 2 bytes) = %u",
-			dp_stats_buf->mac_addr.mac_addr47to32);
-	DP_TRACE_STATS(FATAL, "peer_flags = %u",
-			dp_stats_buf->peer_flags);
-	DP_TRACE_STATS(FATAL, "qpeer_flags = %u\n",
-			dp_stats_buf->qpeer_flags);
+	DP_PRINT_STATS("HTT_PEER_DETAILS_TLV:");
+	DP_PRINT_STATS("peer_type = %u",
+		       dp_stats_buf->peer_type);
+	DP_PRINT_STATS("sw_peer_id = %u",
+		       dp_stats_buf->sw_peer_id);
+	DP_PRINT_STATS("vdev_pdev_ast_idx = %u",
+		       dp_stats_buf->vdev_pdev_ast_idx);
+	DP_PRINT_STATS("mac_addr(upper 4 bytes) = %u",
+		       dp_stats_buf->mac_addr.mac_addr31to0);
+	DP_PRINT_STATS("mac_addr(lower 2 bytes) = %u",
+		       dp_stats_buf->mac_addr.mac_addr47to32);
+	DP_PRINT_STATS("peer_flags = %u",
+		       dp_stats_buf->peer_flags);
+	DP_PRINT_STATS("qpeer_flags = %u\n",
+		       dp_stats_buf->qpeer_flags);
 }
 
 /*
@@ -731,13 +733,13 @@ static inline void dp_print_tx_peer_rate_stats_tlv(uint32_t *tag_buf)
 	for (i = 0; i < HTT_TX_PEER_STATS_NUM_GI_COUNTERS; i++)
 		tx_gi[i] = (char *)qdf_mem_malloc(DP_MAX_STRING_LEN);
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_PEER_RATE_STATS_TLV:");
-	DP_TRACE_STATS(FATAL, "tx_ldpc = %u",
-			dp_stats_buf->tx_ldpc);
-	DP_TRACE_STATS(FATAL, "rts_cnt = %u",
-			dp_stats_buf->rts_cnt);
-	DP_TRACE_STATS(FATAL, "ack_rssi = %u",
-			dp_stats_buf->ack_rssi);
+	DP_PRINT_STATS("HTT_TX_PEER_RATE_STATS_TLV:");
+	DP_PRINT_STATS("tx_ldpc = %u",
+		       dp_stats_buf->tx_ldpc);
+	DP_PRINT_STATS("rts_cnt = %u",
+		       dp_stats_buf->rts_cnt);
+	DP_PRINT_STATS("ack_rssi = %u",
+		       dp_stats_buf->ack_rssi);
 
 	index = 0;
 	qdf_mem_zero(str_buf, DP_MAX_STRING_LEN);
@@ -746,7 +748,7 @@ static inline void dp_print_tx_peer_rate_stats_tlv(uint32_t *tag_buf)
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i, dp_stats_buf->tx_mcs[i]);
 	}
-	DP_TRACE_STATS(FATAL, "tx_mcs = %s ", str_buf);
+	DP_PRINT_STATS("tx_mcs = %s ", str_buf);
 
 	index = 0;
 	qdf_mem_zero(str_buf, DP_MAX_STRING_LEN);
@@ -755,7 +757,7 @@ static inline void dp_print_tx_peer_rate_stats_tlv(uint32_t *tag_buf)
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i, dp_stats_buf->tx_su_mcs[i]);
 	}
-	DP_TRACE_STATS(FATAL, "tx_su_mcs = %s ", str_buf);
+	DP_PRINT_STATS("tx_su_mcs = %s ", str_buf);
 	index = 0;
 	qdf_mem_zero(str_buf, DP_MAX_STRING_LEN);
 	for (i = 0; i <  DP_HTT_TX_MU_MCS_LEN; i++) {
@@ -763,7 +765,7 @@ static inline void dp_print_tx_peer_rate_stats_tlv(uint32_t *tag_buf)
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i, dp_stats_buf->tx_mu_mcs[i]);
 	}
-	DP_TRACE_STATS(FATAL, "tx_mu_mcs = %s ", str_buf);
+	DP_PRINT_STATS("tx_mu_mcs = %s ", str_buf);
 	index = 0;
 	qdf_mem_zero(str_buf, DP_MAX_STRING_LEN);
 	for (i = 0; i <  DP_HTT_TX_NSS_LEN; i++) {
@@ -773,7 +775,7 @@ static inline void dp_print_tx_peer_rate_stats_tlv(uint32_t *tag_buf)
 				" %u:%u,", (i + 1),
 				dp_stats_buf->tx_nss[i]);
 	}
-	DP_TRACE_STATS(FATAL, "tx_nss = %s ", str_buf);
+	DP_PRINT_STATS("tx_nss = %s ", str_buf);
 	index = 0;
 	qdf_mem_zero(str_buf, DP_MAX_STRING_LEN);
 	for (i = 0; i <  DP_HTT_TX_BW_LEN; i++) {
@@ -781,7 +783,7 @@ static inline void dp_print_tx_peer_rate_stats_tlv(uint32_t *tag_buf)
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i, dp_stats_buf->tx_bw[i]);
 	}
-	DP_TRACE_STATS(FATAL, "tx_bw = %s ", str_buf);
+	DP_PRINT_STATS("tx_bw = %s ", str_buf);
 	index = 0;
 	qdf_mem_zero(str_buf, DP_MAX_STRING_LEN);
 	for (i = 0; i <  HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS; i++) {
@@ -789,7 +791,7 @@ static inline void dp_print_tx_peer_rate_stats_tlv(uint32_t *tag_buf)
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i, dp_stats_buf->tx_stbc[i]);
 	}
-	DP_TRACE_STATS(FATAL, "tx_stbc = %s ", str_buf);
+	DP_PRINT_STATS("tx_stbc = %s ", str_buf);
 	index = 0;
 	qdf_mem_zero(str_buf, DP_MAX_STRING_LEN);
 
@@ -798,7 +800,7 @@ static inline void dp_print_tx_peer_rate_stats_tlv(uint32_t *tag_buf)
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i, dp_stats_buf->tx_pream[i]);
 	}
-	DP_TRACE_STATS(FATAL, "tx_pream = %s ", str_buf);
+	DP_PRINT_STATS("tx_pream = %s ", str_buf);
 
 	for (j = 0; j < HTT_TX_PEER_STATS_NUM_GI_COUNTERS; j++) {
 		index = 0;
@@ -808,7 +810,7 @@ static inline void dp_print_tx_peer_rate_stats_tlv(uint32_t *tag_buf)
 					" %u:%u,", i,
 					dp_stats_buf->tx_gi[j][i]);
 		}
-		DP_TRACE_STATS(FATAL, "tx_gi[%u] = %s ", j, tx_gi[j]);
+		DP_PRINT_STATS("tx_gi[%u] = %s ", j, tx_gi[j]);
 	}
 
 	index = 0;
@@ -818,7 +820,7 @@ static inline void dp_print_tx_peer_rate_stats_tlv(uint32_t *tag_buf)
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i, dp_stats_buf->tx_dcm[i]);
 	}
-	DP_TRACE_STATS(FATAL, "tx_dcm = %s\n", str_buf);
+	DP_PRINT_STATS("tx_dcm = %s\n", str_buf);
 	for (i = 0; i < HTT_TX_PEER_STATS_NUM_GI_COUNTERS; i++)
 		qdf_mem_free(tx_gi[i]);
 
@@ -852,19 +854,19 @@ static inline void dp_print_rx_peer_rate_stats_tlv(uint32_t *tag_buf)
 	for (i = 0; i < HTT_RX_PEER_STATS_NUM_GI_COUNTERS; i++)
 		rx_gi[i] = qdf_mem_malloc(DP_MAX_STRING_LEN);
 
-	DP_TRACE_STATS(FATAL, "HTT_RX_PEER_RATE_STATS_TLV:");
-	DP_TRACE_STATS(FATAL, "nsts = %u",
-			dp_stats_buf->nsts);
-	DP_TRACE_STATS(FATAL, "rx_ldpc = %u",
-			dp_stats_buf->rx_ldpc);
-	DP_TRACE_STATS(FATAL, "rts_cnt = %u",
-			dp_stats_buf->rts_cnt);
-	DP_TRACE_STATS(FATAL, "rssi_mgmt = %u",
-			dp_stats_buf->rssi_mgmt);
-	DP_TRACE_STATS(FATAL, "rssi_data = %u",
-			dp_stats_buf->rssi_data);
-	DP_TRACE_STATS(FATAL, "rssi_comb = %u",
-			dp_stats_buf->rssi_comb);
+	DP_PRINT_STATS("HTT_RX_PEER_RATE_STATS_TLV:");
+	DP_PRINT_STATS("nsts = %u",
+		       dp_stats_buf->nsts);
+	DP_PRINT_STATS("rx_ldpc = %u",
+		       dp_stats_buf->rx_ldpc);
+	DP_PRINT_STATS("rts_cnt = %u",
+		       dp_stats_buf->rts_cnt);
+	DP_PRINT_STATS("rssi_mgmt = %u",
+		       dp_stats_buf->rssi_mgmt);
+	DP_PRINT_STATS("rssi_data = %u",
+		       dp_stats_buf->rssi_data);
+	DP_PRINT_STATS("rssi_comb = %u",
+		       dp_stats_buf->rssi_comb);
 
 	qdf_mem_zero(str_buf, DP_MAX_STRING_LEN);
 	for (i = 0; i <  DP_HTT_RX_MCS_LEN; i++) {
@@ -872,7 +874,7 @@ static inline void dp_print_rx_peer_rate_stats_tlv(uint32_t *tag_buf)
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i, dp_stats_buf->rx_mcs[i]);
 	}
-	DP_TRACE_STATS(FATAL, "rx_mcs = %s ", str_buf);
+	DP_PRINT_STATS("rx_mcs = %s ", str_buf);
 
 	index = 0;
 	qdf_mem_zero(str_buf, DP_MAX_STRING_LEN);
@@ -883,7 +885,7 @@ static inline void dp_print_rx_peer_rate_stats_tlv(uint32_t *tag_buf)
 				" %u:%u,", (i + 1),
 				dp_stats_buf->rx_nss[i]);
 	}
-	DP_TRACE_STATS(FATAL, "rx_nss = %s ", str_buf);
+	DP_PRINT_STATS("rx_nss = %s ", str_buf);
 
 	index = 0;
 	qdf_mem_zero(str_buf, DP_MAX_STRING_LEN);
@@ -892,7 +894,7 @@ static inline void dp_print_rx_peer_rate_stats_tlv(uint32_t *tag_buf)
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i, dp_stats_buf->rx_dcm[i]);
 	}
-	DP_TRACE_STATS(FATAL, "rx_dcm = %s ", str_buf);
+	DP_PRINT_STATS("rx_dcm = %s ", str_buf);
 
 	index = 0;
 	qdf_mem_zero(str_buf, DP_MAX_STRING_LEN);
@@ -901,7 +903,7 @@ static inline void dp_print_rx_peer_rate_stats_tlv(uint32_t *tag_buf)
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i, dp_stats_buf->rx_stbc[i]);
 	}
-	DP_TRACE_STATS(FATAL, "rx_stbc = %s ", str_buf);
+	DP_PRINT_STATS("rx_stbc = %s ", str_buf);
 
 	index = 0;
 	qdf_mem_zero(str_buf, DP_MAX_STRING_LEN);
@@ -910,7 +912,7 @@ static inline void dp_print_rx_peer_rate_stats_tlv(uint32_t *tag_buf)
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i, dp_stats_buf->rx_bw[i]);
 	}
-	DP_TRACE_STATS(FATAL, "rx_bw = %s ", str_buf);
+	DP_PRINT_STATS("rx_bw = %s ", str_buf);
 
 	for (j = 0; j < DP_HTT_PEER_NUM_SS; j++) {
 		qdf_mem_zero(str_buf, DP_MAX_STRING_LEN);
@@ -921,7 +923,7 @@ static inline void dp_print_rx_peer_rate_stats_tlv(uint32_t *tag_buf)
 					" %u:%u,", i,
 					dp_stats_buf->rssi_chain[j][i]);
 		}
-		DP_TRACE_STATS(FATAL, "rssi_chain[%u] = %s ", j, rssi_chain[j]);
+		DP_PRINT_STATS("rssi_chain[%u] = %s ", j, rssi_chain[j]);
 	}
 
 	for (j = 0; j < HTT_RX_PEER_STATS_NUM_GI_COUNTERS; j++) {
@@ -932,7 +934,7 @@ static inline void dp_print_rx_peer_rate_stats_tlv(uint32_t *tag_buf)
 					" %u:%u,", i,
 					dp_stats_buf->rx_gi[j][i]);
 		}
-		DP_TRACE_STATS(FATAL, "rx_gi[%u] = %s ", j, rx_gi[j]);
+		DP_PRINT_STATS("rx_gi[%u] = %s ", j, rx_gi[j]);
 	}
 	index = 0;
 	qdf_mem_zero(str_buf, DP_MAX_STRING_LEN);
@@ -941,7 +943,7 @@ static inline void dp_print_rx_peer_rate_stats_tlv(uint32_t *tag_buf)
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i, dp_stats_buf->rx_pream[i]);
 	}
-	DP_TRACE_STATS(FATAL, "rx_pream = %s\n", str_buf);
+	DP_PRINT_STATS("rx_pream = %s\n", str_buf);
 
 	for (i = 0; i < DP_HTT_PEER_NUM_SS; i++)
 		qdf_mem_free(rssi_chain[i]);
@@ -962,13 +964,13 @@ static inline void dp_print_tx_hwq_mu_mimo_sch_stats_tlv(uint32_t *tag_buf)
 	htt_tx_hwq_mu_mimo_sch_stats_tlv *dp_stats_buf =
 		(htt_tx_hwq_mu_mimo_sch_stats_tlv *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_HWQ_MU_MIMO_SCH_STATS_TLV:");
-	DP_TRACE_STATS(FATAL, "mu_mimo_sch_posted = %u",
-			dp_stats_buf->mu_mimo_sch_posted);
-	DP_TRACE_STATS(FATAL, "mu_mimo_sch_failed = %u",
-			dp_stats_buf->mu_mimo_sch_failed);
-	DP_TRACE_STATS(FATAL, "mu_mimo_ppdu_posted = %u\n",
-			dp_stats_buf->mu_mimo_ppdu_posted);
+	DP_PRINT_STATS("HTT_TX_HWQ_MU_MIMO_SCH_STATS_TLV:");
+	DP_PRINT_STATS("mu_mimo_sch_posted = %u",
+		       dp_stats_buf->mu_mimo_sch_posted);
+	DP_PRINT_STATS("mu_mimo_sch_failed = %u",
+		       dp_stats_buf->mu_mimo_sch_failed);
+	DP_PRINT_STATS("mu_mimo_ppdu_posted = %u\n",
+		       dp_stats_buf->mu_mimo_ppdu_posted);
 }
 
 /*
@@ -982,21 +984,21 @@ static inline void dp_print_tx_hwq_mu_mimo_mpdu_stats_tlv(uint32_t *tag_buf)
 	htt_tx_hwq_mu_mimo_mpdu_stats_tlv *dp_stats_buf =
 		(htt_tx_hwq_mu_mimo_mpdu_stats_tlv *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_HWQ_MU_MIMO_MPDU_STATS_TLV:");
-	DP_TRACE_STATS(FATAL, "mu_mimo_mpdus_queued_usr = %u",
-			dp_stats_buf->mu_mimo_mpdus_queued_usr);
-	DP_TRACE_STATS(FATAL, "mu_mimo_mpdus_tried_usr = %u",
-			dp_stats_buf->mu_mimo_mpdus_tried_usr);
-	DP_TRACE_STATS(FATAL, "mu_mimo_mpdus_failed_usr = %u",
-			dp_stats_buf->mu_mimo_mpdus_failed_usr);
-	DP_TRACE_STATS(FATAL, "mu_mimo_mpdus_requeued_usr = %u",
-			dp_stats_buf->mu_mimo_mpdus_requeued_usr);
-	DP_TRACE_STATS(FATAL, "mu_mimo_err_no_ba_usr = %u",
-			dp_stats_buf->mu_mimo_err_no_ba_usr);
-	DP_TRACE_STATS(FATAL, "mu_mimo_mpdu_underrun_usr = %u",
-			dp_stats_buf->mu_mimo_mpdu_underrun_usr);
-	DP_TRACE_STATS(FATAL, "mu_mimo_ampdu_underrun_usr = %u\n",
-			dp_stats_buf->mu_mimo_ampdu_underrun_usr);
+	DP_PRINT_STATS("HTT_TX_HWQ_MU_MIMO_MPDU_STATS_TLV:");
+	DP_PRINT_STATS("mu_mimo_mpdus_queued_usr = %u",
+		       dp_stats_buf->mu_mimo_mpdus_queued_usr);
+	DP_PRINT_STATS("mu_mimo_mpdus_tried_usr = %u",
+		       dp_stats_buf->mu_mimo_mpdus_tried_usr);
+	DP_PRINT_STATS("mu_mimo_mpdus_failed_usr = %u",
+		       dp_stats_buf->mu_mimo_mpdus_failed_usr);
+	DP_PRINT_STATS("mu_mimo_mpdus_requeued_usr = %u",
+		       dp_stats_buf->mu_mimo_mpdus_requeued_usr);
+	DP_PRINT_STATS("mu_mimo_err_no_ba_usr = %u",
+		       dp_stats_buf->mu_mimo_err_no_ba_usr);
+	DP_PRINT_STATS("mu_mimo_mpdu_underrun_usr = %u",
+		       dp_stats_buf->mu_mimo_mpdu_underrun_usr);
+	DP_PRINT_STATS("mu_mimo_ampdu_underrun_usr = %u\n",
+		       dp_stats_buf->mu_mimo_ampdu_underrun_usr);
 }
 
 /*
@@ -1010,9 +1012,9 @@ static inline void dp_print_tx_hwq_mu_mimo_cmn_stats_tlv(uint32_t *tag_buf)
 	htt_tx_hwq_mu_mimo_cmn_stats_tlv *dp_stats_buf =
 		(htt_tx_hwq_mu_mimo_cmn_stats_tlv *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_HWQ_MU_MIMO_CMN_STATS_TLV:");
-	DP_TRACE_STATS(FATAL, "mac_id__hwq_id__word = %u\n",
-			dp_stats_buf->mac_id__hwq_id__word);
+	DP_PRINT_STATS("HTT_TX_HWQ_MU_MIMO_CMN_STATS_TLV:");
+	DP_PRINT_STATS("mac_id__hwq_id__word = %u\n",
+		       dp_stats_buf->mac_id__hwq_id__word);
 }
 
 /*
@@ -1026,47 +1028,47 @@ static inline void dp_print_tx_hwq_stats_cmn_tlv(uint32_t *tag_buf)
 	htt_tx_hwq_stats_cmn_tlv *dp_stats_buf =
 		(htt_tx_hwq_stats_cmn_tlv *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_HWQ_STATS_CMN_TLV:");
-	DP_TRACE_STATS(FATAL, "mac_id__hwq_id__word = %u",
-			dp_stats_buf->mac_id__hwq_id__word);
-	DP_TRACE_STATS(FATAL, "xretry = %u",
-			dp_stats_buf->xretry);
-	DP_TRACE_STATS(FATAL, "underrun_cnt = %u",
-			dp_stats_buf->underrun_cnt);
-	DP_TRACE_STATS(FATAL, "flush_cnt = %u",
-			dp_stats_buf->flush_cnt);
-	DP_TRACE_STATS(FATAL, "filt_cnt = %u",
-			dp_stats_buf->filt_cnt);
-	DP_TRACE_STATS(FATAL, "null_mpdu_bmap = %u",
-			dp_stats_buf->null_mpdu_bmap);
-	DP_TRACE_STATS(FATAL, "user_ack_failure = %u",
-			dp_stats_buf->user_ack_failure);
-	DP_TRACE_STATS(FATAL, "ack_tlv_proc = %u",
-			dp_stats_buf->ack_tlv_proc);
-	DP_TRACE_STATS(FATAL, "sched_id_proc = %u",
-			dp_stats_buf->sched_id_proc);
-	DP_TRACE_STATS(FATAL, "null_mpdu_tx_count = %u",
-			dp_stats_buf->null_mpdu_tx_count);
-	DP_TRACE_STATS(FATAL, "mpdu_bmap_not_recvd = %u",
-			dp_stats_buf->mpdu_bmap_not_recvd);
-	DP_TRACE_STATS(FATAL, "num_bar = %u",
-			dp_stats_buf->num_bar);
-	DP_TRACE_STATS(FATAL, "rts = %u",
-			dp_stats_buf->rts);
-	DP_TRACE_STATS(FATAL, "cts2self = %u",
-			dp_stats_buf->cts2self);
-	DP_TRACE_STATS(FATAL, "qos_null = %u",
-			dp_stats_buf->qos_null);
-	DP_TRACE_STATS(FATAL, "mpdu_tried_cnt = %u",
-			dp_stats_buf->mpdu_tried_cnt);
-	DP_TRACE_STATS(FATAL, "mpdu_queued_cnt = %u",
-			dp_stats_buf->mpdu_queued_cnt);
-	DP_TRACE_STATS(FATAL, "mpdu_ack_fail_cnt = %u",
-			dp_stats_buf->mpdu_ack_fail_cnt);
-	DP_TRACE_STATS(FATAL, "mpdu_filt_cnt = %u",
-			dp_stats_buf->mpdu_filt_cnt);
-	DP_TRACE_STATS(FATAL, "false_mpdu_ack_count = %u\n",
-			dp_stats_buf->false_mpdu_ack_count);
+	DP_PRINT_STATS("HTT_TX_HWQ_STATS_CMN_TLV:");
+	DP_PRINT_STATS("mac_id__hwq_id__word = %u",
+		       dp_stats_buf->mac_id__hwq_id__word);
+	DP_PRINT_STATS("xretry = %u",
+		       dp_stats_buf->xretry);
+	DP_PRINT_STATS("underrun_cnt = %u",
+		       dp_stats_buf->underrun_cnt);
+	DP_PRINT_STATS("flush_cnt = %u",
+		       dp_stats_buf->flush_cnt);
+	DP_PRINT_STATS("filt_cnt = %u",
+		       dp_stats_buf->filt_cnt);
+	DP_PRINT_STATS("null_mpdu_bmap = %u",
+		       dp_stats_buf->null_mpdu_bmap);
+	DP_PRINT_STATS("user_ack_failure = %u",
+		       dp_stats_buf->user_ack_failure);
+	DP_PRINT_STATS("ack_tlv_proc = %u",
+		       dp_stats_buf->ack_tlv_proc);
+	DP_PRINT_STATS("sched_id_proc = %u",
+		       dp_stats_buf->sched_id_proc);
+	DP_PRINT_STATS("null_mpdu_tx_count = %u",
+		       dp_stats_buf->null_mpdu_tx_count);
+	DP_PRINT_STATS("mpdu_bmap_not_recvd = %u",
+		       dp_stats_buf->mpdu_bmap_not_recvd);
+	DP_PRINT_STATS("num_bar = %u",
+		       dp_stats_buf->num_bar);
+	DP_PRINT_STATS("rts = %u",
+		       dp_stats_buf->rts);
+	DP_PRINT_STATS("cts2self = %u",
+		       dp_stats_buf->cts2self);
+	DP_PRINT_STATS("qos_null = %u",
+		       dp_stats_buf->qos_null);
+	DP_PRINT_STATS("mpdu_tried_cnt = %u",
+		       dp_stats_buf->mpdu_tried_cnt);
+	DP_PRINT_STATS("mpdu_queued_cnt = %u",
+		       dp_stats_buf->mpdu_queued_cnt);
+	DP_PRINT_STATS("mpdu_ack_fail_cnt = %u",
+		       dp_stats_buf->mpdu_ack_fail_cnt);
+	DP_PRINT_STATS("mpdu_filt_cnt = %u",
+		       dp_stats_buf->mpdu_filt_cnt);
+	DP_PRINT_STATS("false_mpdu_ack_count = %u\n",
+		       dp_stats_buf->false_mpdu_ack_count);
 }
 
 /*
@@ -1094,9 +1096,9 @@ static inline void dp_print_tx_hwq_difs_latency_stats_tlv_v(uint32_t *tag_buf)
 	tag_len = qdf_min(tag_len,
 			(uint32_t)HTT_TX_HWQ_MAX_DIFS_LATENCY_BINS);
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_HWQ_DIFS_LATENCY_STATS_TLV_V:");
-	DP_TRACE_STATS(FATAL, "hist_intvl = %u",
-			dp_stats_buf->hist_intvl);
+	DP_PRINT_STATS("HTT_TX_HWQ_DIFS_LATENCY_STATS_TLV_V:");
+	DP_PRINT_STATS("hist_intvl = %u",
+		       dp_stats_buf->hist_intvl);
 
 	for (i = 0; i <  tag_len; i++) {
 		index += qdf_snprint(&difs_latency_hist[index],
@@ -1104,7 +1106,7 @@ static inline void dp_print_tx_hwq_difs_latency_stats_tlv_v(uint32_t *tag_buf)
 				" %u:%u,", i,
 				dp_stats_buf->difs_latency_hist[i]);
 	}
-	DP_TRACE_STATS(FATAL, "difs_latency_hist = %s\n", difs_latency_hist);
+	DP_PRINT_STATS("difs_latency_hist = %s\n", difs_latency_hist);
 	qdf_mem_free(difs_latency_hist);
 }
 
@@ -1131,13 +1133,13 @@ static inline void dp_print_tx_hwq_cmd_result_stats_tlv_v(uint32_t *tag_buf)
 
 	tag_len = qdf_min(tag_len, (uint32_t)HTT_TX_HWQ_MAX_CMD_RESULT_STATS);
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_HWQ_CMD_RESULT_STATS_TLV_V:");
+	DP_PRINT_STATS("HTT_TX_HWQ_CMD_RESULT_STATS_TLV_V:");
 	for (i = 0; i <  tag_len; i++) {
 		index += qdf_snprint(&cmd_result[index],
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i, dp_stats_buf->cmd_result[i]);
 	}
-	DP_TRACE_STATS(FATAL, "cmd_result = %s ", cmd_result);
+	DP_PRINT_STATS("cmd_result = %s ", cmd_result);
 	qdf_mem_free(cmd_result);
 }
 
@@ -1164,14 +1166,14 @@ static inline void dp_print_tx_hwq_cmd_stall_stats_tlv_v(uint32_t *tag_buf)
 
 	tag_len = qdf_min(tag_len, (uint32_t)HTT_TX_HWQ_MAX_CMD_STALL_STATS);
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_HWQ_CMD_STALL_STATS_TLV_V:");
+	DP_PRINT_STATS("HTT_TX_HWQ_CMD_STALL_STATS_TLV_V:");
 	for (i = 0; i <  tag_len; i++) {
 		index += qdf_snprint(&cmd_stall_status[index],
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i,
 				dp_stats_buf->cmd_stall_status[i]);
 	}
-	DP_TRACE_STATS(FATAL, "cmd_stall_status = %s\n", cmd_stall_status);
+	DP_PRINT_STATS("cmd_stall_status = %s\n", cmd_stall_status);
 	qdf_mem_free(cmd_stall_status);
 }
 
@@ -1198,13 +1200,13 @@ static inline void dp_print_tx_hwq_fes_result_stats_tlv_v(uint32_t *tag_buf)
 
 	tag_len = qdf_min(tag_len, (uint32_t)HTT_TX_HWQ_MAX_FES_RESULT_STATS);
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_HWQ_FES_RESULT_STATS_TLV_V:");
+	DP_PRINT_STATS("HTT_TX_HWQ_FES_RESULT_STATS_TLV_V:");
 	for (i = 0; i <  tag_len; i++) {
 		index += qdf_snprint(&fes_result[index],
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i, dp_stats_buf->fes_result[i]);
 	}
-	DP_TRACE_STATS(FATAL, "fes_result = %s ", fes_result);
+	DP_PRINT_STATS("fes_result = %s ", fes_result);
 	qdf_mem_free(fes_result);
 }
 
@@ -1219,31 +1221,31 @@ static inline void dp_print_tx_selfgen_cmn_stats_tlv(uint32_t *tag_buf)
 	htt_tx_selfgen_cmn_stats_tlv *dp_stats_buf =
 		(htt_tx_selfgen_cmn_stats_tlv *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_SELFGEN_CMN_STATS_TLV:");
-	DP_TRACE_STATS(FATAL, "mac_id__word = %u",
-			dp_stats_buf->mac_id__word);
-	DP_TRACE_STATS(FATAL, "su_bar = %u",
-			dp_stats_buf->su_bar);
-	DP_TRACE_STATS(FATAL, "rts = %u",
-			dp_stats_buf->rts);
-	DP_TRACE_STATS(FATAL, "cts2self = %u",
-			dp_stats_buf->cts2self);
-	DP_TRACE_STATS(FATAL, "qos_null = %u",
-			dp_stats_buf->qos_null);
-	DP_TRACE_STATS(FATAL, "delayed_bar_1 = %u",
-			dp_stats_buf->delayed_bar_1);
-	DP_TRACE_STATS(FATAL, "delayed_bar_2 = %u",
-			dp_stats_buf->delayed_bar_2);
-	DP_TRACE_STATS(FATAL, "delayed_bar_3 = %u",
-			dp_stats_buf->delayed_bar_3);
-	DP_TRACE_STATS(FATAL, "delayed_bar_4 = %u",
-			dp_stats_buf->delayed_bar_4);
-	DP_TRACE_STATS(FATAL, "delayed_bar_5 = %u",
-			dp_stats_buf->delayed_bar_5);
-	DP_TRACE_STATS(FATAL, "delayed_bar_6 = %u",
-			dp_stats_buf->delayed_bar_6);
-	DP_TRACE_STATS(FATAL, "delayed_bar_7 = %u\n",
-			dp_stats_buf->delayed_bar_7);
+	DP_PRINT_STATS("HTT_TX_SELFGEN_CMN_STATS_TLV:");
+	DP_PRINT_STATS("mac_id__word = %u",
+		       dp_stats_buf->mac_id__word);
+	DP_PRINT_STATS("su_bar = %u",
+		       dp_stats_buf->su_bar);
+	DP_PRINT_STATS("rts = %u",
+		       dp_stats_buf->rts);
+	DP_PRINT_STATS("cts2self = %u",
+		       dp_stats_buf->cts2self);
+	DP_PRINT_STATS("qos_null = %u",
+		       dp_stats_buf->qos_null);
+	DP_PRINT_STATS("delayed_bar_1 = %u",
+		       dp_stats_buf->delayed_bar_1);
+	DP_PRINT_STATS("delayed_bar_2 = %u",
+		       dp_stats_buf->delayed_bar_2);
+	DP_PRINT_STATS("delayed_bar_3 = %u",
+		       dp_stats_buf->delayed_bar_3);
+	DP_PRINT_STATS("delayed_bar_4 = %u",
+		       dp_stats_buf->delayed_bar_4);
+	DP_PRINT_STATS("delayed_bar_5 = %u",
+		       dp_stats_buf->delayed_bar_5);
+	DP_PRINT_STATS("delayed_bar_6 = %u",
+		       dp_stats_buf->delayed_bar_6);
+	DP_PRINT_STATS("delayed_bar_7 = %u\n",
+		       dp_stats_buf->delayed_bar_7);
 }
 
 /*
@@ -1257,21 +1259,21 @@ static inline void dp_print_tx_selfgen_ac_stats_tlv(uint32_t *tag_buf)
 	htt_tx_selfgen_ac_stats_tlv *dp_stats_buf =
 		(htt_tx_selfgen_ac_stats_tlv *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_SELFGEN_AC_STATS_TLV:");
-	DP_TRACE_STATS(FATAL, "ac_su_ndpa = %u",
-			dp_stats_buf->ac_su_ndpa);
-	DP_TRACE_STATS(FATAL, "ac_su_ndp = %u",
-			dp_stats_buf->ac_su_ndp);
-	DP_TRACE_STATS(FATAL, "ac_mu_mimo_ndpa = %u",
-			dp_stats_buf->ac_mu_mimo_ndpa);
-	DP_TRACE_STATS(FATAL, "ac_mu_mimo_ndp = %u",
-			dp_stats_buf->ac_mu_mimo_ndp);
-	DP_TRACE_STATS(FATAL, "ac_mu_mimo_brpoll_1 = %u",
-			dp_stats_buf->ac_mu_mimo_brpoll_1);
-	DP_TRACE_STATS(FATAL, "ac_mu_mimo_brpoll_2 = %u",
-			dp_stats_buf->ac_mu_mimo_brpoll_2);
-	DP_TRACE_STATS(FATAL, "ac_mu_mimo_brpoll_3 = %u\n",
-			dp_stats_buf->ac_mu_mimo_brpoll_3);
+	DP_PRINT_STATS("HTT_TX_SELFGEN_AC_STATS_TLV:");
+	DP_PRINT_STATS("ac_su_ndpa = %u",
+		       dp_stats_buf->ac_su_ndpa);
+	DP_PRINT_STATS("ac_su_ndp = %u",
+		       dp_stats_buf->ac_su_ndp);
+	DP_PRINT_STATS("ac_mu_mimo_ndpa = %u",
+		       dp_stats_buf->ac_mu_mimo_ndpa);
+	DP_PRINT_STATS("ac_mu_mimo_ndp = %u",
+		       dp_stats_buf->ac_mu_mimo_ndp);
+	DP_PRINT_STATS("ac_mu_mimo_brpoll_1 = %u",
+		       dp_stats_buf->ac_mu_mimo_brpoll_1);
+	DP_PRINT_STATS("ac_mu_mimo_brpoll_2 = %u",
+		       dp_stats_buf->ac_mu_mimo_brpoll_2);
+	DP_PRINT_STATS("ac_mu_mimo_brpoll_3 = %u\n",
+		       dp_stats_buf->ac_mu_mimo_brpoll_3);
 }
 
 /*
@@ -1285,37 +1287,37 @@ static inline void dp_print_tx_selfgen_ax_stats_tlv(uint32_t *tag_buf)
 	htt_tx_selfgen_ax_stats_tlv *dp_stats_buf =
 		(htt_tx_selfgen_ax_stats_tlv *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_SELFGEN_AX_STATS_TLV:");
-	DP_TRACE_STATS(FATAL, "ax_su_ndpa = %u",
-			dp_stats_buf->ax_su_ndpa);
-	DP_TRACE_STATS(FATAL, "ax_su_ndp = %u",
-			dp_stats_buf->ax_su_ndp);
-	DP_TRACE_STATS(FATAL, "ax_mu_mimo_ndpa = %u",
-			dp_stats_buf->ax_mu_mimo_ndpa);
-	DP_TRACE_STATS(FATAL, "ax_mu_mimo_ndp = %u",
-			dp_stats_buf->ax_mu_mimo_ndp);
-	DP_TRACE_STATS(FATAL, "ax_mu_mimo_brpoll_1 = %u",
-			dp_stats_buf->ax_mu_mimo_brpoll_1);
-	DP_TRACE_STATS(FATAL, "ax_mu_mimo_brpoll_2 = %u",
-			dp_stats_buf->ax_mu_mimo_brpoll_2);
-	DP_TRACE_STATS(FATAL, "ax_mu_mimo_brpoll_3 = %u",
-			dp_stats_buf->ax_mu_mimo_brpoll_3);
-	DP_TRACE_STATS(FATAL, "ax_mu_mimo_brpoll_4 = %u",
-			dp_stats_buf->ax_mu_mimo_brpoll_4);
-	DP_TRACE_STATS(FATAL, "ax_mu_mimo_brpoll_5 = %u",
-			dp_stats_buf->ax_mu_mimo_brpoll_5);
-	DP_TRACE_STATS(FATAL, "ax_mu_mimo_brpoll_6 = %u",
-			dp_stats_buf->ax_mu_mimo_brpoll_6);
-	DP_TRACE_STATS(FATAL, "ax_mu_mimo_brpoll_7 = %u",
-			dp_stats_buf->ax_mu_mimo_brpoll_7);
-	DP_TRACE_STATS(FATAL, "ax_basic_trigger = %u",
-			dp_stats_buf->ax_basic_trigger);
-	DP_TRACE_STATS(FATAL, "ax_bsr_trigger = %u",
-			dp_stats_buf->ax_bsr_trigger);
-	DP_TRACE_STATS(FATAL, "ax_mu_bar_trigger = %u",
-			dp_stats_buf->ax_mu_bar_trigger);
-	DP_TRACE_STATS(FATAL, "ax_mu_rts_trigger = %u\n",
-			dp_stats_buf->ax_mu_rts_trigger);
+	DP_PRINT_STATS("HTT_TX_SELFGEN_AX_STATS_TLV:");
+	DP_PRINT_STATS("ax_su_ndpa = %u",
+		       dp_stats_buf->ax_su_ndpa);
+	DP_PRINT_STATS("ax_su_ndp = %u",
+		       dp_stats_buf->ax_su_ndp);
+	DP_PRINT_STATS("ax_mu_mimo_ndpa = %u",
+		       dp_stats_buf->ax_mu_mimo_ndpa);
+	DP_PRINT_STATS("ax_mu_mimo_ndp = %u",
+		       dp_stats_buf->ax_mu_mimo_ndp);
+	DP_PRINT_STATS("ax_mu_mimo_brpoll_1 = %u",
+		       dp_stats_buf->ax_mu_mimo_brpoll_1);
+	DP_PRINT_STATS("ax_mu_mimo_brpoll_2 = %u",
+		       dp_stats_buf->ax_mu_mimo_brpoll_2);
+	DP_PRINT_STATS("ax_mu_mimo_brpoll_3 = %u",
+		       dp_stats_buf->ax_mu_mimo_brpoll_3);
+	DP_PRINT_STATS("ax_mu_mimo_brpoll_4 = %u",
+		       dp_stats_buf->ax_mu_mimo_brpoll_4);
+	DP_PRINT_STATS("ax_mu_mimo_brpoll_5 = %u",
+		       dp_stats_buf->ax_mu_mimo_brpoll_5);
+	DP_PRINT_STATS("ax_mu_mimo_brpoll_6 = %u",
+		       dp_stats_buf->ax_mu_mimo_brpoll_6);
+	DP_PRINT_STATS("ax_mu_mimo_brpoll_7 = %u",
+		       dp_stats_buf->ax_mu_mimo_brpoll_7);
+	DP_PRINT_STATS("ax_basic_trigger = %u",
+		       dp_stats_buf->ax_basic_trigger);
+	DP_PRINT_STATS("ax_bsr_trigger = %u",
+		       dp_stats_buf->ax_bsr_trigger);
+	DP_PRINT_STATS("ax_mu_bar_trigger = %u",
+		       dp_stats_buf->ax_mu_bar_trigger);
+	DP_PRINT_STATS("ax_mu_rts_trigger = %u\n",
+		       dp_stats_buf->ax_mu_rts_trigger);
 }
 
 /*
@@ -1329,21 +1331,21 @@ static inline void dp_print_tx_selfgen_ac_err_stats_tlv(uint32_t *tag_buf)
 	htt_tx_selfgen_ac_err_stats_tlv *dp_stats_buf =
 		(htt_tx_selfgen_ac_err_stats_tlv *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_SELFGEN_AC_ERR_STATS_TLV:");
-	DP_TRACE_STATS(FATAL, "ac_su_ndp_err = %u",
-			dp_stats_buf->ac_su_ndp_err);
-	DP_TRACE_STATS(FATAL, "ac_su_ndpa_err = %u",
-			dp_stats_buf->ac_su_ndpa_err);
-	DP_TRACE_STATS(FATAL, "ac_mu_mimo_ndpa_err = %u",
-			dp_stats_buf->ac_mu_mimo_ndpa_err);
-	DP_TRACE_STATS(FATAL, "ac_mu_mimo_ndp_err = %u",
-			dp_stats_buf->ac_mu_mimo_ndp_err);
-	DP_TRACE_STATS(FATAL, "ac_mu_mimo_brp1_err = %u",
-			dp_stats_buf->ac_mu_mimo_brp1_err);
-	DP_TRACE_STATS(FATAL, "ac_mu_mimo_brp2_err = %u",
-			dp_stats_buf->ac_mu_mimo_brp2_err);
-	DP_TRACE_STATS(FATAL, "ac_mu_mimo_brp3_err = %u\n",
-			dp_stats_buf->ac_mu_mimo_brp3_err);
+	DP_PRINT_STATS("HTT_TX_SELFGEN_AC_ERR_STATS_TLV:");
+	DP_PRINT_STATS("ac_su_ndp_err = %u",
+		       dp_stats_buf->ac_su_ndp_err);
+	DP_PRINT_STATS("ac_su_ndpa_err = %u",
+		       dp_stats_buf->ac_su_ndpa_err);
+	DP_PRINT_STATS("ac_mu_mimo_ndpa_err = %u",
+		       dp_stats_buf->ac_mu_mimo_ndpa_err);
+	DP_PRINT_STATS("ac_mu_mimo_ndp_err = %u",
+		       dp_stats_buf->ac_mu_mimo_ndp_err);
+	DP_PRINT_STATS("ac_mu_mimo_brp1_err = %u",
+		       dp_stats_buf->ac_mu_mimo_brp1_err);
+	DP_PRINT_STATS("ac_mu_mimo_brp2_err = %u",
+		       dp_stats_buf->ac_mu_mimo_brp2_err);
+	DP_PRINT_STATS("ac_mu_mimo_brp3_err = %u\n",
+		       dp_stats_buf->ac_mu_mimo_brp3_err);
 }
 
 /*
@@ -1357,37 +1359,37 @@ static inline void dp_print_tx_selfgen_ax_err_stats_tlv(uint32_t *tag_buf)
 	htt_tx_selfgen_ax_err_stats_tlv *dp_stats_buf =
 		(htt_tx_selfgen_ax_err_stats_tlv *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_SELFGEN_AX_ERR_STATS_TLV:");
-	DP_TRACE_STATS(FATAL, "ax_su_ndp_err = %u",
-			dp_stats_buf->ax_su_ndp_err);
-	DP_TRACE_STATS(FATAL, "ax_su_ndpa_err = %u",
-			dp_stats_buf->ax_su_ndpa_err);
-	DP_TRACE_STATS(FATAL, "ax_mu_mimo_ndpa_err = %u",
-			dp_stats_buf->ax_mu_mimo_ndpa_err);
-	DP_TRACE_STATS(FATAL, "ax_mu_mimo_ndp_err = %u",
-			dp_stats_buf->ax_mu_mimo_ndp_err);
-	DP_TRACE_STATS(FATAL, "ax_mu_mimo_brp1_err = %u",
-			dp_stats_buf->ax_mu_mimo_brp1_err);
-	DP_TRACE_STATS(FATAL, "ax_mu_mimo_brp2_err = %u",
-			dp_stats_buf->ax_mu_mimo_brp2_err);
-	DP_TRACE_STATS(FATAL, "ax_mu_mimo_brp3_err = %u",
-			dp_stats_buf->ax_mu_mimo_brp3_err);
-	DP_TRACE_STATS(FATAL, "ax_mu_mimo_brp4_err = %u",
-			dp_stats_buf->ax_mu_mimo_brp4_err);
-	DP_TRACE_STATS(FATAL, "ax_mu_mimo_brp5_err = %u",
-			dp_stats_buf->ax_mu_mimo_brp5_err);
-	DP_TRACE_STATS(FATAL, "ax_mu_mimo_brp6_err = %u",
-			dp_stats_buf->ax_mu_mimo_brp6_err);
-	DP_TRACE_STATS(FATAL, "ax_mu_mimo_brp7_err = %u",
-			dp_stats_buf->ax_mu_mimo_brp7_err);
-	DP_TRACE_STATS(FATAL, "ax_basic_trigger_err = %u",
-			dp_stats_buf->ax_basic_trigger_err);
-	DP_TRACE_STATS(FATAL, "ax_bsr_trigger_err = %u",
-			dp_stats_buf->ax_bsr_trigger_err);
-	DP_TRACE_STATS(FATAL, "ax_mu_bar_trigger_err = %u",
-			dp_stats_buf->ax_mu_bar_trigger_err);
-	DP_TRACE_STATS(FATAL, "ax_mu_rts_trigger_err = %u\n",
-			dp_stats_buf->ax_mu_rts_trigger_err);
+	DP_PRINT_STATS("HTT_TX_SELFGEN_AX_ERR_STATS_TLV:");
+	DP_PRINT_STATS("ax_su_ndp_err = %u",
+		       dp_stats_buf->ax_su_ndp_err);
+	DP_PRINT_STATS("ax_su_ndpa_err = %u",
+		       dp_stats_buf->ax_su_ndpa_err);
+	DP_PRINT_STATS("ax_mu_mimo_ndpa_err = %u",
+		       dp_stats_buf->ax_mu_mimo_ndpa_err);
+	DP_PRINT_STATS("ax_mu_mimo_ndp_err = %u",
+		       dp_stats_buf->ax_mu_mimo_ndp_err);
+	DP_PRINT_STATS("ax_mu_mimo_brp1_err = %u",
+		       dp_stats_buf->ax_mu_mimo_brp1_err);
+	DP_PRINT_STATS("ax_mu_mimo_brp2_err = %u",
+		       dp_stats_buf->ax_mu_mimo_brp2_err);
+	DP_PRINT_STATS("ax_mu_mimo_brp3_err = %u",
+		       dp_stats_buf->ax_mu_mimo_brp3_err);
+	DP_PRINT_STATS("ax_mu_mimo_brp4_err = %u",
+		       dp_stats_buf->ax_mu_mimo_brp4_err);
+	DP_PRINT_STATS("ax_mu_mimo_brp5_err = %u",
+		       dp_stats_buf->ax_mu_mimo_brp5_err);
+	DP_PRINT_STATS("ax_mu_mimo_brp6_err = %u",
+		       dp_stats_buf->ax_mu_mimo_brp6_err);
+	DP_PRINT_STATS("ax_mu_mimo_brp7_err = %u",
+		       dp_stats_buf->ax_mu_mimo_brp7_err);
+	DP_PRINT_STATS("ax_basic_trigger_err = %u",
+		       dp_stats_buf->ax_basic_trigger_err);
+	DP_PRINT_STATS("ax_bsr_trigger_err = %u",
+		       dp_stats_buf->ax_bsr_trigger_err);
+	DP_PRINT_STATS("ax_mu_bar_trigger_err = %u",
+		       dp_stats_buf->ax_mu_bar_trigger_err);
+	DP_PRINT_STATS("ax_mu_rts_trigger_err = %u\n",
+		       dp_stats_buf->ax_mu_rts_trigger_err);
 }
 
 /*
@@ -1402,32 +1404,32 @@ static inline void dp_print_tx_pdev_mu_mimo_sch_stats_tlv(uint32_t *tag_buf)
 	htt_tx_pdev_mu_mimo_sch_stats_tlv *dp_stats_buf =
 		(htt_tx_pdev_mu_mimo_sch_stats_tlv *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_PDEV_MU_MIMO_SCH_STATS_TLV:");
-	DP_TRACE_STATS(FATAL, "mu_mimo_sch_posted = %u",
-			dp_stats_buf->mu_mimo_sch_posted);
-	DP_TRACE_STATS(FATAL, "mu_mimo_sch_failed = %u",
-			dp_stats_buf->mu_mimo_sch_failed);
-	DP_TRACE_STATS(FATAL, "mu_mimo_ppdu_posted = %u\n",
-			dp_stats_buf->mu_mimo_ppdu_posted);
+	DP_PRINT_STATS("HTT_TX_PDEV_MU_MIMO_SCH_STATS_TLV:");
+	DP_PRINT_STATS("mu_mimo_sch_posted = %u",
+		       dp_stats_buf->mu_mimo_sch_posted);
+	DP_PRINT_STATS("mu_mimo_sch_failed = %u",
+		       dp_stats_buf->mu_mimo_sch_failed);
+	DP_PRINT_STATS("mu_mimo_ppdu_posted = %u\n",
+		       dp_stats_buf->mu_mimo_ppdu_posted);
 
-	DP_TRACE_STATS(FATAL, "11ac MU_MIMO SCH STATS:");
+	DP_PRINT_STATS("11ac MU_MIMO SCH STATS:");
 
 	for (i = 0; i < HTT_TX_PDEV_STATS_NUM_AC_MUMIMO_USER_STATS; i++) {
-		DP_TRACE_STATS(FATAL, "ac_mu_mimo_sch_nusers_%u = %u", i,
+		DP_PRINT_STATS("ac_mu_mimo_sch_nusers_%u = %u", i,
 			       dp_stats_buf->ac_mu_mimo_sch_nusers[i]);
 	}
 
-	DP_TRACE_STATS(FATAL, "\n11ax MU_MIMO SCH STATS:");
+	DP_PRINT_STATS("\n11ax MU_MIMO SCH STATS:");
 
 	for (i = 0; i < HTT_TX_PDEV_STATS_NUM_AX_MUMIMO_USER_STATS; i++) {
-		DP_TRACE_STATS(FATAL, "ax_mu_mimo_sch_nusers_%u = %u", i,
+		DP_PRINT_STATS("ax_mu_mimo_sch_nusers_%u = %u", i,
 			       dp_stats_buf->ax_mu_mimo_sch_nusers[i]);
 	}
 
-	DP_TRACE_STATS(FATAL, "\n11ax OFDMA SCH STATS:");
+	DP_PRINT_STATS("\n11ax OFDMA SCH STATS:");
 
 	for (i = 0; i < HTT_TX_PDEV_STATS_NUM_AX_MUMIMO_USER_STATS; i++) {
-		DP_TRACE_STATS(FATAL, "ax_ofdma_sch_nusers_%u = %u", i,
+		DP_PRINT_STATS("ax_ofdma_sch_nusers_%u = %u", i,
 			       dp_stats_buf->ax_ofdma_sch_nusers[i]);
 	}
 }
@@ -1584,14 +1586,14 @@ static inline void dp_print_sched_txq_cmd_posted_tlv_v(uint32_t *tag_buf)
 
 	tag_len = qdf_min(tag_len, (uint32_t)HTT_TX_PDEV_SCHED_TX_MODE_MAX);
 
-	DP_TRACE_STATS(FATAL, "HTT_SCHED_TXQ_CMD_POSTED_TLV_V:");
+	DP_PRINT_STATS("HTT_SCHED_TXQ_CMD_POSTED_TLV_V:");
 	for (i = 0; i <  tag_len; i++) {
 		index += qdf_snprint(&sched_cmd_posted[index],
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i,
 				dp_stats_buf->sched_cmd_posted[i]);
 	}
-	DP_TRACE_STATS(FATAL, "sched_cmd_posted = %s\n", sched_cmd_posted);
+	DP_PRINT_STATS("sched_cmd_posted = %s\n", sched_cmd_posted);
 	qdf_mem_free(sched_cmd_posted);
 }
 
@@ -1618,14 +1620,14 @@ static inline void dp_print_sched_txq_cmd_reaped_tlv_v(uint32_t *tag_buf)
 
 	tag_len = qdf_min(tag_len, (uint32_t)HTT_TX_PDEV_SCHED_TX_MODE_MAX);
 
-	DP_TRACE_STATS(FATAL, "HTT_SCHED_TXQ_CMD_REAPED_TLV_V:");
+	DP_PRINT_STATS("HTT_SCHED_TXQ_CMD_REAPED_TLV_V:");
 	for (i = 0; i <  tag_len; i++) {
 		index += qdf_snprint(&sched_cmd_reaped[index],
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i,
 				dp_stats_buf->sched_cmd_reaped[i]);
 	}
-	DP_TRACE_STATS(FATAL, "sched_cmd_reaped = %s\n", sched_cmd_reaped);
+	DP_PRINT_STATS("sched_cmd_reaped = %s\n", sched_cmd_reaped);
 	qdf_mem_free(sched_cmd_reaped);
 }
 
@@ -1641,47 +1643,47 @@ static inline void dp_print_tx_pdev_stats_sched_per_txq_tlv(uint32_t *tag_buf)
 	htt_tx_pdev_stats_sched_per_txq_tlv *dp_stats_buf =
 		(htt_tx_pdev_stats_sched_per_txq_tlv *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_PDEV_STATS_SCHED_PER_TXQ_TLV:");
-	DP_TRACE_STATS(FATAL, "mac_id__txq_id__word = %u",
-			dp_stats_buf->mac_id__txq_id__word);
-	DP_TRACE_STATS(FATAL, "sched_policy = %u",
-			dp_stats_buf->sched_policy);
-	DP_TRACE_STATS(FATAL, "last_sched_cmd_posted_timestamp = %u",
-			dp_stats_buf->last_sched_cmd_posted_timestamp);
-	DP_TRACE_STATS(FATAL, "last_sched_cmd_compl_timestamp = %u",
-			dp_stats_buf->last_sched_cmd_compl_timestamp);
-	DP_TRACE_STATS(FATAL, "sched_2_tac_lwm_count = %u",
-			dp_stats_buf->sched_2_tac_lwm_count);
-	DP_TRACE_STATS(FATAL, "sched_2_tac_ring_full = %u",
-			dp_stats_buf->sched_2_tac_ring_full);
-	DP_TRACE_STATS(FATAL, "sched_cmd_post_failure = %u",
-			dp_stats_buf->sched_cmd_post_failure);
-	DP_TRACE_STATS(FATAL, "num_active_tids = %u",
-			dp_stats_buf->num_active_tids);
-	DP_TRACE_STATS(FATAL, "num_ps_schedules = %u",
-			dp_stats_buf->num_ps_schedules);
-	DP_TRACE_STATS(FATAL, "sched_cmds_pending = %u",
-			dp_stats_buf->sched_cmds_pending);
-	DP_TRACE_STATS(FATAL, "num_tid_register = %u",
-			dp_stats_buf->num_tid_register);
-	DP_TRACE_STATS(FATAL, "num_tid_unregister = %u",
-			dp_stats_buf->num_tid_unregister);
-	DP_TRACE_STATS(FATAL, "num_qstats_queried = %u",
-			dp_stats_buf->num_qstats_queried);
-	DP_TRACE_STATS(FATAL, "qstats_update_pending = %u",
-			dp_stats_buf->qstats_update_pending);
-	DP_TRACE_STATS(FATAL, "last_qstats_query_timestamp = %u",
-			dp_stats_buf->last_qstats_query_timestamp);
-	DP_TRACE_STATS(FATAL, "num_tqm_cmdq_full = %u",
-			dp_stats_buf->num_tqm_cmdq_full);
-	DP_TRACE_STATS(FATAL, "num_de_sched_algo_trigger = %u",
-			dp_stats_buf->num_de_sched_algo_trigger);
-	DP_TRACE_STATS(FATAL, "num_rt_sched_algo_trigger = %u",
-			dp_stats_buf->num_rt_sched_algo_trigger);
-	DP_TRACE_STATS(FATAL, "num_tqm_sched_algo_trigger = %u",
-			dp_stats_buf->num_tqm_sched_algo_trigger);
-	DP_TRACE_STATS(FATAL, "notify_sched = %u\n",
-			dp_stats_buf->notify_sched);
+	DP_PRINT_STATS("HTT_TX_PDEV_STATS_SCHED_PER_TXQ_TLV:");
+	DP_PRINT_STATS("mac_id__txq_id__word = %u",
+		       dp_stats_buf->mac_id__txq_id__word);
+	DP_PRINT_STATS("sched_policy = %u",
+		       dp_stats_buf->sched_policy);
+	DP_PRINT_STATS("last_sched_cmd_posted_timestamp = %u",
+		       dp_stats_buf->last_sched_cmd_posted_timestamp);
+	DP_PRINT_STATS("last_sched_cmd_compl_timestamp = %u",
+		       dp_stats_buf->last_sched_cmd_compl_timestamp);
+	DP_PRINT_STATS("sched_2_tac_lwm_count = %u",
+		       dp_stats_buf->sched_2_tac_lwm_count);
+	DP_PRINT_STATS("sched_2_tac_ring_full = %u",
+		       dp_stats_buf->sched_2_tac_ring_full);
+	DP_PRINT_STATS("sched_cmd_post_failure = %u",
+		       dp_stats_buf->sched_cmd_post_failure);
+	DP_PRINT_STATS("num_active_tids = %u",
+		       dp_stats_buf->num_active_tids);
+	DP_PRINT_STATS("num_ps_schedules = %u",
+		       dp_stats_buf->num_ps_schedules);
+	DP_PRINT_STATS("sched_cmds_pending = %u",
+		       dp_stats_buf->sched_cmds_pending);
+	DP_PRINT_STATS("num_tid_register = %u",
+		       dp_stats_buf->num_tid_register);
+	DP_PRINT_STATS("num_tid_unregister = %u",
+		       dp_stats_buf->num_tid_unregister);
+	DP_PRINT_STATS("num_qstats_queried = %u",
+		       dp_stats_buf->num_qstats_queried);
+	DP_PRINT_STATS("qstats_update_pending = %u",
+		       dp_stats_buf->qstats_update_pending);
+	DP_PRINT_STATS("last_qstats_query_timestamp = %u",
+		       dp_stats_buf->last_qstats_query_timestamp);
+	DP_PRINT_STATS("num_tqm_cmdq_full = %u",
+		       dp_stats_buf->num_tqm_cmdq_full);
+	DP_PRINT_STATS("num_de_sched_algo_trigger = %u",
+		       dp_stats_buf->num_de_sched_algo_trigger);
+	DP_PRINT_STATS("num_rt_sched_algo_trigger = %u",
+		       dp_stats_buf->num_rt_sched_algo_trigger);
+	DP_PRINT_STATS("num_tqm_sched_algo_trigger = %u",
+		       dp_stats_buf->num_tqm_sched_algo_trigger);
+	DP_PRINT_STATS("notify_sched = %u\n",
+		       dp_stats_buf->notify_sched);
 }
 
 /*
@@ -1695,11 +1697,11 @@ static inline void dp_print_stats_tx_sched_cmn_tlv(uint32_t *tag_buf)
 	htt_stats_tx_sched_cmn_tlv *dp_stats_buf =
 		(htt_stats_tx_sched_cmn_tlv *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_STATS_TX_SCHED_CMN_TLV:");
-	DP_TRACE_STATS(FATAL, "mac_id__word = %u",
-			dp_stats_buf->mac_id__word);
-	DP_TRACE_STATS(FATAL, "current_timestamp = %u\n",
-			dp_stats_buf->current_timestamp);
+	DP_PRINT_STATS("HTT_STATS_TX_SCHED_CMN_TLV:");
+	DP_PRINT_STATS("mac_id__word = %u",
+		       dp_stats_buf->mac_id__word);
+	DP_PRINT_STATS("current_timestamp = %u\n",
+		       dp_stats_buf->current_timestamp);
 }
 
 /*
@@ -1726,14 +1728,14 @@ static inline void dp_print_tx_tqm_gen_mpdu_stats_tlv_v(uint32_t *tag_buf)
 	tag_len = qdf_min(tag_len,
 			(uint32_t)HTT_TX_TQM_MAX_GEN_MPDU_END_REASON);
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_TQM_GEN_MPDU_STATS_TLV_V:");
+	DP_PRINT_STATS("HTT_TX_TQM_GEN_MPDU_STATS_TLV_V:");
 	for (i = 0; i <  tag_len; i++) {
 		index += qdf_snprint(&gen_mpdu_end_reason[index],
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i,
 				dp_stats_buf->gen_mpdu_end_reason[i]);
 	}
-	DP_TRACE_STATS(FATAL, "gen_mpdu_end_reason = %s\n", gen_mpdu_end_reason);
+	DP_PRINT_STATS("gen_mpdu_end_reason = %s\n", gen_mpdu_end_reason);
 	qdf_mem_free(gen_mpdu_end_reason);
 }
 
@@ -1761,15 +1763,15 @@ static inline void dp_print_tx_tqm_list_mpdu_stats_tlv_v(uint32_t *tag_buf)
 	tag_len = qdf_min(tag_len,
 			(uint32_t)HTT_TX_TQM_MAX_LIST_MPDU_END_REASON);
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_TQM_LIST_MPDU_STATS_TLV_V:");
+	DP_PRINT_STATS("HTT_TX_TQM_LIST_MPDU_STATS_TLV_V:");
 	for (i = 0; i <  tag_len; i++) {
 		index += qdf_snprint(&list_mpdu_end_reason[index],
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i,
 				dp_stats_buf->list_mpdu_end_reason[i]);
 	}
-	DP_TRACE_STATS(FATAL, "list_mpdu_end_reason = %s\n",
-			list_mpdu_end_reason);
+	DP_PRINT_STATS("list_mpdu_end_reason = %s\n",
+		       list_mpdu_end_reason);
 	qdf_mem_free(list_mpdu_end_reason);
 }
 
@@ -1797,14 +1799,14 @@ static inline void dp_print_tx_tqm_list_mpdu_cnt_tlv_v(uint32_t *tag_buf)
 	tag_len = qdf_min(tag_len,
 			(uint32_t)HTT_TX_TQM_MAX_LIST_MPDU_CNT_HISTOGRAM_BINS);
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_TQM_LIST_MPDU_CNT_TLV_V:");
+	DP_PRINT_STATS("HTT_TX_TQM_LIST_MPDU_CNT_TLV_V:");
 	for (i = 0; i <  tag_len; i++) {
 		index += qdf_snprint(&list_mpdu_cnt_hist[index],
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i,
 				dp_stats_buf->list_mpdu_cnt_hist[i]);
 	}
-	DP_TRACE_STATS(FATAL, "list_mpdu_cnt_hist = %s\n", list_mpdu_cnt_hist);
+	DP_PRINT_STATS("list_mpdu_cnt_hist = %s\n", list_mpdu_cnt_hist);
 	qdf_mem_free(list_mpdu_cnt_hist);
 }
 
@@ -1819,61 +1821,61 @@ static inline void dp_print_tx_tqm_pdev_stats_tlv_v(uint32_t *tag_buf)
 	htt_tx_tqm_pdev_stats_tlv_v *dp_stats_buf =
 		(htt_tx_tqm_pdev_stats_tlv_v *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_TQM_PDEV_STATS_TLV_V:");
-	DP_TRACE_STATS(FATAL, "msdu_count = %u",
-			dp_stats_buf->msdu_count);
-	DP_TRACE_STATS(FATAL, "mpdu_count = %u",
-			dp_stats_buf->mpdu_count);
-	DP_TRACE_STATS(FATAL, "remove_msdu = %u",
-			dp_stats_buf->remove_msdu);
-	DP_TRACE_STATS(FATAL, "remove_mpdu = %u",
-			dp_stats_buf->remove_mpdu);
-	DP_TRACE_STATS(FATAL, "remove_msdu_ttl = %u",
-			dp_stats_buf->remove_msdu_ttl);
-	DP_TRACE_STATS(FATAL, "send_bar = %u",
-			dp_stats_buf->send_bar);
-	DP_TRACE_STATS(FATAL, "bar_sync = %u",
-			dp_stats_buf->bar_sync);
-	DP_TRACE_STATS(FATAL, "notify_mpdu = %u",
-			dp_stats_buf->notify_mpdu);
-	DP_TRACE_STATS(FATAL, "sync_cmd = %u",
-			dp_stats_buf->sync_cmd);
-	DP_TRACE_STATS(FATAL, "write_cmd = %u",
-			dp_stats_buf->write_cmd);
-	DP_TRACE_STATS(FATAL, "hwsch_trigger = %u",
-			dp_stats_buf->hwsch_trigger);
-	DP_TRACE_STATS(FATAL, "ack_tlv_proc = %u",
-			dp_stats_buf->ack_tlv_proc);
-	DP_TRACE_STATS(FATAL, "gen_mpdu_cmd = %u",
-			dp_stats_buf->gen_mpdu_cmd);
-	DP_TRACE_STATS(FATAL, "gen_list_cmd = %u",
-			dp_stats_buf->gen_list_cmd);
-	DP_TRACE_STATS(FATAL, "remove_mpdu_cmd = %u",
-			dp_stats_buf->remove_mpdu_cmd);
-	DP_TRACE_STATS(FATAL, "remove_mpdu_tried_cmd = %u",
-			dp_stats_buf->remove_mpdu_tried_cmd);
-	DP_TRACE_STATS(FATAL, "mpdu_queue_stats_cmd = %u",
-			dp_stats_buf->mpdu_queue_stats_cmd);
-	DP_TRACE_STATS(FATAL, "mpdu_head_info_cmd = %u",
-			dp_stats_buf->mpdu_head_info_cmd);
-	DP_TRACE_STATS(FATAL, "msdu_flow_stats_cmd = %u",
-			dp_stats_buf->msdu_flow_stats_cmd);
-	DP_TRACE_STATS(FATAL, "remove_msdu_cmd = %u",
-			dp_stats_buf->remove_msdu_cmd);
-	DP_TRACE_STATS(FATAL, "remove_msdu_ttl_cmd = %u",
-			dp_stats_buf->remove_msdu_ttl_cmd);
-	DP_TRACE_STATS(FATAL, "flush_cache_cmd = %u",
-			dp_stats_buf->flush_cache_cmd);
-	DP_TRACE_STATS(FATAL, "update_mpduq_cmd = %u",
-			dp_stats_buf->update_mpduq_cmd);
-	DP_TRACE_STATS(FATAL, "enqueue = %u",
-			dp_stats_buf->enqueue);
-	DP_TRACE_STATS(FATAL, "enqueue_notify = %u",
-			dp_stats_buf->enqueue_notify);
-	DP_TRACE_STATS(FATAL, "notify_mpdu_at_head = %u",
-			dp_stats_buf->notify_mpdu_at_head);
-	DP_TRACE_STATS(FATAL, "notify_mpdu_state_valid = %u\n",
-			dp_stats_buf->notify_mpdu_state_valid);
+	DP_PRINT_STATS("HTT_TX_TQM_PDEV_STATS_TLV_V:");
+	DP_PRINT_STATS("msdu_count = %u",
+		       dp_stats_buf->msdu_count);
+	DP_PRINT_STATS("mpdu_count = %u",
+		       dp_stats_buf->mpdu_count);
+	DP_PRINT_STATS("remove_msdu = %u",
+		       dp_stats_buf->remove_msdu);
+	DP_PRINT_STATS("remove_mpdu = %u",
+		       dp_stats_buf->remove_mpdu);
+	DP_PRINT_STATS("remove_msdu_ttl = %u",
+		       dp_stats_buf->remove_msdu_ttl);
+	DP_PRINT_STATS("send_bar = %u",
+		       dp_stats_buf->send_bar);
+	DP_PRINT_STATS("bar_sync = %u",
+		       dp_stats_buf->bar_sync);
+	DP_PRINT_STATS("notify_mpdu = %u",
+		       dp_stats_buf->notify_mpdu);
+	DP_PRINT_STATS("sync_cmd = %u",
+		       dp_stats_buf->sync_cmd);
+	DP_PRINT_STATS("write_cmd = %u",
+		       dp_stats_buf->write_cmd);
+	DP_PRINT_STATS("hwsch_trigger = %u",
+		       dp_stats_buf->hwsch_trigger);
+	DP_PRINT_STATS("ack_tlv_proc = %u",
+		       dp_stats_buf->ack_tlv_proc);
+	DP_PRINT_STATS("gen_mpdu_cmd = %u",
+		       dp_stats_buf->gen_mpdu_cmd);
+	DP_PRINT_STATS("gen_list_cmd = %u",
+		       dp_stats_buf->gen_list_cmd);
+	DP_PRINT_STATS("remove_mpdu_cmd = %u",
+		       dp_stats_buf->remove_mpdu_cmd);
+	DP_PRINT_STATS("remove_mpdu_tried_cmd = %u",
+		       dp_stats_buf->remove_mpdu_tried_cmd);
+	DP_PRINT_STATS("mpdu_queue_stats_cmd = %u",
+		       dp_stats_buf->mpdu_queue_stats_cmd);
+	DP_PRINT_STATS("mpdu_head_info_cmd = %u",
+		       dp_stats_buf->mpdu_head_info_cmd);
+	DP_PRINT_STATS("msdu_flow_stats_cmd = %u",
+		       dp_stats_buf->msdu_flow_stats_cmd);
+	DP_PRINT_STATS("remove_msdu_cmd = %u",
+		       dp_stats_buf->remove_msdu_cmd);
+	DP_PRINT_STATS("remove_msdu_ttl_cmd = %u",
+		       dp_stats_buf->remove_msdu_ttl_cmd);
+	DP_PRINT_STATS("flush_cache_cmd = %u",
+		       dp_stats_buf->flush_cache_cmd);
+	DP_PRINT_STATS("update_mpduq_cmd = %u",
+		       dp_stats_buf->update_mpduq_cmd);
+	DP_PRINT_STATS("enqueue = %u",
+		       dp_stats_buf->enqueue);
+	DP_PRINT_STATS("enqueue_notify = %u",
+		       dp_stats_buf->enqueue_notify);
+	DP_PRINT_STATS("notify_mpdu_at_head = %u",
+		       dp_stats_buf->notify_mpdu_at_head);
+	DP_PRINT_STATS("notify_mpdu_state_valid = %u\n",
+		       dp_stats_buf->notify_mpdu_state_valid);
 }
 
 /*
@@ -1887,23 +1889,23 @@ static inline void dp_print_tx_tqm_cmn_stats_tlv(uint32_t *tag_buf)
 	htt_tx_tqm_cmn_stats_tlv *dp_stats_buf =
 		(htt_tx_tqm_cmn_stats_tlv *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_TQM_CMN_STATS_TLV:");
-	DP_TRACE_STATS(FATAL, "mac_id__word = %u",
-			dp_stats_buf->mac_id__word);
-	DP_TRACE_STATS(FATAL, "max_cmdq_id = %u",
-			dp_stats_buf->max_cmdq_id);
-	DP_TRACE_STATS(FATAL, "list_mpdu_cnt_hist_intvl = %u",
-			dp_stats_buf->list_mpdu_cnt_hist_intvl);
-	DP_TRACE_STATS(FATAL, "add_msdu = %u",
-			dp_stats_buf->add_msdu);
-	DP_TRACE_STATS(FATAL, "q_empty = %u",
-			dp_stats_buf->q_empty);
-	DP_TRACE_STATS(FATAL, "q_not_empty = %u",
-			dp_stats_buf->q_not_empty);
-	DP_TRACE_STATS(FATAL, "drop_notification = %u",
-			dp_stats_buf->drop_notification);
-	DP_TRACE_STATS(FATAL, "desc_threshold = %u\n",
-			dp_stats_buf->desc_threshold);
+	DP_PRINT_STATS("HTT_TX_TQM_CMN_STATS_TLV:");
+	DP_PRINT_STATS("mac_id__word = %u",
+		       dp_stats_buf->mac_id__word);
+	DP_PRINT_STATS("max_cmdq_id = %u",
+		       dp_stats_buf->max_cmdq_id);
+	DP_PRINT_STATS("list_mpdu_cnt_hist_intvl = %u",
+		       dp_stats_buf->list_mpdu_cnt_hist_intvl);
+	DP_PRINT_STATS("add_msdu = %u",
+		       dp_stats_buf->add_msdu);
+	DP_PRINT_STATS("q_empty = %u",
+		       dp_stats_buf->q_empty);
+	DP_PRINT_STATS("q_not_empty = %u",
+		       dp_stats_buf->q_not_empty);
+	DP_PRINT_STATS("drop_notification = %u",
+		       dp_stats_buf->drop_notification);
+	DP_PRINT_STATS("desc_threshold = %u\n",
+		       dp_stats_buf->desc_threshold);
 }
 
 /*
@@ -1917,13 +1919,13 @@ static inline void dp_print_tx_tqm_error_stats_tlv(uint32_t *tag_buf)
 	htt_tx_tqm_error_stats_tlv *dp_stats_buf =
 		(htt_tx_tqm_error_stats_tlv *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_TQM_ERROR_STATS_TLV:");
-	DP_TRACE_STATS(FATAL, "q_empty_failure = %u",
-			dp_stats_buf->q_empty_failure);
-	DP_TRACE_STATS(FATAL, "q_not_empty_failure = %u",
-			dp_stats_buf->q_not_empty_failure);
-	DP_TRACE_STATS(FATAL, "add_msdu_failure = %u\n",
-			dp_stats_buf->add_msdu_failure);
+	DP_PRINT_STATS("HTT_TX_TQM_ERROR_STATS_TLV:");
+	DP_PRINT_STATS("q_empty_failure = %u",
+		       dp_stats_buf->q_empty_failure);
+	DP_PRINT_STATS("q_not_empty_failure = %u",
+		       dp_stats_buf->q_not_empty_failure);
+	DP_PRINT_STATS("add_msdu_failure = %u\n",
+		       dp_stats_buf->add_msdu_failure);
 }
 
 /*
@@ -1937,31 +1939,31 @@ static inline void dp_print_tx_tqm_cmdq_status_tlv(uint32_t *tag_buf)
 	htt_tx_tqm_cmdq_status_tlv *dp_stats_buf =
 		(htt_tx_tqm_cmdq_status_tlv *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_TQM_CMDQ_STATUS_TLV:");
-	DP_TRACE_STATS(FATAL, "mac_id__cmdq_id__word = %u",
-			dp_stats_buf->mac_id__cmdq_id__word);
-	DP_TRACE_STATS(FATAL, "sync_cmd = %u",
-			dp_stats_buf->sync_cmd);
-	DP_TRACE_STATS(FATAL, "write_cmd = %u",
-			dp_stats_buf->write_cmd);
-	DP_TRACE_STATS(FATAL, "gen_mpdu_cmd = %u",
-			dp_stats_buf->gen_mpdu_cmd);
-	DP_TRACE_STATS(FATAL, "mpdu_queue_stats_cmd = %u",
-			dp_stats_buf->mpdu_queue_stats_cmd);
-	DP_TRACE_STATS(FATAL, "mpdu_head_info_cmd = %u",
-			dp_stats_buf->mpdu_head_info_cmd);
-	DP_TRACE_STATS(FATAL, "msdu_flow_stats_cmd = %u",
-			dp_stats_buf->msdu_flow_stats_cmd);
-	DP_TRACE_STATS(FATAL, "remove_mpdu_cmd = %u",
-			dp_stats_buf->remove_mpdu_cmd);
-	DP_TRACE_STATS(FATAL, "remove_msdu_cmd = %u",
-			dp_stats_buf->remove_msdu_cmd);
-	DP_TRACE_STATS(FATAL, "flush_cache_cmd = %u",
-			dp_stats_buf->flush_cache_cmd);
-	DP_TRACE_STATS(FATAL, "update_mpduq_cmd = %u",
-			dp_stats_buf->update_mpduq_cmd);
-	DP_TRACE_STATS(FATAL, "update_msduq_cmd = %u\n",
-			dp_stats_buf->update_msduq_cmd);
+	DP_PRINT_STATS("HTT_TX_TQM_CMDQ_STATUS_TLV:");
+	DP_PRINT_STATS("mac_id__cmdq_id__word = %u",
+		       dp_stats_buf->mac_id__cmdq_id__word);
+	DP_PRINT_STATS("sync_cmd = %u",
+		       dp_stats_buf->sync_cmd);
+	DP_PRINT_STATS("write_cmd = %u",
+		       dp_stats_buf->write_cmd);
+	DP_PRINT_STATS("gen_mpdu_cmd = %u",
+		       dp_stats_buf->gen_mpdu_cmd);
+	DP_PRINT_STATS("mpdu_queue_stats_cmd = %u",
+		       dp_stats_buf->mpdu_queue_stats_cmd);
+	DP_PRINT_STATS("mpdu_head_info_cmd = %u",
+		       dp_stats_buf->mpdu_head_info_cmd);
+	DP_PRINT_STATS("msdu_flow_stats_cmd = %u",
+		       dp_stats_buf->msdu_flow_stats_cmd);
+	DP_PRINT_STATS("remove_mpdu_cmd = %u",
+		       dp_stats_buf->remove_mpdu_cmd);
+	DP_PRINT_STATS("remove_msdu_cmd = %u",
+		       dp_stats_buf->remove_msdu_cmd);
+	DP_PRINT_STATS("flush_cache_cmd = %u",
+		       dp_stats_buf->flush_cache_cmd);
+	DP_PRINT_STATS("update_mpduq_cmd = %u",
+		       dp_stats_buf->update_mpduq_cmd);
+	DP_PRINT_STATS("update_msduq_cmd = %u\n",
+		       dp_stats_buf->update_msduq_cmd);
 }
 
 /*
@@ -1975,19 +1977,19 @@ static inline void dp_print_tx_de_eapol_packets_stats_tlv(uint32_t *tag_buf)
 	htt_tx_de_eapol_packets_stats_tlv *dp_stats_buf =
 		(htt_tx_de_eapol_packets_stats_tlv *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_DE_EAPOL_PACKETS_STATS_TLV:");
-	DP_TRACE_STATS(FATAL, "m1_packets = %u",
-			dp_stats_buf->m1_packets);
-	DP_TRACE_STATS(FATAL, "m2_packets = %u",
-			dp_stats_buf->m2_packets);
-	DP_TRACE_STATS(FATAL, "m3_packets = %u",
-			dp_stats_buf->m3_packets);
-	DP_TRACE_STATS(FATAL, "m4_packets = %u",
-			dp_stats_buf->m4_packets);
-	DP_TRACE_STATS(FATAL, "g1_packets = %u",
-			dp_stats_buf->g1_packets);
-	DP_TRACE_STATS(FATAL, "g2_packets = %u\n",
-			dp_stats_buf->g2_packets);
+	DP_PRINT_STATS("HTT_TX_DE_EAPOL_PACKETS_STATS_TLV:");
+	DP_PRINT_STATS("m1_packets = %u",
+		       dp_stats_buf->m1_packets);
+	DP_PRINT_STATS("m2_packets = %u",
+		       dp_stats_buf->m2_packets);
+	DP_PRINT_STATS("m3_packets = %u",
+		       dp_stats_buf->m3_packets);
+	DP_PRINT_STATS("m4_packets = %u",
+		       dp_stats_buf->m4_packets);
+	DP_PRINT_STATS("g1_packets = %u",
+		       dp_stats_buf->g1_packets);
+	DP_PRINT_STATS("g2_packets = %u\n",
+		       dp_stats_buf->g2_packets);
 }
 
 /*
@@ -2002,29 +2004,29 @@ static inline void dp_print_tx_de_classify_failed_stats_tlv(uint32_t *tag_buf)
 	htt_tx_de_classify_failed_stats_tlv *dp_stats_buf =
 		(htt_tx_de_classify_failed_stats_tlv *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_DE_CLASSIFY_FAILED_STATS_TLV:");
-	DP_TRACE_STATS(FATAL, "ap_bss_peer_not_found = %u",
-			dp_stats_buf->ap_bss_peer_not_found);
-	DP_TRACE_STATS(FATAL, "ap_bcast_mcast_no_peer = %u",
-			dp_stats_buf->ap_bcast_mcast_no_peer);
-	DP_TRACE_STATS(FATAL, "sta_delete_in_progress = %u",
-			dp_stats_buf->sta_delete_in_progress);
-	DP_TRACE_STATS(FATAL, "ibss_no_bss_peer = %u",
-			dp_stats_buf->ibss_no_bss_peer);
-	DP_TRACE_STATS(FATAL, "invaild_vdev_type = %u",
-			dp_stats_buf->invaild_vdev_type);
-	DP_TRACE_STATS(FATAL, "invalid_ast_peer_entry = %u",
-			dp_stats_buf->invalid_ast_peer_entry);
-	DP_TRACE_STATS(FATAL, "peer_entry_invalid = %u",
-			dp_stats_buf->peer_entry_invalid);
-	DP_TRACE_STATS(FATAL, "ethertype_not_ip = %u",
-			dp_stats_buf->ethertype_not_ip);
-	DP_TRACE_STATS(FATAL, "eapol_lookup_failed = %u",
-			dp_stats_buf->eapol_lookup_failed);
-	DP_TRACE_STATS(FATAL, "qpeer_not_allow_data = %u",
-			dp_stats_buf->qpeer_not_allow_data);
-	DP_TRACE_STATS(FATAL, "fse_tid_override = %u\n",
-			dp_stats_buf->fse_tid_override);
+	DP_PRINT_STATS("HTT_TX_DE_CLASSIFY_FAILED_STATS_TLV:");
+	DP_PRINT_STATS("ap_bss_peer_not_found = %u",
+		       dp_stats_buf->ap_bss_peer_not_found);
+	DP_PRINT_STATS("ap_bcast_mcast_no_peer = %u",
+		       dp_stats_buf->ap_bcast_mcast_no_peer);
+	DP_PRINT_STATS("sta_delete_in_progress = %u",
+		       dp_stats_buf->sta_delete_in_progress);
+	DP_PRINT_STATS("ibss_no_bss_peer = %u",
+		       dp_stats_buf->ibss_no_bss_peer);
+	DP_PRINT_STATS("invaild_vdev_type = %u",
+		       dp_stats_buf->invaild_vdev_type);
+	DP_PRINT_STATS("invalid_ast_peer_entry = %u",
+		       dp_stats_buf->invalid_ast_peer_entry);
+	DP_PRINT_STATS("peer_entry_invalid = %u",
+		       dp_stats_buf->peer_entry_invalid);
+	DP_PRINT_STATS("ethertype_not_ip = %u",
+		       dp_stats_buf->ethertype_not_ip);
+	DP_PRINT_STATS("eapol_lookup_failed = %u",
+		       dp_stats_buf->eapol_lookup_failed);
+	DP_PRINT_STATS("qpeer_not_allow_data = %u",
+		       dp_stats_buf->qpeer_not_allow_data);
+	DP_PRINT_STATS("fse_tid_override = %u\n",
+		       dp_stats_buf->fse_tid_override);
 }
 
 /*
@@ -2038,65 +2040,65 @@ static inline void dp_print_tx_de_classify_stats_tlv(uint32_t *tag_buf)
 	htt_tx_de_classify_stats_tlv *dp_stats_buf =
 		(htt_tx_de_classify_stats_tlv *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_DE_CLASSIFY_STATS_TLV:");
-	DP_TRACE_STATS(FATAL, "arp_packets = %u",
-			dp_stats_buf->arp_packets);
-	DP_TRACE_STATS(FATAL, "igmp_packets = %u",
-			dp_stats_buf->igmp_packets);
-	DP_TRACE_STATS(FATAL, "dhcp_packets = %u",
-			dp_stats_buf->dhcp_packets);
-	DP_TRACE_STATS(FATAL, "host_inspected = %u",
-			dp_stats_buf->host_inspected);
-	DP_TRACE_STATS(FATAL, "htt_included = %u",
-			dp_stats_buf->htt_included);
-	DP_TRACE_STATS(FATAL, "htt_valid_mcs = %u",
-			dp_stats_buf->htt_valid_mcs);
-	DP_TRACE_STATS(FATAL, "htt_valid_nss = %u",
-			dp_stats_buf->htt_valid_nss);
-	DP_TRACE_STATS(FATAL, "htt_valid_preamble_type = %u",
-			dp_stats_buf->htt_valid_preamble_type);
-	DP_TRACE_STATS(FATAL, "htt_valid_chainmask = %u",
-			dp_stats_buf->htt_valid_chainmask);
-	DP_TRACE_STATS(FATAL, "htt_valid_guard_interval = %u",
-			dp_stats_buf->htt_valid_guard_interval);
-	DP_TRACE_STATS(FATAL, "htt_valid_retries = %u",
-			dp_stats_buf->htt_valid_retries);
-	DP_TRACE_STATS(FATAL, "htt_valid_bw_info = %u",
-			dp_stats_buf->htt_valid_bw_info);
-	DP_TRACE_STATS(FATAL, "htt_valid_power = %u",
-			dp_stats_buf->htt_valid_power);
-	DP_TRACE_STATS(FATAL, "htt_valid_key_flags = %u",
-			dp_stats_buf->htt_valid_key_flags);
-	DP_TRACE_STATS(FATAL, "htt_valid_no_encryption = %u",
-			dp_stats_buf->htt_valid_no_encryption);
-	DP_TRACE_STATS(FATAL, "fse_entry_count = %u",
-			dp_stats_buf->fse_entry_count);
-	DP_TRACE_STATS(FATAL, "fse_priority_be = %u",
-			dp_stats_buf->fse_priority_be);
-	DP_TRACE_STATS(FATAL, "fse_priority_high = %u",
-			dp_stats_buf->fse_priority_high);
-	DP_TRACE_STATS(FATAL, "fse_priority_low = %u",
-			dp_stats_buf->fse_priority_low);
-	DP_TRACE_STATS(FATAL, "fse_traffic_ptrn_be = %u",
-			dp_stats_buf->fse_traffic_ptrn_be);
-	DP_TRACE_STATS(FATAL, "fse_traffic_ptrn_over_sub = %u",
-			dp_stats_buf->fse_traffic_ptrn_over_sub);
-	DP_TRACE_STATS(FATAL, "fse_traffic_ptrn_bursty = %u",
-			dp_stats_buf->fse_traffic_ptrn_bursty);
-	DP_TRACE_STATS(FATAL, "fse_traffic_ptrn_interactive = %u",
-			dp_stats_buf->fse_traffic_ptrn_interactive);
-	DP_TRACE_STATS(FATAL, "fse_traffic_ptrn_periodic = %u",
-			dp_stats_buf->fse_traffic_ptrn_periodic);
-	DP_TRACE_STATS(FATAL, "fse_hwqueue_alloc = %u",
-			dp_stats_buf->fse_hwqueue_alloc);
-	DP_TRACE_STATS(FATAL, "fse_hwqueue_created = %u",
-			dp_stats_buf->fse_hwqueue_created);
-	DP_TRACE_STATS(FATAL, "fse_hwqueue_send_to_host = %u",
-			dp_stats_buf->fse_hwqueue_send_to_host);
-	DP_TRACE_STATS(FATAL, "mcast_entry = %u",
-			dp_stats_buf->mcast_entry);
-	DP_TRACE_STATS(FATAL, "bcast_entry = %u\n",
-			dp_stats_buf->bcast_entry);
+	DP_PRINT_STATS("HTT_TX_DE_CLASSIFY_STATS_TLV:");
+	DP_PRINT_STATS("arp_packets = %u",
+		       dp_stats_buf->arp_packets);
+	DP_PRINT_STATS("igmp_packets = %u",
+		       dp_stats_buf->igmp_packets);
+	DP_PRINT_STATS("dhcp_packets = %u",
+		       dp_stats_buf->dhcp_packets);
+	DP_PRINT_STATS("host_inspected = %u",
+		       dp_stats_buf->host_inspected);
+	DP_PRINT_STATS("htt_included = %u",
+		       dp_stats_buf->htt_included);
+	DP_PRINT_STATS("htt_valid_mcs = %u",
+		       dp_stats_buf->htt_valid_mcs);
+	DP_PRINT_STATS("htt_valid_nss = %u",
+		       dp_stats_buf->htt_valid_nss);
+	DP_PRINT_STATS("htt_valid_preamble_type = %u",
+		       dp_stats_buf->htt_valid_preamble_type);
+	DP_PRINT_STATS("htt_valid_chainmask = %u",
+		       dp_stats_buf->htt_valid_chainmask);
+	DP_PRINT_STATS("htt_valid_guard_interval = %u",
+		       dp_stats_buf->htt_valid_guard_interval);
+	DP_PRINT_STATS("htt_valid_retries = %u",
+		       dp_stats_buf->htt_valid_retries);
+	DP_PRINT_STATS("htt_valid_bw_info = %u",
+		       dp_stats_buf->htt_valid_bw_info);
+	DP_PRINT_STATS("htt_valid_power = %u",
+		       dp_stats_buf->htt_valid_power);
+	DP_PRINT_STATS("htt_valid_key_flags = %u",
+		       dp_stats_buf->htt_valid_key_flags);
+	DP_PRINT_STATS("htt_valid_no_encryption = %u",
+		       dp_stats_buf->htt_valid_no_encryption);
+	DP_PRINT_STATS("fse_entry_count = %u",
+		       dp_stats_buf->fse_entry_count);
+	DP_PRINT_STATS("fse_priority_be = %u",
+		       dp_stats_buf->fse_priority_be);
+	DP_PRINT_STATS("fse_priority_high = %u",
+		       dp_stats_buf->fse_priority_high);
+	DP_PRINT_STATS("fse_priority_low = %u",
+		       dp_stats_buf->fse_priority_low);
+	DP_PRINT_STATS("fse_traffic_ptrn_be = %u",
+		       dp_stats_buf->fse_traffic_ptrn_be);
+	DP_PRINT_STATS("fse_traffic_ptrn_over_sub = %u",
+		       dp_stats_buf->fse_traffic_ptrn_over_sub);
+	DP_PRINT_STATS("fse_traffic_ptrn_bursty = %u",
+		       dp_stats_buf->fse_traffic_ptrn_bursty);
+	DP_PRINT_STATS("fse_traffic_ptrn_interactive = %u",
+		       dp_stats_buf->fse_traffic_ptrn_interactive);
+	DP_PRINT_STATS("fse_traffic_ptrn_periodic = %u",
+		       dp_stats_buf->fse_traffic_ptrn_periodic);
+	DP_PRINT_STATS("fse_hwqueue_alloc = %u",
+		       dp_stats_buf->fse_hwqueue_alloc);
+	DP_PRINT_STATS("fse_hwqueue_created = %u",
+		       dp_stats_buf->fse_hwqueue_created);
+	DP_PRINT_STATS("fse_hwqueue_send_to_host = %u",
+		       dp_stats_buf->fse_hwqueue_send_to_host);
+	DP_PRINT_STATS("mcast_entry = %u",
+		       dp_stats_buf->mcast_entry);
+	DP_PRINT_STATS("bcast_entry = %u\n",
+		       dp_stats_buf->bcast_entry);
 }
 
 /*
@@ -2111,23 +2113,23 @@ static inline void dp_print_tx_de_classify_status_stats_tlv(uint32_t *tag_buf)
 	htt_tx_de_classify_status_stats_tlv *dp_stats_buf =
 		(htt_tx_de_classify_status_stats_tlv *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_DE_CLASSIFY_STATUS_STATS_TLV:");
-	DP_TRACE_STATS(FATAL, "eok = %u",
-			dp_stats_buf->eok);
-	DP_TRACE_STATS(FATAL, "classify_done = %u",
-			dp_stats_buf->classify_done);
-	DP_TRACE_STATS(FATAL, "lookup_failed = %u",
-			dp_stats_buf->lookup_failed);
-	DP_TRACE_STATS(FATAL, "send_host_dhcp = %u",
-			dp_stats_buf->send_host_dhcp);
-	DP_TRACE_STATS(FATAL, "send_host_mcast = %u",
-			dp_stats_buf->send_host_mcast);
-	DP_TRACE_STATS(FATAL, "send_host_unknown_dest = %u",
-			dp_stats_buf->send_host_unknown_dest);
-	DP_TRACE_STATS(FATAL, "send_host = %u",
-			dp_stats_buf->send_host);
-	DP_TRACE_STATS(FATAL, "status_invalid = %u\n",
-			dp_stats_buf->status_invalid);
+	DP_PRINT_STATS("HTT_TX_DE_CLASSIFY_STATUS_STATS_TLV:");
+	DP_PRINT_STATS("eok = %u",
+		       dp_stats_buf->eok);
+	DP_PRINT_STATS("classify_done = %u",
+		       dp_stats_buf->classify_done);
+	DP_PRINT_STATS("lookup_failed = %u",
+		       dp_stats_buf->lookup_failed);
+	DP_PRINT_STATS("send_host_dhcp = %u",
+		       dp_stats_buf->send_host_dhcp);
+	DP_PRINT_STATS("send_host_mcast = %u",
+		       dp_stats_buf->send_host_mcast);
+	DP_PRINT_STATS("send_host_unknown_dest = %u",
+		       dp_stats_buf->send_host_unknown_dest);
+	DP_PRINT_STATS("send_host = %u",
+		       dp_stats_buf->send_host);
+	DP_PRINT_STATS("status_invalid = %u\n",
+		       dp_stats_buf->status_invalid);
 }
 
 /*
@@ -2142,13 +2144,13 @@ static inline void dp_print_tx_de_enqueue_packets_stats_tlv(uint32_t *tag_buf)
 	htt_tx_de_enqueue_packets_stats_tlv *dp_stats_buf =
 		(htt_tx_de_enqueue_packets_stats_tlv *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_DE_ENQUEUE_PACKETS_STATS_TLV:");
-	DP_TRACE_STATS(FATAL, "enqueued_pkts = %u",
-			dp_stats_buf->enqueued_pkts);
-	DP_TRACE_STATS(FATAL, "to_tqm = %u",
-			dp_stats_buf->to_tqm);
-	DP_TRACE_STATS(FATAL, "to_tqm_bypass = %u\n",
-			dp_stats_buf->to_tqm_bypass);
+	DP_PRINT_STATS("HTT_TX_DE_ENQUEUE_PACKETS_STATS_TLV:");
+	DP_PRINT_STATS("enqueued_pkts = %u",
+		       dp_stats_buf->enqueued_pkts);
+	DP_PRINT_STATS("to_tqm = %u",
+		       dp_stats_buf->to_tqm);
+	DP_PRINT_STATS("to_tqm_bypass = %u\n",
+		       dp_stats_buf->to_tqm_bypass);
 }
 
 /*
@@ -2163,13 +2165,13 @@ static inline void dp_print_tx_de_enqueue_discard_stats_tlv(uint32_t *tag_buf)
 	htt_tx_de_enqueue_discard_stats_tlv *dp_stats_buf =
 		(htt_tx_de_enqueue_discard_stats_tlv *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_DE_ENQUEUE_DISCARD_STATS_TLV:");
-	DP_TRACE_STATS(FATAL, "discarded_pkts = %u",
-			dp_stats_buf->discarded_pkts);
-	DP_TRACE_STATS(FATAL, "local_frames = %u",
-			dp_stats_buf->local_frames);
-	DP_TRACE_STATS(FATAL, "is_ext_msdu = %u\n",
-			dp_stats_buf->is_ext_msdu);
+	DP_PRINT_STATS("HTT_TX_DE_ENQUEUE_DISCARD_STATS_TLV:");
+	DP_PRINT_STATS("discarded_pkts = %u",
+		       dp_stats_buf->discarded_pkts);
+	DP_PRINT_STATS("local_frames = %u",
+		       dp_stats_buf->local_frames);
+	DP_PRINT_STATS("is_ext_msdu = %u\n",
+		       dp_stats_buf->is_ext_msdu);
 }
 
 /*
@@ -2183,17 +2185,17 @@ static inline void dp_print_tx_de_compl_stats_tlv(uint32_t *tag_buf)
 	htt_tx_de_compl_stats_tlv *dp_stats_buf =
 		(htt_tx_de_compl_stats_tlv *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_DE_COMPL_STATS_TLV:");
-	DP_TRACE_STATS(FATAL, "tcl_dummy_frame = %u",
-			dp_stats_buf->tcl_dummy_frame);
-	DP_TRACE_STATS(FATAL, "tqm_dummy_frame = %u",
-			dp_stats_buf->tqm_dummy_frame);
-	DP_TRACE_STATS(FATAL, "tqm_notify_frame = %u",
-			dp_stats_buf->tqm_notify_frame);
-	DP_TRACE_STATS(FATAL, "fw2wbm_enq = %u",
-			dp_stats_buf->fw2wbm_enq);
-	DP_TRACE_STATS(FATAL, "tqm_bypass_frame = %u\n",
-			dp_stats_buf->tqm_bypass_frame);
+	DP_PRINT_STATS("HTT_TX_DE_COMPL_STATS_TLV:");
+	DP_PRINT_STATS("tcl_dummy_frame = %u",
+		       dp_stats_buf->tcl_dummy_frame);
+	DP_PRINT_STATS("tqm_dummy_frame = %u",
+		       dp_stats_buf->tqm_dummy_frame);
+	DP_PRINT_STATS("tqm_notify_frame = %u",
+		       dp_stats_buf->tqm_notify_frame);
+	DP_PRINT_STATS("fw2wbm_enq = %u",
+		       dp_stats_buf->fw2wbm_enq);
+	DP_PRINT_STATS("tqm_bypass_frame = %u\n",
+		       dp_stats_buf->tqm_bypass_frame);
 }
 
 /*
@@ -2207,21 +2209,21 @@ static inline void dp_print_tx_de_cmn_stats_tlv(uint32_t *tag_buf)
 	htt_tx_de_cmn_stats_tlv *dp_stats_buf =
 		(htt_tx_de_cmn_stats_tlv *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_TX_DE_CMN_STATS_TLV:");
-	DP_TRACE_STATS(FATAL, "mac_id__word = %u",
-			dp_stats_buf->mac_id__word);
-	DP_TRACE_STATS(FATAL, "tcl2fw_entry_count = %u",
-			dp_stats_buf->tcl2fw_entry_count);
-	DP_TRACE_STATS(FATAL, "not_to_fw = %u",
-			dp_stats_buf->not_to_fw);
-	DP_TRACE_STATS(FATAL, "invalid_pdev_vdev_peer = %u",
-			dp_stats_buf->invalid_pdev_vdev_peer);
-	DP_TRACE_STATS(FATAL, "tcl_res_invalid_addrx = %u",
-			dp_stats_buf->tcl_res_invalid_addrx);
-	DP_TRACE_STATS(FATAL, "wbm2fw_entry_count = %u",
-			dp_stats_buf->wbm2fw_entry_count);
-	DP_TRACE_STATS(FATAL, "invalid_pdev = %u\n",
-			dp_stats_buf->invalid_pdev);
+	DP_PRINT_STATS("HTT_TX_DE_CMN_STATS_TLV:");
+	DP_PRINT_STATS("mac_id__word = %u",
+		       dp_stats_buf->mac_id__word);
+	DP_PRINT_STATS("tcl2fw_entry_count = %u",
+		       dp_stats_buf->tcl2fw_entry_count);
+	DP_PRINT_STATS("not_to_fw = %u",
+		       dp_stats_buf->not_to_fw);
+	DP_PRINT_STATS("invalid_pdev_vdev_peer = %u",
+		       dp_stats_buf->invalid_pdev_vdev_peer);
+	DP_PRINT_STATS("tcl_res_invalid_addrx = %u",
+		       dp_stats_buf->tcl_res_invalid_addrx);
+	DP_PRINT_STATS("wbm2fw_entry_count = %u",
+		       dp_stats_buf->wbm2fw_entry_count);
+	DP_PRINT_STATS("invalid_pdev = %u\n",
+		       dp_stats_buf->invalid_pdev);
 }
 
 /*
@@ -2244,29 +2246,29 @@ static inline void dp_print_ring_if_stats_tlv(uint32_t *tag_buf)
 		return;
 	}
 
-	DP_TRACE_STATS(FATAL, "HTT_RING_IF_STATS_TLV:");
-	DP_TRACE_STATS(FATAL, "base_addr = %u",
-			dp_stats_buf->base_addr);
-	DP_TRACE_STATS(FATAL, "elem_size = %u",
-			dp_stats_buf->elem_size);
-	DP_TRACE_STATS(FATAL, "num_elems__prefetch_tail_idx = %u",
-			dp_stats_buf->num_elems__prefetch_tail_idx);
-	DP_TRACE_STATS(FATAL, "head_idx__tail_idx = %u",
-			dp_stats_buf->head_idx__tail_idx);
-	DP_TRACE_STATS(FATAL, "shadow_head_idx__shadow_tail_idx = %u",
-			dp_stats_buf->shadow_head_idx__shadow_tail_idx);
-	DP_TRACE_STATS(FATAL, "num_tail_incr = %u",
-			dp_stats_buf->num_tail_incr);
-	DP_TRACE_STATS(FATAL, "lwm_thresh__hwm_thresh = %u",
-			dp_stats_buf->lwm_thresh__hwm_thresh);
-	DP_TRACE_STATS(FATAL, "overrun_hit_count = %u",
-			dp_stats_buf->overrun_hit_count);
-	DP_TRACE_STATS(FATAL, "underrun_hit_count = %u",
-			dp_stats_buf->underrun_hit_count);
-	DP_TRACE_STATS(FATAL, "prod_blockwait_count = %u",
-			dp_stats_buf->prod_blockwait_count);
-	DP_TRACE_STATS(FATAL, "cons_blockwait_count = %u",
-			dp_stats_buf->cons_blockwait_count);
+	DP_PRINT_STATS("HTT_RING_IF_STATS_TLV:");
+	DP_PRINT_STATS("base_addr = %u",
+		       dp_stats_buf->base_addr);
+	DP_PRINT_STATS("elem_size = %u",
+		       dp_stats_buf->elem_size);
+	DP_PRINT_STATS("num_elems__prefetch_tail_idx = %u",
+		       dp_stats_buf->num_elems__prefetch_tail_idx);
+	DP_PRINT_STATS("head_idx__tail_idx = %u",
+		       dp_stats_buf->head_idx__tail_idx);
+	DP_PRINT_STATS("shadow_head_idx__shadow_tail_idx = %u",
+		       dp_stats_buf->shadow_head_idx__shadow_tail_idx);
+	DP_PRINT_STATS("num_tail_incr = %u",
+		       dp_stats_buf->num_tail_incr);
+	DP_PRINT_STATS("lwm_thresh__hwm_thresh = %u",
+		       dp_stats_buf->lwm_thresh__hwm_thresh);
+	DP_PRINT_STATS("overrun_hit_count = %u",
+		       dp_stats_buf->overrun_hit_count);
+	DP_PRINT_STATS("underrun_hit_count = %u",
+		       dp_stats_buf->underrun_hit_count);
+	DP_PRINT_STATS("prod_blockwait_count = %u",
+		       dp_stats_buf->prod_blockwait_count);
+	DP_PRINT_STATS("cons_blockwait_count = %u",
+		       dp_stats_buf->cons_blockwait_count);
 
 	for (i = 0; i <  DP_HTT_LOW_WM_HIT_COUNT_LEN; i++) {
 		index += qdf_snprint(&wm_hit_count[index],
@@ -2274,7 +2276,7 @@ static inline void dp_print_ring_if_stats_tlv(uint32_t *tag_buf)
 				" %u:%u,", i,
 				dp_stats_buf->low_wm_hit_count[i]);
 	}
-	DP_TRACE_STATS(FATAL, "low_wm_hit_count = %s ", wm_hit_count);
+	DP_PRINT_STATS("low_wm_hit_count = %s ", wm_hit_count);
 
 	qdf_mem_zero(wm_hit_count, DP_MAX_STRING_LEN);
 
@@ -2285,7 +2287,7 @@ static inline void dp_print_ring_if_stats_tlv(uint32_t *tag_buf)
 				" %u:%u,", i,
 				dp_stats_buf->high_wm_hit_count[i]);
 	}
-	DP_TRACE_STATS(FATAL, "high_wm_hit_count = %s\n", wm_hit_count);
+	DP_PRINT_STATS("high_wm_hit_count = %s\n", wm_hit_count);
 }
 
 /*
@@ -2299,11 +2301,11 @@ static inline void dp_print_ring_if_cmn_tlv(uint32_t *tag_buf)
 	htt_ring_if_cmn_tlv *dp_stats_buf =
 		(htt_ring_if_cmn_tlv *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_RING_IF_CMN_TLV:");
-	DP_TRACE_STATS(FATAL, "mac_id__word = %u",
-			dp_stats_buf->mac_id__word);
-	DP_TRACE_STATS(FATAL, "num_records = %u\n",
-			dp_stats_buf->num_records);
+	DP_PRINT_STATS("HTT_RING_IF_CMN_TLV:");
+	DP_PRINT_STATS("mac_id__word = %u",
+		       dp_stats_buf->mac_id__word);
+	DP_PRINT_STATS("num_records = %u\n",
+		       dp_stats_buf->num_records);
 }
 
 /*
@@ -2327,15 +2329,15 @@ static inline void dp_print_sfm_client_user_tlv_v(uint32_t *tag_buf)
 		return;
 	}
 
-	DP_TRACE_STATS(FATAL, "HTT_SFM_CLIENT_USER_TLV_V:");
+	DP_PRINT_STATS("HTT_SFM_CLIENT_USER_TLV_V:");
 	for (i = 0; i <  tag_len; i++) {
 		index += qdf_snprint(&dwords_used_by_user_n[index],
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i,
 				dp_stats_buf->dwords_used_by_user_n[i]);
 	}
-	DP_TRACE_STATS(FATAL, "dwords_used_by_user_n = %s\n",
-			dwords_used_by_user_n);
+	DP_PRINT_STATS("dwords_used_by_user_n = %s\n",
+		       dwords_used_by_user_n);
 	qdf_mem_free(dwords_used_by_user_n);
 }
 
@@ -2350,21 +2352,21 @@ static inline void dp_print_sfm_client_tlv(uint32_t *tag_buf)
 	htt_sfm_client_tlv *dp_stats_buf =
 		(htt_sfm_client_tlv *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_SFM_CLIENT_TLV:");
-	DP_TRACE_STATS(FATAL, "client_id = %u",
-			dp_stats_buf->client_id);
-	DP_TRACE_STATS(FATAL, "buf_min = %u",
-			dp_stats_buf->buf_min);
-	DP_TRACE_STATS(FATAL, "buf_max = %u",
-			dp_stats_buf->buf_max);
-	DP_TRACE_STATS(FATAL, "buf_busy = %u",
-			dp_stats_buf->buf_busy);
-	DP_TRACE_STATS(FATAL, "buf_alloc = %u",
-			dp_stats_buf->buf_alloc);
-	DP_TRACE_STATS(FATAL, "buf_avail = %u",
-			dp_stats_buf->buf_avail);
-	DP_TRACE_STATS(FATAL, "num_users = %u\n",
-			dp_stats_buf->num_users);
+	DP_PRINT_STATS("HTT_SFM_CLIENT_TLV:");
+	DP_PRINT_STATS("client_id = %u",
+		       dp_stats_buf->client_id);
+	DP_PRINT_STATS("buf_min = %u",
+		       dp_stats_buf->buf_min);
+	DP_PRINT_STATS("buf_max = %u",
+		       dp_stats_buf->buf_max);
+	DP_PRINT_STATS("buf_busy = %u",
+		       dp_stats_buf->buf_busy);
+	DP_PRINT_STATS("buf_alloc = %u",
+		       dp_stats_buf->buf_alloc);
+	DP_PRINT_STATS("buf_avail = %u",
+		       dp_stats_buf->buf_avail);
+	DP_PRINT_STATS("num_users = %u\n",
+		       dp_stats_buf->num_users);
 }
 
 /*
@@ -2378,17 +2380,17 @@ static inline void dp_print_sfm_cmn_tlv(uint32_t *tag_buf)
 	htt_sfm_cmn_tlv *dp_stats_buf =
 		(htt_sfm_cmn_tlv *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_SFM_CMN_TLV:");
-	DP_TRACE_STATS(FATAL, "mac_id__word = %u",
-			dp_stats_buf->mac_id__word);
-	DP_TRACE_STATS(FATAL, "buf_total = %u",
-			dp_stats_buf->buf_total);
-	DP_TRACE_STATS(FATAL, "mem_empty = %u",
-			dp_stats_buf->mem_empty);
-	DP_TRACE_STATS(FATAL, "deallocate_bufs = %u",
-			dp_stats_buf->deallocate_bufs);
-	DP_TRACE_STATS(FATAL, "num_records = %u\n",
-			dp_stats_buf->num_records);
+	DP_PRINT_STATS("HTT_SFM_CMN_TLV:");
+	DP_PRINT_STATS("mac_id__word = %u",
+		       dp_stats_buf->mac_id__word);
+	DP_PRINT_STATS("buf_total = %u",
+		       dp_stats_buf->buf_total);
+	DP_PRINT_STATS("mem_empty = %u",
+		       dp_stats_buf->mem_empty);
+	DP_PRINT_STATS("deallocate_bufs = %u",
+		       dp_stats_buf->deallocate_bufs);
+	DP_PRINT_STATS("num_records = %u\n",
+		       dp_stats_buf->num_records);
 }
 
 /*
@@ -2402,25 +2404,25 @@ static inline void dp_print_sring_stats_tlv(uint32_t *tag_buf)
 	htt_sring_stats_tlv *dp_stats_buf =
 		(htt_sring_stats_tlv *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_SRING_STATS_TLV:");
-	DP_TRACE_STATS(FATAL, "mac_id__ring_id__arena__ep = %u",
-			dp_stats_buf->mac_id__ring_id__arena__ep);
-	DP_TRACE_STATS(FATAL, "base_addr_lsb = %u",
-			dp_stats_buf->base_addr_lsb);
-	DP_TRACE_STATS(FATAL, "base_addr_msb = %u",
-			dp_stats_buf->base_addr_msb);
-	DP_TRACE_STATS(FATAL, "ring_size = %u",
-			dp_stats_buf->ring_size);
-	DP_TRACE_STATS(FATAL, "elem_size = %u",
-			dp_stats_buf->elem_size);
-	DP_TRACE_STATS(FATAL, "num_avail_words__num_valid_words = %u",
-			dp_stats_buf->num_avail_words__num_valid_words);
-	DP_TRACE_STATS(FATAL, "head_ptr__tail_ptr = %u",
-			dp_stats_buf->head_ptr__tail_ptr);
-	DP_TRACE_STATS(FATAL, "consumer_empty__producer_full = %u",
-			dp_stats_buf->consumer_empty__producer_full);
-	DP_TRACE_STATS(FATAL, "prefetch_count__internal_tail_ptr = %u\n",
-			dp_stats_buf->prefetch_count__internal_tail_ptr);
+	DP_PRINT_STATS("HTT_SRING_STATS_TLV:");
+	DP_PRINT_STATS("mac_id__ring_id__arena__ep = %u",
+		       dp_stats_buf->mac_id__ring_id__arena__ep);
+	DP_PRINT_STATS("base_addr_lsb = %u",
+		       dp_stats_buf->base_addr_lsb);
+	DP_PRINT_STATS("base_addr_msb = %u",
+		       dp_stats_buf->base_addr_msb);
+	DP_PRINT_STATS("ring_size = %u",
+		       dp_stats_buf->ring_size);
+	DP_PRINT_STATS("elem_size = %u",
+		       dp_stats_buf->elem_size);
+	DP_PRINT_STATS("num_avail_words__num_valid_words = %u",
+		       dp_stats_buf->num_avail_words__num_valid_words);
+	DP_PRINT_STATS("head_ptr__tail_ptr = %u",
+		       dp_stats_buf->head_ptr__tail_ptr);
+	DP_PRINT_STATS("consumer_empty__producer_full = %u",
+		       dp_stats_buf->consumer_empty__producer_full);
+	DP_PRINT_STATS("prefetch_count__internal_tail_ptr = %u\n",
+		       dp_stats_buf->prefetch_count__internal_tail_ptr);
 }
 
 /*
@@ -2434,9 +2436,9 @@ static inline void dp_print_sring_cmn_tlv(uint32_t *tag_buf)
 	htt_sring_cmn_tlv *dp_stats_buf =
 		(htt_sring_cmn_tlv *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_SRING_CMN_TLV:");
-	DP_TRACE_STATS(FATAL, "num_records = %u\n",
-			dp_stats_buf->num_records);
+	DP_PRINT_STATS("HTT_SRING_CMN_TLV:");
+	DP_PRINT_STATS("num_records = %u\n",
+		       dp_stats_buf->num_records);
 }
 
 /*
@@ -3067,29 +3069,29 @@ static inline void dp_print_rx_soc_fw_stats_tlv(uint32_t *tag_buf)
 	htt_rx_soc_fw_stats_tlv *dp_stats_buf =
 		(htt_rx_soc_fw_stats_tlv *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_RX_SOC_FW_STATS_TLV:");
-	DP_TRACE_STATS(FATAL, "fw_reo_ring_data_msdu = %u",
-		      dp_stats_buf->fw_reo_ring_data_msdu);
-	DP_TRACE_STATS(FATAL, "fw_to_host_data_msdu_bcmc = %u",
-		      dp_stats_buf->fw_to_host_data_msdu_bcmc);
-	DP_TRACE_STATS(FATAL, "fw_to_host_data_msdu_uc = %u",
-		      dp_stats_buf->fw_to_host_data_msdu_uc);
-	DP_TRACE_STATS(FATAL, "ofld_remote_data_buf_recycle_cnt = %u",
-		      dp_stats_buf->ofld_remote_data_buf_recycle_cnt);
-	DP_TRACE_STATS(FATAL, "ofld_remote_free_buf_indication_cnt = %u",
-		      dp_stats_buf->ofld_remote_free_buf_indication_cnt);
-	DP_TRACE_STATS(FATAL, "ofld_buf_to_host_data_msdu_uc = %u ",
-		      dp_stats_buf->ofld_buf_to_host_data_msdu_uc);
-	DP_TRACE_STATS(FATAL, "reo_fw_ring_to_host_data_msdu_uc = %u ",
-		      dp_stats_buf->reo_fw_ring_to_host_data_msdu_uc);
-	DP_TRACE_STATS(FATAL, "wbm_sw_ring_reap = %u ",
-		      dp_stats_buf->wbm_sw_ring_reap);
-	DP_TRACE_STATS(FATAL, "wbm_forward_to_host_cnt = %u ",
-		      dp_stats_buf->wbm_forward_to_host_cnt);
-	DP_TRACE_STATS(FATAL, "wbm_target_recycle_cnt = %u ",
-		      dp_stats_buf->wbm_target_recycle_cnt);
-	DP_TRACE_STATS(FATAL, "target_refill_ring_recycle_cnt = %u",
-		      dp_stats_buf->target_refill_ring_recycle_cnt);
+	DP_PRINT_STATS("HTT_RX_SOC_FW_STATS_TLV:");
+	DP_PRINT_STATS("fw_reo_ring_data_msdu = %u",
+		       dp_stats_buf->fw_reo_ring_data_msdu);
+	DP_PRINT_STATS("fw_to_host_data_msdu_bcmc = %u",
+		       dp_stats_buf->fw_to_host_data_msdu_bcmc);
+	DP_PRINT_STATS("fw_to_host_data_msdu_uc = %u",
+		       dp_stats_buf->fw_to_host_data_msdu_uc);
+	DP_PRINT_STATS("ofld_remote_data_buf_recycle_cnt = %u",
+		       dp_stats_buf->ofld_remote_data_buf_recycle_cnt);
+	DP_PRINT_STATS("ofld_remote_free_buf_indication_cnt = %u",
+		       dp_stats_buf->ofld_remote_free_buf_indication_cnt);
+	DP_PRINT_STATS("ofld_buf_to_host_data_msdu_uc = %u ",
+		       dp_stats_buf->ofld_buf_to_host_data_msdu_uc);
+	DP_PRINT_STATS("reo_fw_ring_to_host_data_msdu_uc = %u ",
+		       dp_stats_buf->reo_fw_ring_to_host_data_msdu_uc);
+	DP_PRINT_STATS("wbm_sw_ring_reap = %u ",
+		       dp_stats_buf->wbm_sw_ring_reap);
+	DP_PRINT_STATS("wbm_forward_to_host_cnt = %u ",
+		       dp_stats_buf->wbm_forward_to_host_cnt);
+	DP_PRINT_STATS("wbm_target_recycle_cnt = %u ",
+		       dp_stats_buf->wbm_target_recycle_cnt);
+	DP_PRINT_STATS("target_refill_ring_recycle_cnt = %u",
+		       dp_stats_buf->target_refill_ring_recycle_cnt);
 
 }
 
@@ -3117,15 +3119,15 @@ static inline void dp_print_rx_soc_fw_refill_ring_empty_tlv_v(uint32_t *tag_buf)
 
 	tag_len = qdf_min(tag_len, (uint32_t)HTT_RX_STATS_REFILL_MAX_RING);
 
-	DP_TRACE_STATS(FATAL, "HTT_RX_SOC_FW_REFILL_RING_EMPTY_TLV_V:");
+	DP_PRINT_STATS("HTT_RX_SOC_FW_REFILL_RING_EMPTY_TLV_V:");
 	for (i = 0; i <  tag_len; i++) {
 		index += qdf_snprint(&refill_ring_empty_cnt[index],
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i,
 				dp_stats_buf->refill_ring_empty_cnt[i]);
 	}
-	DP_TRACE_STATS(FATAL, "refill_ring_empty_cnt = %s\n",
-			refill_ring_empty_cnt);
+	DP_PRINT_STATS("refill_ring_empty_cnt = %s\n",
+		       refill_ring_empty_cnt);
 	qdf_mem_free(refill_ring_empty_cnt);
 }
 
@@ -3154,15 +3156,15 @@ static inline void dp_print_rx_soc_fw_refill_ring_num_refill_tlv_v(
 
 	tag_len = qdf_min(tag_len, (uint32_t)HTT_TX_PDEV_MAX_URRN_STATS);
 
-	DP_TRACE_STATS(FATAL, "HTT_RX_SOC_FW_REFILL_RING_NUM_REFILL_TLV_V:");
+	DP_PRINT_STATS("HTT_RX_SOC_FW_REFILL_RING_NUM_REFILL_TLV_V:");
 	for (i = 0; i <  tag_len; i++) {
 		index += qdf_snprint(&refill_ring_num_refill[index],
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i,
 				dp_stats_buf->refill_ring_num_refill[i]);
 	}
-	DP_TRACE_STATS(FATAL, "refill_ring_num_refill = %s\n",
-			refill_ring_num_refill);
+	DP_PRINT_STATS("refill_ring_num_refill = %s\n",
+		       refill_ring_num_refill);
 	qdf_mem_free(refill_ring_num_refill);
 }
 
@@ -3181,25 +3183,25 @@ static inline void dp_print_rx_pdev_fw_stats_tlv(uint32_t *tag_buf)
 	char fw_ring_mgmt_subtype[DP_MAX_STRING_LEN];
 	char fw_ring_ctrl_subtype[DP_MAX_STRING_LEN];
 
-	DP_TRACE_STATS(FATAL, "HTT_RX_PDEV_FW_STATS_TLV:");
-	DP_TRACE_STATS(FATAL, "mac_id__word = %u",
-			dp_stats_buf->mac_id__word);
-	DP_TRACE_STATS(FATAL, "ppdu_recvd = %u",
-			dp_stats_buf->ppdu_recvd);
-	DP_TRACE_STATS(FATAL, "mpdu_cnt_fcs_ok = %u",
-			dp_stats_buf->mpdu_cnt_fcs_ok);
-	DP_TRACE_STATS(FATAL, "mpdu_cnt_fcs_err = %u",
-			dp_stats_buf->mpdu_cnt_fcs_err);
-	DP_TRACE_STATS(FATAL, "tcp_msdu_cnt = %u",
-			dp_stats_buf->tcp_msdu_cnt);
-	DP_TRACE_STATS(FATAL, "tcp_ack_msdu_cnt = %u",
-			dp_stats_buf->tcp_ack_msdu_cnt);
-	DP_TRACE_STATS(FATAL, "udp_msdu_cnt = %u",
-			dp_stats_buf->udp_msdu_cnt);
-	DP_TRACE_STATS(FATAL, "other_msdu_cnt = %u",
-			dp_stats_buf->other_msdu_cnt);
-	DP_TRACE_STATS(FATAL, "fw_ring_mpdu_ind = %u",
-			dp_stats_buf->fw_ring_mpdu_ind);
+	DP_PRINT_STATS("HTT_RX_PDEV_FW_STATS_TLV:");
+	DP_PRINT_STATS("mac_id__word = %u",
+		       dp_stats_buf->mac_id__word);
+	DP_PRINT_STATS("ppdu_recvd = %u",
+		       dp_stats_buf->ppdu_recvd);
+	DP_PRINT_STATS("mpdu_cnt_fcs_ok = %u",
+		       dp_stats_buf->mpdu_cnt_fcs_ok);
+	DP_PRINT_STATS("mpdu_cnt_fcs_err = %u",
+		       dp_stats_buf->mpdu_cnt_fcs_err);
+	DP_PRINT_STATS("tcp_msdu_cnt = %u",
+		       dp_stats_buf->tcp_msdu_cnt);
+	DP_PRINT_STATS("tcp_ack_msdu_cnt = %u",
+		       dp_stats_buf->tcp_ack_msdu_cnt);
+	DP_PRINT_STATS("udp_msdu_cnt = %u",
+		       dp_stats_buf->udp_msdu_cnt);
+	DP_PRINT_STATS("other_msdu_cnt = %u",
+		       dp_stats_buf->other_msdu_cnt);
+	DP_PRINT_STATS("fw_ring_mpdu_ind = %u",
+		       dp_stats_buf->fw_ring_mpdu_ind);
 
 	for (i = 0; i <  DP_HTT_FW_RING_MGMT_SUBTYPE_LEN; i++) {
 		index += qdf_snprint(&fw_ring_mgmt_subtype[index],
@@ -3207,7 +3209,7 @@ static inline void dp_print_rx_pdev_fw_stats_tlv(uint32_t *tag_buf)
 				" %u:%u,", i,
 				dp_stats_buf->fw_ring_mgmt_subtype[i]);
 	}
-	DP_TRACE_STATS(FATAL, "fw_ring_mgmt_subtype = %s ", fw_ring_mgmt_subtype);
+	DP_PRINT_STATS("fw_ring_mgmt_subtype = %s ", fw_ring_mgmt_subtype);
 
 	index = 0;
 	for (i = 0; i <  DP_HTT_FW_RING_CTRL_SUBTYPE_LEN; i++) {
@@ -3216,75 +3218,75 @@ static inline void dp_print_rx_pdev_fw_stats_tlv(uint32_t *tag_buf)
 				" %u:%u,", i,
 				dp_stats_buf->fw_ring_ctrl_subtype[i]);
 	}
-	DP_TRACE_STATS(FATAL, "fw_ring_ctrl_subtype = %s ", fw_ring_ctrl_subtype);
-	DP_TRACE_STATS(FATAL, "fw_ring_mcast_data_msdu = %u",
-			dp_stats_buf->fw_ring_mcast_data_msdu);
-	DP_TRACE_STATS(FATAL, "fw_ring_bcast_data_msdu = %u",
-			dp_stats_buf->fw_ring_bcast_data_msdu);
-	DP_TRACE_STATS(FATAL, "fw_ring_ucast_data_msdu = %u",
-			dp_stats_buf->fw_ring_ucast_data_msdu);
-	DP_TRACE_STATS(FATAL, "fw_ring_null_data_msdu = %u",
-			dp_stats_buf->fw_ring_null_data_msdu);
-	DP_TRACE_STATS(FATAL, "fw_ring_mpdu_drop = %u",
-			dp_stats_buf->fw_ring_mpdu_drop);
-	DP_TRACE_STATS(FATAL, "ofld_local_data_ind_cnt = %u",
-			dp_stats_buf->ofld_local_data_ind_cnt);
-	DP_TRACE_STATS(FATAL, "ofld_local_data_buf_recycle_cnt = %u",
-			dp_stats_buf->ofld_local_data_buf_recycle_cnt);
-	DP_TRACE_STATS(FATAL, "drx_local_data_ind_cnt = %u",
-			dp_stats_buf->drx_local_data_ind_cnt);
-	DP_TRACE_STATS(FATAL, "drx_local_data_buf_recycle_cnt = %u",
-			dp_stats_buf->drx_local_data_buf_recycle_cnt);
-	DP_TRACE_STATS(FATAL, "local_nondata_ind_cnt = %u",
-			dp_stats_buf->local_nondata_ind_cnt);
-	DP_TRACE_STATS(FATAL, "local_nondata_buf_recycle_cnt = %u",
-			dp_stats_buf->local_nondata_buf_recycle_cnt);
-	DP_TRACE_STATS(FATAL, "fw_status_buf_ring_refill_cnt = %u",
-			dp_stats_buf->fw_status_buf_ring_refill_cnt);
-	DP_TRACE_STATS(FATAL, "fw_status_buf_ring_empty_cnt = %u",
-			dp_stats_buf->fw_status_buf_ring_empty_cnt);
-	DP_TRACE_STATS(FATAL, "fw_pkt_buf_ring_refill_cnt = %u",
-			dp_stats_buf->fw_pkt_buf_ring_refill_cnt);
-	DP_TRACE_STATS(FATAL, "fw_pkt_buf_ring_empty_cnt = %u",
-			dp_stats_buf->fw_pkt_buf_ring_empty_cnt);
-	DP_TRACE_STATS(FATAL, "fw_link_buf_ring_refill_cnt = %u",
-			dp_stats_buf->fw_link_buf_ring_refill_cnt);
-	DP_TRACE_STATS(FATAL, "fw_link_buf_ring_empty_cnt = %u",
-			dp_stats_buf->fw_link_buf_ring_empty_cnt);
-	DP_TRACE_STATS(FATAL, "host_pkt_buf_ring_refill_cnt = %u",
-			dp_stats_buf->host_pkt_buf_ring_refill_cnt);
-	DP_TRACE_STATS(FATAL, "host_pkt_buf_ring_empty_cnt = %u",
-			dp_stats_buf->host_pkt_buf_ring_empty_cnt);
-	DP_TRACE_STATS(FATAL, "mon_pkt_buf_ring_refill_cnt = %u",
-			dp_stats_buf->mon_pkt_buf_ring_refill_cnt);
-	DP_TRACE_STATS(FATAL, "mon_pkt_buf_ring_empty_cnt = %u",
-			dp_stats_buf->mon_pkt_buf_ring_empty_cnt);
-	DP_TRACE_STATS(FATAL, "mon_status_buf_ring_refill_cnt = %u",
-			dp_stats_buf->mon_status_buf_ring_refill_cnt);
-	DP_TRACE_STATS(FATAL, "mon_status_buf_ring_empty_cnt = %u",
-			dp_stats_buf->mon_status_buf_ring_empty_cnt);
-	DP_TRACE_STATS(FATAL, "mon_desc_buf_ring_refill_cnt = %u",
-			dp_stats_buf->mon_desc_buf_ring_refill_cnt);
-	DP_TRACE_STATS(FATAL, "mon_desc_buf_ring_empty_cnt = %u",
-			dp_stats_buf->mon_desc_buf_ring_empty_cnt);
-	DP_TRACE_STATS(FATAL, "mon_dest_ring_update_cnt = %u",
-			dp_stats_buf->mon_dest_ring_update_cnt);
-	DP_TRACE_STATS(FATAL, "mon_dest_ring_full_cnt = %u",
-			dp_stats_buf->mon_dest_ring_full_cnt);
-	DP_TRACE_STATS(FATAL, "rx_suspend_cnt = %u",
-			dp_stats_buf->rx_suspend_cnt);
-	DP_TRACE_STATS(FATAL, "rx_suspend_fail_cnt = %u",
-			dp_stats_buf->rx_suspend_fail_cnt);
-	DP_TRACE_STATS(FATAL, "rx_resume_cnt = %u",
-			dp_stats_buf->rx_resume_cnt);
-	DP_TRACE_STATS(FATAL, "rx_resume_fail_cnt = %u",
-			dp_stats_buf->rx_resume_fail_cnt);
-	DP_TRACE_STATS(FATAL, "rx_ring_switch_cnt = %u",
-			dp_stats_buf->rx_ring_switch_cnt);
-	DP_TRACE_STATS(FATAL, "rx_ring_restore_cnt = %u",
-			dp_stats_buf->rx_ring_restore_cnt);
-	DP_TRACE_STATS(FATAL, "rx_flush_cnt = %u\n",
-			dp_stats_buf->rx_flush_cnt);
+	DP_PRINT_STATS("fw_ring_ctrl_subtype = %s ", fw_ring_ctrl_subtype);
+	DP_PRINT_STATS("fw_ring_mcast_data_msdu = %u",
+		       dp_stats_buf->fw_ring_mcast_data_msdu);
+	DP_PRINT_STATS("fw_ring_bcast_data_msdu = %u",
+		       dp_stats_buf->fw_ring_bcast_data_msdu);
+	DP_PRINT_STATS("fw_ring_ucast_data_msdu = %u",
+		       dp_stats_buf->fw_ring_ucast_data_msdu);
+	DP_PRINT_STATS("fw_ring_null_data_msdu = %u",
+		       dp_stats_buf->fw_ring_null_data_msdu);
+	DP_PRINT_STATS("fw_ring_mpdu_drop = %u",
+		       dp_stats_buf->fw_ring_mpdu_drop);
+	DP_PRINT_STATS("ofld_local_data_ind_cnt = %u",
+		       dp_stats_buf->ofld_local_data_ind_cnt);
+	DP_PRINT_STATS("ofld_local_data_buf_recycle_cnt = %u",
+		       dp_stats_buf->ofld_local_data_buf_recycle_cnt);
+	DP_PRINT_STATS("drx_local_data_ind_cnt = %u",
+		       dp_stats_buf->drx_local_data_ind_cnt);
+	DP_PRINT_STATS("drx_local_data_buf_recycle_cnt = %u",
+		       dp_stats_buf->drx_local_data_buf_recycle_cnt);
+	DP_PRINT_STATS("local_nondata_ind_cnt = %u",
+		       dp_stats_buf->local_nondata_ind_cnt);
+	DP_PRINT_STATS("local_nondata_buf_recycle_cnt = %u",
+		       dp_stats_buf->local_nondata_buf_recycle_cnt);
+	DP_PRINT_STATS("fw_status_buf_ring_refill_cnt = %u",
+		       dp_stats_buf->fw_status_buf_ring_refill_cnt);
+	DP_PRINT_STATS("fw_status_buf_ring_empty_cnt = %u",
+		       dp_stats_buf->fw_status_buf_ring_empty_cnt);
+	DP_PRINT_STATS("fw_pkt_buf_ring_refill_cnt = %u",
+		       dp_stats_buf->fw_pkt_buf_ring_refill_cnt);
+	DP_PRINT_STATS("fw_pkt_buf_ring_empty_cnt = %u",
+		       dp_stats_buf->fw_pkt_buf_ring_empty_cnt);
+	DP_PRINT_STATS("fw_link_buf_ring_refill_cnt = %u",
+		       dp_stats_buf->fw_link_buf_ring_refill_cnt);
+	DP_PRINT_STATS("fw_link_buf_ring_empty_cnt = %u",
+		       dp_stats_buf->fw_link_buf_ring_empty_cnt);
+	DP_PRINT_STATS("host_pkt_buf_ring_refill_cnt = %u",
+		       dp_stats_buf->host_pkt_buf_ring_refill_cnt);
+	DP_PRINT_STATS("host_pkt_buf_ring_empty_cnt = %u",
+		       dp_stats_buf->host_pkt_buf_ring_empty_cnt);
+	DP_PRINT_STATS("mon_pkt_buf_ring_refill_cnt = %u",
+		       dp_stats_buf->mon_pkt_buf_ring_refill_cnt);
+	DP_PRINT_STATS("mon_pkt_buf_ring_empty_cnt = %u",
+		       dp_stats_buf->mon_pkt_buf_ring_empty_cnt);
+	DP_PRINT_STATS("mon_status_buf_ring_refill_cnt = %u",
+		       dp_stats_buf->mon_status_buf_ring_refill_cnt);
+	DP_PRINT_STATS("mon_status_buf_ring_empty_cnt = %u",
+		       dp_stats_buf->mon_status_buf_ring_empty_cnt);
+	DP_PRINT_STATS("mon_desc_buf_ring_refill_cnt = %u",
+		       dp_stats_buf->mon_desc_buf_ring_refill_cnt);
+	DP_PRINT_STATS("mon_desc_buf_ring_empty_cnt = %u",
+		       dp_stats_buf->mon_desc_buf_ring_empty_cnt);
+	DP_PRINT_STATS("mon_dest_ring_update_cnt = %u",
+		       dp_stats_buf->mon_dest_ring_update_cnt);
+	DP_PRINT_STATS("mon_dest_ring_full_cnt = %u",
+		       dp_stats_buf->mon_dest_ring_full_cnt);
+	DP_PRINT_STATS("rx_suspend_cnt = %u",
+		       dp_stats_buf->rx_suspend_cnt);
+	DP_PRINT_STATS("rx_suspend_fail_cnt = %u",
+		       dp_stats_buf->rx_suspend_fail_cnt);
+	DP_PRINT_STATS("rx_resume_cnt = %u",
+		       dp_stats_buf->rx_resume_cnt);
+	DP_PRINT_STATS("rx_resume_fail_cnt = %u",
+		       dp_stats_buf->rx_resume_fail_cnt);
+	DP_PRINT_STATS("rx_ring_switch_cnt = %u",
+		       dp_stats_buf->rx_ring_switch_cnt);
+	DP_PRINT_STATS("rx_ring_restore_cnt = %u",
+		       dp_stats_buf->rx_ring_restore_cnt);
+	DP_PRINT_STATS("rx_flush_cnt = %u\n",
+		       dp_stats_buf->rx_flush_cnt);
 }
 
 /*
@@ -3308,14 +3310,14 @@ static inline void dp_print_rx_pdev_fw_ring_mpdu_err_tlv_v(uint32_t *tag_buf)
 		return;
 	}
 
-	DP_TRACE_STATS(FATAL, "HTT_RX_PDEV_FW_RING_MPDU_ERR_TLV_V:");
+	DP_PRINT_STATS("HTT_RX_PDEV_FW_RING_MPDU_ERR_TLV_V:");
 	for (i = 0; i <  DP_HTT_FW_RING_MPDU_ERR_LEN; i++) {
 		index += qdf_snprint(&fw_ring_mpdu_err[index],
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i,
 				dp_stats_buf->fw_ring_mpdu_err[i]);
 	}
-	DP_TRACE_STATS(FATAL, "fw_ring_mpdu_err = %s\n", fw_ring_mpdu_err);
+	DP_PRINT_STATS("fw_ring_mpdu_err = %s\n", fw_ring_mpdu_err);
 	qdf_mem_free(fw_ring_mpdu_err);
 }
 
@@ -3342,13 +3344,13 @@ static inline void dp_print_rx_pdev_fw_mpdu_drop_tlv_v(uint32_t *tag_buf)
 
 	tag_len = qdf_min(tag_len, (uint32_t)HTT_RX_STATS_FW_DROP_REASON_MAX);
 
-	DP_TRACE_STATS(FATAL, "HTT_RX_PDEV_FW_MPDU_DROP_TLV_V:");
+	DP_PRINT_STATS("HTT_RX_PDEV_FW_MPDU_DROP_TLV_V:");
 	for (i = 0; i <  tag_len; i++) {
 		index += qdf_snprint(&fw_mpdu_drop[index],
 				DP_MAX_STRING_LEN - index,
 				" %u:%u,", i, dp_stats_buf->fw_mpdu_drop[i]);
 	}
-	DP_TRACE_STATS(FATAL, "fw_mpdu_drop = %s\n", fw_mpdu_drop);
+	DP_PRINT_STATS("fw_mpdu_drop = %s\n", fw_mpdu_drop);
 	qdf_mem_free(fw_mpdu_drop);
 }
 
@@ -3371,7 +3373,7 @@ static inline void dp_print_rx_soc_fw_refill_ring_num_rxdma_err_tlv(uint32_t *ta
 
 	tag_len = qdf_min(tag_len, (uint32_t)HTT_RX_RXDMA_MAX_ERR_CODE);
 
-	DP_TRACE_STATS(FATAL, "HTT_RX_SOC_FW_REFILL_RING_NUM_RXDMA_ERR_TLV_V");
+	DP_PRINT_STATS("HTT_RX_SOC_FW_REFILL_RING_NUM_RXDMA_ERR_TLV_V");
 
 	for (i = 0; i <  tag_len; i++) {
 		index += snprintf(&rxdma_err_cnt[index],
@@ -3380,7 +3382,7 @@ static inline void dp_print_rx_soc_fw_refill_ring_num_rxdma_err_tlv(uint32_t *ta
 				dp_stats_buf->rxdma_err[i]);
 	}
 
-	DP_TRACE_STATS(FATAL, "rxdma_err = %s\n", rxdma_err_cnt);
+	DP_PRINT_STATS("rxdma_err = %s\n", rxdma_err_cnt);
 }
 
 /*
@@ -3402,7 +3404,7 @@ static inline void dp_print_rx_soc_fw_refill_ring_num_reo_err_tlv(uint32_t *tag_
 
 	tag_len = qdf_min(tag_len, (uint32_t)HTT_RX_REO_MAX_ERR_CODE);
 
-	DP_TRACE_STATS(FATAL, "HTT_RX_SOC_FW_REFILL_RING_NUM_REO_ERR_TLV_V");
+	DP_PRINT_STATS("HTT_RX_SOC_FW_REFILL_RING_NUM_REO_ERR_TLV_V");
 
 	for (i = 0; i <  tag_len; i++) {
 		index += snprintf(&reo_err_cnt[index],
@@ -3411,7 +3413,7 @@ static inline void dp_print_rx_soc_fw_refill_ring_num_reo_err_tlv(uint32_t *tag_
 				dp_stats_buf->reo_err[i]);
 	}
 
-	DP_TRACE_STATS(FATAL, "reo_err = %s\n", reo_err_cnt);
+	DP_PRINT_STATS("reo_err = %s\n", reo_err_cnt);
 }
 
 /*
@@ -3425,28 +3427,28 @@ static inline void dp_print_rx_reo_debug_stats_tlv(uint32_t *tag_buf)
 	htt_rx_reo_resource_stats_tlv_v *dp_stats_buf =
 			(htt_rx_reo_resource_stats_tlv_v *)tag_buf;
 
-	DP_TRACE_STATS(FATAL, "HTT_RX_REO_RESOURCE_STATS_TLV");
+	DP_PRINT_STATS("HTT_RX_REO_RESOURCE_STATS_TLV");
 
-	DP_TRACE_STATS(FATAL, "sample_id: %u ",
-		      dp_stats_buf->sample_id);
-	DP_TRACE_STATS(FATAL, "total_max: %u ",
-		      dp_stats_buf->total_max);
-	DP_TRACE_STATS(FATAL, "total_avg: %u ",
-		      dp_stats_buf->total_avg);
-	DP_TRACE_STATS(FATAL, "total_sample: %u ",
-		      dp_stats_buf->total_sample);
-	DP_TRACE_STATS(FATAL, "non_zeros_avg: %u ",
-		      dp_stats_buf->non_zeros_avg);
-	DP_TRACE_STATS(FATAL, "non_zeros_sample: %u ",
-		      dp_stats_buf->non_zeros_sample);
-	DP_TRACE_STATS(FATAL, "last_non_zeros_max: %u ",
-		      dp_stats_buf->last_non_zeros_max);
-	DP_TRACE_STATS(FATAL, "last_non_zeros_min: %u ",
-		      dp_stats_buf->last_non_zeros_min);
-	DP_TRACE_STATS(FATAL, "last_non_zeros_avg: %u ",
-		      dp_stats_buf->last_non_zeros_avg);
-	DP_TRACE_STATS(FATAL, "last_non_zeros_sample: %u\n ",
-		      dp_stats_buf->last_non_zeros_sample);
+	DP_PRINT_STATS("sample_id: %u ",
+		       dp_stats_buf->sample_id);
+	DP_PRINT_STATS("total_max: %u ",
+		       dp_stats_buf->total_max);
+	DP_PRINT_STATS("total_avg: %u ",
+		       dp_stats_buf->total_avg);
+	DP_PRINT_STATS("total_sample: %u ",
+		       dp_stats_buf->total_sample);
+	DP_PRINT_STATS("non_zeros_avg: %u ",
+		       dp_stats_buf->non_zeros_avg);
+	DP_PRINT_STATS("non_zeros_sample: %u ",
+		       dp_stats_buf->non_zeros_sample);
+	DP_PRINT_STATS("last_non_zeros_max: %u ",
+		       dp_stats_buf->last_non_zeros_max);
+	DP_PRINT_STATS("last_non_zeros_min: %u ",
+		       dp_stats_buf->last_non_zeros_min);
+	DP_PRINT_STATS("last_non_zeros_avg: %u ",
+		       dp_stats_buf->last_non_zeros_avg);
+	DP_PRINT_STATS("last_non_zeros_sample: %u\n ",
+		       dp_stats_buf->last_non_zeros_sample);
 }
 
 /*
@@ -3464,12 +3466,12 @@ static inline void dp_print_rx_pdev_fw_stats_phy_err_tlv(uint32_t *tag_buf)
 	uint16_t index = 0;
 	char phy_errs[DP_MAX_STRING_LEN];
 
-	DP_TRACE_STATS(FATAL, "HTT_RX_PDEV_FW_STATS_PHY_ERR_TLV");
+	DP_PRINT_STATS("HTT_RX_PDEV_FW_STATS_PHY_ERR_TLV");
 
-	DP_TRACE_STATS(FATAL, "mac_id_word: %u",
-		      dp_stats_buf->mac_id__word);
-	DP_TRACE_STATS(FATAL, "total_phy_err_cnt: %u",
-		      dp_stats_buf->total_phy_err_cnt);
+	DP_PRINT_STATS("mac_id_word: %u",
+		       dp_stats_buf->mac_id__word);
+	DP_PRINT_STATS("total_phy_err_cnt: %u",
+		       dp_stats_buf->total_phy_err_cnt);
 
 	for (i = 0; i < HTT_STATS_PHY_ERR_MAX; i++) {
 		index += snprintf(&phy_errs[index],
@@ -3477,7 +3479,7 @@ static inline void dp_print_rx_pdev_fw_stats_phy_err_tlv(uint32_t *tag_buf)
 				" %u:%u,", i, dp_stats_buf->phy_err[i]);
 	}
 
-	DP_TRACE_STATS(FATAL, "phy_errs: %s\n",  phy_errs);
+	DP_PRINT_STATS("phy_errs: %s\n",  phy_errs);
 }
 
 /*
@@ -4085,3 +4087,365 @@ void dp_pdev_print_delay_stats(struct dp_pdev *pdev)
 	}
 }
 #endif
+
+void dp_print_soc_cfg_params(struct dp_soc *soc)
+{
+	struct wlan_cfg_dp_soc_ctxt *soc_cfg_ctx;
+	uint8_t index = 0, i = 0;
+	char ring_mask[DP_MAX_INT_CONTEXTS_STRING_LENGTH];
+	int num_of_int_contexts;
+
+	if (!soc) {
+		dp_err("Context is null");
+		return;
+	}
+
+	soc_cfg_ctx = soc->wlan_cfg_ctx;
+
+	if (!soc_cfg_ctx) {
+		dp_err("Context is null");
+		return;
+	}
+
+	num_of_int_contexts =
+			wlan_cfg_get_num_contexts(soc_cfg_ctx);
+
+	DP_PRINT_STATS("No. of interrupt contexts: %u",
+		       soc_cfg_ctx->num_int_ctxts);
+	DP_PRINT_STATS("Max clients: %u",
+		       soc_cfg_ctx->max_clients);
+	DP_PRINT_STATS("Max alloc size: %u ",
+		       soc_cfg_ctx->max_alloc_size);
+	DP_PRINT_STATS("Per pdev tx ring: %u ",
+		       soc_cfg_ctx->per_pdev_tx_ring);
+	DP_PRINT_STATS("Num tcl data rings: %u ",
+		       soc_cfg_ctx->num_tcl_data_rings);
+	DP_PRINT_STATS("Per pdev rx ring: %u ",
+		       soc_cfg_ctx->per_pdev_rx_ring);
+	DP_PRINT_STATS("Per pdev lmac ring: %u ",
+		       soc_cfg_ctx->per_pdev_lmac_ring);
+	DP_PRINT_STATS("Num of reo dest rings: %u ",
+		       soc_cfg_ctx->num_reo_dest_rings);
+	DP_PRINT_STATS("Num tx desc pool: %u ",
+		       soc_cfg_ctx->num_tx_desc_pool);
+	DP_PRINT_STATS("Num tx ext desc pool: %u ",
+		       soc_cfg_ctx->num_tx_ext_desc_pool);
+	DP_PRINT_STATS("Num tx desc: %u ",
+		       soc_cfg_ctx->num_tx_desc);
+	DP_PRINT_STATS("Num tx ext desc: %u ",
+		       soc_cfg_ctx->num_tx_ext_desc);
+	DP_PRINT_STATS("Htt packet type: %u ",
+		       soc_cfg_ctx->htt_packet_type);
+	DP_PRINT_STATS("Max peer_ids: %u ",
+		       soc_cfg_ctx->max_peer_id);
+	DP_PRINT_STATS("Tx ring size: %u ",
+		       soc_cfg_ctx->tx_ring_size);
+	DP_PRINT_STATS("Tx comp ring size: %u ",
+		       soc_cfg_ctx->tx_comp_ring_size);
+	DP_PRINT_STATS("Tx comp ring size nss: %u ",
+		       soc_cfg_ctx->tx_comp_ring_size_nss);
+	DP_PRINT_STATS("Int batch threshold tx: %u ",
+		       soc_cfg_ctx->int_batch_threshold_tx);
+	DP_PRINT_STATS("Int timer threshold tx: %u ",
+		       soc_cfg_ctx->int_timer_threshold_tx);
+	DP_PRINT_STATS("Int batch threshold rx: %u ",
+		       soc_cfg_ctx->int_batch_threshold_rx);
+	DP_PRINT_STATS("Int timer threshold rx: %u ",
+		       soc_cfg_ctx->int_timer_threshold_rx);
+	DP_PRINT_STATS("Int batch threshold other: %u ",
+		       soc_cfg_ctx->int_batch_threshold_other);
+	DP_PRINT_STATS("Int timer threshold other: %u ",
+		       soc_cfg_ctx->int_timer_threshold_other);
+
+	for (i = 0; i < num_of_int_contexts; i++) {
+		index += qdf_snprint(&ring_mask[index],
+				     DP_MAX_INT_CONTEXTS_STRING_LENGTH - index,
+				     " %d",
+				     soc_cfg_ctx->int_tx_ring_mask[i]);
+	}
+
+	DP_PRINT_STATS("Tx ring mask (0-%d):%s",
+		       num_of_int_contexts, ring_mask);
+
+	index = 0;
+	for (i = 0; i < num_of_int_contexts; i++) {
+		index += qdf_snprint(&ring_mask[index],
+				     DP_MAX_INT_CONTEXTS_STRING_LENGTH - index,
+				     " %d",
+				     soc_cfg_ctx->int_rx_ring_mask[i]);
+	}
+
+	DP_PRINT_STATS("Rx ring mask (0-%d):%s",
+		       num_of_int_contexts, ring_mask);
+
+	index = 0;
+	for (i = 0; i < num_of_int_contexts; i++) {
+		index += qdf_snprint(&ring_mask[index],
+				     DP_MAX_INT_CONTEXTS_STRING_LENGTH - index,
+				     " %d",
+				     soc_cfg_ctx->int_rx_mon_ring_mask[i]);
+	}
+
+	DP_PRINT_STATS("Rx mon ring mask (0-%d):%s",
+		       num_of_int_contexts, ring_mask);
+
+	index = 0;
+	for (i = 0; i < num_of_int_contexts; i++) {
+		index += qdf_snprint(&ring_mask[index],
+				     DP_MAX_INT_CONTEXTS_STRING_LENGTH - index,
+				     " %d",
+				     soc_cfg_ctx->int_rx_err_ring_mask[i]);
+	}
+
+	DP_PRINT_STATS("Rx err ring mask (0-%d):%s",
+		       num_of_int_contexts, ring_mask);
+
+	index = 0;
+	for (i = 0; i < num_of_int_contexts; i++) {
+		index += qdf_snprint(&ring_mask[index],
+				     DP_MAX_INT_CONTEXTS_STRING_LENGTH - index,
+				     " %d",
+				     soc_cfg_ctx->int_rx_wbm_rel_ring_mask[i]);
+	}
+
+	DP_PRINT_STATS("Rx wbm rel ring mask (0-%d):%s",
+		       num_of_int_contexts, ring_mask);
+
+	index = 0;
+	for (i = 0; i < num_of_int_contexts; i++) {
+		index += qdf_snprint(&ring_mask[index],
+				     DP_MAX_INT_CONTEXTS_STRING_LENGTH - index,
+				     " %d",
+				     soc_cfg_ctx->int_reo_status_ring_mask[i]);
+	}
+
+	DP_PRINT_STATS("Reo ring mask (0-%d):%s",
+		       num_of_int_contexts, ring_mask);
+
+	index = 0;
+	for (i = 0; i < num_of_int_contexts; i++) {
+		index += qdf_snprint(&ring_mask[index],
+				     DP_MAX_INT_CONTEXTS_STRING_LENGTH - index,
+				     " %d",
+				     soc_cfg_ctx->int_rxdma2host_ring_mask[i]);
+	}
+
+	DP_PRINT_STATS("Rxdma2host ring mask (0-%d):%s",
+		       num_of_int_contexts, ring_mask);
+
+	index = 0;
+	for (i = 0; i < num_of_int_contexts; i++) {
+		index += qdf_snprint(&ring_mask[index],
+				     DP_MAX_INT_CONTEXTS_STRING_LENGTH - index,
+				     " %d",
+				     soc_cfg_ctx->int_host2rxdma_ring_mask[i]);
+	}
+
+	DP_PRINT_STATS("Host2rxdma ring mask (0-%d):%s",
+		       num_of_int_contexts, ring_mask);
+
+	DP_PRINT_STATS("Rx hash: %u ",
+		       soc_cfg_ctx->rx_hash);
+	DP_PRINT_STATS("Tso enabled: %u ",
+		       soc_cfg_ctx->tso_enabled);
+	DP_PRINT_STATS("Lro enabled: %u ",
+		       soc_cfg_ctx->lro_enabled);
+	DP_PRINT_STATS("Sg enabled: %u ",
+		       soc_cfg_ctx->sg_enabled);
+	DP_PRINT_STATS("Gro enabled: %u ",
+		       soc_cfg_ctx->gro_enabled);
+	DP_PRINT_STATS("rawmode enabled: %u ",
+		       soc_cfg_ctx->rawmode_enabled);
+	DP_PRINT_STATS("peer flow ctrl enabled: %u ",
+		       soc_cfg_ctx->peer_flow_ctrl_enabled);
+	DP_PRINT_STATS("napi enabled: %u ",
+		       soc_cfg_ctx->napi_enabled);
+	DP_PRINT_STATS("Tcp Udp checksum offload: %u ",
+		       soc_cfg_ctx->tcp_udp_checksumoffload);
+	DP_PRINT_STATS("Defrag timeout check: %u ",
+		       soc_cfg_ctx->defrag_timeout_check);
+	DP_PRINT_STATS("Rx defrag min timeout: %u ",
+		       soc_cfg_ctx->rx_defrag_min_timeout);
+	DP_PRINT_STATS("WBM release ring: %u ",
+		       soc_cfg_ctx->wbm_release_ring);
+	DP_PRINT_STATS("TCL CMD ring: %u ",
+		       soc_cfg_ctx->tcl_cmd_ring);
+	DP_PRINT_STATS("TCL Status ring: %u ",
+		       soc_cfg_ctx->tcl_status_ring);
+	DP_PRINT_STATS("REO Reinject ring: %u ",
+		       soc_cfg_ctx->reo_reinject_ring);
+	DP_PRINT_STATS("RX release ring: %u ",
+		       soc_cfg_ctx->rx_release_ring);
+	DP_PRINT_STATS("REO Exception ring: %u ",
+		       soc_cfg_ctx->reo_exception_ring);
+	DP_PRINT_STATS("REO CMD ring: %u ",
+		       soc_cfg_ctx->reo_cmd_ring);
+	DP_PRINT_STATS("REO STATUS ring: %u ",
+		       soc_cfg_ctx->reo_status_ring);
+	DP_PRINT_STATS("RXDMA refill ring: %u ",
+		       soc_cfg_ctx->rxdma_refill_ring);
+	DP_PRINT_STATS("RXDMA err dst ring: %u ",
+		       soc_cfg_ctx->rxdma_err_dst_ring);
+}
+
+void
+dp_print_pdev_cfg_params(struct dp_pdev *pdev)
+{
+	struct wlan_cfg_dp_pdev_ctxt *pdev_cfg_ctx;
+
+	if (!pdev) {
+		dp_err("Context is null");
+		return;
+	}
+
+	pdev_cfg_ctx = pdev->wlan_cfg_ctx;
+
+	if (!pdev_cfg_ctx) {
+		dp_err("Context is null");
+		return;
+	}
+
+	DP_PRINT_STATS("Rx dma buf ring size: %d ",
+		       pdev_cfg_ctx->rx_dma_buf_ring_size);
+	DP_PRINT_STATS("DMA Mon buf ring size: %d ",
+		       pdev_cfg_ctx->dma_mon_buf_ring_size);
+	DP_PRINT_STATS("DMA Mon dest ring size: %d ",
+		       pdev_cfg_ctx->dma_mon_dest_ring_size);
+	DP_PRINT_STATS("DMA Mon status ring size: %d ",
+		       pdev_cfg_ctx->dma_mon_status_ring_size);
+	DP_PRINT_STATS("Rxdma monitor desc ring: %d",
+		       pdev_cfg_ctx->rxdma_monitor_desc_ring);
+	DP_PRINT_STATS("Num mac rings: %d ",
+		       pdev_cfg_ctx->num_mac_rings);
+}
+
+/**
+ * dp_print_ring_stat_from_hal(): Print hal level ring stats
+ * @soc: DP_SOC handle
+ * @srng: DP_SRNG handle
+ * @ring_name: SRNG name
+ * @ring_type: srng src/dst ring
+ *
+ * Return: void
+ */
+static void
+dp_print_ring_stat_from_hal(struct dp_soc *soc,  struct dp_srng *srng,
+			    enum hal_ring_type ring_type)
+{
+	uint32_t tailp;
+	uint32_t headp;
+	int32_t hw_headp = -1;
+	int32_t hw_tailp = -1;
+	const char *ring_name;
+	struct hal_soc *hal_soc;
+
+	if (soc && srng && srng->hal_srng) {
+		hal_soc = (struct hal_soc *)soc->hal_soc;
+		ring_name = dp_srng_get_str_from_hal_ring_type(ring_type);
+
+		hal_get_sw_hptp(soc->hal_soc, srng->hal_srng, &tailp, &headp);
+
+		DP_PRINT_STATS("%s:SW:Head pointer = %d Tail Pointer = %d\n",
+			       ring_name, headp, tailp);
+
+		hal_get_hw_hptp(soc->hal_soc, srng->hal_srng, &hw_headp,
+				&hw_tailp, ring_type);
+
+		DP_PRINT_STATS("%s:HW:Head pointer = %d Tail Pointer = %d\n",
+			       ring_name, hw_headp, hw_tailp);
+	}
+}
+
+/**
+ * dp_print_mon_ring_stats_from_hal() - Print stat for monitor rings based
+ *					on target
+ * @pdev: physical device handle
+ * @mac_id: mac id
+ *
+ * Return: void
+ */
+static inline
+void dp_print_mon_ring_stat_from_hal(struct dp_pdev *pdev, uint8_t mac_id)
+{
+	if (pdev->soc->wlan_cfg_ctx->rxdma1_enable) {
+		dp_print_ring_stat_from_hal(pdev->soc,
+					    &pdev->rxdma_mon_buf_ring[mac_id],
+					    RXDMA_MONITOR_BUF);
+		dp_print_ring_stat_from_hal(pdev->soc,
+					    &pdev->rxdma_mon_dst_ring[mac_id],
+					    RXDMA_MONITOR_DST);
+		dp_print_ring_stat_from_hal(pdev->soc,
+					    &pdev->rxdma_mon_desc_ring[mac_id],
+					    RXDMA_MONITOR_DESC);
+	}
+
+	dp_print_ring_stat_from_hal(pdev->soc,
+				    &pdev->rxdma_mon_status_ring[mac_id],
+				    RXDMA_MONITOR_STATUS);
+}
+
+void
+dp_print_ring_stats(struct dp_pdev *pdev)
+{
+	uint32_t i;
+	int mac_id;
+
+	dp_print_ring_stat_from_hal(pdev->soc,
+				    &pdev->soc->reo_exception_ring,
+				    REO_EXCEPTION);
+	dp_print_ring_stat_from_hal(pdev->soc,
+				    &pdev->soc->reo_reinject_ring,
+				    REO_REINJECT);
+	dp_print_ring_stat_from_hal(pdev->soc,
+				    &pdev->soc->reo_cmd_ring,
+				    REO_CMD);
+	dp_print_ring_stat_from_hal(pdev->soc,
+				    &pdev->soc->reo_status_ring,
+				    REO_STATUS);
+	dp_print_ring_stat_from_hal(pdev->soc,
+				    &pdev->soc->rx_rel_ring,
+				    WBM2SW_RELEASE);
+	dp_print_ring_stat_from_hal(pdev->soc,
+				    &pdev->soc->tcl_cmd_ring,
+				    TCL_CMD);
+	dp_print_ring_stat_from_hal(pdev->soc,
+				    &pdev->soc->tcl_status_ring,
+				    TCL_STATUS);
+	dp_print_ring_stat_from_hal(pdev->soc,
+				    &pdev->soc->wbm_desc_rel_ring,
+				    SW2WBM_RELEASE);
+	for (i = 0; i < MAX_REO_DEST_RINGS; i++)
+		dp_print_ring_stat_from_hal(pdev->soc,
+					    &pdev->soc->reo_dest_ring[i],
+					    REO_DST);
+
+	for (i = 0; i < pdev->soc->num_tcl_data_rings; i++)
+		dp_print_ring_stat_from_hal(pdev->soc,
+					    &pdev->soc->tcl_data_ring[i],
+					    TCL_DATA);
+	for (i = 0; i < MAX_TCL_DATA_RINGS; i++)
+		dp_print_ring_stat_from_hal(pdev->soc,
+					    &pdev->soc->tx_comp_ring[i],
+					    WBM2SW_RELEASE);
+
+	dp_print_ring_stat_from_hal(pdev->soc,
+				    &pdev->rx_refill_buf_ring,
+				    RXDMA_BUF);
+
+	dp_print_ring_stat_from_hal(pdev->soc,
+				    &pdev->rx_refill_buf_ring2,
+				    RXDMA_BUF);
+
+	for (i = 0; i < MAX_RX_MAC_RINGS; i++)
+		dp_print_ring_stat_from_hal(pdev->soc,
+					    &pdev->rx_mac_buf_ring[i],
+					    RXDMA_BUF);
+
+	for (mac_id = 0; mac_id < NUM_RXDMA_RINGS_PER_PDEV; mac_id++)
+		dp_print_mon_ring_stat_from_hal(pdev, mac_id);
+
+	for (i = 0; i < NUM_RXDMA_RINGS_PER_PDEV; i++)
+		dp_print_ring_stat_from_hal(pdev->soc,
+					    &pdev->rxdma_err_dst_ring[i],
+					    RXDMA_DST);
+}