| 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: <20210506050658.9624-1-qiangqing.zhang@nxp.com>
Date: Thu, 6 May 2021 13:06:58 +0800
From: Joakim Zhang <qiangqing.zhang@....com>
To: peppe.cavallaro@...com, alexandre.torgue@...com,
joabreu@...opsys.com, davem@...emloft.net, kuba@...nel.org,
f.fainelli@...il.com, andrew@...n.ch
Cc: Jisheng.Zhang@...aptics.com, netdev@...r.kernel.org,
linux-imx@....com
Subject: [PATCH V4 net] net: stmmac: Fix MAC WoL not working if PHY does not support WoL
Both get and set WoL will check device_can_wakeup(), if MAC supports PMT,
it will set device wakeup capability. After commit 1d8e5b0f3f2c ("net:
stmmac: Support WOL with phy"), device wakeup capability will be overwrite
in stmmac_init_phy() according to phy's Wol feature. If phy doesn't support
WoL, then MAC will lose wakeup capability.
This patch combines WoL capabilities both MAC and PHY from stmmac_get_wol(),
set wakeup capability and give WoL priority to the PHY in stmmac_set_wol()
when enable WoL. What PHYs do implement is WAKE_MAGIC, WAKE_UCAST, WAKE_MAGICSECURE
and WAKE_BCAST.
Fixes: commit 1d8e5b0f3f2c ("net: stmmac: Support WOL with phy")
Suggested-by: Andrew Lunn <andrew@...n.ch>
Signed-off-by: Joakim Zhang <qiangqing.zhang@....com>
---
ChangeLogs:
V1->V2:
* combine WoL capabilities both MAC and PHY.
V2->V3:
* give WoL priority to the PHY.
V3->V4:
* improve patch subject, unwork->not working
* Reverse christmas tree for variable definition
* return -EOPNOTSUPP not -EINVAL when pass wolopts
* enable wol sources the PHY actually supports, and let the MAC
implement the rest.
---
.../ethernet/stmicro/stmmac/stmmac_ethtool.c | 55 ++++++++++++-------
.../net/ethernet/stmicro/stmmac/stmmac_main.c | 8 +--
2 files changed, 37 insertions(+), 26 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
index c5642985ef95..6d09908dec1f 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
@@ -629,35 +629,49 @@ static void stmmac_get_strings(struct net_device *dev, u32 stringset, u8 *data)
/* Currently only support WOL through Magic packet. */
static void stmmac_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
{
+ struct ethtool_wolinfo wol_phy = { .cmd = ETHTOOL_GWOL };
struct stmmac_priv *priv = netdev_priv(dev);
- if (!priv->plat->pmt)
- return phylink_ethtool_get_wol(priv->phylink, wol);
-
mutex_lock(&priv->lock);
- if (device_can_wakeup(priv->device)) {
+ if (priv->plat->pmt) {
wol->supported = WAKE_MAGIC | WAKE_UCAST;
if (priv->hw_cap_support && !priv->dma_cap.pmt_magic_frame)
wol->supported &= ~WAKE_MAGIC;
- wol->wolopts = priv->wolopts;
}
+
+ phylink_ethtool_get_wol(priv->phylink, &wol_phy);
+
+ /* Combine WoL capabilities both PHY and MAC */
+ wol->supported |= wol_phy.supported;
+ wol->wolopts = priv->wolopts;
+
mutex_unlock(&priv->lock);
}
static int stmmac_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
{
+ u32 support = WAKE_MAGIC | WAKE_UCAST | WAKE_MAGICSECURE | WAKE_BCAST;
+ struct ethtool_wolinfo wol_phy = { .cmd = ETHTOOL_GWOL };
struct stmmac_priv *priv = netdev_priv(dev);
- u32 support = WAKE_MAGIC | WAKE_UCAST;
+ int ret;
- if (!device_can_wakeup(priv->device))
+ if (wol->wolopts & ~support)
return -EOPNOTSUPP;
- if (!priv->plat->pmt) {
- int ret = phylink_ethtool_set_wol(priv->phylink, wol);
-
- if (!ret)
- device_set_wakeup_enable(priv->device, !!wol->wolopts);
- return ret;
+ /* First check if can WoL from PHY */
+ phylink_ethtool_get_wol(priv->phylink, &wol_phy);
+ if (wol->wolopts & wol_phy.supported) {
+ wol->wolopts &= wol_phy.supported;
+ ret = phylink_ethtool_set_wol(priv->phylink, wol);
+
+ if (!ret) {
+ pr_info("stmmac: phy wakeup enable\n");
+ device_set_wakeup_capable(priv->device, 1);
+ device_set_wakeup_enable(priv->device, 1);
+ goto wolopts_update;
+ } else {
+ return ret;
+ }
}
/* By default almost all GMAC devices support the WoL via
@@ -666,18 +680,21 @@ static int stmmac_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
if ((priv->hw_cap_support) && (!priv->dma_cap.pmt_magic_frame))
wol->wolopts &= ~WAKE_MAGIC;
- if (wol->wolopts & ~support)
- return -EINVAL;
-
- if (wol->wolopts) {
- pr_info("stmmac: wakeup enable\n");
+ if (priv->plat->pmt && wol->wolopts) {
+ pr_info("stmmac: mac wakeup enable\n");
+ device_set_wakeup_capable(priv->device, 1);
device_set_wakeup_enable(priv->device, 1);
enable_irq_wake(priv->wol_irq);
- } else {
+ goto wolopts_update;
+ }
+
+ if (!wol->wolopts) {
+ device_set_wakeup_capable(priv->device, 0);
device_set_wakeup_enable(priv->device, 0);
disable_irq_wake(priv->wol_irq);
}
+wolopts_update:
mutex_lock(&priv->lock);
priv->wolopts = wol->wolopts;
mutex_unlock(&priv->lock);
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index c6f24abf6432..d62d8c28463d 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -1076,7 +1076,6 @@ static void stmmac_check_pcs_mode(struct stmmac_priv *priv)
*/
static int stmmac_init_phy(struct net_device *dev)
{
- struct ethtool_wolinfo wol = { .cmd = ETHTOOL_GWOL };
struct stmmac_priv *priv = netdev_priv(dev);
struct device_node *node;
int ret;
@@ -1102,9 +1101,6 @@ static int stmmac_init_phy(struct net_device *dev)
ret = phylink_connect_phy(priv->phylink, phydev);
}
- phylink_ethtool_get_wol(priv->phylink, &wol);
- device_set_wakeup_capable(priv->device, !!wol.supported);
-
return ret;
}
@@ -4787,10 +4783,8 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
if (priv->plat->tx_coe)
dev_info(priv->device, "TX Checksum insertion supported\n");
- if (priv->plat->pmt) {
+ if (priv->plat->pmt)
dev_info(priv->device, "Wake-Up On Lan supported\n");
- device_set_wakeup_capable(priv->device, 1);
- }
if (priv->dma_cap.tsoen)
dev_info(priv->device, "TSO supported\n");
--
2.17.1
Powered by blists - more mailing lists