diff options
| author | Vladimir Oltean <vladimir.oltean@nxp.com> | 2021-03-04 11:56:53 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-03-04 23:19:01 +0100 |
| commit | 053d8ad10d585adf9891fcd049637536e2fe9ea7 (patch) | |
| tree | 1e78be70c7fe83001a8c68957e6da91d15d81a61 /drivers/net/dsa/sja1105/sja1105_main.c | |
| parent | net: mscc: ocelot: properly reject destination IP keys in VCAP IS1 (diff) | |
| download | linux-053d8ad10d585adf9891fcd049637536e2fe9ea7.tar.xz linux-053d8ad10d585adf9891fcd049637536e2fe9ea7.zip | |
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: ffe10e679cec ("net: dsa: sja1105: Add support for the SGMII port")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/dsa/sja1105/sja1105_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c index 7692338730df..c1982615c631 100644 --- a/drivers/net/dsa/sja1105/sja1105_main.c +++ b/drivers/net/dsa/sja1105/sja1105_main.c @@ -1922,7 +1922,7 @@ out_unlock_ptp: speed = SPEED_1000; else if (bmcr & BMCR_SPEED100) speed = SPEED_100; - else if (bmcr & BMCR_SPEED10) + else speed = SPEED_10; sja1105_sgmii_pcs_force_speed(priv, speed); |