net: dsa: do not use slave MII bus for fixed PHYs

Commit cd28a1a9baee7 ("net: dsa: fully divert PHY reads/writes if
requested") introduced a check for particular PHYs that need to be
accessed using the slave MII bus created by DSA, but this check was too
inclusive. This would prevent fixed PHYs from being successfully
registered because those should not go through the slave MII bus created
by DSA.

Make sure we check that the PHY is not a fixed PHY to prevent that from
happening.

Fixes: cd28a1a9baee7 ("net: dsa: fully divert PHY reads/writes if requested")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 188b69773e702d2ab6cb84bd520226894efc2f28..6511552039d6dde3e7343ff3a3f811cd2246c5ae 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -675,7 +675,8 @@ static int dsa_slave_phy_setup(struct dsa_slave_priv *p,
                 * want to bind this device using the slave MII bus created by
                 * DSA to make that happen.
                 */
-               if (ret >= 0 && (ds->phys_mii_mask & (1 << ret))) {
+               if (!phy_is_fixed && ret >= 0 &&
+                   (ds->phys_mii_mask & (1 << ret))) {
                        ret = dsa_slave_phy_connect(p, slave_dev, ret);
                        if (ret)
                                return ret;