Skip to content

Commit eb96b68

Browse files
claudiu-mkuba-moo
authored andcommitted
enetc: Fix reporting of h/w packet counters
Noticed some inconsistencies in packet statistics reporting. This patch adds the missing Tx packet counter registers to ethtool reporting and fixes the information strings for a few of them. Fixes: 16eb4c8 ("enetc: Add ethtool statistics") Signed-off-by: Claudiu Manoil <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 10c678b commit eb96b68

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

drivers/net/ethernet/freescale/enetc/enetc_ethtool.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ static const struct {
143143
{ ENETC_PM0_R255, "MAC rx 128-255 byte packets" },
144144
{ ENETC_PM0_R511, "MAC rx 256-511 byte packets" },
145145
{ ENETC_PM0_R1023, "MAC rx 512-1023 byte packets" },
146-
{ ENETC_PM0_R1518, "MAC rx 1024-1518 byte packets" },
147-
{ ENETC_PM0_R1519X, "MAC rx 1519 to max-octet packets" },
146+
{ ENETC_PM0_R1522, "MAC rx 1024-1522 byte packets" },
147+
{ ENETC_PM0_R1523X, "MAC rx 1523 to max-octet packets" },
148148
{ ENETC_PM0_ROVR, "MAC rx oversized packets" },
149149
{ ENETC_PM0_RJBR, "MAC rx jabber packets" },
150150
{ ENETC_PM0_RFRG, "MAC rx fragment packets" },
@@ -163,9 +163,13 @@ static const struct {
163163
{ ENETC_PM0_TBCA, "MAC tx broadcast frames" },
164164
{ ENETC_PM0_TPKT, "MAC tx packets" },
165165
{ ENETC_PM0_TUND, "MAC tx undersized packets" },
166+
{ ENETC_PM0_T64, "MAC tx 64 byte packets" },
166167
{ ENETC_PM0_T127, "MAC tx 65-127 byte packets" },
168+
{ ENETC_PM0_T255, "MAC tx 128-255 byte packets" },
169+
{ ENETC_PM0_T511, "MAC tx 256-511 byte packets" },
167170
{ ENETC_PM0_T1023, "MAC tx 512-1023 byte packets" },
168-
{ ENETC_PM0_T1518, "MAC tx 1024-1518 byte packets" },
171+
{ ENETC_PM0_T1522, "MAC tx 1024-1522 byte packets" },
172+
{ ENETC_PM0_T1523X, "MAC tx 1523 to max-octet packets" },
169173
{ ENETC_PM0_TCNP, "MAC tx control packets" },
170174
{ ENETC_PM0_TDFR, "MAC tx deferred packets" },
171175
{ ENETC_PM0_TMCOL, "MAC tx multiple collisions" },

drivers/net/ethernet/freescale/enetc/enetc_hw.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,8 @@ enum enetc_bdr_type {TX, RX};
267267
#define ENETC_PM0_R255 0x8180
268268
#define ENETC_PM0_R511 0x8188
269269
#define ENETC_PM0_R1023 0x8190
270-
#define ENETC_PM0_R1518 0x8198
271-
#define ENETC_PM0_R1519X 0x81A0
270+
#define ENETC_PM0_R1522 0x8198
271+
#define ENETC_PM0_R1523X 0x81A0
272272
#define ENETC_PM0_ROVR 0x81A8
273273
#define ENETC_PM0_RJBR 0x81B0
274274
#define ENETC_PM0_RFRG 0x81B8
@@ -287,9 +287,13 @@ enum enetc_bdr_type {TX, RX};
287287
#define ENETC_PM0_TBCA 0x8250
288288
#define ENETC_PM0_TPKT 0x8260
289289
#define ENETC_PM0_TUND 0x8268
290+
#define ENETC_PM0_T64 0x8270
290291
#define ENETC_PM0_T127 0x8278
292+
#define ENETC_PM0_T255 0x8280
293+
#define ENETC_PM0_T511 0x8288
291294
#define ENETC_PM0_T1023 0x8290
292-
#define ENETC_PM0_T1518 0x8298
295+
#define ENETC_PM0_T1522 0x8298
296+
#define ENETC_PM0_T1523X 0x82A0
293297
#define ENETC_PM0_TCNP 0x82C0
294298
#define ENETC_PM0_TDFR 0x82D0
295299
#define ENETC_PM0_TMCOL 0x82D8

0 commit comments

Comments
 (0)