From 9eb951b2e1e9446d4471fa35709739d4718ad10f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 2 Apr 2021 14:54:22 +0200 Subject: [PATCH] Revert "net: phy: introduce phydev->port" This reverts commit 9a5267264fc2f366b687b400487ec06747f054b6. It causes an ABI breakage that we will revert after the next KABI "break" is allowed in a week or so. Bug: 161946584 Signed-off-by: Greg Kroah-Hartman Change-Id: I4f072c8477716d890ad534d133c45fea9f3f9521 --- drivers/net/phy/broadcom.c | 2 -- drivers/net/phy/dp83822.c | 3 --- drivers/net/phy/dp83869.c | 4 ---- drivers/net/phy/lxt.c | 1 - drivers/net/phy/marvell.c | 1 - drivers/net/phy/marvell10g.c | 2 -- drivers/net/phy/micrel.c | 14 +++----------- drivers/net/phy/phy.c | 2 +- drivers/net/phy/phy_device.c | 9 --------- include/linux/phy.h | 2 -- 10 files changed, 4 insertions(+), 36 deletions(-) diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c index 739efcce6dd5..69713ea36d4e 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c @@ -505,8 +505,6 @@ static int bcm54616s_probe(struct phy_device *phydev) */ if (!(val & BCM54616S_100FX_MODE)) phydev->dev_flags |= PHY_BCM_FLAGS_MODE_1000BX; - - phydev->port = PORT_FIBRE; } return 0; diff --git a/drivers/net/phy/dp83822.c b/drivers/net/phy/dp83822.c index a9b058bb1be8..c162c9551bd1 100644 --- a/drivers/net/phy/dp83822.c +++ b/drivers/net/phy/dp83822.c @@ -534,9 +534,6 @@ static int dp83822_probe(struct phy_device *phydev) dp83822_of_init(phydev); - if (dp83822->fx_enabled) - phydev->port = PORT_FIBRE; - return 0; } diff --git a/drivers/net/phy/dp83869.c b/drivers/net/phy/dp83869.c index a9daff88006b..cf6dec7b7d8e 100644 --- a/drivers/net/phy/dp83869.c +++ b/drivers/net/phy/dp83869.c @@ -821,10 +821,6 @@ static int dp83869_probe(struct phy_device *phydev) if (ret) return ret; - if (dp83869->mode == DP83869_RGMII_100_BASE || - dp83869->mode == DP83869_RGMII_1000_BASE) - phydev->port = PORT_FIBRE; - return dp83869_config_init(phydev); } diff --git a/drivers/net/phy/lxt.c b/drivers/net/phy/lxt.c index cb8e4f0215fe..fec58ad69e02 100644 --- a/drivers/net/phy/lxt.c +++ b/drivers/net/phy/lxt.c @@ -218,7 +218,6 @@ static int lxt973_probe(struct phy_device *phydev) phy_write(phydev, MII_BMCR, val); /* Remember that the port is in fiber mode. */ phydev->priv = lxt973_probe; - phydev->port = PORT_FIBRE; } else { phydev->priv = NULL; } diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 5dbdaf0f5f09..5aec673a0120 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -1449,7 +1449,6 @@ static int marvell_read_status_page(struct phy_device *phydev, int page) phydev->asym_pause = 0; phydev->speed = SPEED_UNKNOWN; phydev->duplex = DUPLEX_UNKNOWN; - phydev->port = fiber ? PORT_FIBRE : PORT_TP; if (phydev->autoneg == AUTONEG_ENABLE) err = marvell_read_status_page_an(phydev, fiber, status); diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c index b1bb9b8e1e4e..1901ba277413 100644 --- a/drivers/net/phy/marvell10g.c +++ b/drivers/net/phy/marvell10g.c @@ -631,7 +631,6 @@ static int mv3310_read_status_10gbaser(struct phy_device *phydev) phydev->link = 1; phydev->speed = SPEED_10000; phydev->duplex = DUPLEX_FULL; - phydev->port = PORT_FIBRE; return 0; } @@ -691,7 +690,6 @@ static int mv3310_read_status_copper(struct phy_device *phydev) phydev->duplex = cssr1 & MV_PCS_CSSR1_DUPLEX_FULL ? DUPLEX_FULL : DUPLEX_HALF; - phydev->port = PORT_TP; phydev->mdix = cssr1 & MV_PCS_CSSR1_MDIX ? ETH_TP_MDI_X : ETH_TP_MDI; diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 9b0bc8b74bc0..47ae1d1723c5 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -308,19 +308,14 @@ static int kszphy_config_init(struct phy_device *phydev) return kszphy_config_reset(phydev); } -static int ksz8041_fiber_mode(struct phy_device *phydev) -{ - struct device_node *of_node = phydev->mdio.dev.of_node; - - return of_property_read_bool(of_node, "micrel,fiber-mode"); -} - static int ksz8041_config_init(struct phy_device *phydev) { __ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, }; + struct device_node *of_node = phydev->mdio.dev.of_node; + /* Limit supported and advertised modes in fiber mode */ - if (ksz8041_fiber_mode(phydev)) { + if (of_property_read_bool(of_node, "micrel,fiber-mode")) { phydev->dev_flags |= MICREL_PHY_FXEN; linkmode_set_bit(ETHTOOL_LINK_MODE_100baseT_Full_BIT, mask); linkmode_set_bit(ETHTOOL_LINK_MODE_100baseT_Half_BIT, mask); @@ -1148,9 +1143,6 @@ static int kszphy_probe(struct phy_device *phydev) } } - if (ksz8041_fiber_mode(phydev)) - phydev->port = PORT_FIBRE; - /* Support legacy board-file configuration */ if (phydev->dev_flags & MICREL_PHY_50MHZ_CLK) { priv->rmii_ref_clk_sel = true; diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 28ddaad721ed..49e96ca585ff 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -327,7 +327,7 @@ void phy_ethtool_ksettings_get(struct phy_device *phydev, if (phydev->interface == PHY_INTERFACE_MODE_MOCA) cmd->base.port = PORT_BNC; else - cmd->base.port = phydev->port; + cmd->base.port = PORT_MII; cmd->base.transceiver = phy_is_internal(phydev) ? XCVR_INTERNAL : XCVR_EXTERNAL; cmd->base.phy_address = phydev->mdio.addr; diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 85f3cde5ffd0..2d4eed2d61ce 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -576,7 +576,6 @@ struct phy_device *phy_device_create(struct mii_bus *bus, int addr, u32 phy_id, dev->pause = 0; dev->asym_pause = 0; dev->link = 0; - dev->port = PORT_TP; dev->interface = PHY_INTERFACE_MODE_GMII; dev->autoneg = AUTONEG_ENABLE; @@ -1385,14 +1384,6 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev, phydev->state = PHY_READY; - /* Port is set to PORT_TP by default and the actual PHY driver will set - * it to different value depending on the PHY configuration. If we have - * the generic PHY driver we can't figure it out, thus set the old - * legacy PORT_MII value. - */ - if (using_genphy) - phydev->port = PORT_MII; - /* Initial carrier state is off as the phy is about to be * (re)initialized. */ diff --git a/include/linux/phy.h b/include/linux/phy.h index 08725a262f32..56563e5e0dc7 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -499,7 +499,6 @@ struct macsec_ops; * * @speed: Current link speed * @duplex: Current duplex - * @port: Current port * @pause: Current pause * @asym_pause: Current asymmetric pause * @supported: Combined MAC/PHY supported linkmodes @@ -578,7 +577,6 @@ struct phy_device { */ int speed; int duplex; - int port; int pause; int asym_pause; u8 master_slave_get;