Commit 938d44c2 authored by Russell King's avatar Russell King Committed by David S. Miller
Browse files

net: phylink: re-split __phylink_connect_phy() 



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: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6912b712

drivers/net/phy/phylink.c

+24 −15
Original line number Diff line number Diff line
@@ -764,11 +764,9 @@ static int phylink_bringup_phy(struct phylink *pl, struct phy_device *phy) 
	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)

{

	int ret;



	if (WARN_ON(pl->link_an_mode == MLO_AN_FIXED ||

		    (pl->link_an_mode == MLO_AN_INBAND &&

		     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)

		return -EBUSY;



	ret = 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;

	return phy_attach_direct(pl->netdev, phy, 0, interface);

}



/**
@@ -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 ret;



	/* Use PHY device/driver interface */

	if (pl->link_interface == PHY_INTERFACE_MODE_NA) {

		pl->link_interface = phy->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);
@@ -1809,8 +1809,17 @@ static void phylink_sfp_link_up(void *upstream) 
static int phylink_sfp_connect_phy(void *upstream, struct phy_device *phy)

{

	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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE