Browse Source

qcacld-3.0: Update data path statistics log level

Do not required to print function and line number
for data path statistics function which is invoked
by ioctl.
Change data path statistics to info print so
that it can be printed in dmesg as well.

Change-Id: I4b5ea4202255ace71dbb6f9a4bbff6f93e496425
CRs-Fixed: 2278885
Nirav Shah 6 years ago
parent
commit
e6194ac8ad

File diff suppressed because it is too large
+ 371 - 369
core/dp/htt/htt_fw_stats.c


+ 103 - 107
core/dp/htt/htt_internal.h

@@ -191,31 +191,31 @@ static inline struct htt_host_rx_desc_base *htt_rx_desc(qdf_nbuf_t msdu)
  */
 static inline void htt_print_rx_desc_lro(struct htt_host_rx_desc_base *rx_desc)
 {
-	qdf_print
+	qdf_nofl_info
 		("----------------------RX DESC LRO----------------------\n");
-	qdf_print("msdu_end.lro_eligible:0x%x\n",
-		 rx_desc->msdu_end.lro_eligible);
-	qdf_print("msdu_start.tcp_only_ack:0x%x\n",
-		 rx_desc->msdu_start.tcp_only_ack);
-	qdf_print("msdu_end.tcp_udp_chksum:0x%x\n",
-		 rx_desc->msdu_end.tcp_udp_chksum);
-	qdf_print("msdu_end.tcp_seq_number:0x%x\n",
-		 rx_desc->msdu_end.tcp_seq_number);
-	qdf_print("msdu_end.tcp_ack_number:0x%x\n",
-		 rx_desc->msdu_end.tcp_ack_number);
-	qdf_print("msdu_start.tcp_proto:0x%x\n",
-		 rx_desc->msdu_start.tcp_proto);
-	qdf_print("msdu_start.ipv6_proto:0x%x\n",
-		 rx_desc->msdu_start.ipv6_proto);
-	qdf_print("msdu_start.ipv4_proto:0x%x\n",
-		 rx_desc->msdu_start.ipv4_proto);
-	qdf_print("msdu_start.l3_offset:0x%x\n",
-		 rx_desc->msdu_start.l3_offset);
-	qdf_print("msdu_start.l4_offset:0x%x\n",
-		 rx_desc->msdu_start.l4_offset);
-	qdf_print("msdu_start.flow_id_toeplitz:0x%x\n",
-			   rx_desc->msdu_start.flow_id_toeplitz);
-	qdf_print
+	qdf_nofl_info("msdu_end.lro_eligible:0x%x\n",
+		      rx_desc->msdu_end.lro_eligible);
+	qdf_nofl_info("msdu_start.tcp_only_ack:0x%x\n",
+		      rx_desc->msdu_start.tcp_only_ack);
+	qdf_nofl_info("msdu_end.tcp_udp_chksum:0x%x\n",
+		      rx_desc->msdu_end.tcp_udp_chksum);
+	qdf_nofl_info("msdu_end.tcp_seq_number:0x%x\n",
+		      rx_desc->msdu_end.tcp_seq_number);
+	qdf_nofl_info("msdu_end.tcp_ack_number:0x%x\n",
+		      rx_desc->msdu_end.tcp_ack_number);
+	qdf_nofl_info("msdu_start.tcp_proto:0x%x\n",
+		      rx_desc->msdu_start.tcp_proto);
+	qdf_nofl_info("msdu_start.ipv6_proto:0x%x\n",
+		      rx_desc->msdu_start.ipv6_proto);
+	qdf_nofl_info("msdu_start.ipv4_proto:0x%x\n",
+		      rx_desc->msdu_start.ipv4_proto);
+	qdf_nofl_info("msdu_start.l3_offset:0x%x\n",
+		      rx_desc->msdu_start.l3_offset);
+	qdf_nofl_info("msdu_start.l4_offset:0x%x\n",
+		      rx_desc->msdu_start.l4_offset);
+	qdf_nofl_info("msdu_start.flow_id_toeplitz:0x%x\n",
+		      rx_desc->msdu_start.flow_id_toeplitz);
+	qdf_nofl_info
 		("---------------------------------------------------------\n");
 }
 
