nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

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

Browse source 
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>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Maxime Chevallier 2024-04-04 11:29:52 +02:00 committed by David S. Miller
parent 6916e461e7
commit 0ec5ed6c13
3 changed files with 5 additions and 4 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/net/phy/phylink.c
View file

@ -3408,7 +3408,8 @@ static int phylink_sfp_connect_phy(void *upstream, struct phy_device *phy)
return ret; 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); phylink_disconnect_phy(upstream);
} }

4
drivers/net/phy/sfp-bus.c
View file

@ -486,7 +486,7 @@ static void sfp_unregister_bus(struct sfp_bus *bus)
bus->socket_ops->stop(bus->sfp); bus->socket_ops->stop(bus->sfp);
bus->socket_ops->detach(bus->sfp); bus->socket_ops->detach(bus->sfp);
if (bus->phydev && ops && ops->disconnect_phy) if (bus->phydev && ops && ops->disconnect_phy)
ops->disconnect_phy(bus->upstream); ops->disconnect_phy(bus->upstream, bus->phydev);
} }
bus->registered = false; 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); const struct sfp_upstream_ops *ops = sfp_get_upstream_ops(bus);
if (ops && ops->disconnect_phy) if (ops && ops->disconnect_phy)
ops->disconnect_phy(bus->upstream); ops->disconnect_phy(bus->upstream, bus->phydev);
bus->phydev = NULL; bus->phydev = NULL;
} }
EXPORT_SYMBOL_GPL(sfp_remove_phy); EXPORT_SYMBOL_GPL(sfp_remove_phy);

2
include/linux/sfp.h
View file

@ -544,7 +544,7 @@ struct sfp_upstream_ops {
void (*link_down)(void *priv); void (*link_down)(void *priv);
void (*link_up)(void *priv); void (*link_up)(void *priv);
int (*connect_phy)(void *priv, struct phy_device *); 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) #if IS_ENABLED(CONFIG_SFP)