From: Hao Chen <chenhaoa@uniontech.com>
To: peppe.cavallaro@st.com
Cc: alexandre.torgue@foss.st.com, joabreu@synopsys.com,
davem@davemloft.net, kuba@kernel.org, mcoquelin.stm32@gmail.com,
linux@armlinux.org.uk, netdev@vger.kernel.org,
linux-stm32@st-md-mailman.stormreply.com,
linux-kernel@vger.kernel.org, Hao Chen <chenhaoa@uniontech.com>
Subject: [PATCH v4] net: stmmac: fix 'ethtool -P' return -EBUSY
Date: Mon, 19 Jul 2021 17:32:07 +0800 [thread overview]
Message-ID: <20210719093207.17343-1-chenhaoa@uniontech.com> (raw)
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.
Signed-off-by: Hao Chen <chenhaoa@uniontech.com>
---
.../ethernet/stmicro/stmmac/stmmac_ethtool.c | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
index d0ce608b81c3..25c44c1ecbd6 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
@@ -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,
--
2.20.1
next reply other threads:[~2021-07-19 9:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-19 9:32 Hao Chen [this message]
2021-07-19 9:52 ` Joakim Zhang
2021-07-19 19:48 ` Andrew Lunn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210719093207.17343-1-chenhaoa@uniontech.com \
--to=chenhaoa@uniontech.com \
--cc=alexandre.torgue@foss.st.com \
--cc=davem@davemloft.net \
--cc=joabreu@synopsys.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=linux@armlinux.org.uk \
--cc=mcoquelin.stm32@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=peppe.cavallaro@st.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®