@@ -269,67 +269,67 @@ static inline void htt_rx_extract_lro_info(qdf_nbuf_t msdu,
 
 static inline void htt_print_rx_desc(struct htt_host_rx_desc_base *rx_desc)
 {
-	qdf_print
+	qdf_nofl_info
 		("----------------------RX DESC----------------------------\n");
-	qdf_print("attention: %#010x\n",
-		  (unsigned int)(*(uint32_t *) &rx_desc->attention));
-	qdf_print("frag_info: %#010x\n",
-		  (unsigned int)(*(uint32_t *) &rx_desc->frag_info));
-	qdf_print("mpdu_start: %#010x %#010x %#010x\n",
-		  (unsigned int)(((uint32_t *) &rx_desc->mpdu_start)[0]),
-		  (unsigned int)(((uint32_t *) &rx_desc->mpdu_start)[1]),
-		  (unsigned int)(((uint32_t *) &rx_desc->mpdu_start)[2]));
-	qdf_print("msdu_start: %#010x %#010x %#010x\n",
-		  (unsigned int)(((uint32_t *) &rx_desc->msdu_start)[0]),
-		  (unsigned int)(((uint32_t *) &rx_desc->msdu_start)[1]),
-		  (unsigned int)(((uint32_t *) &rx_desc->msdu_start)[2]));
-	qdf_print("msdu_end: %#010x %#010x %#010x %#010x %#010x\n",
-		  (unsigned int)(((uint32_t *) &rx_desc->msdu_end)[0]),
-		  (unsigned int)(((uint32_t *) &rx_desc->msdu_end)[1]),
-		  (unsigned int)(((uint32_t *) &rx_desc->msdu_end)[2]),
-		  (unsigned int)(((uint32_t *) &rx_desc->msdu_end)[3]),
-		  (unsigned int)(((uint32_t *) &rx_desc->msdu_end)[4]));
-	qdf_print("mpdu_end: %#010x\n",
-		  (unsigned int)(*(uint32_t *) &rx_desc->mpdu_end));
-	qdf_print("ppdu_start: %#010x %#010x %#010x %#010x %#010x\n"
-		  "%#010x %#010x %#010x %#010x %#010x\n",
-		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_start)[0]),
-		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_start)[1]),
-		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_start)[2]),
-		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_start)[3]),
-		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_start)[4]),
-		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_start)[5]),
-		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_start)[6]),
-		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_start)[7]),
-		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_start)[8]),
-		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_start)[9]));
-	qdf_print("ppdu_end: %#010x %#010x %#010x %#010x %#010x\n"
-		  "%#010x %#010x %#010x %#010x %#010x\n"
-		  "%#010x,%#010x %#010x %#010x %#010x\n"
-		  "%#010x %#010x %#010x %#010x %#010x\n" "%#010x %#010x\n",
-		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_end)[0]),
-		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_end)[1]),
-		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_end)[2]),
-		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_end)[3]),
-		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_end)[4]),
-		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_end)[5]),
-		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_end)[6]),
-		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_end)[7]),
-		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_end)[8]),
-		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_end)[9]),
-		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_end)[10]),
-		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_end)[11]),
-		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_end)[12]),
-		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_end)[13]),
-		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_end)[14]),
-		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_end)[15]),
-		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_end)[16]),
-		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_end)[17]),
-		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_end)[18]),
-		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_end)[19]),
-		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_end)[20]),
-		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_end)[21]));
-	qdf_print
+	qdf_nofl_info("attention: %#010x\n",
+		      (unsigned int)(*(uint32_t *)&rx_desc->attention));
+	qdf_nofl_info("frag_info: %#010x\n",
+		      (unsigned int)(*(uint32_t *)&rx_desc->frag_info));
+	qdf_nofl_info("mpdu_start: %#010x %#010x %#010x\n",
+		      (unsigned int)(((uint32_t *)&rx_desc->mpdu_start)[0]),
+		      (unsigned int)(((uint32_t *)&rx_desc->mpdu_start)[1]),
+		      (unsigned int)(((uint32_t *)&rx_desc->mpdu_start)[2]));
+	qdf_nofl_info("msdu_start: %#010x %#010x %#010x\n",
+		      (unsigned int)(((uint32_t *)&rx_desc->msdu_start)[0]),
+		      (unsigned int)(((uint32_t *)&rx_desc->msdu_start)[1]),
+		      (unsigned int)(((uint32_t *)&rx_desc->msdu_start)[2]));
+	qdf_nofl_info("msdu_end: %#010x %#010x %#010x %#010x %#010x\n",
+		      (unsigned int)(((uint32_t *)&rx_desc->msdu_end)[0]),
+		      (unsigned int)(((uint32_t *)&rx_desc->msdu_end)[1]),
+		      (unsigned int)(((uint32_t *)&rx_desc->msdu_end)[2]),
+		      (unsigned int)(((uint32_t *)&rx_desc->msdu_end)[3]),
+		      (unsigned int)(((uint32_t *)&rx_desc->msdu_end)[4]));
+	qdf_nofl_info("mpdu_end: %#010x\n",
+		      (unsigned int)(*(uint32_t *)&rx_desc->mpdu_end));
+	qdf_nofl_info("ppdu_start: %#010x %#010x %#010x %#010x %#010x\n"
+		      "%#010x %#010x %#010x %#010x %#010x\n",
+		      (unsigned int)(((uint32_t *)&rx_desc->ppdu_start)[0]),
+		      (unsigned int)(((uint32_t *)&rx_desc->ppdu_start)[1]),
+		      (unsigned int)(((uint32_t *)&rx_desc->ppdu_start)[2]),
+		      (unsigned int)(((uint32_t *)&rx_desc->ppdu_start)[3]),
+		      (unsigned int)(((uint32_t *)&rx_desc->ppdu_start)[4]),
+		      (unsigned int)(((uint32_t *)&rx_desc->ppdu_start)[5]),
+		      (unsigned int)(((uint32_t *)&rx_desc->ppdu_start)[6]),
+		      (unsigned int)(((uint32_t *)&rx_desc->ppdu_start)[7]),
+		      (unsigned int)(((uint32_t *)&rx_desc->ppdu_start)[8]),
+		      (unsigned int)(((uint32_t *)&rx_desc->ppdu_start)[9]));
+	qdf_nofl_info("ppdu_end: %#010x %#010x %#010x %#010x %#010x\n"
+		      "%#010x %#010x %#010x %#010x %#010x\n"
+		      "%#010x,%#010x %#010x %#010x %#010x\n"
+		      "%#010x %#010x %#010x %#010x %#010x\n" "%#010x %#010x\n",
+		      (unsigned int)(((uint32_t *)&rx_desc->ppdu_end)[0]),
+		      (unsigned int)(((uint32_t *)&rx_desc->ppdu_end)[1]),
+		      (unsigned int)(((uint32_t *)&rx_desc->ppdu_end)[2]),
+		      (unsigned int)(((uint32_t *)&rx_desc->ppdu_end)[3]),
+		      (unsigned int)(((uint32_t *)&rx_desc->ppdu_end)[4]),
+		      (unsigned int)(((uint32_t *)&rx_desc->ppdu_end)[5]),
+		      (unsigned int)(((uint32_t *)&rx_desc->ppdu_end)[6]),
+		      (unsigned int)(((uint32_t *)&rx_desc->ppdu_end)[7]),
+		      (unsigned int)(((uint32_t *)&rx_desc->ppdu_end)[8]),
+		      (unsigned int)(((uint32_t *)&rx_desc->ppdu_end)[9]),
+		      (unsigned int)(((uint32_t *)&rx_desc->ppdu_end)[10]),
+		      (unsigned int)(((uint32_t *)&rx_desc->ppdu_end)[11]),
+		      (unsigned int)(((uint32_t *)&rx_desc->ppdu_end)[12]),
+		      (unsigned int)(((uint32_t *)&rx_desc->ppdu_end)[13]),
+		      (unsigned int)(((uint32_t *)&rx_desc->ppdu_end)[14]),
+		      (unsigned int)(((uint32_t *)&rx_desc->ppdu_end)[15]),
+		      (unsigned int)(((uint32_t *)&rx_desc->ppdu_end)[16]),
+		      (unsigned int)(((uint32_t *)&rx_desc->ppdu_end)[17]),
+		      (unsigned int)(((uint32_t *)&rx_desc->ppdu_end)[18]),
+		      (unsigned int)(((uint32_t *)&rx_desc->ppdu_end)[19]),
+		      (unsigned int)(((uint32_t *)&rx_desc->ppdu_end)[20]),
+		      (unsigned int)(((uint32_t *)&rx_desc->ppdu_end)[21]));
+	qdf_nofl_info
 		("---------------------------------------------------------\n");
 }
 
@@ -703,31 +703,27 @@ static inline int htt_display_rx_buf_debug(struct htt_pdev_t *pdev)
 		buf = pdev->rx_buff_list;
 		for (i = 0; i < HTT_RX_RING_BUFF_DBG_LIST; i++) {
 			if (buf[i].posted != 0)
-				QDF_TRACE(QDF_MODULE_ID_TXRX,
-					  QDF_TRACE_LEVEL_ERROR,
-					  "[%d][0x%x] %pK %lu %pK %llu %llu",
-					  i, buf[i].cpu,
-					  buf[i].nbuf_data,
-					  (unsigned long)buf[i].paddr,
-					  buf[i].nbuf,
-					  buf[i].posted,
-					  buf[i].recved);
+				qdf_nofl_info("[%d][0x%x] %pK %lu %pK %llu %llu",
+					      i, buf[i].cpu,
+					      buf[i].nbuf_data,
+					      (unsigned long)buf[i].paddr,
+					      buf[i].nbuf,
+					      buf[i].posted,
+					      buf[i].recved);
 		}
 
-		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
-		"rxbuf_idx %d all_posted: %d all_recvd: %d recv_err: %d",
-		pdev->rx_buff_index,
-		pdev->rx_buff_posted_cum,
-		pdev->rx_buff_recvd_cum,
-		pdev->rx_buff_recvd_err);
-
-		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
-		"timer kicks :%d actual  :%d restarts:%d debtors: %d fill_n: %d",
-		pdev->refill_retry_timer_starts,
-		pdev->refill_retry_timer_calls,
-		pdev->refill_retry_timer_doubles,
-		pdev->rx_buff_debt_invoked,
-		pdev->rx_buff_fill_n_invoked);
+		qdf_nofl_info("rxbuf_idx %d all_posted: %d all_recvd: %d recv_err: %d",
+			      pdev->rx_buff_index,
+			      pdev->rx_buff_posted_cum,
+			      pdev->rx_buff_recvd_cum,
+			      pdev->rx_buff_recvd_err);
+
+		qdf_nofl_info("timer kicks :%d actual  :%d restarts:%d debtors: %d fill_n: %d",
+			      pdev->refill_retry_timer_starts,
+			      pdev->refill_retry_timer_calls,
+			      pdev->refill_retry_timer_doubles,
+			      pdev->rx_buff_debt_invoked,
+			      pdev->rx_buff_fill_n_invoked);
 	} else
 		return -EINVAL;
 	return 0;

+ 44 - 43
core/dp/txrx/ol_tx_ll.c

@@ -706,37 +706,38 @@ void ol_txrx_stats_display_tso(ol_txrx_pdev_handle pdev)
 	int msdu_idx;
 	int seg_idx;
 
