Commit c916e8e1 authored by Oleksij Rempel's avatar Oleksij Rempel Committed by David S. Miller

net: dsa: dsa_slave_phy_connect(): extend phy's flags with port specific phy flags

The current get_phy_flags() is only processed when we connect to a PHY
via a designed phy-handle property via phylink_of_phy_connect(), but if
we fallback on the internal MDIO bus created by a switch and take the
dsa_slave_phy_connect() path then we would not be processing that flag
and using it at PHY connection time.
Suggested-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarOleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 36838050
...@@ -1749,7 +1749,8 @@ static void dsa_slave_phylink_fixed_state(struct phylink_config *config, ...@@ -1749,7 +1749,8 @@ static void dsa_slave_phylink_fixed_state(struct phylink_config *config,
} }
/* slave device setup *******************************************************/ /* slave device setup *******************************************************/
static int dsa_slave_phy_connect(struct net_device *slave_dev, int addr) static int dsa_slave_phy_connect(struct net_device *slave_dev, int addr,
u32 flags)
{ {
struct dsa_port *dp = dsa_slave_to_port(slave_dev); struct dsa_port *dp = dsa_slave_to_port(slave_dev);
struct dsa_switch *ds = dp->ds; struct dsa_switch *ds = dp->ds;
...@@ -1760,6 +1761,8 @@ static int dsa_slave_phy_connect(struct net_device *slave_dev, int addr) ...@@ -1760,6 +1761,8 @@ static int dsa_slave_phy_connect(struct net_device *slave_dev, int addr)
return -ENODEV; return -ENODEV;
} }
slave_dev->phydev->dev_flags |= flags;
return phylink_connect_phy(dp->pl, slave_dev->phydev); return phylink_connect_phy(dp->pl, slave_dev->phydev);
} }
...@@ -1804,7 +1807,7 @@ static int dsa_slave_phy_setup(struct net_device *slave_dev) ...@@ -1804,7 +1807,7 @@ static int dsa_slave_phy_setup(struct net_device *slave_dev)
/* We could not connect to a designated PHY or SFP, so try to /* We could not connect to a designated PHY or SFP, so try to
* use the switch internal MDIO bus instead * use the switch internal MDIO bus instead
*/ */
ret = dsa_slave_phy_connect(slave_dev, dp->index); ret = dsa_slave_phy_connect(slave_dev, dp->index, phy_flags);
if (ret) { if (ret) {
netdev_err(slave_dev, netdev_err(slave_dev,
"failed to connect to port %d: %d\n", "failed to connect to port %d: %d\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment