| Message ID | 20230217183415.3300158-1-f.fainelli@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 3fcdf2dfefb6313ea0395519d1784808c0b6559b |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: bcmgenet: Support wake-up from s2idle | expand |
Hello: This patch was applied to netdev/net-next.git (master) by David S. Miller <davem@davemloft.net>: On Fri, 17 Feb 2023 10:34:14 -0800 you wrote: > When we suspend into s2idle we also need to enable the interrupt line > that generates the MPD and HFB interrupts towards the host CPU interrupt > controller (typically the ARM GIC or MIPS L1) to make it exit s2idle. > > When we suspend into other modes such as "standby" or "mem" we engage a > power management state machine which will gate off the CPU L1 controller > (priv->irq0) and ungate the side band wake-up interrupt (priv->wol_irq). > It is safe to have both enabled as wake-up sources because they are > mutually exclusive given any suspend mode. > > [...] Here is the summary with links: - [net-next] net: bcmgenet: Support wake-up from s2idle https://git.kernel.org/netdev/net-next/c/3fcdf2dfefb6 You are awesome, thank you!
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c b/drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c index f55d9d9c01a8..3a4b6cb7b7b9 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c @@ -77,14 +77,18 @@ int bcmgenet_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) if (wol->wolopts) { device_set_wakeup_enable(kdev, 1); /* Avoid unbalanced enable_irq_wake calls */ - if (priv->wol_irq_disabled) + if (priv->wol_irq_disabled) { enable_irq_wake(priv->wol_irq); + enable_irq_wake(priv->irq0); + } priv->wol_irq_disabled = false; } else { device_set_wakeup_enable(kdev, 0); /* Avoid unbalanced disable_irq_wake calls */ - if (!priv->wol_irq_disabled) + if (!priv->wol_irq_disabled) { disable_irq_wake(priv->wol_irq); + disable_irq_wake(priv->irq0); + } priv->wol_irq_disabled = true; }
When we suspend into s2idle we also need to enable the interrupt line that generates the MPD and HFB interrupts towards the host CPU interrupt controller (typically the ARM GIC or MIPS L1) to make it exit s2idle. When we suspend into other modes such as "standby" or "mem" we engage a power management state machine which will gate off the CPU L1 controller (priv->irq0) and ungate the side band wake-up interrupt (priv->wol_irq). It is safe to have both enabled as wake-up sources because they are mutually exclusive given any suspend mode. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> --- drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)