From: Ansuel Smith <ansuelsmth@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>,
Rob Herring <robh+dt@kernel.org>,
Heiner Kallweit <hkallweit1@gmail.com>,
Russell King <linux@armlinux.org.uk>,
netdev@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Ansuel Smith <ansuelsmth@gmail.com>
Subject: [PATCH net-next v6 02/25] net: dsa: qca8k: use iopoll macro for qca8k_busy_wait
Date: Fri, 14 May 2021 22:59:52 +0200 [thread overview]
Message-ID: <20210514210015.18142-3-ansuelsmth@gmail.com> (raw)
In-Reply-To: <20210514210015.18142-1-ansuelsmth@gmail.com>
Use iopoll macro instead of while loop.
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
---
drivers/net/dsa/qca8k.c | 23 +++++++++++------------
drivers/net/dsa/qca8k.h | 2 ++
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c
index 0b295da6c356..25fa7084e820 100644
--- a/drivers/net/dsa/qca8k.c
+++ b/drivers/net/dsa/qca8k.c
@@ -262,21 +262,20 @@ static struct regmap_config qca8k_regmap_config = {
static int
qca8k_busy_wait(struct qca8k_priv *priv, u32 reg, u32 mask)
{
- unsigned long timeout;
-
- timeout = jiffies + msecs_to_jiffies(20);
+ u32 val;
+ int ret;
- /* loop until the busy flag has cleared */
- do {
- u32 val = qca8k_read(priv, reg);
- int busy = val & mask;
+ ret = read_poll_timeout(qca8k_read, val, !(val & mask),
+ 0, QCA8K_BUSY_WAIT_TIMEOUT * USEC_PER_MSEC, false,
+ priv, reg);
- if (!busy)
- break;
- cond_resched();
- } while (!time_after_eq(jiffies, timeout));
+ /* Check if qca8k_read has failed for a different reason
+ * before returning -ETIMEDOUT
+ */
+ if (ret < 0 && val < 0)
+ return val;
- return time_after_eq(jiffies, timeout);
+ return ret;
}
static void
diff --git a/drivers/net/dsa/qca8k.h b/drivers/net/dsa/qca8k.h
index 7ca4b93e0bb5..86c585b7ec4a 100644
--- 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
--
2.30.2
next prev parent reply other threads:[~2021-05-14 21:00 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-14 20:59 [PATCH net-next v6 00/25] Multiple improvement to qca8k stability Ansuel Smith
2021-05-14 20:59 ` [PATCH net-next v6 01/25] net: dsa: qca8k: change simple print to dev variant Ansuel Smith
2021-05-14 22:43 ` Russell King (Oracle)
2021-05-14 20:59 ` Ansuel Smith [this message]
2021-05-14 22:52 ` [PATCH net-next v6 02/25] net: dsa: qca8k: use iopoll macro for qca8k_busy_wait Russell King (Oracle)
2021-05-14 23:07 ` Ansuel Smith
2021-05-14 20:59 ` [PATCH net-next v6 03/25] net: dsa: qca8k: improve qca8k read/write/rmw bus access Ansuel Smith
2021-05-14 22:53 ` Russell King (Oracle)
2021-05-14 20:59 ` [PATCH net-next v6 04/25] net: dsa: qca8k: handle qca8k_set_page errors Ansuel Smith
2021-05-14 22:55 ` Russell King (Oracle)
2021-05-14 20:59 ` [PATCH net-next v6 05/25] net: dsa: qca8k: handle error with qca8k_read operation Ansuel Smith
2021-05-14 23:01 ` Russell King (Oracle)
2021-05-14 20:59 ` [PATCH net-next v6 06/25] net: dsa: qca8k: handle error with qca8k_write operation Ansuel Smith
2021-05-14 20:59 ` [PATCH net-next v6 07/25] net: dsa: qca8k: handle error with qca8k_rmw operation Ansuel Smith
2021-05-14 20:59 ` [PATCH net-next v6 08/25] net: dsa: qca8k: handle error from qca8k_busy_wait Ansuel Smith
2021-05-14 20:59 ` [PATCH net-next v6 09/25] net: dsa: qca8k: add support for qca8327 switch Ansuel Smith
2021-05-14 21:00 ` [PATCH net-next v6 10/25] devicetree: net: dsa: qca8k: Document new compatible qca8327 Ansuel Smith
2021-05-14 21:00 ` [PATCH net-next v6 11/25] net: dsa: qca8k: add priority tweak to qca8337 switch Ansuel Smith
2021-05-14 21:00 ` [PATCH net-next v6 12/25] net: dsa: qca8k: limit port5 delay to qca8337 Ansuel Smith
2021-05-14 21:00 ` [PATCH net-next v6 13/25] net: dsa: qca8k: add GLOBAL_FC settings needed for qca8327 Ansuel Smith
2021-05-14 21:00 ` [PATCH net-next v6 14/25] net: dsa: qca8k: add support for switch rev Ansuel Smith
2021-05-14 21:00 ` [PATCH net-next v6 15/25] net: dsa: qca8k: add ethernet-ports fallback to setup_mdio_bus Ansuel Smith
2021-05-14 21:00 ` [PATCH net-next v6 16/25] net: dsa: qca8k: make rgmii delay configurable Ansuel Smith
2021-05-14 21:00 ` [PATCH net-next v6 17/25] net: dsa: qca8k: clear MASTER_EN after phy read/write Ansuel Smith
2021-05-14 21:00 ` [PATCH net-next v6 18/25] net: dsa: qca8k: dsa: qca8k: protect MASTER busy_wait with mdio mutex Ansuel Smith
2021-05-14 21:00 ` [PATCH net-next v6 19/25] net: dsa: qca8k: enlarge mdio delay and timeout Ansuel Smith
2021-05-14 21:00 ` [PATCH net-next v6 20/25] net: dsa: qca8k: add support for internal phy and internal mdio Ansuel Smith
2021-05-14 21:00 ` [PATCH net-next v6 21/25] devicetree: bindings: dsa: qca8k: Document internal mdio definition Ansuel Smith
2021-05-14 21:00 ` [PATCH net-next v6 22/25] net: dsa: qca8k: improve internal mdio read/write bus access Ansuel Smith
2021-05-14 21:00 ` [PATCH net-next v6 23/25] net: dsa: qca8k: pass switch_revision info to phy dev_flags Ansuel Smith
2021-05-14 21:00 ` [PATCH net-next v6 24/25] net: phy: at803x: clean whitespace errors Ansuel Smith
2021-05-14 21:00 ` [PATCH net-next v6 25/25] net: phy: add support for qca8k switch internal PHY in at803x Ansuel Smith
2021-05-14 22:40 ` [PATCH net-next v6 00/25] Multiple improvement to qca8k stability patchwork-bot+netdevbpf
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=20210514210015.18142-3-ansuelsmth@gmail.com \
--to=ansuelsmth@gmail.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=f.fainelli@gmail.com \
--cc=hkallweit1@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=netdev@vger.kernel.org \
--cc=olteanv@gmail.com \
--cc=robh+dt@kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).