net: stmmac: fix 'ethtool -P' return -EBUSY
Subsystems (4)
PATCH v4 1/1 net: stmmac: fix 'ethtool -P' return -EBUSY
The permanent mac address should be available for query when the device is not up.
NetworkManager, the system network daemon, uses 'ethtool -P' to obtain the permanent address after the kernel start. When the network device is not up, it will return the device busy error with 'ethtool -P'. At that time, it is unable to access the Internet through the permanent address by NetworkManager.
I think that the '.begin' is not used to check if the device is up.
--- .../ethernet/stmicro/stmmac/stmmac_ethtool.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +15 -4
@@ -15,6 +15,7 @@#include <linux/phylink.h> #include <linux/net_tstamp.h> #include <asm/io.h> +#include <linux/pm_runtime.h> #include "stmmac.h" #include "dwmac_dma.h"
@@ -410,13 +411,22 @@ static void stmmac_ethtool_setmsglevel(struct net_device *dev, u32 level) } -static int stmmac_check_if_running (struct net_device *dev) +static int stmmac_ethtool_begin (struct net_device *dev) { -if (!netif_running (dev)) -return -EBUSY ; +struct stmmac_priv *priv =netdev_priv (dev); + +pm_runtime_get_sync (priv->device); +return 0 ; } +static void stmmac_ethtool_complete (struct net_device *dev) +{ +struct stmmac_priv *priv =netdev_priv (dev); + +pm_runtime_put (priv->device); +} +static int stmmac_ethtool_get_regs_len (struct net_device *dev) {struct stmmac_priv *priv =netdev_priv (dev);
@@ -1073,7 +1083,8 @@ static int stmmac_set_tunable(struct net_device *dev,static const struct ethtool_ops stmmac_ethtool_ops = { .supported_coalesce_params =ETHTOOL_COALESCE_USECS |ETHTOOL_COALESCE_MAX_FRAMES , - .begin = stmmac_check_if_running, + .begin = stmmac_ethtool_begin, + .complete = stmmac_ethtool_complete, .get_drvinfo = stmmac_ethtool_getdrvinfo, .get_msglevel = stmmac_ethtool_getmsglevel, .set_msglevel = stmmac_ethtool_setmsglevel,
Signature · 1 line
2.20.1
Quoted 31 lines
-----Original Message-----
From: Hao Chen <[email protected]>
Sent: 2021年7月19日 17:32
To: [email protected]
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Hao Chen <[email protected]>
Subject: [PATCH v4] net: stmmac: fix 'ethtool -P' return-EBUSYThe permanent mac address should be available for query when the device is not up.
NetworkManager, the system network daemon, uses 'ethtool -P' to obtain the permanent address after the kernel start. When the network device is not up, it will return the device busy error with 'ethtool -P'. At that time, it is unable to access the Internet through the permanent address by NetworkManager.
I think that the '.begin' is not used to check if the device is up.Signed-off-by Hao Chen <[email protected]>--- .../ethernet/stmicro/stmmac/stmmac_ethtool.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +0
-0
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c line 18
Quoted 4 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +1
-0@@ -15,6 +15,7 @@#include <linux/phylink.h> #include <linux/net_tstamp.h> #include <asm/io.h> +#include <linux/pm_runtime.h>
Please in alphabetical order.
Quoted 8 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +0
-1#include "stmmac.h" #include "dwmac_dma.h" @@ -410,13 +411,22 @@ static void stmmac_ethtool_setmsglevel(struct net_device *dev, u32 level) } -static int stmmac_check_if_running (struct net_device *dev)
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c static void stmmac_ethtool_setmsglevel(struct · line 422
Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +5
-2+static int stmmac_ethtool_begin (struct net_device *dev) { -if (!netif_running (dev)) -return -EBUSY ; +struct stmmac_priv *priv =netdev_priv (dev); + +pm_runtime_get_sync (priv->device); +return 0 ; }
Add error check, like:
ret = pm_runtime_get_sync(priv->device);
if (ret < 0) {
pm_runtime_put_noidle(priv->device);
return ret;
}Best Regards,
Joakim Zhang
Quoted 22 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +6
-0+static void stmmac_ethtool_complete (struct net_device *dev) { +struct stmmac_priv *priv =netdev_priv (dev); + +pm_runtime_put (priv->device); +} +static int stmmac_ethtool_get_regs_len (struct net_device *dev) { struct stmmac_priv *priv = netdev_priv(dev); @@ -1073,7 +1083,8 @@static int stmmac_set_tunable(struct
net_device*dev, static const structethtool_opsstmmac_ethtool_ops= {drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +2
-2.supported_coalesce_params = ETHTOOL_COALESCE_USECS | ETHTOOL_COALESCE_MAX_FRAMES, - .begin = stmmac_check_if_running, + .begin = stmmac_ethtool_begin, + .complete = stmmac_ethtool_complete, .get_drvinfo = stmmac_ethtool_getdrvinfo, .get_msglevel = stmmac_ethtool_getmsglevel, .set_msglevel = stmmac_ethtool_setmsglevel, --2.20.1
Quoted 8 lines · Hao Chen
The permanent mac address should be available for query when the device is not up.
NetworkManager, the system network daemon, uses 'ethtool -P' to obtain the permanent address after the kernel start. When the network device is not up, it will return the device busy error with 'ethtool -P'. At that time, it is unable to access the Internet through the permanent address by NetworkManager.
I think that the '.begin' is not used to check if the device is up.
You forgot to update the commit message.
Andrew