net: phylink: use phy interface mode bitmaps

Use the phy interface mode bitmaps for SFP modules and PHYs to select
the operating interface for SFPs and PHYs with SFPs.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>

1 files changed, 40 insertions, 4 deletions

diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 6e66aa1d3a7e..4250c7f048f5 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -2914,6 +2914,7 @@ static bool phylink_phy_no_inband(struct phy_device *phy)
 
 static int phylink_sfp_connect_phy(void *upstream, struct phy_device *phy)
 {
+	DECLARE_PHY_INTERFACE_MASK(interfaces);
 	struct phylink *pl = upstream;
 	phy_interface_t interface;
 	u8 mode;
@@ -2933,12 +2934,47 @@ static int phylink_sfp_connect_phy(void *upstream, struct phy_device *phy)
 	else
 		mode = MLO_AN_INBAND;
 
-	/* Do the initial configuration */
-	ret = phylink_sfp_config_phy(pl, mode, phy);
-	if (ret < 0)
-		return ret;
+	if (phy_interface_empty(phy->supported_interfaces)) {
+		/* Do the initial configuration */
+		ret = phylink_sfp_config_phy(pl, mode, phy);
+		if (ret < 0)
+			return ret;
+	} else {
+		phylink_dbg(pl, "copper SFP: interfaces=[mac=%*pbl, sfp=%*pbl]\n",
+			    (int)PHY_INTERFACE_MODE_MAX,
+			    pl->config->supported_interfaces,
+			    (int)PHY_INTERFACE_MODE_MAX,
+			    phy->supported_interfaces);
+
+		phy_interface_and(interfaces, phy->supported_interfaces,
+				  pl->config->supported_interfaces);
+		interface = phylink_choose_sfp_interface(pl, interfaces);
+		if (interface == PHY_INTERFACE_MODE_NA) {
+			phylink_err(pl,
+				    "selection of interface for PHY failed\n");
+			return -EINVAL;
+		}
+
+		phylink_dbg(pl, "copper SFP: chosen %s interface\n",
+			    phy_modes(interface));
+
+		if (pl->cur_link_an_mode != mode ||
+		    pl->link_config.interface != interface) {
+			pl->link_config.interface = interface;
+			pl->cur_link_an_mode = mode;
+
+			phylink_info(pl, "switched to %s/%s link mode\n",
+				     phylink_an_mode_str(mode),
+				     phy_modes(interface));
+		}
+
+		if (!test_bit(PHYLINK_DISABLE_STOPPED,
+			      &pl->phylink_disable_state))
+			phylink_mac_initial_config(pl, false);
+	}
 
 	interface = pl->link_config.interface;
+
 	ret = phylink_attach_phy(pl, phy, interface);
 	if (ret < 0)
 		return ret;