[SRU][F][PULL][PATCH v2 18/23] Revert "UBUNTU: SAUCE: mlxbf_gige_main.c: Support ethtool options"

[Asmaa Mnebhi]

BugLink: https://bugs.launchpad.net/bugs/1934923

This reverts commit 9f965ce4074635f1e477e6e67aa0d9de8963f55d.

Signed-off-by: Asmaa Mnebhi <asmaa at nvidia.com>
---
 .../ethernet/mellanox/mlxbf_gige/mlxbf_gige.h |  2 -
 .../mellanox/mlxbf_gige/mlxbf_gige_main.c     | 55 -------------------
 .../mellanox/mlxbf_gige/mlxbf_gige_mdio.c     |  2 +
 3 files changed, 2 insertions(+), 57 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige.h b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige.h
index a32e5da07f56..adbdc90ddae4 100644
--- a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige.h
+++ b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige.h
@@ -48,8 +48,6 @@
 #define MLXBF_GIGE_LLU_PLU_INTR_IDX     2
 #define MLXBF_GIGE_PHY_INT_N            3
 
-#define MLXBF_GIGE_DEFAULT_PHY_ADDR	0x3
-
 struct mlxbf_gige_stats {
 	u64 hw_access_errors;
 	u64 tx_invalid_checksums;
diff --git a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c
index b267d473f978..abd3fc661e6f 100644
--- a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c
+++ b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c
@@ -473,58 +473,6 @@ static void mlxbf_gige_get_ethtool_stats(struct net_device *netdev,
 	spin_unlock_irqrestore(&priv->lock, flags);
 }
 
-static void mlxbf_gige_get_pauseparam(struct net_device *netdev,
-				      struct ethtool_pauseparam *pause)
-{
-	pause->autoneg = AUTONEG_ENABLE;
-	pause->rx_pause = 1;
-	pause->tx_pause = 1;
-}
-
-static int mlxbf_gige_get_link_ksettings(struct net_device *netdev,
-					 struct ethtool_link_ksettings *link_ksettings)
-{
-	struct phy_device *phydev = netdev->phydev;
-	u32 supported, advertising;
-	u32 lp_advertising = 0;
-	int status;
-
-	supported = SUPPORTED_TP | SUPPORTED_1000baseT_Full |
-		    SUPPORTED_Autoneg | SUPPORTED_Pause;
-
-	advertising = ADVERTISED_1000baseT_Full | ADVERTISED_Autoneg |
-		     ADVERTISED_Pause;
-
-	status = phy_read(phydev, MII_LPA);
-	if (status >= 0) {
-		lp_advertising = mii_lpa_to_ethtool_lpa_t(status & 0xffff);
-	}
-
-	status = phy_read(phydev, MII_STAT1000);
-	if (status >= 0) {
-		lp_advertising |= mii_stat1000_to_ethtool_lpa_t(status & 0xffff);
-	}
-
-	ethtool_convert_legacy_u32_to_link_mode(link_ksettings->link_modes.supported,
-						supported);
-	ethtool_convert_legacy_u32_to_link_mode(link_ksettings->link_modes.advertising,
-						advertising);
-	ethtool_convert_legacy_u32_to_link_mode(link_ksettings->link_modes.lp_advertising,
-						lp_advertising);
-
-	link_ksettings->base.autoneg = AUTONEG_ENABLE;
-	link_ksettings->base.speed = SPEED_1000;
-	link_ksettings->base.duplex = DUPLEX_FULL;
-	link_ksettings->base.port = PORT_TP;
-	link_ksettings->base.phy_address = MLXBF_GIGE_DEFAULT_PHY_ADDR;
-	link_ksettings->base.transceiver = XCVR_INTERNAL;
-	link_ksettings->base.mdio_support = ETH_MDIO_SUPPORTS_C22;
-	link_ksettings->base.eth_tp_mdix = ETH_TP_MDI_INVALID;
-	link_ksettings->base.eth_tp_mdix_ctrl = ETH_TP_MDI_INVALID;
-
-	return 0;
-}
-
 static const struct ethtool_ops mlxbf_gige_ethtool_ops = {
 	.get_drvinfo		= mlxbf_gige_get_drvinfo,
 	.get_link		= ethtool_op_get_link,
@@ -535,9 +483,6 @@ static const struct ethtool_ops mlxbf_gige_ethtool_ops = {
 	.get_strings            = mlxbf_gige_get_strings,
 	.get_sset_count         = mlxbf_gige_get_sset_count,
 	.get_ethtool_stats      = mlxbf_gige_get_ethtool_stats,
-	.nway_reset		= phy_ethtool_nway_reset,
-	.get_pauseparam		= mlxbf_gige_get_pauseparam,
-	.get_link_ksettings	= mlxbf_gige_get_link_ksettings,
 };
 
 static void mlxbf_gige_handle_link_change(struct net_device *netdev)
diff --git a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c
index 200a221deb3e..e5c535270a25 100644
--- a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c
+++ b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c
@@ -20,6 +20,8 @@
 
 #include "mlxbf_gige.h"
 
+#define MLXBF_GIGE_DEFAULT_PHY_ADDR	0x3
+
 #define MLXBF_GIGE_POLL_BUSY_TIMEOUT	100 /* ms */
 #define MLXBF_GIGE_POLL_DELAY_USEC	100 /* microsec */
 
-- 
2.30.1