lkml.org 
[lkml]   [2022]   [Oct]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH net] net: phy: Avoid WARN_ON for PHY_NOLINK during resuming
Date
When resuming from sleep, if there is a time lag from link-down to link-up
due to auto-negotiation, the phy status has been still PHY_NOLINK, so
WARN_ON dump occurs in mdio_bus_phy_resume(). For example, UniPhier AVE
ethernet takes about a few seconds to link up after resuming.

To avoid this issue, should remove PHY_NOLINK the WARN_ON conditions.

Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
drivers/net/phy/phy_device.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 57849ac0384e..c647d027bb5d 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -318,12 +318,12 @@ static __maybe_unused int mdio_bus_phy_resume(struct device *dev)
phydev->suspended_by_mdio_bus = 0;

/* If we managed to get here with the PHY state machine in a state
- * neither PHY_HALTED, PHY_READY nor PHY_UP, this is an indication
- * that something went wrong and we should most likely be using
- * MAC managed PM, but we are not.
+ * neither PHY_HALTED, PHY_READY, PHY_UP nor PHY_NOLINK, this is an
+ * indication that something went wrong and we should most likely
+ * be using MAC managed PM, but we are not.
*/
WARN_ON(phydev->state != PHY_HALTED && phydev->state != PHY_READY &&
- phydev->state != PHY_UP);
+ phydev->state != PHY_UP && phydev->state != PHY_NOLINK);

ret = phy_init_hw(phydev);
if (ret < 0)
--
2.25.1
\
 
 \ /
  Last update: 2022-10-21 09:44    [W:0.075 / U:0.140 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site