From: Pawel Dembicki <paweldembicki@gmail.com>
To: netdev@vger.kernel.org
Cc: Linus Walleij <linus.walleij@linaro.org>,
Simon Horman <horms@kernel.org>,
Pawel Dembicki <paweldembicki@gmail.com>,
Russell King <linux@armlinux.org.uk>,
Andrew Lunn <andrew@lunn.ch>,
Florian Fainelli <florian.fainelli@broadcom.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Vladimir Oltean <olteanv@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Claudiu Manoil <claudiu.manoil@nxp.com>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
UNGLinuxDriver@microchip.com, linux-kernel@vger.kernel.org
Subject: [PATCH net-next v6 01/16] net: dsa: vsc73xx: use read_poll_timeout instead delay loop
Date: Fri, 1 Mar 2024 23:16:23 +0100 [thread overview]
Message-ID: <20240301221641.159542-2-paweldembicki@gmail.com> (raw)
In-Reply-To: <20240301221641.159542-1-paweldembicki@gmail.com>
Switch the delay loop during the Arbiter empty check from
vsc73xx_adjust_link() to use read_poll_timeout(). Functionally,
one msleep() call is eliminated at the end of the loop in the timeout
case.
As Russell King suggested:
"This [change] avoids the issue that on the last iteration, the code reads
the register, tests it, finds the condition that's being waiting for is
false, _then_ waits and end up printing the error message - that last
wait is rather useless, and as the arbiter state isn't checked after
waiting, it could be that we had success during the last wait."
Suggested-by: Russell King <linux@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
---
v6:
- resend only
v5:
- improved commit description
- added two defines instead magic numbers
- added include with iopoll.h
v4:
- resend patch
v3:
- added "Reviewed-by" to commit message only
v2:
- introduced patch
drivers/net/dsa/vitesse-vsc73xx-core.c | 30 ++++++++++++++------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/drivers/net/dsa/vitesse-vsc73xx-core.c b/drivers/net/dsa/vitesse-vsc73xx-core.c
index ae70eac3be28..ab5771d4d828 100644
--- a/drivers/net/dsa/vitesse-vsc73xx-core.c
+++ b/drivers/net/dsa/vitesse-vsc73xx-core.c
@@ -17,6 +17,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/device.h>
+#include <linux/iopoll.h>
#include <linux/of.h>
#include <linux/of_mdio.h>
#include <linux/bitops.h>
@@ -268,6 +269,9 @@
#define IS_7398(a) ((a)->chipid == VSC73XX_CHIPID_ID_7398)
#define IS_739X(a) (IS_7395(a) || IS_7398(a))
+#define VSC73XX_POLL_SLEEP_US 1000
+#define VSC73XX_POLL_TIMEOUT_US 10000
+
struct vsc73xx_counter {
u8 counter;
const char *name;
@@ -779,7 +783,7 @@ static void vsc73xx_adjust_link(struct dsa_switch *ds, int port,
* after a PHY or the CPU port comes up or down.
*/
if (!phydev->link) {
- int maxloop = 10;
+ int ret, err;
dev_dbg(vsc->dev, "port %d: went down\n",
port);
@@ -794,19 +798,17 @@ static void vsc73xx_adjust_link(struct dsa_switch *ds, int port,
VSC73XX_ARBDISC, BIT(port), BIT(port));
/* Wait until queue is empty */
- vsc73xx_read(vsc, VSC73XX_BLOCK_ARBITER, 0,
- VSC73XX_ARBEMPTY, &val);
- while (!(val & BIT(port))) {
- msleep(1);
- vsc73xx_read(vsc, VSC73XX_BLOCK_ARBITER, 0,
- VSC73XX_ARBEMPTY, &val);
- if (--maxloop == 0) {
- dev_err(vsc->dev,
- "timeout waiting for block arbiter\n");
- /* Continue anyway */
- break;
- }
- }
+ ret = read_poll_timeout(vsc73xx_read, err,
+ err < 0 || (val & BIT(port)),
+ VSC73XX_POLL_SLEEP_US,
+ VSC73XX_POLL_TIMEOUT_US, false,
+ vsc, VSC73XX_BLOCK_ARBITER, 0,
+ VSC73XX_ARBEMPTY, &val);
+ if (ret)
+ dev_err(vsc->dev,
+ "timeout waiting for block arbiter\n");
+ else if (err < 0)
+ dev_err(vsc->dev, "error reading arbiter\n");
/* Put this port into reset */
vsc73xx_write(vsc, VSC73XX_BLOCK_MAC, port, VSC73XX_MAC_CFG,
--
2.34.1
next prev parent reply other threads:[~2024-03-01 22:17 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-01 22:16 [PATCH net-next v6 00/16] net: dsa: vsc73xx: Make vsc73xx usable Pawel Dembicki
2024-03-01 22:16 ` Pawel Dembicki [this message]
2024-03-01 22:16 ` [PATCH net-next v6 02/16] net: dsa: vsc73xx: convert to PHYLINK Pawel Dembicki
2024-03-05 23:15 ` Florian Fainelli
2024-03-06 8:40 ` Linus Walleij
2024-03-06 8:46 ` Russell King (Oracle)
2024-03-01 22:16 ` [PATCH net-next v6 03/16] net: dsa: vsc73xx: use macros for rgmii recognition Pawel Dembicki
2024-03-06 8:47 ` Russell King (Oracle)
2024-03-01 22:16 ` [PATCH net-next v6 04/16] net: dsa: vsc73xx: Add define for max num of ports Pawel Dembicki
2024-03-01 23:39 ` Linus Walleij
2024-03-05 23:16 ` Florian Fainelli
2024-03-01 22:16 ` [PATCH net-next v6 05/16] net: dsa: vsc73xx: add structure descriptions Pawel Dembicki
2024-03-01 22:16 ` [PATCH net-next v6 06/16] net: dsa: vsc73xx: add port_stp_state_set function Pawel Dembicki
2024-03-05 22:42 ` Linus Walleij
2024-03-05 23:18 ` Florian Fainelli
2024-03-08 9:54 ` Vladimir Oltean
2024-03-01 22:16 ` [PATCH net-next v6 07/16] net: dsa: vsc73xx: Add vlan filtering Pawel Dembicki
2024-03-05 23:51 ` Florian Fainelli
2024-03-08 13:09 ` Vladimir Oltean
2024-03-25 20:42 ` Paweł Dembicki
2024-03-08 12:38 ` Vladimir Oltean
2024-03-01 22:16 ` [PATCH net-next v6 08/16] net: dsa: tag_sja1105: absorb logic for not overwriting precise info into dsa_8021q_rcv() Pawel Dembicki
2024-03-01 22:16 ` [PATCH net-next v6 09/16] net: dsa: tag_sja1105: absorb entire sja1105_vlan_rcv() " Pawel Dembicki
2024-03-01 22:16 ` [PATCH net-next v6 10/16] net: dsa: tag_sja1105: prefer precise source port info on SJA1110 too Pawel Dembicki
2024-03-01 22:16 ` [PATCH net-next v6 11/16] net: dsa: tag_sja1105: refactor skb->dev assignment to dsa_tag_8021q_find_user() Pawel Dembicki
2024-03-06 23:12 ` Florian Fainelli
2024-03-01 22:16 ` [PATCH net-next v6 12/16] net: dsa: vsc73xx: introduce tag 8021q for vsc73xx Pawel Dembicki
2024-03-06 23:14 ` Florian Fainelli
2024-03-08 9:45 ` Vladimir Oltean
2024-03-01 22:16 ` [PATCH net-next v6 13/16] net: dsa: vsc73xx: Implement the tag_8021q VLAN operations Pawel Dembicki
2024-03-01 22:16 ` [PATCH net-next v6 14/16] net: dsa: Define max num of bridges in tag8021q implementation Pawel Dembicki
2024-03-06 8:31 ` Linus Walleij
2024-03-01 22:16 ` [PATCH net-next v6 15/16] net: dsa: vsc73xx: Add bridge support Pawel Dembicki
2024-03-06 23:16 ` Florian Fainelli
2024-03-01 22:16 ` [PATCH net-next v6 16/16] net: dsa: vsc73xx: start treating the BR_LEARNING flag Pawel Dembicki
2024-03-06 8:36 ` Linus Walleij
2024-03-06 23:19 ` Florian Fainelli
2024-03-08 9:42 ` Vladimir Oltean
2024-03-05 22:45 ` [PATCH net-next v6 00/16] net: dsa: vsc73xx: Make vsc73xx usable Linus Walleij
2024-03-05 23:27 ` Florian Fainelli
2024-03-06 9:03 ` Linus Walleij
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=20240301221641.159542-2-paweldembicki@gmail.com \
--to=paweldembicki@gmail.com \
--cc=UNGLinuxDriver@microchip.com \
--cc=alexandre.belloni@bootlin.com \
--cc=andrew@lunn.ch \
--cc=claudiu.manoil@nxp.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=f.fainelli@gmail.com \
--cc=florian.fainelli@broadcom.com \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=netdev@vger.kernel.org \
--cc=olteanv@gmail.com \
--cc=pabeni@redhat.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).