Commit 7e68708b authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'stmmac-missing-stats-DW-GMAC' 



Minda Chen says:

====================
Add missing mmc statistics in DW GMAC

Add miss MMC statistic in DW GMAC

base on 6.9-rc1

changed
v2:
   patch2 : remove mmc_rx_control_g due to it is gotten in
ethtool_ops::get_eth_ctrl_stats.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 49563be8 ff20393b

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

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ struct stmmac_counters { 
	unsigned int mmc_tx_excessdef;

	unsigned int mmc_tx_pause_frame;

	unsigned int mmc_tx_vlan_frame_g;

	unsigned int mmc_tx_oversize_g;

	unsigned int mmc_tx_lpi_usec;

	unsigned int mmc_tx_lpi_tran;
@@ -80,6 +81,7 @@ struct stmmac_counters { 
	unsigned int mmc_rx_fifo_overflow;

	unsigned int mmc_rx_vlan_frames_gb;

	unsigned int mmc_rx_watchdog_error;

	unsigned int mmc_rx_error;

	unsigned int mmc_rx_lpi_usec;

	unsigned int mmc_rx_lpi_tran;

	unsigned int mmc_rx_discard_frames_gb;

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

+15 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
#define MMC_TX_EXCESSDEF		0x6c

#define MMC_TX_PAUSE_FRAME		0x70

#define MMC_TX_VLAN_FRAME_G		0x74

#define MMC_TX_OVERSIZE_G		0x78



/* MMC RX counter registers */

#define MMC_RX_FRAMECOUNT_GB		0x80
@@ -79,6 +80,13 @@ 
#define MMC_RX_FIFO_OVERFLOW		0xd4

#define MMC_RX_VLAN_FRAMES_GB		0xd8

#define MMC_RX_WATCHDOG_ERROR		0xdc

#define MMC_RX_ERROR			0xe0



#define MMC_TX_LPI_USEC			0xec

#define MMC_TX_LPI_TRAN			0xf0

#define MMC_RX_LPI_USEC			0xf4

#define MMC_RX_LPI_TRAN			0xf8



/* IPC*/

#define MMC_RX_IPC_INTR_MASK		0x100

#define MMC_RX_IPC_INTR			0x108
@@ -283,6 +291,9 @@ static void dwmac_mmc_read(void __iomem *mmcaddr, struct stmmac_counters *mmc) 
	mmc->mmc_tx_excessdef += readl(mmcaddr + MMC_TX_EXCESSDEF);

	mmc->mmc_tx_pause_frame += readl(mmcaddr + MMC_TX_PAUSE_FRAME);

	mmc->mmc_tx_vlan_frame_g += readl(mmcaddr + MMC_TX_VLAN_FRAME_G);

	mmc->mmc_tx_oversize_g	 += readl(mmcaddr + MMC_TX_OVERSIZE_G);

	mmc->mmc_tx_lpi_usec += readl(mmcaddr + MMC_TX_LPI_USEC);

	mmc->mmc_tx_lpi_tran += readl(mmcaddr + MMC_TX_LPI_TRAN);



	/* MMC RX counter registers */

	mmc->mmc_rx_framecount_gb += readl(mmcaddr + MMC_RX_FRAMECOUNT_GB);
@@ -316,6 +327,10 @@ static void dwmac_mmc_read(void __iomem *mmcaddr, struct stmmac_counters *mmc) 
	mmc->mmc_rx_fifo_overflow += readl(mmcaddr + MMC_RX_FIFO_OVERFLOW);

	mmc->mmc_rx_vlan_frames_gb += readl(mmcaddr + MMC_RX_VLAN_FRAMES_GB);

	mmc->mmc_rx_watchdog_error += readl(mmcaddr + MMC_RX_WATCHDOG_ERROR);

	mmc->mmc_rx_error += readl(mmcaddr + MMC_RX_ERROR);

	mmc->mmc_rx_lpi_usec += readl(mmcaddr + MMC_RX_LPI_USEC);

	mmc->mmc_rx_lpi_tran += readl(mmcaddr + MMC_RX_LPI_TRAN);



	/* IPv4 */

	mmc->mmc_rx_ipv4_gd += readl(mmcaddr + MMC_RX_IPV4_GD);

	mmc->mmc_rx_ipv4_hderr += readl(mmcaddr + MMC_RX_IPV4_HDERR);

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

+2 −0
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ static const struct stmmac_stats stmmac_mmc[] = { 
	STMMAC_MMC_STAT(mmc_tx_excessdef),

	STMMAC_MMC_STAT(mmc_tx_pause_frame),

	STMMAC_MMC_STAT(mmc_tx_vlan_frame_g),

	STMMAC_MMC_STAT(mmc_tx_oversize_g),

	STMMAC_MMC_STAT(mmc_tx_lpi_usec),

	STMMAC_MMC_STAT(mmc_tx_lpi_tran),

	STMMAC_MMC_STAT(mmc_rx_framecount_gb),
@@ -238,6 +239,7 @@ static const struct stmmac_stats stmmac_mmc[] = { 
	STMMAC_MMC_STAT(mmc_rx_fifo_overflow),

	STMMAC_MMC_STAT(mmc_rx_vlan_frames_gb),

	STMMAC_MMC_STAT(mmc_rx_watchdog_error),

	STMMAC_MMC_STAT(mmc_rx_error),

	STMMAC_MMC_STAT(mmc_rx_lpi_usec),

	STMMAC_MMC_STAT(mmc_rx_lpi_tran),

	STMMAC_MMC_STAT(mmc_rx_discard_frames_gb),