Commit 96026d05 authored Mar 14, 2015 by Florian Fainelli Committed by David S. Miller Mar 14, 2015

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



Commit cd28a1a9 ("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: cd28a1a9 ("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>

parent 316ad4be

net/dsa/slave.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message