Add missing mmc statistics in DW GMAC
Subsystems (4)
v2 cover 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 inethtool_ops::get_eth_ctrl_stats.
Minda Chen (2):
net: stmmac: mmc_core: Add GMAC LPI statistics
net: stmmac: mmc_core: Add GMAC mmc tx/rx missing statistics
drivers/net/ethernet/stmicro/stmmac/mmc.h | 2 ++ drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 15 +++++++++++++++ .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 2 ++ 3 files changed, 19 insertions(+)
base-commit: 4cece764965020c22cff7665b18a012006359095
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 1/2 net: stmmac: mmc_core: Add GMAC LPI statistics
XGMAC MMC has already added LPI statistics. GMAC MMC lack of these statistics. Add register definition and reading the LPI statistics from registers.
--- drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/net/ethernet/stmicro/stmmac/mmc_core.c +11 -0
@@ -79,6 +79,12 @@#define MMC_RX_FIFO_OVERFLOW 0xd4#define MMC_RX_VLAN_FRAMES_GB 0xd8#define MMC_RX_WATCHDOG_ERROR 0xdc + +#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 +289,8 @@ 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_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 +324,9 @@ 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_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 );
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 2/2 net: stmmac: mmc_core: Add GMAC mmc tx/rx missing statistics
In reply to Minda ChenThe missing statistics including Rx_Receive_Error_Packets and Tx_OSize_Packets_Good.
--- drivers/net/ethernet/stmicro/stmmac/mmc.h | 2 ++ drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 4 ++++ drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 2 ++ 3 files changed, 8 insertions(+)
drivers/net/ethernet/stmicro/stmmac/mmc.h +2 -0
@@ -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 +4 -0
@@ -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,7 @@#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
@@ -289,6 +291,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 +327,7 @@ 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 );
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +2 -0
@@ -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),
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
This series was applied to netdev/net.git (main) by David S. Miller <[email protected]>:
Hello:
This series was applied to netdev/net.git (main)
by David S. Miller <[email protected]>:
Quoted 10 lines · On Mon, 8 Apr 2024 09:29:41 +0800 you wrote:
Add miss MMC statistic in DW GMAC
base on 6.9-rc1
changed
v2:
patch2 : removemmc_rx_control_gdue to it is gotten inethtool_ops::get_eth_ctrl_stats.[...]
Here is the summary with links:
- [v2,1/2] net: stmmac: mmc_core: Add GMAC LPI statistics
https://git.kernel.org/netdev/net/c/dfe073f8714d - [v2,2/2] net: stmmac: mmc_core: Add GMAC mmc tx/rx missing statistics https://git.kernel.org/netdev/net/c/ff20393bdc45
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Quoted 8 lines · Minda Chen
Add miss MMC statistic in DW GMAC
base on 6.9-rc1
changed
v2:
patch2 : removemmc_rx_control_gdue to it is gotten inethtool_ops::get_eth_ctrl_stats.
The series has already been merged in. Just a small note about the patches. Both the changes seems reasonable:
LPI-statistics for DW GMAC and DW QoS Eth,
and
Rx-Recv and Tx-oversize errors stat for DW GMAC and DW QoS Eth. The former stats has originally been added for DW XGMAC and the later stats aren't supported by DW XGMAC. So the provided change is complete. Thanks.
-Serge(y)
Quoted 16 lines
Minda Chen (2):
net: stmmac:mmc_core: Add GMAC LPI statistics
net: stmmac:mmc_core: Add GMAC mmc tx/rx missing statisticsdrivers/net/ethernet/stmicro/stmmac/mmc.h | 2 ++ drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 15 +++++++++++++++ .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 2 ++ 3 files changed, 19 insertions(+)base-commit:
4cece764965020c22cff7665b18a012006359095Signature · 1 line
2.17.1