Commit 053d8ad1 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller

net: dsa: sja1105: fix SGMII PCS being forced to SPEED_UNKNOWN instead of SPEED_10

When using MLO_AN_PHY or MLO_AN_FIXED, the MII_BMCR of the SGMII PCS is
read before resetting the switch so it can be reprogrammed afterwards.
This works for the speeds of 1Gbps and 100Mbps, but not for 10Mbps,
because SPEED_10 is actually 0, so AND-ing anything with 0 is false,
therefore that last branch is dead code.

Do what others do (genphy_read_status_fixed, phy_mii_ioctl) and just
remove the check for SPEED_10, let it fall into the default case.

Fixes: ffe10e67 ("net: dsa: sja1105: Add support for the SGMII port")
Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f1becbed
...@@ -1922,7 +1922,7 @@ int sja1105_static_config_reload(struct sja1105_private *priv, ...@@ -1922,7 +1922,7 @@ int sja1105_static_config_reload(struct sja1105_private *priv,
speed = SPEED_1000; speed = SPEED_1000;
else if (bmcr & BMCR_SPEED100) else if (bmcr & BMCR_SPEED100)
speed = SPEED_100; speed = SPEED_100;
else if (bmcr & BMCR_SPEED10) else
speed = SPEED_10; speed = SPEED_10;
sja1105_sgmii_pcs_force_speed(priv, speed); sja1105_sgmii_pcs_force_speed(priv, speed);
......
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