diff mbox series

[SRU,J:linux-bluefield,v1,1/2] Revert "UBUNTU: SAUCE: mlxbf_gige: add support to display pause frame counters"

Message ID c90f064c7dc00311f68c2a86a712cf58f0a140f2.1711563241.git.davthompson@nvidia.com
State New
Headers show
Series mlxbf_gige: replace SAUCE patch for pause frame counters | expand

Commit Message

David Thompson March 27, 2024, 6:25 p.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/2059279

This reverts commit a99b0d90722687edb659200ca31cf3ea4ec4061f.

Signed-off-by: David Thompson <davthompson@nvidia.com>
---
 .../mellanox/mlxbf_gige/mlxbf_gige_ethtool.c  | 39 -------------------
 .../mellanox/mlxbf_gige/mlxbf_gige_regs.h     | 22 -----------
 2 files changed, 61 deletions(-)
diff mbox series

Patch

diff --git a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_ethtool.c b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_ethtool.c
index c2a376db6ad1..602537f62098 100644
--- a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_ethtool.c
@@ -158,44 +158,6 @@  static void mlxbf_gige_get_pauseparam(struct net_device *netdev,
 	pause->tx_pause = 1;
 }
 
-static bool mlxbf_gige_llu_counters_enabled(struct mlxbf_gige *priv)
-{
-	u32 data;
-
-	if (priv->hw_version == MLXBF_GIGE_VERSION_BF2) {
-		data = readl(priv->llu_base + MLXBF_GIGE_BF2_LLU_GENERAL_CONFIG);
-		if (data & MLXBF_GIGE_BF2_LLU_COUNTERS_EN)
-			return true;
-	} else {
-		data = readl(priv->llu_base + MLXBF_GIGE_BF3_LLU_GENERAL_CONFIG);
-		if (data & MLXBF_GIGE_BF3_LLU_COUNTERS_EN)
-			return true;
-	}
-
-	return false;
-}
-
-static void mlxbf_gige_get_pause_stats(struct net_device *netdev,
-				       struct ethtool_pause_stats *pause_stats)
-{
-	struct mlxbf_gige *priv = netdev_priv(netdev);
-	u64 dataLo, dataHi;
-
-	/* Read LLU counters only if they are enabled */
-	if (mlxbf_gige_llu_counters_enabled(priv)) {
-		dataLo = readl(priv->llu_base + MLXBF_GIGE_TX_PAUSE_CNT_LO);
-		dataHi = readl(priv->llu_base + MLXBF_GIGE_TX_PAUSE_CNT_HI);
-		pause_stats->tx_pause_frames = (dataHi << 32) | dataLo;
-
-		dataLo = readl(priv->llu_base + MLXBF_GIGE_RX_PAUSE_CNT_LO);
-		dataHi = readl(priv->llu_base + MLXBF_GIGE_RX_PAUSE_CNT_HI);
-		pause_stats->rx_pause_frames = (dataHi << 32) | dataLo;
-	} else {
-		pause_stats->tx_pause_frames = 0;
-		pause_stats->rx_pause_frames = 0;
-	}
-}
-
 const struct ethtool_ops mlxbf_gige_ethtool_ops = {
 	.get_link		= ethtool_op_get_link,
 	.get_ringparam		= mlxbf_gige_get_ringparam,
@@ -207,7 +169,6 @@  const struct ethtool_ops mlxbf_gige_ethtool_ops = {
 	.get_ethtool_stats      = mlxbf_gige_get_ethtool_stats,
 	.nway_reset		= phy_ethtool_nway_reset,
 	.get_pauseparam		= mlxbf_gige_get_pauseparam,
-	.get_pause_stats	= mlxbf_gige_get_pause_stats,
 	.get_link_ksettings	= phy_ethtool_get_link_ksettings,
 	.set_link_ksettings	= phy_ethtool_set_link_ksettings,
 };
diff --git a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_regs.h b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_regs.h
index 9702b5be3c85..cd0973229c9b 100644
--- a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_regs.h
+++ b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_regs.h
@@ -99,26 +99,4 @@ 
 #define MLXBF_GIGE_100M_IPG_SIZE                      119
 #define MLXBF_GIGE_10M_IPG_SIZE                       1199
 
-/* Offsets into OOB LLU block for pause frame counters */
-#define MLXBF_GIGE_BF2_TX_PAUSE_CNT_HI                0x33d8
-#define MLXBF_GIGE_BF2_TX_PAUSE_CNT_LO                0x33dc
-#define MLXBF_GIGE_BF2_RX_PAUSE_CNT_HI                0x3210
-#define MLXBF_GIGE_BF2_RX_PAUSE_CNT_LO                0x3214
-
-#define MLXBF_GIGE_BF3_TX_PAUSE_CNT_HI                0x3a88
-#define MLXBF_GIGE_BF3_TX_PAUSE_CNT_LO                0x3a8c
-#define MLXBF_GIGE_BF3_RX_PAUSE_CNT_HI                0x38c0
-#define MLXBF_GIGE_BF3_RX_PAUSE_CNT_LO                0x38c4
-
-#define MLXBF_GIGE_TX_PAUSE_CNT_HI ((priv->hw_version == MLXBF_GIGE_VERSION_BF2) ? MLXBF_GIGE_BF2_TX_PAUSE_CNT_HI : MLXBF_GIGE_BF3_TX_PAUSE_CNT_HI)
-#define MLXBF_GIGE_TX_PAUSE_CNT_LO ((priv->hw_version == MLXBF_GIGE_VERSION_BF2) ? MLXBF_GIGE_BF2_TX_PAUSE_CNT_LO : MLXBF_GIGE_BF3_TX_PAUSE_CNT_LO)
-#define MLXBF_GIGE_RX_PAUSE_CNT_HI ((priv->hw_version == MLXBF_GIGE_VERSION_BF2) ? MLXBF_GIGE_BF2_RX_PAUSE_CNT_HI : MLXBF_GIGE_BF3_RX_PAUSE_CNT_HI)
-#define MLXBF_GIGE_RX_PAUSE_CNT_LO ((priv->hw_version == MLXBF_GIGE_VERSION_BF2) ? MLXBF_GIGE_BF2_RX_PAUSE_CNT_LO : MLXBF_GIGE_BF3_RX_PAUSE_CNT_LO)
-
-#define MLXBF_GIGE_BF2_LLU_GENERAL_CONFIG             0x2110
-#define MLXBF_GIGE_BF3_LLU_GENERAL_CONFIG             0x2030
-
-#define MLXBF_GIGE_BF2_LLU_COUNTERS_EN                BIT(0)
-#define MLXBF_GIGE_BF3_LLU_COUNTERS_EN                BIT(4)
-
 #endif /* !defined(__MLXBF_GIGE_REGS_H__) */