drivers: net: xgene: Add frame recovered statistics counter for errata 10GE_8/ENET_11

This patch adds statistic counter for frames recovered from HW errata
10GE_8 and ENET_11:
"HW reports Length error for valid 64 byte frames with len <46 bytes".

Signed-off-by: Quan Nguyen <qnguyen@apm.com>
Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c b/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
index 6b2a4b917c1094600bc9c24656b8f40af8744720..5c2c84a8b69019aa5312bd50f4e683a0afdab273 100644 (file)
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
@@ -64,6 +64,7 @@ static const struct xgene_gstrings_stats gstrings_extd_stats[] = {
        XGENE_EXTD_STAT(rx_unk_opcode_cntr, RXUO, 16),
        XGENE_EXTD_STAT(rx_align_err_cntr, RALN, 16),
        XGENE_EXTD_STAT(rx_frame_len_err_cntr, RFLR, 16),
+       XGENE_EXTD_STAT(rx_frame_len_err_recov_cntr, DUMP, 0),
        XGENE_EXTD_STAT(rx_code_err_cntr, RCDE, 16),
        XGENE_EXTD_STAT(rx_carrier_sense_err_cntr, RCSE, 16),
        XGENE_EXTD_STAT(rx_undersize_pkt_cntr, RUND, 16),
@@ -95,8 +96,9 @@ static const struct xgene_gstrings_stats gstrings_extd_stats[] = {
 
 #define XGENE_STATS_LEN                ARRAY_SIZE(gstrings_stats)
 #define XGENE_EXTD_STATS_LEN   ARRAY_SIZE(gstrings_extd_stats)
-#define RX_OVERRUN_IDX         22
-#define TX_UNDERRUN_IDX                41
+#define FALSE_RFLR_IDX         15
+#define RX_OVERRUN_IDX         23
+#define TX_UNDERRUN_IDX                42
 
 static void xgene_get_drvinfo(struct net_device *ndev,
                              struct ethtool_drvinfo *info)
@@ -229,6 +231,9 @@ static void xgene_get_extd_stats(struct xgene_enet_pdata *pdata)
        pdata->mac_ops->get_drop_cnt(pdata, &rx_drop, &tx_drop);
        pdata->extd_stats[RX_OVERRUN_IDX] += rx_drop;
        pdata->extd_stats[TX_UNDERRUN_IDX] += tx_drop;
+
+       /* Errata 10GE_8 -  Update Frame recovered from Errata 10GE_8/ENET_11 */
+       pdata->extd_stats[FALSE_RFLR_IDX] = pdata->false_rflr;
 }
 
 int xgene_extd_stats_init(struct xgene_enet_pdata *pdata)

diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
index bd2486e3065348e60239254ecc8c5f200e34ff0f..c2d38da88084ec31c961f2bf9f325cd9a6496294 100644 (file)
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
@@ -712,6 +712,8 @@ static int xgene_enet_rx_frame(struct xgene_enet_desc_ring *rx_ring,
                        xgene_enet_parse_error(rx_ring, status);
                        rx_ring->rx_dropped++;
                        goto out;
+               } else {
+                       pdata->false_rflr++;
                }
        }
 

diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
index cabe54edb17c97ec3498b3c1a790852e050b4283..0f5f0b07c482db00b9a3f6b4267e5a690551887f 100644 (file)
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
@@ -224,6 +224,7 @@ struct xgene_enet_pdata {
        enum xgene_enet_rm rm;
        struct xgene_enet_cle cle;
        u64 *extd_stats;
+       u64 false_rflr;
        spinlock_t stats_lock; /* statistics lock */
        const struct xgene_mac_ops *mac_ops;
        spinlock_t mac_lock; /* mac lock */