net/mlx5e: Add port module event counters to ethtool stats

Add port module event counters to ethtool -S command

Signed-off-by: Huy Nguyen <huyn@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
index 27ff401cec201d48a9e66dab934f3dd9f32d9901..b154621bdad728cdf16e043fe465460c38a21155 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
@@ -173,7 +173,10 @@ static int mlx5e_get_sset_count(struct net_device *dev, int sset)
                       NUM_VPORT_COUNTERS + NUM_PPORT_COUNTERS +
                       MLX5E_NUM_RQ_STATS(priv) +
                       MLX5E_NUM_SQ_STATS(priv) +
-                      MLX5E_NUM_PFC_COUNTERS(priv);
+                      MLX5E_NUM_PFC_COUNTERS(priv) +
+                      ARRAY_SIZE(mlx5e_pme_status_desc) +
+                      ARRAY_SIZE(mlx5e_pme_error_desc);
+
        case ETH_SS_PRIV_FLAGS:
                return ARRAY_SIZE(mlx5e_priv_flags);
        /* fallthrough */
@@ -237,6 +240,13 @@ static void mlx5e_fill_stats_strings(struct mlx5e_priv *priv, uint8_t *data)
                }
        }
 
+       /* port module event counters */
+       for (i = 0; i < ARRAY_SIZE(mlx5e_pme_status_desc); i++)
+               strcpy(data + (idx++) * ETH_GSTRING_LEN, mlx5e_pme_status_desc[i].format);
+
+       for (i = 0; i < ARRAY_SIZE(mlx5e_pme_error_desc); i++)
+               strcpy(data + (idx++) * ETH_GSTRING_LEN, mlx5e_pme_error_desc[i].format);
+
        if (!test_bit(MLX5E_STATE_OPENED, &priv->state))
                return;
 
@@ -279,6 +289,7 @@ static void mlx5e_get_ethtool_stats(struct net_device *dev,
                                    struct ethtool_stats *stats, u64 *data)
 {
        struct mlx5e_priv *priv = netdev_priv(dev);
+       struct mlx5_priv *mlx5_priv;
        int i, j, tc, prio, idx = 0;
        unsigned long pfc_combined;
 
@@ -335,6 +346,16 @@ static void mlx5e_get_ethtool_stats(struct net_device *dev,
                }
        }
 
+       /* port module event counters */
+       mlx5_priv =  &priv->mdev->priv;
+       for (i = 0; i < ARRAY_SIZE(mlx5e_pme_status_desc); i++)
+               data[idx++] = MLX5E_READ_CTR64_CPU(mlx5_priv->pme_stats.status_counters,
+                                                  mlx5e_pme_status_desc, i);
+
+       for (i = 0; i < ARRAY_SIZE(mlx5e_pme_error_desc); i++)
+               data[idx++] = MLX5E_READ_CTR64_CPU(mlx5_priv->pme_stats.error_counters,
+                                                  mlx5e_pme_error_desc, i);
+
        if (!test_bit(MLX5E_STATE_OPENED, &priv->state))
                return;
 

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h
index 57452fdc515406b4a6020d81886d5e0f52cafb2a..b817e5133a55e0df793dbecf8c6130373f4ef92c 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h
@@ -379,4 +379,21 @@ struct mlx5e_stats {
        struct mlx5e_pport_stats pport;
 };
 
+static const struct counter_desc mlx5e_pme_status_desc[] = {
+       { "module_plug", 0 },
+       { "module_unplug", 8 },
+};
+
+static const struct counter_desc mlx5e_pme_error_desc[] = {
+       { "module_pwr_budget_exd", 0 },  /* power budget exceed */
+       { "module_long_range", 8 },      /* long range for non MLNX cable */
+       { "module_bus_stuck", 16 },      /* bus stuck (I2C or data shorted) */
+       { "module_no_eeprom", 24 },      /* no eeprom/retry time out */
+       { "module_enforce_part", 32 },   /* enforce part number list */
+       { "module_unknown_id", 40 },     /* unknown identifier */
+       { "module_high_temp", 48 },      /* high temperature */
+       { "module_bad_shorted", 56 },    /* bad or shorted cable/module */
+       { "module_unknown_status", 64 },
+};
+
 #endif /* __MLX5_EN_STATS_H__ */