leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: phylink: re-split __phylink_connect_phy()

Browse Source 
In order to support Clause 45 PHYs on SFP+ modules, which have an
indeterminant phy interface mode, we need to be able to call
phylink_bringup_phy() with a different interface mode to that used when
binding the PHY. Reduce __phylink_connect_phy() to an attach operation,
and move the call to phylink_bringup_phy() to its call sites.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Russell King
2019-12-11 10:56:25 +00:00
committed by David S. Miller
parent 6912b712cd
commit 938d44c2b5
1 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/net/phy/phylink.c
View File

@@ -764,11 +764,9 @@ static int phylink_bringup_phy(struct phylink *pl, struct phy_device *phy)
return 0; return 0;
} }
static int __phylink_connect_phy(struct phylink *pl, struct phy_device *phy, static int phylink_attach_phy(struct phylink *pl, struct phy_device *phy,
phy_interface_t interface) phy_interface_t interface)
{ {
int ret;
if (WARN_ON(pl->link_an_mode == MLO_AN_FIXED || if (WARN_ON(pl->link_an_mode == MLO_AN_FIXED ||
(pl->link_an_mode == MLO_AN_INBAND && (pl->link_an_mode == MLO_AN_INBAND &&
phy_interface_mode_is_8023z(interface)))) phy_interface_mode_is_8023z(interface))))
@@ -777,15 +775,7 @@ static int __phylink_connect_phy(struct phylink *pl, struct phy_device *phy,
if (pl->phydev) if (pl->phydev)
return -EBUSY; return -EBUSY;
ret = phy_attach_direct(pl->netdev, phy, 0, interface); return phy_attach_direct(pl->netdev, phy, 0, interface);
if (ret)
return ret;
ret = phylink_bringup_phy(pl, phy);
if (ret)
phy_detach(phy);
return ret;
} }
/** /**
@@ -805,13 +795,23 @@ static int __phylink_connect_phy(struct phylink *pl, struct phy_device *phy,
*/ */
int phylink_connect_phy(struct phylink *pl, struct phy_device *phy) int phylink_connect_phy(struct phylink *pl, struct phy_device *phy)
{ {
int ret;
/* Use PHY device/driver interface */ /* Use PHY device/driver interface */
if (pl->link_interface == PHY_INTERFACE_MODE_NA) { if (pl->link_interface == PHY_INTERFACE_MODE_NA) {
pl->link_interface = phy->interface; pl->link_interface = phy->interface;
pl->link_config.interface = pl->link_interface; pl->link_config.interface = pl->link_interface;
} }
return __phylink_connect_phy(pl, phy, pl->link_interface); ret = phylink_attach_phy(pl, phy, pl->link_interface);
if (ret < 0)
return ret;
ret = phylink_bringup_phy(pl, phy);
if (ret)
phy_detach(phy);
return ret;
} }
EXPORT_SYMBOL_GPL(phylink_connect_phy); EXPORT_SYMBOL_GPL(phylink_connect_phy);
@@ -1809,8 +1809,17 @@ static void phylink_sfp_link_up(void *upstream)
static int phylink_sfp_connect_phy(void *upstream, struct phy_device *phy) static int phylink_sfp_connect_phy(void *upstream, struct phy_device *phy)
{ {
struct phylink *pl = upstream; struct phylink *pl = upstream;
int ret;
return __phylink_connect_phy(upstream, phy, pl->link_config.interface); ret = phylink_attach_phy(pl, phy, pl->link_config.interface);
if (ret < 0)
return ret;
ret = phylink_bringup_phy(pl, phy);
if (ret)
phy_detach(phy);
return ret;
} }
static void phylink_sfp_disconnect_phy(void *upstream) static void phylink_sfp_disconnect_phy(void *upstream)