mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-10 10:20:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'net-enetc-change-some-statistics-to-64-bit'

Browse Source 
Wei Fang says:

====================
net: enetc: change some statistics to 64-bit

The port MAC counters of ENETC are 64-bit registers and the statistics
of ethtool are also u64 type, so add enetc_port_rd64() helper function
to read 64-bit statistics from these registers, and also change the
statistics of ring to unsigned long type to be consistent with the
statistics type in struct net_device_stats.

v1: https://lore.kernel.org/20250620102140.2020008-1-wei.fang@nxp.com
v2: https://lore.kernel.org/20250624101548.2669522-1-wei.fang@nxp.com
====================

Link: https://patch.msgid.link/20250627021108.3359642-1-wei.fang@nxp.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski
2025-06-30 18:23:57 -07:00
parent b7ad21258f 4c7ef31984
commit 7878e21e40
3 changed files with 66 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/net/ethernet/freescale/enetc/enetc.h
View File

@@ -96,17 +96,17 @@ struct enetc_rx_swbd {
#define ENETC_TXBDS_MAX_NEEDED(x) ENETC_TXBDS_NEEDED((x) + 1)
struct enetc_ring_stats {
unsigned int packets;
unsigned int bytes;
unsigned int rx_alloc_errs;
unsigned int xdp_drops;
unsigned int xdp_tx;
unsigned int xdp_tx_drops;
unsigned int xdp_redirect;
unsigned int xdp_redirect_failures;
unsigned int recycles;
unsigned int recycle_failures;
unsigned int win_drop;
unsigned long packets;
unsigned long bytes;
unsigned long rx_alloc_errs;
unsigned long xdp_drops;
unsigned long xdp_tx;
unsigned long xdp_tx_drops;
unsigned long xdp_redirect;
unsigned long xdp_redirect_failures;
unsigned long recycles;
unsigned long recycle_failures;
unsigned long win_drop;
};
struct enetc_xdp_data {

95
drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
View File

@@ -142,7 +142,7 @@ static const struct {
static const struct {
int reg;
char name[ETH_GSTRING_LEN] __nonstring;
} enetc_port_counters[] = {
} enetc_pm_counters[] = {
{ ENETC_PM_REOCT(0), "MAC rx ethernet octets" },
{ ENETC_PM_RALN(0), "MAC rx alignment errors" },
{ ENETC_PM_RXPF(0), "MAC rx valid pause frames" },
@@ -194,6 +194,12 @@ static const struct {
{ ENETC_PM_TSCOL(0), "MAC tx single collisions" },
{ ENETC_PM_TLCOL(0), "MAC tx late collisions" },
{ ENETC_PM_TECOL(0), "MAC tx excessive collisions" },
};
static const struct {
int reg;
char name[ETH_GSTRING_LEN] __nonstring;
} enetc_port_counters[] = {
{ ENETC_UFDMF, "SI MAC nomatch u-cast discards" },
{ ENETC_MFDMF, "SI MAC nomatch m-cast discards" },
{ ENETC_PBFDSIR, "SI MAC nomatch b-cast discards" },
@@ -240,6 +246,7 @@ static int enetc_get_sset_count(struct net_device *ndev, int sset)
return len;
len += ARRAY_SIZE(enetc_port_counters);
len += ARRAY_SIZE(enetc_pm_counters);
return len;
}
@@ -266,6 +273,9 @@ static void enetc_get_strings(struct net_device *ndev, u32 stringset, u8 *data)
for (i = 0; i < ARRAY_SIZE(enetc_port_counters); i++)
ethtool_cpy(&data, enetc_port_counters[i].name);
for (i = 0; i < ARRAY_SIZE(enetc_pm_counters); i++)
ethtool_cpy(&data, enetc_pm_counters[i].name);
break;
}
}
@@ -302,13 +312,16 @@ static void enetc_get_ethtool_stats(struct net_device *ndev,
for (i = 0; i < ARRAY_SIZE(enetc_port_counters); i++)
data[o++] = enetc_port_rd(hw, enetc_port_counters[i].reg);
for (i = 0; i < ARRAY_SIZE(enetc_pm_counters); i++)
data[o++] = enetc_port_rd64(hw, enetc_pm_counters[i].reg);
}
static void enetc_pause_stats(struct enetc_hw *hw, int mac,
struct ethtool_pause_stats *pause_stats)
{
pause_stats->tx_pause_frames = enetc_port_rd(hw, ENETC_PM_TXPF(mac));
pause_stats->rx_pause_frames = enetc_port_rd(hw, ENETC_PM_RXPF(mac));
pause_stats->tx_pause_frames = enetc_port_rd64(hw, ENETC_PM_TXPF(mac));
pause_stats->rx_pause_frames = enetc_port_rd64(hw, ENETC_PM_RXPF(mac));
}
static void enetc_get_pause_stats(struct net_device *ndev,
@@ -335,31 +348,31 @@ static void enetc_get_pause_stats(struct net_device *ndev,
static void enetc_mac_stats(struct enetc_hw *hw, int mac,
struct ethtool_eth_mac_stats *s)
{
s->FramesTransmittedOK = enetc_port_rd(hw, ENETC_PM_TFRM(mac));
s->SingleCollisionFrames = enetc_port_rd(hw, ENETC_PM_TSCOL(mac));
s->MultipleCollisionFrames = enetc_port_rd(hw, ENETC_PM_TMCOL(mac));
s->FramesReceivedOK = enetc_port_rd(hw, ENETC_PM_RFRM(mac));
s->FrameCheckSequenceErrors = enetc_port_rd(hw, ENETC_PM_RFCS(mac));
s->AlignmentErrors = enetc_port_rd(hw, ENETC_PM_RALN(mac));
s->OctetsTransmittedOK = enetc_port_rd(hw, ENETC_PM_TEOCT(mac));
s->FramesWithDeferredXmissions = enetc_port_rd(hw, ENETC_PM_TDFR(mac));
s->LateCollisions = enetc_port_rd(hw, ENETC_PM_TLCOL(mac));
s->FramesAbortedDueToXSColls = enetc_port_rd(hw, ENETC_PM_TECOL(mac));
s->FramesLostDueToIntMACXmitError = enetc_port_rd(hw, ENETC_PM_TERR(mac));
s->CarrierSenseErrors = enetc_port_rd(hw, ENETC_PM_TCRSE(mac));
s->OctetsReceivedOK = enetc_port_rd(hw, ENETC_PM_REOCT(mac));
s->FramesLostDueToIntMACRcvError = enetc_port_rd(hw, ENETC_PM_RDRNTP(mac));
s->MulticastFramesXmittedOK = enetc_port_rd(hw, ENETC_PM_TMCA(mac));
s->BroadcastFramesXmittedOK = enetc_port_rd(hw, ENETC_PM_TBCA(mac));
s->MulticastFramesReceivedOK = enetc_port_rd(hw, ENETC_PM_RMCA(mac));
s->BroadcastFramesReceivedOK = enetc_port_rd(hw, ENETC_PM_RBCA(mac));
s->FramesTransmittedOK = enetc_port_rd64(hw, ENETC_PM_TFRM(mac));
s->SingleCollisionFrames = enetc_port_rd64(hw, ENETC_PM_TSCOL(mac));
s->MultipleCollisionFrames = enetc_port_rd64(hw, ENETC_PM_TMCOL(mac));
s->FramesReceivedOK = enetc_port_rd64(hw, ENETC_PM_RFRM(mac));
s->FrameCheckSequenceErrors = enetc_port_rd64(hw, ENETC_PM_RFCS(mac));
s->AlignmentErrors = enetc_port_rd64(hw, ENETC_PM_RALN(mac));
s->OctetsTransmittedOK = enetc_port_rd64(hw, ENETC_PM_TEOCT(mac));
s->FramesWithDeferredXmissions = enetc_port_rd64(hw, ENETC_PM_TDFR(mac));
s->LateCollisions = enetc_port_rd64(hw, ENETC_PM_TLCOL(mac));
s->FramesAbortedDueToXSColls = enetc_port_rd64(hw, ENETC_PM_TECOL(mac));
s->FramesLostDueToIntMACXmitError = enetc_port_rd64(hw, ENETC_PM_TERR(mac));
s->CarrierSenseErrors = enetc_port_rd64(hw, ENETC_PM_TCRSE(mac));
s->OctetsReceivedOK = enetc_port_rd64(hw, ENETC_PM_REOCT(mac));
s->FramesLostDueToIntMACRcvError = enetc_port_rd64(hw, ENETC_PM_RDRNTP(mac));
s->MulticastFramesXmittedOK = enetc_port_rd64(hw, ENETC_PM_TMCA(mac));
s->BroadcastFramesXmittedOK = enetc_port_rd64(hw, ENETC_PM_TBCA(mac));
s->MulticastFramesReceivedOK = enetc_port_rd64(hw, ENETC_PM_RMCA(mac));
s->BroadcastFramesReceivedOK = enetc_port_rd64(hw, ENETC_PM_RBCA(mac));
}
static void enetc_ctrl_stats(struct enetc_hw *hw, int mac,
struct ethtool_eth_ctrl_stats *s)
{
s->MACControlFramesTransmitted = enetc_port_rd(hw, ENETC_PM_TCNP(mac));
s->MACControlFramesReceived = enetc_port_rd(hw, ENETC_PM_RCNP(mac));
s->MACControlFramesTransmitted = enetc_port_rd64(hw, ENETC_PM_TCNP(mac));
s->MACControlFramesReceived = enetc_port_rd64(hw, ENETC_PM_RCNP(mac));
}
static const struct ethtool_rmon_hist_range enetc_rmon_ranges[] = {
@@ -376,26 +389,26 @@ static const struct ethtool_rmon_hist_range enetc_rmon_ranges[] = {
static void enetc_rmon_stats(struct enetc_hw *hw, int mac,
struct ethtool_rmon_stats *s)
{
s->undersize_pkts = enetc_port_rd(hw, ENETC_PM_RUND(mac));
s->oversize_pkts = enetc_port_rd(hw, ENETC_PM_ROVR(mac));
s->fragments = enetc_port_rd(hw, ENETC_PM_RFRG(mac));
s->jabbers = enetc_port_rd(hw, ENETC_PM_RJBR(mac));
s->undersize_pkts = enetc_port_rd64(hw, ENETC_PM_RUND(mac));
s->oversize_pkts = enetc_port_rd64(hw, ENETC_PM_ROVR(mac));
s->fragments = enetc_port_rd64(hw, ENETC_PM_RFRG(mac));
s->jabbers = enetc_port_rd64(hw, ENETC_PM_RJBR(mac));
s->hist[0] = enetc_port_rd(hw, ENETC_PM_R64(mac));
s->hist[1] = enetc_port_rd(hw, ENETC_PM_R127(mac));
s->hist[2] = enetc_port_rd(hw, ENETC_PM_R255(mac));
s->hist[3] = enetc_port_rd(hw, ENETC_PM_R511(mac));
s->hist[4] = enetc_port_rd(hw, ENETC_PM_R1023(mac));
s->hist[5] = enetc_port_rd(hw, ENETC_PM_R1522(mac));
s->hist[6] = enetc_port_rd(hw, ENETC_PM_R1523X(mac));
s->hist[0] = enetc_port_rd64(hw, ENETC_PM_R64(mac));
s->hist[1] = enetc_port_rd64(hw, ENETC_PM_R127(mac));
s->hist[2] = enetc_port_rd64(hw, ENETC_PM_R255(mac));
s->hist[3] = enetc_port_rd64(hw, ENETC_PM_R511(mac));
s->hist[4] = enetc_port_rd64(hw, ENETC_PM_R1023(mac));
s->hist[5] = enetc_port_rd64(hw, ENETC_PM_R1522(mac));
s->hist[6] = enetc_port_rd64(hw, ENETC_PM_R1523X(mac));
s->hist_tx[0] = enetc_port_rd(hw, ENETC_PM_T64(mac));
s->hist_tx[1] = enetc_port_rd(hw, ENETC_PM_T127(mac));
s->hist_tx[2] = enetc_port_rd(hw, ENETC_PM_T255(mac));
s->hist_tx[3] = enetc_port_rd(hw, ENETC_PM_T511(mac));
s->hist_tx[4] = enetc_port_rd(hw, ENETC_PM_T1023(mac));
s->hist_tx[5] = enetc_port_rd(hw, ENETC_PM_T1522(mac));
s->hist_tx[6] = enetc_port_rd(hw, ENETC_PM_T1523X(mac));
s->hist_tx[0] = enetc_port_rd64(hw, ENETC_PM_T64(mac));
s->hist_tx[1] = enetc_port_rd64(hw, ENETC_PM_T127(mac));
s->hist_tx[2] = enetc_port_rd64(hw, ENETC_PM_T255(mac));
s->hist_tx[3] = enetc_port_rd64(hw, ENETC_PM_T511(mac));
s->hist_tx[4] = enetc_port_rd64(hw, ENETC_PM_T1023(mac));
s->hist_tx[5] = enetc_port_rd64(hw, ENETC_PM_T1522(mac));
s->hist_tx[6] = enetc_port_rd64(hw, ENETC_PM_T1523X(mac));
}
static void enetc_get_eth_mac_stats(struct net_device *ndev,

1
drivers/net/ethernet/freescale/enetc/enetc_hw.h
View File

@@ -536,6 +536,7 @@ static inline u64 _enetc_rd_reg64_wa(void __iomem *reg)
/* port register accessors - PF only */
#define enetc_port_rd(hw, off) enetc_rd_reg((hw)->port + (off))
#define enetc_port_wr(hw, off, val) enetc_wr_reg((hw)->port + (off), val)
#define enetc_port_rd64(hw, off) _enetc_rd_reg64_wa((hw)->port + (off))
#define enetc_port_rd_mdio(hw, off) _enetc_rd_mdio_reg_wa((hw)->port + (off))
#define enetc_port_wr_mdio(hw, off, val) _enetc_wr_mdio_reg_wa(\
(hw)->port + (off), val)