|
 |
2b6231 |
From 0d455718461b9cba11c262d2c24d263ccc17dc1f Mon Sep 17 00:00:00 2001
|
|
|
2b6231 |
From: Claudiu Manoil <claudiu.manoil@nxp.com>
|
|
|
2b6231 |
Date: Fri, 4 Dec 2020 19:15:05 +0200
|
|
|
2b6231 |
Subject: [PATCH 10/14] enetc: Fix reporting of h/w packet counters
|
|
|
2b6231 |
Git-commit: eb96b686fc2c601e78903cc61b6cf4588ddde013
|
|
|
2b6231 |
Patch-mainline: v5.10
|
|
|
2b6231 |
References: git-fixes
|
|
|
2b6231 |
|
|
|
2b6231 |
Noticed some inconsistencies in packet statistics reporting.
|
|
|
2b6231 |
This patch adds the missing Tx packet counter registers to
|
|
|
2b6231 |
ethtool reporting and fixes the information strings for a
|
|
|
2b6231 |
few of them.
|
|
|
2b6231 |
|
|
|
2b6231 |
Fixes: 16eb4c85c964 ("enetc: Add ethtool statistics")
|
|
|
2b6231 |
Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
|
|
|
2b6231 |
Link: https://lore.kernel.org/r/20201204171505.21389-1-claudiu.manoil@nxp.com
|
|
|
2b6231 |
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
|
2b6231 |
Signed-off-by: Denis Kirjanov <denis.kirjanov@suse.com>
|
|
|
2b6231 |
---
|
|
|
2b6231 |
drivers/net/ethernet/freescale/enetc/enetc_ethtool.c | 10 +++++++---
|
|
|
2b6231 |
drivers/net/ethernet/freescale/enetc/enetc_hw.h | 10 +++++++---
|
|
|
2b6231 |
2 files changed, 14 insertions(+), 6 deletions(-)
|
|
|
2b6231 |
|
|
|
2b6231 |
diff --git a/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c b/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
|
|
|
2b6231 |
index 301ee0dde02d..a6abd4fd7388 100644
|
|
|
2b6231 |
--- a/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
|
|
|
2b6231 |
+++ b/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
|
|
|
2b6231 |
@@ -141,8 +141,8 @@ static const struct {
|
|
|
2b6231 |
{ ENETC_PM0_R255, "MAC rx 128-255 byte packets" },
|
|
|
2b6231 |
{ ENETC_PM0_R511, "MAC rx 256-511 byte packets" },
|
|
|
2b6231 |
{ ENETC_PM0_R1023, "MAC rx 512-1023 byte packets" },
|
|
|
2b6231 |
- { ENETC_PM0_R1518, "MAC rx 1024-1518 byte packets" },
|
|
|
2b6231 |
- { ENETC_PM0_R1519X, "MAC rx 1519 to max-octet packets" },
|
|
|
2b6231 |
+ { ENETC_PM0_R1522, "MAC rx 1024-1522 byte packets" },
|
|
|
2b6231 |
+ { ENETC_PM0_R1523X, "MAC rx 1523 to max-octet packets" },
|
|
|
2b6231 |
{ ENETC_PM0_ROVR, "MAC rx oversized packets" },
|
|
|
2b6231 |
{ ENETC_PM0_RJBR, "MAC rx jabber packets" },
|
|
|
2b6231 |
{ ENETC_PM0_RFRG, "MAC rx fragment packets" },
|
|
|
2b6231 |
@@ -161,9 +161,13 @@ static const struct {
|
|
|
2b6231 |
{ ENETC_PM0_TBCA, "MAC tx broadcast frames" },
|
|
|
2b6231 |
{ ENETC_PM0_TPKT, "MAC tx packets" },
|
|
|
2b6231 |
{ ENETC_PM0_TUND, "MAC tx undersized packets" },
|
|
|
2b6231 |
+ { ENETC_PM0_T64, "MAC tx 64 byte packets" },
|
|
|
2b6231 |
{ ENETC_PM0_T127, "MAC tx 65-127 byte packets" },
|
|
|
2b6231 |
+ { ENETC_PM0_T255, "MAC tx 128-255 byte packets" },
|
|
|
2b6231 |
+ { ENETC_PM0_T511, "MAC tx 256-511 byte packets" },
|
|
|
2b6231 |
{ ENETC_PM0_T1023, "MAC tx 512-1023 byte packets" },
|
|
|
2b6231 |
- { ENETC_PM0_T1518, "MAC tx 1024-1518 byte packets" },
|
|
|
2b6231 |
+ { ENETC_PM0_T1522, "MAC tx 1024-1522 byte packets" },
|
|
|
2b6231 |
+ { ENETC_PM0_T1523X, "MAC tx 1523 to max-octet packets" },
|
|
|
2b6231 |
{ ENETC_PM0_TCNP, "MAC tx control packets" },
|
|
|
2b6231 |
{ ENETC_PM0_TDFR, "MAC tx deferred packets" },
|
|
|
2b6231 |
{ ENETC_PM0_TMCOL, "MAC tx multiple collisions" },
|
|
|
2b6231 |
diff --git a/drivers/net/ethernet/freescale/enetc/enetc_hw.h b/drivers/net/ethernet/freescale/enetc/enetc_hw.h
|
|
|
2b6231 |
index 7df4482af1b7..862aa1d722e2 100644
|
|
|
2b6231 |
--- a/drivers/net/ethernet/freescale/enetc/enetc_hw.h
|
|
|
2b6231 |
+++ b/drivers/net/ethernet/freescale/enetc/enetc_hw.h
|
|
|
2b6231 |
@@ -248,8 +248,8 @@ enum enetc_bdr_type {TX, RX};
|
|
|
2b6231 |
#define ENETC_PM0_R255 0x8180
|
|
|
2b6231 |
#define ENETC_PM0_R511 0x8188
|
|
|
2b6231 |
#define ENETC_PM0_R1023 0x8190
|
|
|
2b6231 |
-#define ENETC_PM0_R1518 0x8198
|
|
|
2b6231 |
-#define ENETC_PM0_R1519X 0x81A0
|
|
|
2b6231 |
+#define ENETC_PM0_R1522 0x8198
|
|
|
2b6231 |
+#define ENETC_PM0_R1523X 0x81A0
|
|
|
2b6231 |
#define ENETC_PM0_ROVR 0x81A8
|
|
|
2b6231 |
#define ENETC_PM0_RJBR 0x81B0
|
|
|
2b6231 |
#define ENETC_PM0_RFRG 0x81B8
|
|
|
2b6231 |
@@ -268,9 +268,13 @@ enum enetc_bdr_type {TX, RX};
|
|
|
2b6231 |
#define ENETC_PM0_TBCA 0x8250
|
|
|
2b6231 |
#define ENETC_PM0_TPKT 0x8260
|
|
|
2b6231 |
#define ENETC_PM0_TUND 0x8268
|
|
|
2b6231 |
+#define ENETC_PM0_T64 0x8270
|
|
|
2b6231 |
#define ENETC_PM0_T127 0x8278
|
|
|
2b6231 |
+#define ENETC_PM0_T255 0x8280
|
|
|
2b6231 |
+#define ENETC_PM0_T511 0x8288
|
|
|
2b6231 |
#define ENETC_PM0_T1023 0x8290
|
|
|
2b6231 |
-#define ENETC_PM0_T1518 0x8298
|
|
|
2b6231 |
+#define ENETC_PM0_T1522 0x8298
|
|
|
2b6231 |
+#define ENETC_PM0_T1523X 0x82A0
|
|
|
2b6231 |
#define ENETC_PM0_TCNP 0x82C0
|
|
|
2b6231 |
#define ENETC_PM0_TDFR 0x82D0
|
|
|
2b6231 |
#define ENETC_PM0_TMCOL 0x82D8
|
|
|
2b6231 |
--
|
|
|
2b6231 |
2.16.4
|
|
|
2b6231 |
|