-	ol_txrx_info("TSO Statistics:");
-	ol_txrx_info("TSO pkts %lld, bytes %lld\n",
-		     pdev->stats.pub.tx.tso.tso_pkts.pkts,
-		     pdev->stats.pub.tx.tso.tso_pkts.bytes);
-
-	ol_txrx_info("TSO Histogram for numbers of segments:\n"
-		     "Single segment %d\n"
-		     "  2-5 segments %d\n"
-		     " 6-10 segments %d\n"
-		     "11-15 segments %d\n"
-		     "16-20 segments %d\n"
-		     "  20+ segments %d\n",
-		     pdev->stats.pub.tx.tso.tso_hist.pkts_1,
-		     pdev->stats.pub.tx.tso.tso_hist.pkts_2_5,
-		     pdev->stats.pub.tx.tso.tso_hist.pkts_6_10,
-		     pdev->stats.pub.tx.tso.tso_hist.pkts_11_15,
-		     pdev->stats.pub.tx.tso.tso_hist.pkts_16_20,
-		     pdev->stats.pub.tx.tso.tso_hist.pkts_20_plus);
-
-	ol_txrx_info("TSO History Buffer: Total size %d, current_index %d",
-		     NUM_MAX_TSO_MSDUS, TXRX_STATS_TSO_MSDU_IDX(pdev));
+	txrx_nofl_info("TSO Statistics:");
+	txrx_nofl_info("TSO pkts %lld, bytes %lld\n",
+		       pdev->stats.pub.tx.tso.tso_pkts.pkts,
+		       pdev->stats.pub.tx.tso.tso_pkts.bytes);
+
+	txrx_nofl_info("TSO Histogram for numbers of segments:\n"
+		       "Single segment	%d\n"
+		       "  2-5 segments	%d\n"
+		       " 6-10 segments	%d\n"
+		       "11-15 segments	%d\n"
+		       "16-20 segments	%d\n"
+		       "  20+ segments	%d\n",
+		       pdev->stats.pub.tx.tso.tso_hist.pkts_1,
+		       pdev->stats.pub.tx.tso.tso_hist.pkts_2_5,
+		       pdev->stats.pub.tx.tso.tso_hist.pkts_6_10,
+		       pdev->stats.pub.tx.tso.tso_hist.pkts_11_15,
+		       pdev->stats.pub.tx.tso.tso_hist.pkts_16_20,
+		       pdev->stats.pub.tx.tso.tso_hist.pkts_20_plus);
+
+	txrx_nofl_info("TSO History Buffer: Total size %d, current_index %d",
+		       NUM_MAX_TSO_MSDUS,
+		       TXRX_STATS_TSO_MSDU_IDX(pdev));
 
 	for (msdu_idx = 0; msdu_idx < NUM_MAX_TSO_MSDUS; msdu_idx++) {
 		if (TXRX_STATS_TSO_MSDU_TOTAL_LEN(pdev, msdu_idx) == 0)
 			continue;
-		ol_txrx_info("jumbo pkt idx: %d num segs %d gso_len %d total_len %d nr_frags %d",
-			     msdu_idx,
-			     TXRX_STATS_TSO_MSDU_NUM_SEG(pdev, msdu_idx),
-			     TXRX_STATS_TSO_MSDU_GSO_SIZE(pdev, msdu_idx),
-			     TXRX_STATS_TSO_MSDU_TOTAL_LEN(pdev, msdu_idx),
-			     TXRX_STATS_TSO_MSDU_NR_FRAGS(pdev, msdu_idx));
+		txrx_nofl_info("jumbo pkt idx: %d num segs %d gso_len %d total_len %d nr_frags %d",
+			       msdu_idx,
+			       TXRX_STATS_TSO_MSDU_NUM_SEG(pdev, msdu_idx),
+			       TXRX_STATS_TSO_MSDU_GSO_SIZE(pdev, msdu_idx),
+			       TXRX_STATS_TSO_MSDU_TOTAL_LEN(pdev, msdu_idx),
+			       TXRX_STATS_TSO_MSDU_NR_FRAGS(pdev, msdu_idx));
 
 		for (seg_idx = 0;
 			 ((seg_idx < TXRX_STATS_TSO_MSDU_NUM_SEG(pdev,
@@ -745,22 +746,22 @@ void ol_txrx_stats_display_tso(ol_txrx_pdev_handle pdev)
 			struct qdf_tso_seg_t tso_seg =
 				 TXRX_STATS_TSO_SEG(pdev, msdu_idx, seg_idx);
 
-			ol_txrx_info("seg idx: %d", seg_idx);
-			ol_txrx_info("tso_enable: %d",
-				     tso_seg.tso_flags.tso_enable);
-			ol_txrx_info("fin %d syn %d rst %d psh %d ack %d urg %d ece %d cwr %d ns %d",
-				     tso_seg.tso_flags.fin,
-				     tso_seg.tso_flags.syn,
-				     tso_seg.tso_flags.rst,
-				     tso_seg.tso_flags.psh,
-				     tso_seg.tso_flags.ack,
-				     tso_seg.tso_flags.urg,
-				     tso_seg.tso_flags.ece,
-				     tso_seg.tso_flags.cwr,
-				     tso_seg.tso_flags.ns);
-			ol_txrx_info("tcp_seq_num: 0x%x ip_id: %d",
-				     tso_seg.tso_flags.tcp_seq_num,
-				     tso_seg.tso_flags.ip_id);
+			txrx_nofl_info("seg idx: %d", seg_idx);
+			txrx_nofl_info("tso_enable: %d",
+				       tso_seg.tso_flags.tso_enable);
+			txrx_nofl_info("fin %d syn %d rst %d psh %d ack %d urg %d ece %d cwr %d ns %d",
+				       tso_seg.tso_flags.fin,
+				       tso_seg.tso_flags.syn,
+				       tso_seg.tso_flags.rst,
+				       tso_seg.tso_flags.psh,
+				       tso_seg.tso_flags.ack,
+				       tso_seg.tso_flags.urg,
+				       tso_seg.tso_flags.ece,
+				       tso_seg.tso_flags.cwr,
+				       tso_seg.tso_flags.ns);
+			txrx_nofl_info("tcp_seq_num: 0x%x ip_id: %d",
+				       tso_seg.tso_flags.tcp_seq_num,
+				       tso_seg.tso_flags.ip_id);
 		}
 	}
 }

+ 4 - 7
core/dp/txrx/ol_tx_queue.c

@@ -1458,13 +1458,10 @@ ol_tx_queue_log_display(struct ol_txrx_pdev_t *pdev)
 	 * being changed while in use, but since this is just for debugging,
 	 * don't bother.
 	 */
-	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
-		"Current target credit: %d",
-		 qdf_atomic_read(&pdev->target_tx_credit));
-	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
-		  "Tx queue log:");
-	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
-		  ": Frames  Bytes  TID  PEER");
+	txrx_nofl_info("Current target credit: %d",
+		       qdf_atomic_read(&pdev->target_tx_credit));
+	txrx_nofl_info("Tx queue log:");
+	txrx_nofl_info(": Frames  Bytes  TID  PEER");
 
 	while (unwrap || offset != pdev->txq_log.offset) {
 		int delta = ol_tx_queue_log_record_display(pdev, offset);

+ 27 - 29
core/dp/txrx/ol_tx_sched.c

@@ -630,22 +630,21 @@ static void ol_tx_sched_wrr_adv_cat_stat_dump(
 {
 	int i;
 
-	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
-		  "Scheduler Stats:");
-	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
-		  "====category(CRR,CRT,WSW): Queued  Discard  Dequeued  frms  wrr===");
+	txrx_nofl_info("Scheduler Stats:");
+	txrx_nofl_info("====category(CRR,CRT,WSW): Queued  Discard  Dequeued  frms  wrr===");
 	for (i = 0; i < OL_TX_SCHED_WRR_ADV_NUM_CATEGORIES; ++i) {
-		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
-			  "%12s(%2d, %2d, %2d):  %6d  %7d  %8d  %4d  %3d",
-			  scheduler->categories[i].stat.cat_name,
-			  scheduler->categories[i].specs.credit_reserve,
-			  scheduler->categories[i].specs.credit_threshold,
-			  scheduler->categories[i].specs.wrr_skip_weight,
-			  scheduler->categories[i].stat.queued,
-			  scheduler->categories[i].stat.discard,
-			  scheduler->categories[i].stat.dispatched,
-			  scheduler->categories[i].state.frms,
-			  scheduler->categories[i].state.wrr_count);
+		txrx_nofl_info("%12s(%2d, %2d, %2d):  %6d  %7d  %8d  %4d  %3d",
+			       scheduler->categories[i].stat.cat_name,
+			       scheduler->categories[i].specs.credit_reserve,
+			       scheduler->categories[i].specs.
+					credit_threshold,
+			       scheduler->categories[i].
+					specs.wrr_skip_weight,
+			       scheduler->categories[i].stat.queued,
+			       scheduler->categories[i].stat.discard,
+			       scheduler->categories[i].stat.dispatched,
+			       scheduler->categories[i].state.frms,
+			       scheduler->categories[i].state.wrr_count);
 	}
 }
 
