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: 744d23c71af3 ("net: phy: Warn about incorrect mdio_bus_phy_resume() state")
Signed-off-by: Xiaolei Wang <[email protected]>
---
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 0c6efd792690..12ff276b80ae 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -316,11 +316,11 @@ 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 other
- * than PHY_HALTED this is an indication that something went wrong and
- * we should most likely be using MAC managed PM and we are not.
+ /* If we manged to get here with the PHY state machine in a state neither
+ * PHY_HALTED nor PHY_READY this is an indication that something went wrong
+ * 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);
if (ret < 0)
--
2.25.1
On 8/19/2022 1:24 AM, Xiaolei Wang wrote:
> 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: 744d23c71af3 ("net: phy: Warn about incorrect mdio_bus_phy_resume() state")
> Signed-off-by: Xiaolei Wang <[email protected]>
Acked-by: Florian Fainelli <[email protected]>
I see the use case you have and it does make sense to me, thanks!
--
Florian
Hello:
This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:
On Fri, 19 Aug 2022 16:24:51 +0800 you wrote:
> 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.
>
> [...]
Here is the summary with links:
- [v2] net: phy: Don't WARN for PHY_READY state in mdio_bus_phy_resume()
https://git.kernel.org/netdev/net/c/6dbe852c379f
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html