| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20250917-wol-smsc-phy-v2-3-105f5eb89b7f@foss.st.com>
Date: Wed, 17 Sep 2025 17:36:38 +0200
From: Gatien Chevallier <gatien.chevallier@...s.st.com>
To: Andrew Lunn <andrew+netdev@...n.ch>,
"David S. Miller"
<davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>, Jakub Kicinski
<kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>, Rob Herring
<robh@...nel.org>,
Krzysztof Kozlowski <krzk+dt@...nel.org>,
Conor Dooley
<conor+dt@...nel.org>,
Maxime Coquelin <mcoquelin.stm32@...il.com>,
"Alexandre Torgue" <alexandre.torgue@...s.st.com>,
Christophe Roullier
<christophe.roullier@...s.st.com>,
Andrew Lunn <andrew@...n.ch>,
"Heiner
Kallweit" <hkallweit1@...il.com>,
Russell King <linux@...linux.org.uk>,
"Simon Horman" <horms@...nel.org>,
Tristram Ha <Tristram.Ha@...rochip.com>,
"Florian Fainelli" <florian.fainelli@...adcom.com>
CC: <netdev@...r.kernel.org>, <devicetree@...r.kernel.org>,
<linux-stm32@...md-mailman.stormreply.com>,
<linux-arm-kernel@...ts.infradead.org>, <linux-kernel@...r.kernel.org>,
Gatien Chevallier <gatien.chevallier@...s.st.com>
Subject: [PATCH net-next v2 3/4] net: phy: smsc: fix and improve WoL
support
Add suspend()/resume() callbacks that do not shut down the PHY if the
WoL is supported and handle the WoL status flags.
If the WoL is supported by the PHY, indicate that the PHY device can
be a source of wake up for the platform. When setting the WoL
configuration, enable this capability.
The suspend() callback now handle WoL event flags that would prevent
a system to wake up from a WoL event when in low-power mode. Because
the WoL prevents a call to the suspend() callback, add the
PHY_ALWAYS_CALL_SUSPEND flag to the LAN8742 PHYs.
Fixes: 8b305ee2a91c ("net: phy: smsc: add WoL support to LAN8740/LAN8742 PHYs")
Signed-off-by: Gatien Chevallier <gatien.chevallier@...s.st.com>
---
drivers/net/phy/smsc.c | 66 +++++++++++++++++++++++++++++++++++++++++++++----
include/linux/smscphy.h | 2 ++
2 files changed, 63 insertions(+), 5 deletions(-)
diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c
index 48487149c22528631be5aca98ff4980f55b495d9..818cb21b833a530c7fa2384f605bbb2e93c5eb5f 100644
--- a/drivers/net/phy/smsc.c
+++ b/drivers/net/phy/smsc.c
@@ -537,14 +537,67 @@ static int lan874x_set_wol(struct phy_device *phydev,
}
}
- rc = phy_write_mmd(phydev, MDIO_MMD_PCS, MII_LAN874X_PHY_MMD_WOL_WUCSR,
- val_wucsr);
+ /* Enable wakeup on PHY device if at least one WoL feature is configured */
+ device_set_wakeup_enable(&phydev->mdio.dev, !!(val_wucsr & MII_LAN874X_PHY_WOL_MASK));
+
+ rc = phy_write_mmd(phydev, MDIO_MMD_PCS, MII_LAN874X_PHY_MMD_WOL_WUCSR, val_wucsr);
if (rc < 0)
return rc;
return 0;
}
+static int smsc_phy_suspend(struct phy_device *phydev)
+{
+ int rc;
+
+ if (!device_may_wakeup(&phydev->mdio.dev))
+ return 0;
+
+ if (!phydev->wol_enabled)
+ return genphy_suspend(phydev);
+
+ /* Handle pending WoL events */
+ rc = phy_read_mmd(phydev, MDIO_MMD_PCS, MII_LAN874X_PHY_MMD_WOL_WUCSR);
+ if (rc < 0) {
+ phy_error(phydev);
+ return -EINVAL;
+ }
+
+ if (!(rc & MII_LAN874X_PHY_WOL_STATUS_MASK))
+ return 0;
+
+ rc = phy_write_mmd(phydev, MDIO_MMD_PCS, MII_LAN874X_PHY_MMD_WOL_WUCSR,
+ rc | MII_LAN874X_PHY_WOL_STATUS_MASK);
+ if (rc < 0) {
+ phy_error(phydev);
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static int smsc_phy_resume(struct phy_device *phydev)
+{
+ int rc;
+
+ if (!phydev->wol_enabled)
+ return genphy_resume(phydev);
+
+ rc = phy_read_mmd(phydev, MDIO_MMD_PCS, MII_LAN874X_PHY_MMD_WOL_WUCSR);
+ if (rc < 0)
+ return rc;
+
+ if (!(rc & MII_LAN874X_PHY_WOL_STATUS_MASK))
+ return 0;
+
+ phydev_dbg(phydev, "Woke up from LAN event.\n");
+ rc = phy_write_mmd(phydev, MDIO_MMD_PCS, MII_LAN874X_PHY_MMD_WOL_WUCSR,
+ rc | MII_LAN874X_PHY_WOL_STATUS_MASK);
+
+ return rc;
+}
+
static int smsc_get_sset_count(struct phy_device *phydev)
{
return ARRAY_SIZE(smsc_hw_stats);
@@ -673,6 +726,9 @@ int smsc_phy_probe(struct phy_device *phydev)
phydev->priv = priv;
+ if (phydev->drv->set_wol)
+ device_set_wakeup_capable(&phydev->mdio.dev, true);
+
/* Make clk optional to keep DTB backward compatibility. */
refclk = devm_clk_get_optional_enabled_with_rate(dev, NULL,
50 * 1000 * 1000);
@@ -851,7 +907,7 @@ static struct phy_driver smsc_phy_driver[] = {
.name = "Microchip LAN8742",
/* PHY_BASIC_FEATURES */
- .flags = PHY_RST_AFTER_CLK_EN,
+ .flags = PHY_RST_AFTER_CLK_EN | PHY_ALWAYS_CALL_SUSPEND,
.probe = smsc_phy_probe,
@@ -876,8 +932,8 @@ static struct phy_driver smsc_phy_driver[] = {
.set_wol = lan874x_set_wol,
.get_wol = lan874x_get_wol,
- .suspend = genphy_suspend,
- .resume = genphy_resume,
+ .suspend = smsc_phy_suspend,
+ .resume = smsc_phy_resume,
} };
module_phy_driver(smsc_phy_driver);
diff --git a/include/linux/smscphy.h b/include/linux/smscphy.h
index 1a6a851d2cf80d225bada7adeb79969e625964bd..cdf266960032609241afc8316da23f1c4834bfee 100644
--- a/include/linux/smscphy.h
+++ b/include/linux/smscphy.h
@@ -65,6 +65,8 @@ int smsc_phy_probe(struct phy_device *phydev);
#define MII_LAN874X_PHY_WOL_WUEN BIT(2)
#define MII_LAN874X_PHY_WOL_MPEN BIT(1)
#define MII_LAN874X_PHY_WOL_BCSTEN BIT(0)
+#define MII_LAN874X_PHY_WOL_MASK GENMASK(4, 0)
+#define MII_LAN874X_PHY_WOL_STATUS_MASK GENMASK(7, 4)
#define MII_LAN874X_PHY_WOL_FILTER_EN BIT(15)
#define MII_LAN874X_PHY_WOL_FILTER_MCASTTEN BIT(9)
--
2.35.3
Powered by blists - more mailing lists