net/mlx5e: Ensure each counter group uses its PCAM bit

The code was incorrectly relying on PCAM bit of ppcnt_statistical_group
for accessing per_lane_error_counters.
If ppcnt_statistical_group PCAM bit was not set, we would not read
per_lane_error_counters, even when its PCAM bit is set.
Given the existing device capabilities, it seems to cause no harm, so
this change primarily serves as cleanup.

Signed-off-by: Yael Chemla <ychemla@nvidia.com>
Reviewed-by: Cosmin Ratiu <cratiu@nvidia.com>
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Reviewed-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Link: https://patch.msgid.link/1742112876-2890-2-git-send-email-tariqt@nvidia.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c
index 611ec4b6f3709286a98c5dc36e751d20bda52ec2..77d34037b92bb55d91166660547694b4e9674265 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c
@@ -1272,11 +1272,9 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STRS(phy)
 
        ethtool_puts(data, "link_down_events_phy");
 
-       if (!MLX5_CAP_PCAM_FEATURE(mdev, ppcnt_statistical_group))
-               return;
-
-       for (i = 0; i < NUM_PPORT_PHY_STATISTICAL_COUNTERS; i++)
-               ethtool_puts(data, pport_phy_statistical_stats_desc[i].format);
+       if (MLX5_CAP_PCAM_FEATURE(mdev, ppcnt_statistical_group))
+               for (i = 0; i < NUM_PPORT_PHY_STATISTICAL_COUNTERS; i++)
+                       ethtool_puts(data, pport_phy_statistical_stats_desc[i].format);
 
        if (MLX5_CAP_PCAM_FEATURE(mdev, per_lane_error_counters))
                for (i = 0; i < NUM_PPORT_PHY_STATISTICAL_PER_LANE_COUNTERS; i++)
@@ -1294,15 +1292,13 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS(phy)
                data, MLX5_GET(ppcnt_reg, priv->stats.pport.phy_counters,
                               counter_set.phys_layer_cntrs.link_down_events));
 
-       if (!MLX5_CAP_PCAM_FEATURE(mdev, ppcnt_statistical_group))
-               return;
-
-       for (i = 0; i < NUM_PPORT_PHY_STATISTICAL_COUNTERS; i++)
-               mlx5e_ethtool_put_stat(
-                       data,
-                       MLX5E_READ_CTR64_BE(
-                               &priv->stats.pport.phy_statistical_counters,
-                               pport_phy_statistical_stats_desc, i));
+       if (MLX5_CAP_PCAM_FEATURE(mdev, ppcnt_statistical_group))
+               for (i = 0; i < NUM_PPORT_PHY_STATISTICAL_COUNTERS; i++)
+                       mlx5e_ethtool_put_stat(
+                               data,
+                               MLX5E_READ_CTR64_BE(
+                                       &priv->stats.pport.phy_statistical_counters,
+                                       pport_phy_statistical_stats_desc, i));
 
        if (MLX5_CAP_PCAM_FEATURE(mdev, per_lane_error_counters))
                for (i = 0; i < NUM_PPORT_PHY_STATISTICAL_PER_LANE_COUNTERS; i++)