Skip to contentSkip to conversation

eth: lan966x: don't clear unsupported stats

PATCH Applied Jakub Kicinski 3 participants 3 messages Jun 13, 2024 – Jun 15, 2024

Subsystems (3)
lore
Share & tools
lore

Jakub Kicinski

author maintainer
#0 lore raw

PATCH 1/1 eth: lan966x: don't clear unsupported stats

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.

---
CC: [email protected]
CC: [email protected]

---
 drivers/net/ethernet/microchip/lan966x/lan966x_ethtool.c | 8 --------
 1 file changed, 8 deletions(-)
drivers/net/ethernet/microchip/lan966x/lan966x_ethtool.c +0 -8
index 06811c60d598..c0fc85ac5db3 100644
@@ -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 =
Signature · 1 line
2.45.2
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Jakub Kicinski

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.

Quoted 50 lines

---
CC: [email protected]
CC: [email protected]

---
 drivers/net/ethernet/microchip/lan966x/lan966x_ethtool.c | 8 --------
 1 file changed, 8 deletions(-)
drivers/net/ethernet/microchip/lan966x/lan966x_ethtool.c +0 -9
index 06811c60d598..c0fc85ac5db3 100644
@@ -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

Signature · 1 line
/Horatiu
#2 lore raw
In reply to Jakub Kicinski
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Quoted 8 lines · 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.

[...]

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!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html