net: sfp: pass the phy_device when disconnecting an sfp module's PHY

Pass the phy_device as a parameter to the sfp upstream .disconnect_phy
operation. This is preparatory work to help track phy devices across
a net_device's link.

Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index ab8ae976a2f8b9beec12caf98b66e8bc5a9a52f9..711629c49c11336438ab9dd5ed310525e8bcbc9d 100644 (file)
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -266,6 +266,14 @@ static void phy_mdio_device_remove(struct mdio_device *mdiodev)
 
 static struct phy_driver genphy_driver;
 
+static struct phy_link_topology *phy_get_link_topology(struct phy_device *phydev)
+{
+       if (phydev->attached_dev)
+               return &phydev->attached_dev->link_topo;
+
+       return NULL;
+}
+
 static LIST_HEAD(phy_fixup_list);
 static DEFINE_MUTEX(phy_fixup_lock);
 

diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 298dfd6982a5046e117aa92ffb48ef6e09c1830e..3d25a4a6212b53690a5ce61ba6f8fa48802afb89 100644 (file)
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -3319,7 +3319,8 @@ static int phylink_sfp_connect_phy(void *upstream, struct phy_device *phy)
        return ret;
 }
 
-static void phylink_sfp_disconnect_phy(void *upstream)
+static void phylink_sfp_disconnect_phy(void *upstream,
+                                      struct phy_device *phydev)
 {
        phylink_disconnect_phy(upstream);
 }

diff --git a/drivers/net/phy/sfp-bus.c b/drivers/net/phy/sfp-bus.c
index 6fa679b36290ed528d942b8f3450217ec4a0b1bf..3a86c41e123581b65c33b6b77e66e9978882d42f 100644 (file)
--- a/drivers/net/phy/sfp-bus.c
+++ b/drivers/net/phy/sfp-bus.c
@@ -486,7 +486,7 @@ static void sfp_unregister_bus(struct sfp_bus *bus)
                        bus->socket_ops->stop(bus->sfp);
                bus->socket_ops->detach(bus->sfp);
                if (bus->phydev && ops && ops->disconnect_phy)
-                       ops->disconnect_phy(bus->upstream);
+                       ops->disconnect_phy(bus->upstream, bus->phydev);
        }
        bus->registered = false;
 }
@@ -742,7 +742,7 @@ void sfp_remove_phy(struct sfp_bus *bus)
        const struct sfp_upstream_ops *ops = sfp_get_upstream_ops(bus);
 
        if (ops && ops->disconnect_phy)
-               ops->disconnect_phy(bus->upstream);
+               ops->disconnect_phy(bus->upstream, bus->phydev);
        bus->phydev = NULL;
 }
 EXPORT_SYMBOL_GPL(sfp_remove_phy);

diff --git a/include/linux/sfp.h b/include/linux/sfp.h
index 9346cd44814d6aa0b69968baad4a261dfc6adbf9..0573e53b0c11f842060358bb765e2572e3897479 100644 (file)
--- a/include/linux/sfp.h
+++ b/include/linux/sfp.h
@@ -544,7 +544,7 @@ struct sfp_upstream_ops {
        void (*link_down)(void *priv);
        void (*link_up)(void *priv);
        int (*connect_phy)(void *priv, struct phy_device *);
-       void (*disconnect_phy)(void *priv);
+       void (*disconnect_phy)(void *priv, struct phy_device *);
 };
 
 #if IS_ENABLED(CONFIG_SFP)