From 36791014bb9fb8794e027670f118ab73de7b7c44 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 22 Sep 2021 15:38:13 +0100 Subject: [PATCH] net: phy: lan87xx: Allow more time for link detect commit 59bd0184158581304069fe4e7347dbdf31d73f47 from https://github.com/raspberrypi/linux.git rpi-5.15.y With EDPWRDOWN set in idle, it must be cleared before checking for ENERGYON going high, indicating that a link is being established. The existing code allows 640ms for ENERGYON to go high, but on Raspberry Pis that appears not to be enough, causing link detection to fail. Increase the polling timeout to 1500ms - with a polling interval of 10ms it shouldn't cause unnecessary delays. See: https://github.com/raspberrypi/linux/issues/4393 Signed-off-by: Phil Elwell Signed-off-by: Meng Li --- drivers/net/phy/smsc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c index d8cac02a79b95..c168a7f95a25d 100644 --- a/drivers/net/phy/smsc.c +++ b/drivers/net/phy/smsc.c @@ -228,12 +228,12 @@ static int lan87xx_read_status(struct phy_device *phydev) if (rc < 0) return rc; - /* Wait max 640 ms to detect energy and the timeout is not + /* Wait max 1500 ms to detect energy and the timeout is not * an actual error. */ read_poll_timeout(phy_read, rc, rc & MII_LAN83C185_ENERGYON || rc < 0, - 10000, 640000, true, phydev, + 10000, 1500000, true, phydev, MII_LAN83C185_CTRL_STATUS); if (rc < 0) return rc;