@@ -654,21 +653,20 @@ static void ol_tx_sched_wrr_adv_cat_cur_state_dump(
 {
 	int i;
 
-	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
-		  "Scheduler State Snapshot:");
-	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
-		  "====category(CRR,CRT,WSW): IS_Active  Pend_Frames  Pend_bytes  wrr===");
+	txrx_nofl_info("Scheduler State Snapshot:");
+	txrx_nofl_info("====category(CRR,CRT,WSW): IS_Active  Pend_Frames  Pend_bytes  wrr===");
 	for (i = 0; i < OL_TX_SCHED_WRR_ADV_NUM_CATEGORIES; ++i) {
-		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
-			  "%12s(%2d, %2d, %2d):  %9d  %11d  %10d  %3d",
-			  scheduler->categories[i].stat.cat_name,
-			  scheduler->categories[i].specs.credit_reserve,
-			  scheduler->categories[i].specs.credit_threshold,
-			  scheduler->categories[i].specs.wrr_skip_weight,
-			  scheduler->categories[i].state.active,
-			  scheduler->categories[i].state.frms,
-			  scheduler->categories[i].state.bytes,
-			  scheduler->categories[i].state.wrr_count);
+		txrx_nofl_info("%12s(%2d, %2d, %2d):  %9d  %11d  %10d  %3d",
+			       scheduler->categories[i].stat.cat_name,
+			       scheduler->categories[i].specs.credit_reserve,
+			       scheduler->categories[i].specs.
+					credit_threshold,
+			       scheduler->categories[i].specs.
+					wrr_skip_weight,
+			       scheduler->categories[i].state.active,
+			       scheduler->categories[i].state.frms,
+			       scheduler->categories[i].state.bytes,
+			       scheduler->categories[i].state.wrr_count);
 	}
 }
 

+ 11 - 18
core/dp/txrx/ol_tx_send.c

@@ -938,10 +938,8 @@ void ol_tx_dump_group_credit_stats(ol_txrx_pdev_handle pdev)
 	int16_t curr_index, old_index, wrap_around;
 	uint16_t curr_credit, old_credit, mem_vdevs;
 
-	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
-		  "Group credit stats:");
-	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
-		  "  No: GrpID: Credit: Change: vdev_map");
+	txrx_nofl_info("Group credit stats:");
+	txrx_nofl_info("  No: GrpID: Credit: Change: vdev_map");
 
 	qdf_spin_lock_bh(&pdev->grp_stat_spinlock);
 	curr_index = pdev->grp_stats.last_valid_index;
@@ -949,8 +947,7 @@ void ol_tx_dump_group_credit_stats(ol_txrx_pdev_handle pdev)
 	qdf_spin_unlock_bh(&pdev->grp_stat_spinlock);
 
 	if (curr_index < 0) {
-		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
-			  "Not initialized");
+		txrx_nofl_info("Not initialized");
 		return;
 	}
 
@@ -979,19 +976,15 @@ void ol_tx_dump_group_credit_stats(ol_txrx_pdev_handle pdev)
 			qdf_spin_unlock_bh(&pdev->grp_stat_spinlock);
 
 			if (!is_break)
-				QDF_TRACE(QDF_MODULE_ID_TXRX,
-					  QDF_TRACE_LEVEL_ERROR,
-					  "%4d: %5d: %6d %6d %8x",
-					  curr_index, j,
-					  curr_credit,
-					  (curr_credit - old_credit),
-					  mem_vdevs);
+				txrx_nofl_info("%4d: %5d: %6d %6d %8x",
+					       curr_index, j,
+					       curr_credit,
+					       (curr_credit - old_credit),
+					       mem_vdevs);
 			else
-				QDF_TRACE(QDF_MODULE_ID_TXRX,
-					  QDF_TRACE_LEVEL_ERROR,
-					  "%4d: %5d: %6d %6s %8x",
-					  curr_index, j,
-					  curr_credit, "NA", mem_vdevs);
+				txrx_nofl_info("%4d: %5d: %6d %6s %8x",
+					       curr_index, j,
+					       curr_credit, "NA", mem_vdevs);
 		}
 
 		if (is_break)

+ 112 - 119
core/dp/txrx/ol_txrx.c

