Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43860c12 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

nfp: move more ring debug info to debugfs 



We already print most of ring configuration including descriptors
in debugfs, add the few missing pieces and remove debug prints.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 47465aed

drivers/net/ethernet/netronome/nfp/nfp_net_common.c

+0 −9
Original line number Original line Diff line number Diff line
@@ -1776,11 +1776,6 @@ nfp_net_tx_ring_alloc(struct nfp_net_tx_ring *tx_ring, u32 cnt, bool is_xdp) 
		netif_set_xps_queue(nn->netdev, &r_vec->affinity_mask,

		netif_set_xps_queue(nn->netdev, &r_vec->affinity_mask,

				    tx_ring->idx);

				    tx_ring->idx);





	nn_dbg(nn, "TxQ%02d: QCidx=%02d cnt=%d dma=%#llx host=%p %s\n",

	       tx_ring->idx, tx_ring->qcidx,

	       tx_ring->cnt, (unsigned long long)tx_ring->dma, tx_ring->txds,

	       is_xdp ? "XDP" : "");



	return 0;

	return 0;





err_alloc:

err_alloc:
@@ -1900,10 +1895,6 @@ nfp_net_rx_ring_alloc(struct nfp_net_rx_ring *rx_ring, unsigned int fl_bufsz, 
	if (!rx_ring->rxbufs)

	if (!rx_ring->rxbufs)

		goto err_alloc;

		goto err_alloc;





	nn_dbg(nn, "RxQ%02d: FlQCidx=%02d RxQCidx=%02d cnt=%d dma=%#llx host=%p\n",

	       rx_ring->idx, rx_ring->fl_qcidx, rx_ring->rx_qcidx,

	       rx_ring->cnt, (unsigned long long)rx_ring->dma, rx_ring->rxds);



	return 0;

	return 0;





err_alloc:

err_alloc:

drivers/net/ethernet/netronome/nfp/nfp_net_debugfs.c

+9 −4
Original line number Original line Diff line number Diff line
@@ -64,8 +64,10 @@ static int nfp_net_debugfs_rx_q_read(struct seq_file *file, void *data) 
	rx_rd_p = nfp_qcp_rd_ptr_read(rx_ring->qcp_rx);

	rx_rd_p = nfp_qcp_rd_ptr_read(rx_ring->qcp_rx);

	rx_wr_p = nfp_qcp_wr_ptr_read(rx_ring->qcp_rx);

	rx_wr_p = nfp_qcp_wr_ptr_read(rx_ring->qcp_rx);





	seq_printf(file, "RX[%02d]: H_RD=%d H_WR=%d FL_RD=%d FL_WR=%d RX_RD=%d RX_WR=%d\n",

	seq_printf(file, "RX[%02d,%02d,%02d]: cnt=%d dma=%pad host=%p   H_RD=%d H_WR=%d FL_RD=%d FL_WR=%d RX_RD=%d RX_WR=%d\n",

		   rx_ring->idx, rx_ring->rd_p, rx_ring->wr_p,

		   rx_ring->idx, rx_ring->fl_qcidx, rx_ring->rx_qcidx,

		   rx_ring->cnt, &rx_ring->dma, rx_ring->rxds,

		   rx_ring->rd_p, rx_ring->wr_p,

		   fl_rd_p, fl_wr_p, rx_rd_p, rx_wr_p);

		   fl_rd_p, fl_wr_p, rx_rd_p, rx_wr_p);





	for (i = 0; i < rxd_cnt; i++) {

	for (i = 0; i < rxd_cnt; i++) {
@@ -151,8 +153,11 @@ static int nfp_net_debugfs_tx_q_read(struct seq_file *file, void *data) 
	d_rd_p = nfp_qcp_rd_ptr_read(tx_ring->qcp_q);

	d_rd_p = nfp_qcp_rd_ptr_read(tx_ring->qcp_q);

	d_wr_p = nfp_qcp_wr_ptr_read(tx_ring->qcp_q);

	d_wr_p = nfp_qcp_wr_ptr_read(tx_ring->qcp_q);





	seq_printf(file, "TX[%02d]: H_RD=%d H_WR=%d D_RD=%d D_WR=%d\n",

	seq_printf(file, "TX[%02d,%02d%s]: cnt=%d dma=%pad host=%p   H_RD=%d H_WR=%d D_RD=%d D_WR=%d\n",

		   tx_ring->idx, tx_ring->rd_p, tx_ring->wr_p, d_rd_p, d_wr_p);

		   tx_ring->idx, tx_ring->qcidx,

		   tx_ring == r_vec->tx_ring ? "" : "xdp",

		   tx_ring->cnt, &tx_ring->dma, tx_ring->txds,

		   tx_ring->rd_p, tx_ring->wr_p, d_rd_p, d_wr_p);





	for (i = 0; i < txd_cnt; i++) {

	for (i = 0; i < txd_cnt; i++) {

		txd = &tx_ring->txds[i];

		txd = &tx_ring->txds[i];