mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
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:b31f65fb43
("net: dsa: slave: Fix autoneg for phys on switch MDIO bus") Fixes:0d8bcdd383
("net: dsa: allow for more complex PHY setups") Cc: Florian Fainelli <f.fainelli@gmail.com> Cc: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Acked-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
7afb8886a0
commit
19334920ea
1 changed files with 7 additions and 2 deletions
|
@ -521,10 +521,13 @@ static int dsa_slave_phy_setup(struct dsa_slave_priv *p,
|
||||||
struct device_node *phy_dn, *port_dn;
|
struct device_node *phy_dn, *port_dn;
|
||||||
bool phy_is_fixed = false;
|
bool phy_is_fixed = false;
|
||||||
u32 phy_flags = 0;
|
u32 phy_flags = 0;
|
||||||
int ret;
|
int mode, ret;
|
||||||
|
|
||||||
port_dn = cd->port_dn[p->port];
|
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);
|
phy_dn = of_parse_phandle(port_dn, "phy-handle", 0);
|
||||||
if (of_phy_is_fixed_link(port_dn)) {
|
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)
|
if (!p->phy)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
|
/* Use already configured phy mode */
|
||||||
|
p->phy_interface = p->phy->interface;
|
||||||
phy_connect_direct(slave_dev, p->phy, dsa_slave_adjust_link,
|
phy_connect_direct(slave_dev, p->phy, dsa_slave_adjust_link,
|
||||||
p->phy_interface);
|
p->phy_interface);
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in a new issue