| Message ID | 20240613003222.3327368-1-kuba@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 72421f35540c3e8830be8897ef1b99d2b7aa0981 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] eth: lan966x: don't clear unsupported stats | expand |
The 06/12/2024 17:32, Jakub Kicinski wrote: > Commit 12c2d0a5b8e2 ("net: lan966x: add ethtool configuration and statistics") > added support for various standard stats. We should not clear the stats > which are not collected by the device. Core code uses a special > initializer to detect when device does not report given stat. > > Signed-off-by: Jakub Kicinski <kuba@kernel.org> Acked-by: Horatiu Vultur <horatiu.vultur@microchip.com> > --- > CC: horatiu.vultur@microchip.com > CC: UNGLinuxDriver@microchip.com > --- > drivers/net/ethernet/microchip/lan966x/lan966x_ethtool.c | 8 -------- > 1 file changed, 8 deletions(-) > > diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_ethtool.c b/drivers/net/ethernet/microchip/lan966x/lan966x_ethtool.c > index 06811c60d598..c0fc85ac5db3 100644 > --- a/drivers/net/ethernet/microchip/lan966x/lan966x_ethtool.c > +++ b/drivers/net/ethernet/microchip/lan966x/lan966x_ethtool.c > @@ -376,7 +376,6 @@ static void lan966x_get_eth_mac_stats(struct net_device *dev, > lan966x->stats[idx + SYS_COUNT_TX_PMAC_BC]; > mac_stats->SingleCollisionFrames = > lan966x->stats[idx + SYS_COUNT_TX_COL]; > - mac_stats->MultipleCollisionFrames = 0; > mac_stats->FramesReceivedOK = > lan966x->stats[idx + SYS_COUNT_RX_UC] + > lan966x->stats[idx + SYS_COUNT_RX_MC] + > @@ -384,26 +383,19 @@ static void lan966x_get_eth_mac_stats(struct net_device *dev, > mac_stats->FrameCheckSequenceErrors = > lan966x->stats[idx + SYS_COUNT_RX_CRC] + > lan966x->stats[idx + SYS_COUNT_RX_CRC]; > - mac_stats->AlignmentErrors = 0; > mac_stats->OctetsTransmittedOK = > lan966x->stats[idx + SYS_COUNT_TX_OCT] + > lan966x->stats[idx + SYS_COUNT_TX_PMAC_OCT]; > mac_stats->FramesWithDeferredXmissions = > lan966x->stats[idx + SYS_COUNT_TX_MM_HOLD]; > - mac_stats->LateCollisions = 0; > - mac_stats->FramesAbortedDueToXSColls = 0; > - mac_stats->FramesLostDueToIntMACXmitError = 0; > - mac_stats->CarrierSenseErrors = 0; > mac_stats->OctetsReceivedOK = > lan966x->stats[idx + SYS_COUNT_RX_OCT]; > - mac_stats->FramesLostDueToIntMACRcvError = 0; > mac_stats->MulticastFramesXmittedOK = > lan966x->stats[idx + SYS_COUNT_TX_MC] + > lan966x->stats[idx + SYS_COUNT_TX_PMAC_MC]; > mac_stats->BroadcastFramesXmittedOK = > lan966x->stats[idx + SYS_COUNT_TX_BC] + > lan966x->stats[idx + SYS_COUNT_TX_PMAC_BC]; > - mac_stats->FramesWithExcessiveDeferral = 0; > mac_stats->MulticastFramesReceivedOK = > lan966x->stats[idx + SYS_COUNT_RX_MC]; > mac_stats->BroadcastFramesReceivedOK = > -- > 2.45.2 > >
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Wed, 12 Jun 2024 17:32:22 -0700 you wrote: > Commit 12c2d0a5b8e2 ("net: lan966x: add ethtool configuration and statistics") > added support for various standard stats. We should not clear the stats > which are not collected by the device. Core code uses a special > initializer to detect when device does not report given stat. > > Signed-off-by: Jakub Kicinski <kuba@kernel.org> > > [...] Here is the summary with links: - [net-next] eth: lan966x: don't clear unsupported stats https://git.kernel.org/netdev/net-next/c/72421f35540c You are awesome, thank you!
diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_ethtool.c b/drivers/net/ethernet/microchip/lan966x/lan966x_ethtool.c index 06811c60d598..c0fc85ac5db3 100644 --- a/drivers/net/ethernet/microchip/lan966x/lan966x_ethtool.c +++ b/drivers/net/ethernet/microchip/lan966x/lan966x_ethtool.c @@ -376,7 +376,6 @@ static void lan966x_get_eth_mac_stats(struct net_device *dev, lan966x->stats[idx + SYS_COUNT_TX_PMAC_BC]; mac_stats->SingleCollisionFrames = lan966x->stats[idx + SYS_COUNT_TX_COL]; - mac_stats->MultipleCollisionFrames = 0; mac_stats->FramesReceivedOK = lan966x->stats[idx + SYS_COUNT_RX_UC] + lan966x->stats[idx + SYS_COUNT_RX_MC] + @@ -384,26 +383,19 @@ static void lan966x_get_eth_mac_stats(struct net_device *dev, mac_stats->FrameCheckSequenceErrors = lan966x->stats[idx + SYS_COUNT_RX_CRC] + lan966x->stats[idx + SYS_COUNT_RX_CRC]; - mac_stats->AlignmentErrors = 0; mac_stats->OctetsTransmittedOK = lan966x->stats[idx + SYS_COUNT_TX_OCT] + lan966x->stats[idx + SYS_COUNT_TX_PMAC_OCT]; mac_stats->FramesWithDeferredXmissions = lan966x->stats[idx + SYS_COUNT_TX_MM_HOLD]; - mac_stats->LateCollisions = 0; - mac_stats->FramesAbortedDueToXSColls = 0; - mac_stats->FramesLostDueToIntMACXmitError = 0; - mac_stats->CarrierSenseErrors = 0; mac_stats->OctetsReceivedOK = lan966x->stats[idx + SYS_COUNT_RX_OCT]; - mac_stats->FramesLostDueToIntMACRcvError = 0; mac_stats->MulticastFramesXmittedOK = lan966x->stats[idx + SYS_COUNT_TX_MC] + lan966x->stats[idx + SYS_COUNT_TX_PMAC_MC]; mac_stats->BroadcastFramesXmittedOK = lan966x->stats[idx + SYS_COUNT_TX_BC] + lan966x->stats[idx + SYS_COUNT_TX_PMAC_BC]; - mac_stats->FramesWithExcessiveDeferral = 0; mac_stats->MulticastFramesReceivedOK = lan966x->stats[idx + SYS_COUNT_RX_MC]; mac_stats->BroadcastFramesReceivedOK =
Commit 12c2d0a5b8e2 ("net: lan966x: add ethtool configuration and statistics") added support for various standard stats. We should not clear the stats which are not collected by the device. Core code uses a special initializer to detect when device does not report given stat. Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- CC: horatiu.vultur@microchip.com CC: UNGLinuxDriver@microchip.com --- drivers/net/ethernet/microchip/lan966x/lan966x_ethtool.c | 8 -------- 1 file changed, 8 deletions(-)