Commit b6cdf09f authored by Jose Abreu's avatar Jose Abreu Committed by David S. Miller
Browse files

net: stmmac: xgmac: Implement MMC counters 



Implement the MMC counters feature in XGMAC core.

Signed-off-by: default avatarJose Abreu <joabreu@synopsys.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6c9081a3

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

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ 
#define XGMAC_HWFEAT_AVSEL		BIT(11)

#define XGMAC_HWFEAT_RAVSEL		BIT(10)

#define XGMAC_HWFEAT_ARPOFFSEL		BIT(9)

#define XGMAC_HWFEAT_MMCSEL		BIT(8)

#define XGMAC_HWFEAT_MGKSEL		BIT(7)

#define XGMAC_HWFEAT_RWKSEL		BIT(6)

#define XGMAC_HWFEAT_GMIISEL		BIT(1)

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

+1 −0
Original line number Diff line number Diff line
@@ -356,6 +356,7 @@ static void dwxgmac2_get_hw_feature(void __iomem *ioaddr, 
	dma_cap->atime_stamp = (hw_cap & XGMAC_HWFEAT_TSSEL) >> 12;

	dma_cap->av = (hw_cap & XGMAC_HWFEAT_AVSEL) >> 11;

	dma_cap->av &= (hw_cap & XGMAC_HWFEAT_RAVSEL) >> 10;

	dma_cap->rmon = (hw_cap & XGMAC_HWFEAT_MMCSEL) >> 8;

	dma_cap->pmt_magic_frame = (hw_cap & XGMAC_HWFEAT_MGKSEL) >> 7;

	dma_cap->pmt_remote_wake_up = (hw_cap & XGMAC_HWFEAT_RWKSEL) >> 6;

	dma_cap->mbps_1000 = (hw_cap & XGMAC_HWFEAT_GMIISEL) >> 1;

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

+2 −2
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static const struct stmmac_hwif_entry { 
		.min_id = DWXGMAC_CORE_2_10,

		.regs = {

			.ptp_off = PTP_XGMAC_OFFSET,

			.mmc_off = 0,

			.mmc_off = MMC_XGMAC_OFFSET,

		},

		.desc = &dwxgmac210_desc_ops,

		.dma = &dwxgmac210_dma_ops,
@@ -209,7 +209,7 @@ static const struct stmmac_hwif_entry { 
		.hwtimestamp = &stmmac_ptp,

		.mode = NULL,

		.tc = &dwmac510_tc_ops,

		.mmc = NULL,

		.mmc = &dwxgmac_mmc_ops,

		.setup = dwxgmac2_setup,

		.quirks = NULL,

	},

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

+1 −0
Original line number Diff line number Diff line
@@ -503,6 +503,7 @@ extern const struct stmmac_ops dwxgmac210_ops; 
extern const struct stmmac_dma_ops dwxgmac210_dma_ops;

extern const struct stmmac_desc_ops dwxgmac210_desc_ops;

extern const struct stmmac_mmc_ops dwmac_mmc_ops;

extern const struct stmmac_mmc_ops dwxgmac_mmc_ops;



#define GMAC_VERSION		0x00000020	/* GMAC CORE Version */

#define GMAC4_VERSION		0x00000110	/* GMAC4+ CORE Version */

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

+9 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 


#define MMC_GMAC4_OFFSET		0x700

#define MMC_GMAC3_X_OFFSET		0x100

#define MMC_XGMAC_OFFSET		0x800



struct stmmac_counters {

	unsigned int mmc_tx_octetcount_gb;
@@ -116,6 +117,14 @@ struct stmmac_counters { 
	unsigned int mmc_rx_tcp_err_octets;

	unsigned int mmc_rx_icmp_gd_octets;

	unsigned int mmc_rx_icmp_err_octets;



	/* FPE */

	unsigned int mmc_tx_fpe_fragment_cntr;

	unsigned int mmc_tx_hold_req_cntr;

	unsigned int mmc_rx_packet_assembly_err_cntr;

	unsigned int mmc_rx_packet_smd_err_cntr;

	unsigned int mmc_rx_packet_assembly_ok_cntr;

	unsigned int mmc_rx_fpe_fragment_cntr;

};



#endif /* __MMC_H__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE