Re: [PATCH] net: phy: Don't disable irqs on shutdown if WoL is enabled

Jakub Kicinski
2023-08-08T21:54:06Z

On Fri, 4 Aug 2023 09:17:57 +0200 Uwe Kleine-König wrote:
> Most PHYs signal WoL using an interrupt. So disabling interrupts breaks
> WoL at least on PHYs covered by the marvell driver. So skip disabling
> irqs on shutdown if WoL is enabled.
>
> While at it also explain the motivation that irqs are disabled at all.
>
> Fixes: e2f016cf7751 ("net: phy: add a shutdown procedure")
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

What do we do with this one? It sounded like Russell was leaning
towards a revert?

FTR original report:
https://lore.kernel.org/all/20230803181640.yzxsk2xphwryxww4@pengutronix.de/

> while I'm not sure that disabling interrupts is a good idea in general,
> this change at least should fix the WoL case. Note that this change is
> only compile tested as next doesn't boot on my test machine (because of
> https://git.kernel.org/linus/b3574f579ece24439c90e9a179742c61205fbcfa)
> and 6.1 (which is the other kernel I have running) doesn't know about
> .wol_enabled. I don't want to delay this fix until I bisected this new
> issue.
>
> Assuming this patch is eligible for backporting to stable, maybe point
> out that it depends on v6.5-rc1~163^2~286^2~2 ("net: phy: Allow drivers
> to always call into ->suspend()"). Didn't try to backport that.
>
> Best regards
> Uwe
>
> drivers/net/phy/phy_device.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
> index 61921d4dbb13..6d1526bdd1d7 100644
> --- a/drivers/net/phy/phy_device.c
> +++ b/drivers/net/phy/phy_device.c
> @@ -3340,6 +3340,15 @@ static void phy_shutdown(struct device *dev)
> if (phydev->state == PHY_READY || !phydev->attached_dev)
> return;
>
> + /* Most phys signal WoL via the irq line. So for these irqs shouldn't be
> + * disabled.
> + */
> + if (phydev->wol_enabled)
> + return;
> +
> + /* On shutdown disable irqs to prevent an irq storm on systems where the
> + * irq line is shared by several devices.
> + */
> phy_disable_interrupts(phydev);
> }
>