f2f42a54e8
The qca8k patch series brings the numbering to 799. This patch renames 7xx patches to create space for more backports to be added. Signed-off-by: Matthew Hagan <mnhagan88@gmail.com> [rename 729->719] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
61 lines
1.6 KiB
Diff
61 lines
1.6 KiB
Diff
From 2ad255f2faaffb3af786031fba2e7955454b558a Mon Sep 17 00:00:00 2001
|
|
From: Ansuel Smith <ansuelsmth@gmail.com>
|
|
Date: Fri, 14 May 2021 22:59:52 +0200
|
|
Subject: [PATCH] net: dsa: qca8k: use iopoll macro for qca8k_busy_wait
|
|
|
|
Use iopoll macro instead of while loop.
|
|
|
|
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
|
|
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/dsa/qca8k.c | 23 +++++++++++------------
|
|
drivers/net/dsa/qca8k.h | 2 ++
|
|
2 files changed, 13 insertions(+), 12 deletions(-)
|
|
|
|
--- a/drivers/net/dsa/qca8k.c
|
|
+++ b/drivers/net/dsa/qca8k.c
|
|
@@ -262,21 +262,20 @@ static struct regmap_config qca8k_regmap
|
|
static int
|
|
qca8k_busy_wait(struct qca8k_priv *priv, u32 reg, u32 mask)
|
|
{
|
|
- unsigned long timeout;
|
|
+ u32 val;
|
|
+ int ret;
|
|
|
|
- timeout = jiffies + msecs_to_jiffies(20);
|
|
+ ret = read_poll_timeout(qca8k_read, val, !(val & mask),
|
|
+ 0, QCA8K_BUSY_WAIT_TIMEOUT * USEC_PER_MSEC, false,
|
|
+ priv, reg);
|
|
|
|
- /* loop until the busy flag has cleared */
|
|
- do {
|
|
- u32 val = qca8k_read(priv, reg);
|
|
- int busy = val & mask;
|
|
+ /* Check if qca8k_read has failed for a different reason
|
|
+ * before returning -ETIMEDOUT
|
|
+ */
|
|
+ if (ret < 0 && val < 0)
|
|
+ return val;
|
|
|
|
- if (!busy)
|
|
- break;
|
|
- cond_resched();
|
|
- } while (!time_after_eq(jiffies, timeout));
|
|
-
|
|
- return time_after_eq(jiffies, timeout);
|
|
+ return ret;
|
|
}
|
|
|
|
static void
|
|
--- a/drivers/net/dsa/qca8k.h
|
|
+++ b/drivers/net/dsa/qca8k.h
|
|
@@ -18,6 +18,8 @@
|
|
#define PHY_ID_QCA8337 0x004dd036
|
|
#define QCA8K_ID_QCA8337 0x13
|
|
|
|
+#define QCA8K_BUSY_WAIT_TIMEOUT 20
|
|
+
|
|
#define QCA8K_NUM_FDB_RECORDS 2048
|
|
|
|
#define QCA8K_CPU_PORT 0
|