Commit 1375e2ca authored Mar 11, 2020 by Andrew Lunn Committed by Greg Kroah-Hartman Mar 18, 2020

net: dsa: Don't instantiate phylink for CPU/DSA ports unless needed



[ Upstream commit a20f997010c4ec76eaa55b8cc047d76dcac69f70 ]

By default, DSA drivers should configure CPU and DSA ports to their
maximum speed. In many configurations this is sufficient to make the
link work.

In some cases it is necessary to configure the link to run slower,
e.g. because of limitations of the SoC it is connected to. Or back to
back PHYs are used and the PHY needs to be driven in order to
establish link. In this case, phylink is used.

Only instantiate phylink if it is required. If there is no PHY, or no
fixed link properties, phylink can upset a link which works in the
default configuration.

Fixes: 0e279218 ("net: dsa: Use PHYLINK for the CPU/DSA ports")
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent dd359b5a

net/dsa/port.c

+9 −3

Original line number	Diff line number	Diff line
		@@ -649,9 +649,14 @@ static int dsa_port_phylink_register(struct dsa_port *dp)
		int dsa_port_link_register_of(struct dsa_port *dp)
		{
		struct dsa_switch *ds = dp->ds;
		struct device_node *phy_np;

		if (!ds->ops->adjust_link)
		if (!ds->ops->adjust_link) {
		phy_np = of_parse_phandle(dp->dn, "phy-handle", 0);
		if (of_phy_is_fixed_link(dp->dn) \|\| phy_np)
		return dsa_port_phylink_register(dp);
		return 0;
		}

		dev_warn(ds->dev,
		"Using legacy PHYLIB callbacks. Please migrate to PHYLINK!\n");
		@@ -666,11 +671,12 @@ void dsa_port_link_unregister_of(struct dsa_port *dp)
		{
		struct dsa_switch *ds = dp->ds;

		if (!ds->ops->adjust_link) {
		if (!ds->ops->adjust_link && dp->pl) {
		rtnl_lock();
		phylink_disconnect_phy(dp->pl);
		rtnl_unlock();
		phylink_destroy(dp->pl);
		dp->pl = NULL;
		return;
		}