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: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 3ca509eb284d941f746a9c0c5ae50bb3b7413ec7..798944aa847a0351fc18aa06722e7c0c51701943 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -1749,7 +1749,8 @@ static void dsa_slave_phylink_fixed_state(struct phylink_config *config,
 }
 
 /* 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_switch *ds = dp->ds;
@@ -1760,6 +1761,8 @@ static int dsa_slave_phy_connect(struct net_device *slave_dev, int addr)
                return -ENODEV;
        }
 
+       slave_dev->phydev->dev_flags |= flags;
+
        return phylink_connect_phy(dp->pl, slave_dev->phydev);
 }
 
@@ -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
                 * 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) {
                        netdev_err(slave_dev,
                                   "failed to connect to port %d: %d\n",