net: bcmgenet: Correct overlaying of PHY and MAC Wake-on-LAN
Subsystems (3)
Florian Fainelli
maintainerPATCH 1/1 net: bcmgenet: Correct overlaying of PHY and MAC Wake-on-LAN
Some Wake-on-LAN modes such as WAKE_FILTER may only be supported by the MAC, while others might be only supported by the PHY. Make sure that the .get_wol() returns the union of both rather than only that of the PHY if the PHY supports Wake-on-LAN.
When disabling Wake-on-LAN, make sure that this is done at both the PHY and MAC level, rather than doing an early return from the PHY driver.
--- .../net/ethernet/broadcom/genet/bcmgenet_wol.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c +12 -4
@@ -41,9 +41,12 @@ void bcmgenet_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol) {struct bcmgenet_priv *priv =netdev_priv (dev);struct device *kdev = &priv->pdev->dev; +u32 phy_wolopts =0 ; -if (dev->phydev) +if (dev->phydev) {phy_ethtool_get_wol (dev->phydev, wol); + phy_wolopts = wol->wolopts; + }/* MAC is not wake-up capable, return what the PHY does */ if (!device_can_wakeup (kdev))
@@ -51,9 +54,14 @@ void bcmgenet_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)/* Overlay MAC capabilities with that of the PHY queried before */ wol->supported |=WAKE_MAGIC |WAKE_MAGICSECURE |WAKE_FILTER ; - wol->wolopts = priv->wolopts; -memset (wol->sopass,0 ,sizeof (wol->sopass)); + wol->wolopts |= priv->wolopts; +/* Return the PHY configured magic password */ +if (phy_wolopts &WAKE_MAGICSECURE ) +return ; + +/* Otherwise the MAC one */ +memset (wol->sopass,0 ,sizeof (wol->sopass));if (wol->wolopts &WAKE_MAGICSECURE )memcpy (wol->sopass, priv->sopass,sizeof (priv->sopass)); }
@@ -70,7 +78,7 @@ int bcmgenet_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)/* Try Wake-on-LAN from the PHY first */ if (dev->phydev) { ret =phy_ethtool_set_wol (dev->phydev, wol); -if (ret != -EOPNOTSUPP ) +if (ret != -EOPNOTSUPP && wol->wolopts)return ret; }
Signature · 1 line
2.43.0
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Wed, 29 Jan 2025 15:13:42 -0800 you wrote:
Some Wake-on-LAN modes such as
WAKE_FILTERmay only be supported by the MAC, while others might be only supported by the PHY. Make sure that the .get_wol() returns the union of both rather than only that of the PHY if the PHY supports Wake-on-LAN.When disabling Wake-on-LAN, make sure that this is done at both the PHY and MAC level, rather than doing an early return from the PHY driver.
[...]
Here is the summary with links:
- [net] net: bcmgenet: Correct overlaying of PHY and MAC Wake-on-LAN
https://git.kernel.org/netdev/net/c/46ded7092323
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html