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

Commit f09875c4 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: stmmac: Add per queue ethtool stats"

parents 666ce72c 1aec6680

drivers/net/ethernet/stmicro/stmmac/common.h

+2 −0
Original line number Diff line number Diff line
@@ -94,6 +94,8 @@ struct stmmac_extra_stats { 
	unsigned long threshold;

	unsigned long tx_pkt_n;

	unsigned long rx_pkt_n;

	unsigned long q_tx_pkt_n[MTL_MAX_TX_QUEUES];

	unsigned long q_rx_pkt_n[MTL_MAX_RX_QUEUES];

	unsigned long normal_irq_n;

	unsigned long rx_normal_irq_n;

	unsigned long napi_poll;

drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c

+9 −0
Original line number Diff line number Diff line
@@ -89,7 +89,16 @@ static const struct stmmac_stats stmmac_gstrings_stats[] = { 
	STMMAC_STAT(rx_early_irq),

	STMMAC_STAT(threshold),

	STMMAC_STAT(tx_pkt_n),

	STMMAC_STAT(q_tx_pkt_n[0]),

	STMMAC_STAT(q_tx_pkt_n[1]),

	STMMAC_STAT(q_tx_pkt_n[2]),

	STMMAC_STAT(q_tx_pkt_n[3]),

	STMMAC_STAT(q_tx_pkt_n[4]),

	STMMAC_STAT(rx_pkt_n),

	STMMAC_STAT(q_rx_pkt_n[0]),

	STMMAC_STAT(q_rx_pkt_n[1]),

	STMMAC_STAT(q_rx_pkt_n[2]),

	STMMAC_STAT(q_rx_pkt_n[3]),

	STMMAC_STAT(normal_irq_n),

	STMMAC_STAT(rx_normal_irq_n),

	STMMAC_STAT(napi_poll),

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+2 −0
Original line number Diff line number Diff line
@@ -1968,6 +1968,7 @@ static void stmmac_tx_clean(struct stmmac_priv *priv, u32 queue) 
			} else {

				priv->dev->stats.tx_packets++;

				priv->xstats.tx_pkt_n++;

				priv->xstats.q_tx_pkt_n[queue]++;

#ifdef CONFIG_MSM_BOOT_TIME_MARKER

if (priv->dev->stats.tx_packets == 1)

	place_marker("M - Ethernet first packet transmitted");
@@ -3703,6 +3704,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) 
	stmmac_rx_refill(priv, queue);



	priv->xstats.rx_pkt_n += count;

	priv->xstats.q_rx_pkt_n[queue] += count;



	return count;

}