Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19334920 authored by Guenter Roeck's avatar Guenter Roeck Committed by David S. Miller
Browse files

net: dsa: Set valid phy interface type 



If the phy interface mode is not found in devicetree, or if devicetree
is not configured, of_get_phy_mode returns -ENODEV. The current code
sets the phy interface mode to the return value from of_get_phy_mode
without checking if it is valid.

This invalid phy interface mode is passed as parameter to of_phy_connect
or to phy_connect_direct. This sets the phy interface mode to the invalid
value, which in turn causes problems for any code using phydev->interface.

Fixes: b31f65fb ("net: dsa: slave: Fix autoneg for phys on switch MDIO bus")
Fixes: 0d8bcdd3 ("net: dsa: allow for more complex PHY setups")
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7afb8886

net/dsa/slave.c

+7 −2
Original line number Diff line number Diff line
@@ -521,10 +521,13 @@ static int dsa_slave_phy_setup(struct dsa_slave_priv *p, 
	struct device_node *phy_dn, *port_dn;

	bool phy_is_fixed = false;

	u32 phy_flags = 0;

	int ret;

	int mode, ret;



	port_dn = cd->port_dn[p->port];

	p->phy_interface = of_get_phy_mode(port_dn);

	mode = of_get_phy_mode(port_dn);

	if (mode < 0)

		mode = PHY_INTERFACE_MODE_NA;

	p->phy_interface = mode;



	phy_dn = of_parse_phandle(port_dn, "phy-handle", 0);

	if (of_phy_is_fixed_link(port_dn)) {
@@ -559,6 +562,8 @@ static int dsa_slave_phy_setup(struct dsa_slave_priv *p, 
		if (!p->phy)

			return -ENODEV;



		/* Use already configured phy mode */

		p->phy_interface = p->phy->interface;

		phy_connect_direct(slave_dev, p->phy, dsa_slave_adjust_link,

				   p->phy_interface);

	} else {