@@ -4039,13 +4039,12 @@ ol_txrx_stats(uint8_t vdev_id, char *buffer, unsigned int buf_len)
  */
 static void ol_txrx_disp_peer_cached_bufq_stats(struct ol_txrx_peer_t *peer)
 {
-	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
-		  "cached_bufq: curr %d drops %d hwm %d whatifs %d thresh %d",
-		  peer->bufq_info.curr,
-		  peer->bufq_info.dropped,
-		  peer->bufq_info.high_water_mark,
-		  peer->bufq_info.qdepth_no_thresh,
-		  peer->bufq_info.thresh);
+	txrx_nofl_info("cached_bufq: curr %d drops %d hwm %d whatifs %d thresh %d",
+		       peer->bufq_info.curr,
+		       peer->bufq_info.dropped,
+		       peer->bufq_info.high_water_mark,
+		       peer->bufq_info.qdepth_no_thresh,
+		       peer->bufq_info.thresh);
 }
 
 /**
@@ -4073,8 +4072,8 @@ static void ol_txrx_disp_peer_stats(ol_txrx_pdev_handle pdev)
 		qdf_spin_unlock_bh(&pdev->local_peer_ids.lock);
 
 		if (peer) {
-			QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
-				"stats: peer 0x%pK local peer id %d", peer, i);
+			txrx_nofl_info("stats: peer 0x%pK local peer id %d",
+				       peer, i);
 			ol_txrx_disp_peer_cached_bufq_stats(peer);
 			ol_txrx_peer_release_ref(peer,
 						 PEER_DEBUG_ID_OL_INTERNAL);
@@ -4084,8 +4083,7 @@ static void ol_txrx_disp_peer_stats(ol_txrx_pdev_handle pdev)
 #else
 static void ol_txrx_disp_peer_stats(ol_txrx_pdev_handle pdev)
 {
-	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
-		  "peer stats not supported w/o QCA_SUPPORT_TXRX_LOCAL_PEER_ID");
+	txrx_nofl_info("peer stats not supported w/o QCA_SUPPORT_TXRX_LOCAL_PEER_ID");
 }
 #endif
 
@@ -4099,117 +4097,112 @@ void ol_txrx_stats_display(ol_txrx_pdev_handle pdev,
 		  + pdev->stats.pub.tx.dropped.others.pkts;
 
 	if (level == QDF_STATS_VERBOSITY_LEVEL_LOW) {
-		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
-			  "STATS |%u %u|TX: %lld tso %lld ok %lld drops(%u-%lld %u-%lld %u-%lld ?-%lld hR-%lld)|RX: %lld drops(E %lld PI %lld ME %lld) fwd(S %d F %d SF %d)|",
-			  pdev->tx_desc.num_free,
-			  pdev->tx_desc.pool_size,
-			  pdev->stats.pub.tx.from_stack.pkts,
-			  pdev->stats.pub.tx.tso.tso_pkts.pkts,
-			  pdev->stats.pub.tx.delivered.pkts,
-			  htt_tx_status_download_fail,
-			  pdev->stats.pub.tx.dropped.download_fail.pkts,
-			  htt_tx_status_discard,
-			  pdev->stats.pub.tx.dropped.target_discard.pkts,
-			  htt_tx_status_no_ack,
-			  pdev->stats.pub.tx.dropped.no_ack.pkts,
-			  pdev->stats.pub.tx.dropped.others.pkts,
-			  pdev->stats.pub.tx.dropped.host_reject.pkts,
-			  pdev->stats.pub.rx.delivered.pkts,
-			  pdev->stats.pub.rx.dropped_err.pkts,
-			  pdev->stats.pub.rx.dropped_peer_invalid.pkts,
-			  pdev->stats.pub.rx.dropped_mic_err.pkts,
-			  pdev->stats.pub.rx.intra_bss_fwd.packets_stack,
-			  pdev->stats.pub.rx.intra_bss_fwd.packets_fwd,
-			  pdev->stats.pub.rx.intra_bss_fwd.packets_stack_n_fwd);
+		txrx_nofl_dbg("STATS |%u %u|TX: %lld tso %lld ok %lld drops(%u-%lld %u-%lld %u-%lld ?-%lld hR-%lld)|RX: %lld drops(E %lld PI %lld ME %lld) fwd(S %d F %d SF %d)|",
+			      pdev->tx_desc.num_free,
+			      pdev->tx_desc.pool_size,
+			      pdev->stats.pub.tx.from_stack.pkts,
+			      pdev->stats.pub.tx.tso.tso_pkts.pkts,
+			      pdev->stats.pub.tx.delivered.pkts,
+			      htt_tx_status_download_fail,
+			      pdev->stats.pub.tx.dropped.download_fail.pkts,
+			      htt_tx_status_discard,
+			      pdev->stats.pub.tx.dropped.
+					target_discard.pkts,
+			      htt_tx_status_no_ack,
+			      pdev->stats.pub.tx.dropped.no_ack.pkts,
+			      pdev->stats.pub.tx.dropped.others.pkts,
+			      pdev->stats.pub.tx.dropped.host_reject.pkts,
+			      pdev->stats.pub.rx.delivered.pkts,
+			      pdev->stats.pub.rx.dropped_err.pkts,
+			      pdev->stats.pub.rx.dropped_peer_invalid.pkts,
+			      pdev->stats.pub.rx.dropped_mic_err.pkts,
+			      pdev->stats.pub.rx.intra_bss_fwd.
+					packets_stack,
+			      pdev->stats.pub.rx.intra_bss_fwd.
+					packets_fwd,
+			      pdev->stats.pub.rx.intra_bss_fwd.
+					packets_stack_n_fwd);
 		return;
 	}
 
-	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
-		  "TX PATH Statistics:");
-	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
-		  "sent %lld msdus (%lld B), host rejected %lld (%lld B), dropped %lld (%lld B)",
-		  pdev->stats.pub.tx.from_stack.pkts,
-		  pdev->stats.pub.tx.from_stack.bytes,
-		  pdev->stats.pub.tx.dropped.host_reject.pkts,
-		  pdev->stats.pub.tx.dropped.host_reject.bytes,
-		  tx_dropped,
-		  pdev->stats.pub.tx.dropped.download_fail.bytes
-		  + pdev->stats.pub.tx.dropped.target_discard.bytes
-		  + pdev->stats.pub.tx.dropped.no_ack.bytes);
-	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
-		  "successfully delivered: %lld (%lld B), download fail: %lld (%lld B), target discard: %lld (%lld B), no ack: %lld (%lld B) others: %lld (%lld B)",
-		  pdev->stats.pub.tx.delivered.pkts,
-		  pdev->stats.pub.tx.delivered.bytes,
-		  pdev->stats.pub.tx.dropped.download_fail.pkts,
-		  pdev->stats.pub.tx.dropped.download_fail.bytes,
-		  pdev->stats.pub.tx.dropped.target_discard.pkts,
-		  pdev->stats.pub.tx.dropped.target_discard.bytes,
-		  pdev->stats.pub.tx.dropped.no_ack.pkts,
-		  pdev->stats.pub.tx.dropped.no_ack.bytes,
-		  pdev->stats.pub.tx.dropped.others.pkts,
-		  pdev->stats.pub.tx.dropped.others.bytes);
-	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
-		  "Tx completions per HTT message:\n"
-		  "Single Packet  %d\n"
-		  " 2-10 Packets  %d\n"
-		  "11-20 Packets  %d\n"
-		  "21-30 Packets  %d\n"
-		  "31-40 Packets  %d\n"
-		  "41-50 Packets  %d\n"
-		  "51-60 Packets  %d\n"
-		  "  60+ Packets  %d\n",
-		  pdev->stats.pub.tx.comp_histogram.pkts_1,
-		  pdev->stats.pub.tx.comp_histogram.pkts_2_10,
-		  pdev->stats.pub.tx.comp_histogram.pkts_11_20,
-		  pdev->stats.pub.tx.comp_histogram.pkts_21_30,
-		  pdev->stats.pub.tx.comp_histogram.pkts_31_40,
-		  pdev->stats.pub.tx.comp_histogram.pkts_41_50,
-		  pdev->stats.pub.tx.comp_histogram.pkts_51_60,
-		  pdev->stats.pub.tx.comp_histogram.pkts_61_plus);
-
-	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
-		  "RX PATH Statistics:");
-	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
-		  "%lld ppdus, %lld mpdus, %lld msdus, %lld bytes\n"
-		  "dropped: err %lld (%lld B), peer_invalid %lld (%lld B), mic_err %lld (%lld B)\n"
-		  "msdus with frag_ind: %d msdus with offload_ind: %d",
-		  pdev->stats.priv.rx.normal.ppdus,
-		  pdev->stats.priv.rx.normal.mpdus,
-		  pdev->stats.pub.rx.delivered.pkts,
-		  pdev->stats.pub.rx.delivered.bytes,
-		  pdev->stats.pub.rx.dropped_err.pkts,
-		  pdev->stats.pub.rx.dropped_err.bytes,
-		  pdev->stats.pub.rx.dropped_peer_invalid.pkts,
-		  pdev->stats.pub.rx.dropped_peer_invalid.bytes,
-		  pdev->stats.pub.rx.dropped_mic_err.pkts,
-		  pdev->stats.pub.rx.dropped_mic_err.bytes,
-		  pdev->stats.pub.rx.msdus_with_frag_ind,
-		  pdev->stats.pub.rx.msdus_with_offload_ind);
-
-	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
-		  "  fwd to stack %d, fwd to fw %d, fwd to stack & fw  %d\n",
-		  pdev->stats.pub.rx.intra_bss_fwd.packets_stack,
-		  pdev->stats.pub.rx.intra_bss_fwd.packets_fwd,
-		  pdev->stats.pub.rx.intra_bss_fwd.packets_stack_n_fwd);
-
-	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
-		  "Rx packets per HTT message:\n"
-		  "Single Packet  %d\n"
-		  " 2-10 Packets  %d\n"
-		  "11-20 Packets  %d\n"
-		  "21-30 Packets  %d\n"
-		  "31-40 Packets  %d\n"
-		  "41-50 Packets  %d\n"
-		  "51-60 Packets  %d\n"
-		  "  60+ Packets  %d\n",
-		  pdev->stats.pub.rx.rx_ind_histogram.pkts_1,
-		  pdev->stats.pub.rx.rx_ind_histogram.pkts_2_10,
-		  pdev->stats.pub.rx.rx_ind_histogram.pkts_11_20,
-		  pdev->stats.pub.rx.rx_ind_histogram.pkts_21_30,
-		  pdev->stats.pub.rx.rx_ind_histogram.pkts_31_40,
-		  pdev->stats.pub.rx.rx_ind_histogram.pkts_41_50,
-		  pdev->stats.pub.rx.rx_ind_histogram.pkts_51_60,
-		  pdev->stats.pub.rx.rx_ind_histogram.pkts_61_plus);
+	txrx_nofl_info("TX PATH Statistics:");
+	txrx_nofl_info("sent %lld msdus (%lld B), host rejected %lld (%lld B), dropped %lld (%lld B)",
+		       pdev->stats.pub.tx.from_stack.pkts,
+		       pdev->stats.pub.tx.from_stack.bytes,
+		       pdev->stats.pub.tx.dropped.host_reject.pkts,
+		       pdev->stats.pub.tx.dropped.host_reject.bytes,
+			  tx_dropped,
+		       pdev->stats.pub.tx.dropped.download_fail.bytes
+			  + pdev->stats.pub.tx.dropped.target_discard.bytes
+			  + pdev->stats.pub.tx.dropped.no_ack.bytes);
+	txrx_nofl_info("successfully delivered: %lld (%lld B), download fail: %lld (%lld B), target discard: %lld (%lld B), no ack: %lld (%lld B) others: %lld (%lld B)",
+		       pdev->stats.pub.tx.delivered.pkts,
+		       pdev->stats.pub.tx.delivered.bytes,
+		       pdev->stats.pub.tx.dropped.download_fail.pkts,
+		       pdev->stats.pub.tx.dropped.download_fail.bytes,
+		       pdev->stats.pub.tx.dropped.target_discard.pkts,
+		       pdev->stats.pub.tx.dropped.target_discard.bytes,
+		       pdev->stats.pub.tx.dropped.no_ack.pkts,
+		       pdev->stats.pub.tx.dropped.no_ack.bytes,
+		       pdev->stats.pub.tx.dropped.others.pkts,
+		       pdev->stats.pub.tx.dropped.others.bytes);
+	txrx_nofl_info("Tx completions per HTT message:\n"
+		       "Single Packet  %d\n"
+		       " 2-10 Packets  %d\n"
+		       "11-20 Packets  %d\n"
+		       "21-30 Packets  %d\n"
+		       "31-40 Packets  %d\n"
+		       "41-50 Packets  %d\n"
+		       "51-60 Packets  %d\n"
+		       "  60+ Packets  %d\n",
+		       pdev->stats.pub.tx.comp_histogram.pkts_1,
+		       pdev->stats.pub.tx.comp_histogram.pkts_2_10,
+		       pdev->stats.pub.tx.comp_histogram.pkts_11_20,
+		       pdev->stats.pub.tx.comp_histogram.pkts_21_30,
+		       pdev->stats.pub.tx.comp_histogram.pkts_31_40,
+		       pdev->stats.pub.tx.comp_histogram.pkts_41_50,
+		       pdev->stats.pub.tx.comp_histogram.pkts_51_60,
+		       pdev->stats.pub.tx.comp_histogram.pkts_61_plus);
+
+	txrx_nofl_info("RX PATH Statistics:");
+	txrx_nofl_info("%lld ppdus, %lld mpdus, %lld msdus, %lld bytes\n"
+		       "dropped: err %lld (%lld B), peer_invalid %lld (%lld B), mic_err %lld (%lld B)\n"
+		       "msdus with frag_ind: %d msdus with offload_ind: %d",
+		       pdev->stats.priv.rx.normal.ppdus,
+		       pdev->stats.priv.rx.normal.mpdus,
+		       pdev->stats.pub.rx.delivered.pkts,
+		       pdev->stats.pub.rx.delivered.bytes,
+		       pdev->stats.pub.rx.dropped_err.pkts,
+		       pdev->stats.pub.rx.dropped_err.bytes,
+		       pdev->stats.pub.rx.dropped_peer_invalid.pkts,
+		       pdev->stats.pub.rx.dropped_peer_invalid.bytes,
+		       pdev->stats.pub.rx.dropped_mic_err.pkts,
+		       pdev->stats.pub.rx.dropped_mic_err.bytes,
+		       pdev->stats.pub.rx.msdus_with_frag_ind,
+		       pdev->stats.pub.rx.msdus_with_offload_ind);
+
+	txrx_nofl_info("  fwd to stack %d, fwd to fw %d, fwd to stack & fw  %d\n",
+		       pdev->stats.pub.rx.intra_bss_fwd.packets_stack,
+		       pdev->stats.pub.rx.intra_bss_fwd.packets_fwd,
+		       pdev->stats.pub.rx.intra_bss_fwd.packets_stack_n_fwd);
+
+	txrx_nofl_info("packets per HTT message:\n"
+		       "Single Packet  %d\n"
+		       " 2-10 Packets  %d\n"
+		       "11-20 Packets  %d\n"
+		       "21-30 Packets  %d\n"
+		       "31-40 Packets  %d\n"
+		       "41-50 Packets  %d\n"
+		       "51-60 Packets  %d\n"
+		       "  60+ Packets  %d\n",
+		       pdev->stats.pub.rx.rx_ind_histogram.pkts_1,
+		       pdev->stats.pub.rx.rx_ind_histogram.pkts_2_10,
+		       pdev->stats.pub.rx.rx_ind_histogram.pkts_11_20,
+		       pdev->stats.pub.rx.rx_ind_histogram.pkts_21_30,
+		       pdev->stats.pub.rx.rx_ind_histogram.pkts_31_40,
+		       pdev->stats.pub.rx.rx_ind_histogram.pkts_41_50,
+		       pdev->stats.pub.rx.rx_ind_histogram.pkts_51_60,
+		       pdev->stats.pub.rx.rx_ind_histogram.pkts_61_plus);
 
 	ol_txrx_disp_peer_stats(pdev);
 }

+ 24 - 23
core/dp/txrx/ol_txrx_flow_control.c

@@ -389,16 +389,16 @@ void ol_tx_dump_flow_pool_info(void *ctx)
 		return;
 	}
 
-	ol_txrx_info("Global total %d :: avail %d invalid flow_pool %d ",
-		     pdev->tx_desc.pool_size,
-		     pdev->tx_desc.num_free,
-		     pdev->tx_desc.num_invalid_bin);
-
-	ol_txrx_info("maps %d pool unmaps %d pool resize %d pkt drops %d",
-		     pdev->pool_stats.pool_map_count,
-		     pdev->pool_stats.pool_unmap_count,
-		     pdev->pool_stats.pool_resize_count,
-		     pdev->pool_stats.pkt_drop_no_pool);
+	txrx_nofl_info("Global total %d :: avail %d invalid flow_pool %d ",
+		       pdev->tx_desc.pool_size,
+		       pdev->tx_desc.num_free,
+		       pdev->tx_desc.num_invalid_bin);
+
+	txrx_nofl_info("maps %d pool unmaps %d pool resize %d pkt drops %d",
+		       pdev->pool_stats.pool_map_count,
+		       pdev->pool_stats.pool_unmap_count,
+		       pdev->pool_stats.pool_resize_count,
+		       pdev->pool_stats.pkt_drop_no_pool);
 	/*
 	 * Nested spin lock.
 	 * Always take in below order.
@@ -416,19 +416,20 @@ void ol_tx_dump_flow_pool_info(void *ctx)
 		if (pool_prev)
 			ol_tx_dec_pool_ref(pool_prev, false);
 
-		ol_txrx_info("flow_pool_id %d ::", tmp_pool.flow_pool_id);
-		ol_txrx_info("status %s flow_id %d flow_type %d",
-			     ol_tx_flow_pool_status_to_str(tmp_pool.status),
-			     tmp_pool.member_flow_id, tmp_pool.flow_type);
-		ol_txrx_info("total %d :: available %d :: deficient %d :: overflow %d :: pkt dropped (no desc) %d",
-			     tmp_pool.flow_pool_size, tmp_pool.avail_desc,
-			     tmp_pool.deficient_desc,
-			     tmp_pool.overflow_desc,
-			     tmp_pool.pkt_drop_no_desc);
-		ol_txrx_info("thresh: start %d stop %d prio start %d prio stop %d",
-			     tmp_pool.start_th, tmp_pool.stop_th,
-			     tmp_pool.start_priority_th,
-			     tmp_pool.stop_priority_th);
+		txrx_nofl_info("flow_pool_id %d ::", tmp_pool.flow_pool_id);
+		txrx_nofl_info("status %s flow_id %d flow_type %d",
+			       ol_tx_flow_pool_status_to_str
+					(tmp_pool.status),
+			       tmp_pool.member_flow_id, tmp_pool.flow_type);
+		txrx_nofl_info("total %d :: available %d :: deficient %d :: overflow %d :: pkt dropped (no desc) %d",
+			       tmp_pool.flow_pool_size, tmp_pool.avail_desc,
+			       tmp_pool.deficient_desc,
+			       tmp_pool.overflow_desc,
+			       tmp_pool.pkt_drop_no_desc);
+		txrx_nofl_info("thresh: start %d stop %d prio start %d prio stop %d",
+			       tmp_pool.start_th, tmp_pool.stop_th,
+			       tmp_pool.start_priority_th,
+			       tmp_pool.stop_priority_th);
 		pool_prev = pool;
 		qdf_spin_lock_bh(&pdev->tx_desc.flow_pool_list_lock);
 	}

+ 54 - 50
core/hdd/src/wlan_hdd_main.c

@@ -7826,40 +7826,40 @@ void wlan_hdd_display_tx_rx_histogram(struct hdd_context *hdd_ctx)
 	int i;
 
 #ifdef MSM_PLATFORM
-	hdd_debug("BW compute Interval: %dms",
-		hdd_ctx->config->busBandwidthComputeInterval);
-	hdd_debug("BW High TH: %d BW Med TH: %d BW Low TH: %d",
-		hdd_ctx->config->busBandwidthHighThreshold,
-		hdd_ctx->config->busBandwidthMediumThreshold,
-		hdd_ctx->config->busBandwidthLowThreshold);
-	hdd_debug("Enable TCP DEL ACK: %d",
-		hdd_ctx->en_tcp_delack_no_lro);
-	hdd_debug("TCP DEL High TH: %d TCP DEL Low TH: %d",
-		hdd_ctx->config->tcpDelackThresholdHigh,
-		hdd_ctx->config->tcpDelackThresholdLow);
-	hdd_debug("TCP TX HIGH TP TH: %d (Use to set tcp_output_bytes_limit)",
-		hdd_ctx->config->tcp_tx_high_tput_thres);
+	hdd_nofl_info("BW compute Interval: %dms",
+		      hdd_ctx->config->busBandwidthComputeInterval);
+	hdd_nofl_info("BW High TH: %d BW Med TH: %d BW Low TH: %d",
+		      hdd_ctx->config->busBandwidthHighThreshold,
+		      hdd_ctx->config->busBandwidthMediumThreshold,
+		      hdd_ctx->config->busBandwidthLowThreshold);
+	hdd_nofl_info("Enable TCP DEL ACK: %d",
+		      hdd_ctx->en_tcp_delack_no_lro);
+	hdd_nofl_info("TCP DEL High TH: %d TCP DEL Low TH: %d",
+		      hdd_ctx->config->tcpDelackThresholdHigh,
+		      hdd_ctx->config->tcpDelackThresholdLow);
+	hdd_nofl_info("TCP TX HIGH TP TH: %d (Use to set tcp_output_bytes_limit)",
+		      hdd_ctx->config->tcp_tx_high_tput_thres);
 #endif
 
-	hdd_debug("Total entries: %d Current index: %d",
-		NUM_TX_RX_HISTOGRAM, hdd_ctx->hdd_txrx_hist_idx);
+	hdd_nofl_info("Total entries: %d Current index: %d",
+		      NUM_TX_RX_HISTOGRAM, hdd_ctx->hdd_txrx_hist_idx);
 
-	hdd_debug("[index][timestamp]: interval_rx, interval_tx, bus_bw_level, RX TP Level, TX TP Level");
+	hdd_nofl_info("[index][timestamp]: interval_rx, interval_tx, bus_bw_level, RX TP Level, TX TP Level");
 
 	for (i = 0; i < NUM_TX_RX_HISTOGRAM; i++) {
 		/* using hdd_log to avoid printing function name */
 		if (hdd_ctx->hdd_txrx_hist[i].qtime > 0)
