summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMian Yousaf Kaukab <ykaukab@suse.de>2019-12-05 10:41:16 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-12-18 16:05:44 +0100
commit01e73a8cc49c8d818b56c4a9fd43910a47820a39 (patch)
tree0b6d2a53a0acb9a1f19319f30c0e96c255f89cf8
parentd38ae2264d8650abcbc5f27e90e444f474355a61 (diff)
downloadlinux-stable-01e73a8cc49c8d818b56c4a9fd43910a47820a39.tar.gz
linux-stable-01e73a8cc49c8d818b56c4a9fd43910a47820a39.tar.bz2
linux-stable-01e73a8cc49c8d818b56c4a9fd43910a47820a39.zip
net: thunderx: start phy before starting autonegotiation
[ Upstream commit a350d2e7adbb57181d33e3aa6f0565632747feaa ] Since commit 2b3e88ea6528 ("net: phy: improve phy state checking") phy_start_aneg() expects phy state to be >= PHY_UP. Call phy_start() before calling phy_start_aneg() during probe so that autonegotiation is initiated. As phy_start() takes care of calling phy_start_aneg(), drop the explicit call to phy_start_aneg(). Network fails without this patch on Octeon TX. Fixes: 2b3e88ea6528 ("net: phy: improve phy state checking") Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/ethernet/cavium/thunder/thunder_bgx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
index acb016834f04..6cc100e7d5c0 100644
--- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
+++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
@@ -1115,7 +1115,7 @@ static int bgx_lmac_enable(struct bgx *bgx, u8 lmacid)
phy_interface_mode(lmac->lmac_type)))
return -ENODEV;
- phy_start_aneg(lmac->phydev);
+ phy_start(lmac->phydev);
return 0;
}