* [PATCH v1 1/2] net: stmmac: mmc_core: Add GMAC LPI statistics @ 2024-04-01 2:44 Minda Chen 2024-04-01 2:44 ` [PATCH v1 2/2] net: stmmac: mmc_core: Add GMAC mmc tx/rx missing statistics Minda Chen 2024-04-02 8:33 ` [PATCH v1 1/2] net: stmmac: mmc_core: Add GMAC LPI statistics Simon Horman 0 siblings, 2 replies; 6+ messages in thread From: Minda Chen @ 2024-04-01 2:44 UTC (permalink / raw) To: Alexandre Torgue, Jose Abreu, David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Maxime Coquelin Cc: netdev, linux-stm32, linux-arm-kernel, linux-kernel, Minda Chen XGMAC MMC has already added LPI statistics. GMAC MMC lack of these statistics. Add register definition and reading the LPI statistics from registers. Signed-off-by: Minda Chen <minda.chen@starfivetech.com> --- drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c index 7eb477faa75a..b0db5f4e8fe8 100644 --- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c +++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c @@ -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); -- 2.17.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v1 2/2] net: stmmac: mmc_core: Add GMAC mmc tx/rx missing statistics 2024-04-01 2:44 [PATCH v1 1/2] net: stmmac: mmc_core: Add GMAC LPI statistics Minda Chen @ 2024-04-01 2:44 ` Minda Chen 2024-04-02 8:33 ` Simon Horman 2024-04-03 1:23 ` Jakub Kicinski 2024-04-02 8:33 ` [PATCH v1 1/2] net: stmmac: mmc_core: Add GMAC LPI statistics Simon Horman 1 sibling, 2 replies; 6+ messages in thread From: Minda Chen @ 2024-04-01 2:44 UTC (permalink / raw) To: Alexandre Torgue, Jose Abreu, David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Maxime Coquelin Cc: netdev, linux-stm32, linux-arm-kernel, linux-kernel, Minda Chen The missing statistics including Rx_Receive_Error_Packets, Rx_Control_Packets_Good and Tx_OSize_Packets_Good. Signed-off-by: Minda Chen <minda.chen@starfivetech.com> --- 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 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v1 2/2] net: stmmac: mmc_core: Add GMAC mmc tx/rx missing statistics 2024-04-01 2:44 ` [PATCH v1 2/2] net: stmmac: mmc_core: Add GMAC mmc tx/rx missing statistics Minda Chen @ 2024-04-02 8:33 ` Simon Horman 2024-04-03 1:23 ` Jakub Kicinski 1 sibling, 0 replies; 6+ messages in thread From: Simon Horman @ 2024-04-02 8:33 UTC (permalink / raw) To: Minda Chen Cc: Alexandre Torgue, Jose Abreu, David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Maxime Coquelin, netdev, linux-stm32, linux-arm-kernel, linux-kernel 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 <minda.chen@starfivetech.com> Reviewed-by: Simon Horman <horms@kernel.org> ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v1 2/2] net: stmmac: mmc_core: Add GMAC mmc tx/rx missing statistics 2024-04-01 2:44 ` [PATCH v1 2/2] net: stmmac: mmc_core: Add GMAC mmc tx/rx missing statistics Minda Chen 2024-04-02 8:33 ` Simon Horman @ 2024-04-03 1:23 ` Jakub Kicinski 2024-04-03 1:41 ` Minda Chen 1 sibling, 1 reply; 6+ messages in thread From: Jakub Kicinski @ 2024-04-03 1:23 UTC (permalink / raw) To: Minda Chen Cc: Alexandre Torgue, Jose Abreu, David S . Miller, Eric Dumazet, Paolo Abeni, Maxime Coquelin, netdev, linux-stm32, linux-arm-kernel, linux-kernel 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. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v1 2/2] net: stmmac: mmc_core: Add GMAC mmc tx/rx missing statistics 2024-04-03 1:23 ` Jakub Kicinski @ 2024-04-03 1:41 ` Minda Chen 0 siblings, 0 replies; 6+ messages in thread From: Minda Chen @ 2024-04-03 1:41 UTC (permalink / raw) To: Jakub Kicinski Cc: Alexandre Torgue, Jose Abreu, David S . Miller, Eric Dumazet, Paolo Abeni, Maxime Coquelin, netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org > > 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v1 1/2] net: stmmac: mmc_core: Add GMAC LPI statistics 2024-04-01 2:44 [PATCH v1 1/2] net: stmmac: mmc_core: Add GMAC LPI statistics Minda Chen 2024-04-01 2:44 ` [PATCH v1 2/2] net: stmmac: mmc_core: Add GMAC mmc tx/rx missing statistics Minda Chen @ 2024-04-02 8:33 ` Simon Horman 1 sibling, 0 replies; 6+ messages in thread From: Simon Horman @ 2024-04-02 8:33 UTC (permalink / raw) To: Minda Chen Cc: Alexandre Torgue, Jose Abreu, David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Maxime Coquelin, netdev, linux-stm32, linux-arm-kernel, linux-kernel On Mon, Apr 01, 2024 at 10:44:55AM +0800, Minda Chen wrote: > XGMAC MMC has already added LPI statistics. GMAC MMC lack of these > statistics. Add register definition and reading the LPI statistics > from registers. > > Signed-off-by: Minda Chen <minda.chen@starfivetech.com> Reviewed-by: Simon Horman <horms@kernel.org> ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-04-03 1:41 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2024-04-01 2:44 [PATCH v1 1/2] net: stmmac: mmc_core: Add GMAC LPI statistics Minda Chen 2024-04-01 2:44 ` [PATCH v1 2/2] net: stmmac: mmc_core: Add GMAC mmc tx/rx missing statistics Minda Chen 2024-04-02 8:33 ` Simon Horman 2024-04-03 1:23 ` Jakub Kicinski 2024-04-03 1:41 ` Minda Chen 2024-04-02 8:33 ` [PATCH v1 1/2] net: stmmac: mmc_core: Add GMAC LPI statistics Simon Horman
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).