-			hdd_debug("[%3d][%15llu]: %6llu, %6llu, %s, %s, %s",
-				  i, hdd_ctx->hdd_txrx_hist[i].qtime,
-				  hdd_ctx->hdd_txrx_hist[i].interval_rx,
-				  hdd_ctx->hdd_txrx_hist[i].interval_tx,
-				  convert_level_to_string(
+			hdd_nofl_info("[%3d][%15llu]: %6llu, %6llu, %s, %s, %s",
+				      i, hdd_ctx->hdd_txrx_hist[i].qtime,
+				      hdd_ctx->hdd_txrx_hist[i].interval_rx,
+				      hdd_ctx->hdd_txrx_hist[i].interval_tx,
+				      convert_level_to_string(
 					hdd_ctx->hdd_txrx_hist[i].
 						next_vote_level),
-				  convert_level_to_string(
+				      convert_level_to_string(
 					hdd_ctx->hdd_txrx_hist[i].
 						next_rx_level),
-				  convert_level_to_string(
+				      convert_level_to_string(
 					hdd_ctx->hdd_txrx_hist[i].
 						next_tx_level));
 	}
@@ -7987,10 +7987,10 @@ wlan_hdd_display_netif_queue_history(struct hdd_context *hdd_ctx,
 	}
 
 	hdd_for_each_adapter(hdd_ctx, adapter) {
-		hdd_debug("Netif queue operation statistics:");
-		hdd_debug("Session_id %d device mode %d",
-			adapter->session_id, adapter->device_mode);
-		hdd_debug("Current pause_map value %x", adapter->pause_map);
+		hdd_nofl_info("Netif queue operation statistics:");
+		hdd_nofl_info("Session_id %d device mode %d",
+			      adapter->session_id, adapter->device_mode);
+		hdd_nofl_info("Current pause_map value %x", adapter->pause_map);
 		curr_time = qdf_system_ticks();
 		total = curr_time - adapter->start_time;
 		delta = curr_time - adapter->last_time;
@@ -8001,11 +8001,11 @@ wlan_hdd_display_netif_queue_history(struct hdd_context *hdd_ctx,
 			unpause = adapter->total_unpause_time + delta;
 			pause = adapter->total_pause_time;
 		}
-		hdd_debug("Total: %ums Pause: %ums Unpause: %ums",
-			qdf_system_ticks_to_msecs(total),
-			qdf_system_ticks_to_msecs(pause),
-			qdf_system_ticks_to_msecs(unpause));
-		hdd_debug("reason_type: pause_cnt: unpause_cnt: pause_time");
+		hdd_nofl_info("Total: %ums Pause: %ums Unpause: %ums",
+			      qdf_system_ticks_to_msecs(total),
+			      qdf_system_ticks_to_msecs(pause),
+			      qdf_system_ticks_to_msecs(unpause));
+		hdd_nofl_info("reason_type: pause_cnt: unpause_cnt: pause_time");
 
 		for (i = WLAN_CONTROL_PATH; i < WLAN_REASON_TYPE_MAX; i++) {
 			qdf_time_t pause_delta = 0;
@@ -8014,33 +8014,37 @@ wlan_hdd_display_netif_queue_history(struct hdd_context *hdd_ctx,
 				pause_delta = delta;
 
 			/* using hdd_log to avoid printing function name */
-			hdd_debug("%s: %d: %d: %ums",
-				 hdd_reason_type_to_string(i),
-				 adapter->queue_oper_stats[i].pause_count,
-				 adapter->queue_oper_stats[i].unpause_count,
-				 qdf_system_ticks_to_msecs(
-				 adapter->queue_oper_stats[i].total_pause_time +
-				 pause_delta));
+			hdd_nofl_info("%s: %d: %d: %ums",
+				      hdd_reason_type_to_string(i),
+				      adapter->queue_oper_stats[i].pause_count,
+				      adapter->queue_oper_stats[i].
+					unpause_count,
+				      qdf_system_ticks_to_msecs(
+				      adapter->queue_oper_stats[i].
+					total_pause_time + pause_delta));
 		}
 
-		hdd_debug("Netif queue operation history:");
-		hdd_debug("Total entries: %d current index %d",
-			WLAN_HDD_MAX_HISTORY_ENTRY, adapter->history_index);
+		hdd_nofl_info("Netif queue operation history:");
+		hdd_nofl_info("Total entries: %d current index %d",
+			      WLAN_HDD_MAX_HISTORY_ENTRY,
+			      adapter->history_index);
 
-		hdd_debug("index: time: action_type: reason_type: pause_map");
+		hdd_nofl_info("index: time: action_type: reason_type: pause_map");
 
 		for (i = 0; i < WLAN_HDD_MAX_HISTORY_ENTRY; i++) {
 			/* using hdd_log to avoid printing function name */
 			if (adapter->queue_oper_history[i].time == 0)
 				continue;
-			hdd_debug("%d: %u: %s: %s: %x",
-				  i, qdf_system_ticks_to_msecs(
+			hdd_nofl_info("%d: %u: %s: %s: %x",
+				      i, qdf_system_ticks_to_msecs(
 					adapter->queue_oper_history[i].time),
-				  hdd_action_type_to_string(
-				  adapter->queue_oper_history[i].netif_action),
-				  hdd_reason_type_to_string(
-				  adapter->queue_oper_history[i].netif_reason),
-				  adapter->queue_oper_history[i].pause_map);
+				      hdd_action_type_to_string(
+					adapter->queue_oper_history[i].
+						netif_action),
+				      hdd_reason_type_to_string(
+					adapter->queue_oper_history[i].
+						netif_reason),
+				      adapter->queue_oper_history[i].pause_map);
 		}
 	}
 }

+ 16 - 15
core/hdd/src/wlan_hdd_napi.c

@@ -476,10 +476,10 @@ int hdd_display_napi_stats(void)
 		hdd_err("%s unable to retrieve napi structure", __func__);
 		return -EFAULT;
 	}
-	hdd_debug("[NAPI %u][BL %d]:  scheds   polls   comps    done t-lim p-lim  corr  max_time napi-buckets(%d)",
-		  napid->napi_mode,
-		  hif_napi_cpu_blacklist(napid, BLACKLIST_QUERY),
-		  QCA_NAPI_NUM_BUCKETS);
+	hdd_nofl_info("[NAPI %u][BL %d]:  scheds   polls   comps    done t-lim p-lim  corr  max_time napi-buckets(%d)",
+		      napid->napi_mode,
+		      hif_napi_cpu_blacklist(napid, BLACKLIST_QUERY),
+		      QCA_NAPI_NUM_BUCKETS);
 
 	for (i = 0; i < CE_COUNT_MAX; i++)
 		if (napid->ce_map & (0x01 << i)) {
@@ -499,17 +499,18 @@ int hdd_display_napi_stats(void)
 				}
 
 				if (napis->napi_schedules != 0)
-					hdd_debug("NAPI[%2d]CPU[%d]: %7d %7d %7d %7d %5d %5d %5d %9llu %s",
-						  i, j,
-						  napis->napi_schedules,
-						  napis->napi_polls,
-						  napis->napi_completes,
-						  napis->napi_workdone,
-						  napis->time_limit_reached,
-						  napis->rxpkt_thresh_reached,
-						  napis->cpu_corrected,
-						  napis->napi_max_poll_time,
-						  buf);
+					hdd_nofl_info("NAPI[%2d]CPU[%d]: %7d %7d %7d %7d %5d %5d %5d %9llu %s",
+						      i, j,
+						      napis->napi_schedules,
+						      napis->napi_polls,
+						      napis->napi_completes,
+						      napis->napi_workdone,
+						      napis->time_limit_reached,
+						      napis->
+							rxpkt_thresh_reached,
+						      napis->cpu_corrected,
+						      napis->napi_max_poll_time,
+						      buf);
 			}
 		}
 

+ 11 - 11
core/hdd/src/wlan_hdd_wext.c

@@ -3178,17 +3178,17 @@ void hdd_wlan_list_fw_profile(uint16_t *length,
  */
 static void hdd_display_stats_help(void)
 {
-	hdd_err("iwpriv wlan0 dumpStats [option] - dump statistics");
-	hdd_err("iwpriv wlan0 clearStats [option] - clear statistics");
-	hdd_err("options:");
-	hdd_err("  1 -- TXRX PATH statistics");
-	hdd_err("  2 -- TXRX HIST statistics");
-	hdd_err("  3 -- TSO statistics");
-	hdd_err("  4 -- Network queue statistics");
-	hdd_err("  5 -- Flow control statistics");
-	hdd_err("  6 -- Per Layer statistics");
-	hdd_err("  7 -- Copy engine interrupt statistics");
-	hdd_err("  9 -- NAPI statistics");
+	hdd_nofl_info("iwpriv wlan0 dumpStats [option] - dump statistics");
+	hdd_nofl_info("iwpriv wlan0 clearStats [option] - clear statistics");
+	hdd_nofl_info("options:");
+	hdd_nofl_info("  1 -- TXRX PATH statistics");
+	hdd_nofl_info("  2 -- TXRX HIST statistics");
+	hdd_nofl_info("  3 -- TSO statistics");
+	hdd_nofl_info("  4 -- Network queue statistics");
+	hdd_nofl_info("  5 -- Flow control statistics");
+	hdd_nofl_info("  6 -- Per Layer statistics");
+	hdd_nofl_info("  7 -- Copy engine interrupt statistics");
+	hdd_nofl_info("  9 -- NAPI statistics");
 }
 
 /**

+ 12 - 12
core/sme/src/common/sme_api.c

@@ -15617,23 +15617,23 @@ void sme_display_disconnect_stats(tHalHandle hal, uint8_t session_id)
 		return;
 	}
 
-	sme_debug("Total No. of Disconnections: %d",
-		  session->disconnect_stats.disconnection_cnt);
+	sme_nofl_info("Total No. of Disconnections: %d",
+		      session->disconnect_stats.disconnection_cnt);
 
-	sme_debug("No. of Diconnects Triggered by Application: %d",
-		  session->disconnect_stats.disconnection_by_app);
+	sme_nofl_info("No. of Diconnects Triggered by Application: %d",
+		      session->disconnect_stats.disconnection_by_app);
 
-	sme_debug("No. of Disassoc Sent by Peer: %d",
-		  session->disconnect_stats.disassoc_by_peer);
+	sme_nofl_info("No. of Disassoc Sent by Peer: %d",
+		      session->disconnect_stats.disassoc_by_peer);
 
-	sme_debug("No. of Deauth Sent by Peer: %d",
-		  session->disconnect_stats.deauth_by_peer);
+	sme_nofl_info("No. of Deauth Sent by Peer: %d",
+		      session->disconnect_stats.deauth_by_peer);
 
-	sme_debug("No. of Disconnections due to Beacon Miss: %d",
-		  session->disconnect_stats.bmiss);
+	sme_nofl_info("No. of Disconnections due to Beacon Miss: %d",
+		      session->disconnect_stats.bmiss);
 
-	sme_debug("No. of Disconnections due to Peer Kickout: %d",
-		  session->disconnect_stats.peer_kickout);
+	sme_nofl_info("No. of Disconnections due to Peer Kickout: %d",
+		      session->disconnect_stats.peer_kickout);
 }
 
  /**

Some files were not shown because too many files changed in this diff