From: Miaoqian Lin <linmq006@gmail.com>
To: Andrew Lunn <andrew@lunn.ch>,
Vivien Didelot <vivien.didelot@gmail.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Vladimir Oltean <olteanv@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Ansuel Smith <ansuelsmth@gmail.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: linmq006@gmail.com
Subject: [PATCH] net: dsa: Fix return value check of wait_for_completion_timeout
Date: Tue, 12 Apr 2022 02:45:40 +0000 [thread overview]
Message-ID: <20220412024541.17572-1-linmq006@gmail.com> (raw)
wait_for_completion_timeout() returns unsigned long not int.
It returns 0 if timed out, and positive if completed.
The check for <= 0 is ambiguous and should be == 0 here
indicating timeout which is the only error case.
Fixes: 2cd548566384 ("net: dsa: qca8k: add support for phy read/write with mgmt Ethernet")
Fixes: 5950c7c0a68c ("net: dsa: qca8k: add support for mgmt read/write in Ethernet packet")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
---
drivers/net/dsa/qca8k.c | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c
index d3ed0a7f8077..bd8c238955a8 100644
--- a/drivers/net/dsa/qca8k.c
+++ b/drivers/net/dsa/qca8k.c
@@ -300,7 +300,7 @@ static int qca8k_read_eth(struct qca8k_priv *priv, u32 reg, u32 *val, int len)
struct qca8k_mgmt_eth_data *mgmt_eth_data = &priv->mgmt_eth_data;
struct sk_buff *skb;
bool ack;
- int ret;
+ unsigned long ret;
skb = qca8k_alloc_mdio_header(MDIO_READ, reg, NULL,
QCA8K_ETHERNET_MDIO_PRIORITY, len);
@@ -338,7 +338,7 @@ static int qca8k_read_eth(struct qca8k_priv *priv, u32 reg, u32 *val, int len)
mutex_unlock(&mgmt_eth_data->mutex);
- if (ret <= 0)
+ if (ret == 0)
return -ETIMEDOUT;
if (!ack)
@@ -352,7 +352,7 @@ static int qca8k_write_eth(struct qca8k_priv *priv, u32 reg, u32 *val, int len)
struct qca8k_mgmt_eth_data *mgmt_eth_data = &priv->mgmt_eth_data;
struct sk_buff *skb;
bool ack;
- int ret;
+ unsigned long ret;
skb = qca8k_alloc_mdio_header(MDIO_WRITE, reg, val,
QCA8K_ETHERNET_MDIO_PRIORITY, len);
@@ -386,7 +386,7 @@ static int qca8k_write_eth(struct qca8k_priv *priv, u32 reg, u32 *val, int len)
mutex_unlock(&mgmt_eth_data->mutex);
- if (ret <= 0)
+ if (ret == 0)
return -ETIMEDOUT;
if (!ack)
@@ -956,7 +956,7 @@ qca8k_phy_eth_busy_wait(struct qca8k_mgmt_eth_data *mgmt_eth_data,
{
struct sk_buff *skb = skb_copy(read_skb, GFP_KERNEL);
bool ack;
- int ret;
+ unsigned long ret;
reinit_completion(&mgmt_eth_data->rw_done);
@@ -972,7 +972,7 @@ qca8k_phy_eth_busy_wait(struct qca8k_mgmt_eth_data *mgmt_eth_data,
ack = mgmt_eth_data->ack;
- if (ret <= 0)
+ if (ret == 0)
return -ETIMEDOUT;
if (!ack)
@@ -993,6 +993,7 @@ qca8k_phy_eth_command(struct qca8k_priv *priv, bool read, int phy,
struct net_device *mgmt_master;
int ret, ret1;
bool ack;
+ unsigned long time_left;
if (regnum >= QCA8K_MDIO_MASTER_MAX_REG)
return -EINVAL;
@@ -1059,12 +1060,12 @@ qca8k_phy_eth_command(struct qca8k_priv *priv, bool read, int phy,
dev_queue_xmit(write_skb);
- ret = wait_for_completion_timeout(&mgmt_eth_data->rw_done,
- QCA8K_ETHERNET_TIMEOUT);
+ time_left = wait_for_completion_timeout(&mgmt_eth_data->rw_done,
+ QCA8K_ETHERNET_TIMEOUT);
ack = mgmt_eth_data->ack;
- if (ret <= 0) {
+ if (time_left == 0) {
ret = -ETIMEDOUT;
kfree_skb(read_skb);
goto exit;
@@ -1096,12 +1097,12 @@ qca8k_phy_eth_command(struct qca8k_priv *priv, bool read, int phy,
dev_queue_xmit(read_skb);
- ret = wait_for_completion_timeout(&mgmt_eth_data->rw_done,
- QCA8K_ETHERNET_TIMEOUT);
+ time_left = wait_for_completion_timeout(&mgmt_eth_data->rw_done,
+ QCA8K_ETHERNET_TIMEOUT);
ack = mgmt_eth_data->ack;
- if (ret <= 0) {
+ if (time_left == 0) {
ret = -ETIMEDOUT;
goto exit;
}
--
2.17.1
next reply other threads:[~2022-04-12 2:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-12 2:45 Miaoqian Lin [this message]
2022-04-12 12:53 ` 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=20220412024541.17572-1-linmq006@gmail.com \
--to=linmq006@gmail.com \
--cc=andrew@lunn.ch \
--cc=ansuelsmth@gmail.com \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=olteanv@gmail.com \
--cc=pabeni@redhat.com \
--cc=vivien.didelot@gmail.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®