Skip to content

Commit 664124b

Browse files
claudiu-mksacilotto
authored andcommitted
enetc: Fix reporting of h/w packet counters
BugLink: https://bugs.launchpad.net/bugs/1910817 [ Upstream commit eb96b68 ] 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 <claudiu.manoil@nxp.com> Link: https://lore.kernel.org/r/20201204171505.21389-1-claudiu.manoil@nxp.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>
1 parent 969dd61 commit 664124b

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
@@ -141,8 +141,8 @@ static const struct {
141141
{ ENETC_PM0_R255, "MAC rx 128-255 byte packets" },
142142
{ ENETC_PM0_R511, "MAC rx 256-511 byte packets" },
143143
{ ENETC_PM0_R1023, "MAC rx 512-1023 byte packets" },
144-
{ ENETC_PM0_R1518, "MAC rx 1024-1518 byte packets" },
145-
{ ENETC_PM0_R1519X, "MAC rx 1519 to max-octet packets" },
144+
{ ENETC_PM0_R1522, "MAC rx 1024-1522 byte packets" },
145+
{ ENETC_PM0_R1523X, "MAC rx 1523 to max-octet packets" },
146146
{ ENETC_PM0_ROVR, "MAC rx oversized packets" },
147147
{ ENETC_PM0_RJBR, "MAC rx jabber packets" },
148148
{ ENETC_PM0_RFRG, "MAC rx fragment packets" },
@@ -161,9 +161,13 @@ static const struct {
161161
{ ENETC_PM0_TBCA, "MAC tx broadcast frames" },
162162
{ ENETC_PM0_TPKT, "MAC tx packets" },
163163
{ ENETC_PM0_TUND, "MAC tx undersized packets" },
164+
{ ENETC_PM0_T64, "MAC tx 64 byte packets" },
164165
{ ENETC_PM0_T127, "MAC tx 65-127 byte packets" },
166+
{ ENETC_PM0_T255, "MAC tx 128-255 byte packets" },
167+
{ ENETC_PM0_T511, "MAC tx 256-511 byte packets" },
165168
{ ENETC_PM0_T1023, "MAC tx 512-1023 byte packets" },
166-
{ ENETC_PM0_T1518, "MAC tx 1024-1518 byte packets" },
169+
{ ENETC_PM0_T1522, "MAC tx 1024-1522 byte packets" },
170+
{ ENETC_PM0_T1523X, "MAC tx 1523 to max-octet packets" },
167171
{ ENETC_PM0_TCNP, "MAC tx control packets" },
168172
{ ENETC_PM0_TDFR, "MAC tx deferred packets" },
169173
{ 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
@@ -239,8 +239,8 @@ enum enetc_bdr_type {TX, RX};
239239
#define ENETC_PM0_R255 0x8180
240240
#define ENETC_PM0_R511 0x8188
241241
#define ENETC_PM0_R1023 0x8190
242-
#define ENETC_PM0_R1518 0x8198
243-
#define ENETC_PM0_R1519X 0x81A0
242+
#define ENETC_PM0_R1522 0x8198
243+
#define ENETC_PM0_R1523X 0x81A0
244244
#define ENETC_PM0_ROVR 0x81A8
245245
#define ENETC_PM0_RJBR 0x81B0
246246
#define ENETC_PM0_RFRG 0x81B8
@@ -259,9 +259,13 @@ enum enetc_bdr_type {TX, RX};
259259
#define ENETC_PM0_TBCA 0x8250
260260
#define ENETC_PM0_TPKT 0x8260
261261
#define ENETC_PM0_TUND 0x8268
262+
#define ENETC_PM0_T64 0x8270
262263
#define ENETC_PM0_T127 0x8278
264+
#define ENETC_PM0_T255 0x8280
265+
#define ENETC_PM0_T511 0x8288
263266
#define ENETC_PM0_T1023 0x8290
264-
#define ENETC_PM0_T1518 0x8298
267+
#define ENETC_PM0_T1522 0x8298
268+
#define ENETC_PM0_T1523X 0x82A0
265269
#define ENETC_PM0_TCNP 0x82C0
266270
#define ENETC_PM0_TDFR 0x82D0
267271
#define ENETC_PM0_TMCOL 0x82D8

0 commit comments

Comments
 (0)