Commit 6dbe852c authored by Xiaolei Wang's avatar Xiaolei Wang Committed by Jakub Kicinski

net: phy: Don't WARN for PHY_READY state in mdio_bus_phy_resume()

For some MAC drivers, they set the mac_managed_pm to true in its
->ndo_open() callback. So before the mac_managed_pm is set to true,
we still want to leverage the mdio_bus_phy_suspend()/resume() for
the phy device suspend and resume. In this case, the phy device is
in PHY_READY, and we shouldn't warn about this. It also seems that
the check of mac_managed_pm in WARN_ON is redundant since we already
check this in the entry of mdio_bus_phy_resume(), so drop it.

Fixes: 744d23c7 ("net: phy: Warn about incorrect mdio_bus_phy_resume() state")
Signed-off-by: default avatarXiaolei Wang <xiaolei.wang@windriver.com>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Link: https://lore.kernel.org/r/20220819082451.1992102-1-xiaolei.wang@windriver.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent b8d43803
...@@ -316,11 +316,11 @@ static __maybe_unused int mdio_bus_phy_resume(struct device *dev) ...@@ -316,11 +316,11 @@ static __maybe_unused int mdio_bus_phy_resume(struct device *dev)
phydev->suspended_by_mdio_bus = 0; phydev->suspended_by_mdio_bus = 0;
/* If we managed to get here with the PHY state machine in a state other /* If we manged to get here with the PHY state machine in a state neither
* than PHY_HALTED this is an indication that something went wrong and * PHY_HALTED nor PHY_READY this is an indication that something went wrong
* we should most likely be using MAC managed PM and we are not. * and we should most likely be using MAC managed PM and we are not.
*/ */
WARN_ON(phydev->state != PHY_HALTED && !phydev->mac_managed_pm); WARN_ON(phydev->state != PHY_HALTED && phydev->state != PHY_READY);
ret = phy_init_hw(phydev); ret = phy_init_hw(phydev);
if (ret < 0) if (ret < 0)
......
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