@@ -264,8 +264,8 @@ static int qca8k_read_eth(struct qca8k_priv *priv, u32 reg, u32 *val, int len)
mutex_unlock(&mgmt_eth_data->mutex);
- if (ret <= 0)
- return -ETIMEDOUT;
+ if (ret)
+ return ret;
if (!ack)
return -EINVAL;
@@ -308,8 +308,8 @@ static int qca8k_write_eth(struct qca8k_priv *priv, u32 reg, u32 *val, int len)
mutex_unlock(&mgmt_eth_data->mutex);
- if (ret <= 0)
- return -ETIMEDOUT;
+ if (ret)
+ return ret;
if (!ack)
return -EINVAL;
@@ -450,8 +450,8 @@ qca8k_phy_eth_busy_wait(struct qca8k_mgmt_eth_data *mgmt_eth_data,
ack = mgmt_eth_data->ack;
- if (ret <= 0)
- return -ETIMEDOUT;
+ if (ret)
+ return ret;
if (!ack)
return -EINVAL;
@@ -538,8 +538,7 @@ qca8k_phy_eth_command(struct qca8k_priv *priv, bool read, int phy,
ack = mgmt_eth_data->ack;
- if (ret <= 0) {
- ret = -ETIMEDOUT;
+ if (ret) {
kfree_skb(read_skb);
goto exit;
}
@@ -571,10 +570,8 @@ qca8k_phy_eth_command(struct qca8k_priv *priv, bool read, int phy,
ack = mgmt_eth_data->ack;
- if (ret <= 0) {
- ret = -ETIMEDOUT;
+ if (ret)
goto exit;
- }
if (!ack) {
ret = -EINVAL;
@@ -591,8 +588,9 @@ qca8k_phy_eth_command(struct qca8k_priv *priv, bool read, int phy,
qca8k_mdio_header_fill_seq_num(clear_skb, mgmt_eth_data->seq);
mgmt_eth_data->ack = false;
- dsa_inband_wait_for_completion(&mgmt_eth_data->inband,
- QCA8K_ETHERNET_TIMEOUT);
+ /* This is expected to fail sometimes, so don't check return value. */
+ dsa_inband_request(&mgmt_eth_data->inband, clear_skb,
+ QCA8K_ETHERNET_TIMEOUT);
mutex_unlock(&mgmt_eth_data->mutex);
@@ -547,12 +547,16 @@ int dsa_inband_request(struct dsa_inband *inband, struct sk_buff *skb,
int timeout_ms)
{
unsigned long jiffies = msecs_to_jiffies(timeout_ms);
+ int ret;
reinit_completion(&inband->completion);
dev_queue_xmit(skb);
- return wait_for_completion_timeout(&inband->completion, jiffies);
+ ret = wait_for_completion_timeout(&inband->completion, jiffies);
+ if (ret == 0)
+ return -ETIMEDOUT;
+ return 0;
}
EXPORT_SYMBOL_GPL(dsa_inband_request);
wait_for_completion_timeout() has unusual return values. If it times out, it returns 0, and on success it returns the number of remaining jiffies for the timeout. For the use case here, the remaining time is not needed. All that is really interesting is, it succeeded and returns 0, or a timeout. Massage the return value to fit this, and modify the callers to the more usual pattern of ret < 0 is an error. Sending the clear message is expected to fail, so don't check the return value, and add a comment about this. Signed-off-by: Andrew Lunn <andrew@lunn.ch> --- v2 Remove check on the clear message. wait_for_completion_timeout() does not return negative values --- drivers/net/dsa/qca/qca8k-8xxx.c | 24 +++++++++++------------- net/dsa/dsa.c | 6 +++++- 2 files changed, 16 insertions(+), 14 deletions(-)