2024-04-01 03:00:19

by Minda Chen

[permalink] [raw]
Subject: [PATCH v1 2/2] net: stmmac: mmc_core: Add GMAC mmc tx/rx missing statistics

The missing statistics including Rx_Receive_Error_Packets,
Rx_Control_Packets_Good and Tx_OSize_Packets_Good.

Signed-off-by: Minda Chen <[email protected]>
---
drivers/net/ethernet/stmicro/stmmac/mmc.h | 3 +++
drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 6 ++++++
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 3 +++
3 files changed, 12 insertions(+)

diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc.h b/drivers/net/ethernet/stmicro/stmmac/mmc.h
index dff02d75d519..cc189bdc563f 100644
--- a/drivers/net/ethernet/stmicro/stmmac/mmc.h
+++ b/drivers/net/ethernet/stmicro/stmmac/mmc.h
@@ -54,6 +54,7 @@ struct stmmac_counters {
unsigned int mmc_tx_vlan_frame_g;
unsigned int mmc_tx_lpi_usec;
unsigned int mmc_tx_lpi_tran;
+ unsigned int mmc_tx_oversize_g;

/* MMC RX counter registers */
unsigned int mmc_rx_framecount_gb;
@@ -85,6 +86,8 @@ struct stmmac_counters {
unsigned int mmc_rx_discard_frames_gb;
unsigned int mmc_rx_discard_octets_gb;
unsigned int mmc_rx_align_err_frames;
+ unsigned int mmc_rx_error;
+ unsigned int mmc_rx_control_g;

/* IPv4 */
unsigned int mmc_rx_ipv4_gd;
diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
index b0db5f4e8fe8..948f12b18de3 100644
--- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
@@ -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,8 @@
#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_RX_CONTROL_G 0xe4

#define MMC_TX_LPI_USEC 0xec
#define MMC_TX_LPI_TRAN 0xf0
@@ -289,6 +292,7 @@ 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);

@@ -324,6 +328,8 @@ 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_control_g += readl(mmcaddr + MMC_RX_CONTROL_G);
mmc->mmc_rx_lpi_usec += readl(mmcaddr + MMC_RX_LPI_USEC);
mmc->mmc_rx_lpi_tran += readl(mmcaddr + MMC_RX_LPI_TRAN);

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
index e1537a57815f..4517d5162c5a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
@@ -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,8 @@ 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_control_g),
STMMAC_MMC_STAT(mmc_rx_lpi_usec),
STMMAC_MMC_STAT(mmc_rx_lpi_tran),
STMMAC_MMC_STAT(mmc_rx_discard_frames_gb),
--
2.17.1



2024-04-02 08:37:04

by Simon Horman

[permalink] [raw]
Subject: Re: [PATCH v1 2/2] net: stmmac: mmc_core: Add GMAC mmc tx/rx missing statistics

On Mon, Apr 01, 2024 at 10:44:56AM +0800, Minda Chen wrote:
> The missing statistics including Rx_Receive_Error_Packets,
> Rx_Control_Packets_Good and Tx_OSize_Packets_Good.
>
> Signed-off-by: Minda Chen <[email protected]>

Reviewed-by: Simon Horman <[email protected]>


2024-04-03 01:24:03

by Jakub Kicinski

[permalink] [raw]
Subject: Re: [PATCH v1 2/2] net: stmmac: mmc_core: Add GMAC mmc tx/rx missing statistics

On Mon, 1 Apr 2024 10:44:56 +0800 Minda Chen wrote:
> + unsigned int mmc_rx_control_g;

What's control_g?
If it's number of received control frames it should be reported as
MACControlFramesReceived from ethtool_ops::get_eth_ctrl_stats.

2024-04-03 01:43:42

by Minda Chen

[permalink] [raw]
Subject: Re: [PATCH v1 2/2] net: stmmac: mmc_core: Add GMAC mmc tx/rx missing statistics


>
> On Mon, 1 Apr 2024 10:44:56 +0800 Minda Chen wrote:
> > + unsigned int mmc_rx_control_g;
>
> What's control_g?
> If it's number of received control frames it should be reported as
> MACControlFramesReceived from ethtool_ops::get_eth_ctrl_stats.

This is explanations
Rx Control Packets Good
This field indicates the number of good control packets received.

It looks it is number of received control. But I don't know register offset
in designware XGMAC IP.I can't implement ethtool_ops::get_eth_ctrl_stats.
I will delete this first