From: Paul Burton <paul.burton@imgtec.com> To: <netdev@vger.kernel.org> Cc: "David S . Miller" <davem@davemloft.net>, <linux-mips@linux-mips.org>, Eric Dumazet <edumazet@google.com>, Jarod Wilson <jarod@redhat.com>, Tobias Klauser <tklauser@distanz.ch>, Paul Burton <paul.burton@imgtec.com> Subject: [PATCH v4 6/7] net: pch_gbe: Allow longer for resets Date: Mon, 5 Jun 2017 10:31:35 -0700 [thread overview] Message-ID: <20170605173136.10795-7-paul.burton@imgtec.com> (raw) In-Reply-To: <20170605173136.10795-1-paul.burton@imgtec.com> Resets of the EG20T MAC on the MIPS Boston development board take longer than the 1000 loops that pch_gbe_wait_clr_bit was performing. Rather than simply increasing the number of loops, switch to using readl_poll_timeout_atomic() from linux/iopoll.h in order to provide some independence from the speed of the CPU. Signed-off-by: Paul Burton <paul.burton@imgtec.com> Cc: David S. Miller <davem@davemloft.net> Cc: Eric Dumazet <edumazet@google.com> Cc: Jarod Wilson <jarod@redhat.com> Cc: Tobias Klauser <tklauser@distanz.ch> Cc: linux-mips@linux-mips.org Cc: netdev@vger.kernel.org --- Changes in v4: None Changes in v3: - Switch to using readl_poll_timeout_atomic(). Changes in v2: None drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c index c8554d3adf1c..c109646803a4 100644 --- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c @@ -24,6 +24,7 @@ #include <linux/ptp_classify.h> #include <linux/gpio.h> #include <linux/gpio/consumer.h> +#include <linux/iopoll.h> #include <linux/of_gpio.h> #define DRV_VERSION "1.01" @@ -318,13 +319,11 @@ s32 pch_gbe_mac_read_mac_addr(struct pch_gbe_hw *hw) */ static void pch_gbe_wait_clr_bit(void *reg, u32 bit) { + int err; u32 tmp; - /* wait busy */ - tmp = 1000; - while ((ioread32(reg) & bit) && --tmp) - cpu_relax(); - if (!tmp) + err = readl_poll_timeout_atomic(reg, tmp, !(tmp & bit), 10, 500); + if (err) pr_err("Error: busy bit is not cleared\n"); } -- 2.13.0
WARNING: multiple messages have this Message-ID (diff)
From: Paul Burton <paul.burton@imgtec.com> To: netdev@vger.kernel.org Cc: "David S . Miller" <davem@davemloft.net>, linux-mips@linux-mips.org, Eric Dumazet <edumazet@google.com>, Jarod Wilson <jarod@redhat.com>, Tobias Klauser <tklauser@distanz.ch>, Paul Burton <paul.burton@imgtec.com> Subject: [PATCH v4 6/7] net: pch_gbe: Allow longer for resets Date: Mon, 5 Jun 2017 10:31:35 -0700 [thread overview] Message-ID: <20170605173136.10795-7-paul.burton@imgtec.com> (raw) Message-ID: <20170605173135.X8H4-x8ye8CXqnuzU3amGUbJJIuW2NylfUYd0xR01Nw@z> (raw) In-Reply-To: <20170605173136.10795-1-paul.burton@imgtec.com> Resets of the EG20T MAC on the MIPS Boston development board take longer than the 1000 loops that pch_gbe_wait_clr_bit was performing. Rather than simply increasing the number of loops, switch to using readl_poll_timeout_atomic() from linux/iopoll.h in order to provide some independence from the speed of the CPU. Signed-off-by: Paul Burton <paul.burton@imgtec.com> Cc: David S. Miller <davem@davemloft.net> Cc: Eric Dumazet <edumazet@google.com> Cc: Jarod Wilson <jarod@redhat.com> Cc: Tobias Klauser <tklauser@distanz.ch> Cc: linux-mips@linux-mips.org Cc: netdev@vger.kernel.org --- Changes in v4: None Changes in v3: - Switch to using readl_poll_timeout_atomic(). Changes in v2: None drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c index c8554d3adf1c..c109646803a4 100644 --- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c @@ -24,6 +24,7 @@ #include <linux/ptp_classify.h> #include <linux/gpio.h> #include <linux/gpio/consumer.h> +#include <linux/iopoll.h> #include <linux/of_gpio.h> #define DRV_VERSION "1.01" @@ -318,13 +319,11 @@ s32 pch_gbe_mac_read_mac_addr(struct pch_gbe_hw *hw) */ static void pch_gbe_wait_clr_bit(void *reg, u32 bit) { + int err; u32 tmp; - /* wait busy */ - tmp = 1000; - while ((ioread32(reg) & bit) && --tmp) - cpu_relax(); - if (!tmp) + err = readl_poll_timeout_atomic(reg, tmp, !(tmp & bit), 10, 500); + if (err) pr_err("Error: busy bit is not cleared\n"); } -- 2.13.0
next prev parent reply other threads:[~2017-06-05 17:34 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-06-02 23:40 [PATCH v3 0/7] net: pch_gbe: Fixes & MIPS support Paul Burton 2017-06-02 23:40 ` Paul Burton 2017-06-02 23:40 ` [PATCH v3 1/7] net: pch_gbe: Mark Minnow PHY reset GPIO active low Paul Burton 2017-06-02 23:40 ` Paul Burton 2017-06-02 23:40 ` [PATCH v3 2/7] net: pch_gbe: Pull PHY GPIO handling out of Minnow code Paul Burton 2017-06-02 23:40 ` Paul Burton 2017-06-03 17:52 ` Andrew Lunn 2017-06-05 17:21 ` Paul Burton 2017-06-05 17:21 ` Paul Burton 2017-06-05 18:43 ` Andrew Lunn [not found] ` <20170602234042.22782-1-paul.burton-1AXoQHu6uovQT0dZR+AlfA@public.gmane.org> 2017-06-02 23:40 ` [PATCH v3 3/7] dt-bindings: net: Document Intel pch_gbe binding Paul Burton 2017-06-02 23:40 ` Paul Burton 2017-06-02 23:40 ` Paul Burton 2017-06-02 23:40 ` Paul Burton 2017-06-02 23:40 ` [PATCH v3 4/7] net: pch_gbe: Add device tree support Paul Burton 2017-06-02 23:40 ` Paul Burton 2017-06-03 6:36 ` kbuild test robot 2017-06-03 6:36 ` kbuild test robot 2017-06-03 6:36 ` [PATCH] net: pch_gbe: fix err_cast.cocci warnings kbuild test robot 2017-06-03 6:36 ` kbuild test robot 2017-06-02 23:40 ` [PATCH v3 5/7] net: pch_gbe: Always reset PHY along with MAC Paul Burton 2017-06-02 23:40 ` Paul Burton 2017-06-02 23:40 ` [PATCH v3 6/7] net: pch_gbe: Allow longer for resets Paul Burton 2017-06-02 23:40 ` Paul Burton 2017-06-06 14:10 ` Marcin Nowakowski 2017-06-06 14:10 ` Marcin Nowakowski 2017-06-02 23:40 ` [PATCH v3 7/7] net: pch_gbe: Allow build on MIPS platforms Paul Burton 2017-06-02 23:40 ` Paul Burton 2017-06-05 17:31 ` [PATCH v4 0/7] net: pch_gbe: Fixes & MIPS support Paul Burton 2017-06-05 17:31 ` Paul Burton 2017-06-05 17:31 ` [PATCH v4 1/7] net: pch_gbe: Mark Minnow PHY reset GPIO active low Paul Burton 2017-06-05 17:31 ` Paul Burton 2017-06-05 17:31 ` [PATCH v4 2/7] net: pch_gbe: Pull PHY GPIO handling out of Minnow code Paul Burton 2017-06-05 17:31 ` Paul Burton 2017-06-05 18:55 ` Andrew Lunn [not found] ` <20170605173136.10795-1-paul.burton-1AXoQHu6uovQT0dZR+AlfA@public.gmane.org> 2017-06-05 17:31 ` [PATCH v4 3/7] dt-bindings: net: Document Intel pch_gbe binding Paul Burton 2017-06-05 17:31 ` Paul Burton 2017-06-05 17:31 ` Paul Burton 2017-06-05 17:31 ` Paul Burton [not found] ` <20170605173136.10795-4-paul.burton-1AXoQHu6uovQT0dZR+AlfA@public.gmane.org> 2017-06-05 18:45 ` Sergei Shtylyov 2017-06-05 18:45 ` Sergei Shtylyov 2017-06-09 13:21 ` Rob Herring 2017-06-09 13:21 ` Rob Herring 2017-06-05 17:31 ` [PATCH v4 4/7] net: pch_gbe: Add device tree support Paul Burton 2017-06-05 17:31 ` Paul Burton 2017-06-05 18:54 ` Andrew Lunn 2017-06-05 17:31 ` [PATCH v4 5/7] net: pch_gbe: Always reset PHY along with MAC Paul Burton 2017-06-05 17:31 ` Paul Burton 2017-06-05 17:31 ` Paul Burton [this message] 2017-06-05 17:31 ` [PATCH v4 6/7] net: pch_gbe: Allow longer for resets Paul Burton 2017-06-05 17:31 ` [PATCH v4 7/7] net: pch_gbe: Allow build on MIPS platforms Paul Burton 2017-06-05 17:31 ` Paul Burton
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=20170605173136.10795-7-paul.burton@imgtec.com \ --to=paul.burton@imgtec.com \ --cc=davem@davemloft.net \ --cc=edumazet@google.com \ --cc=jarod@redhat.com \ --cc=linux-mips@linux-mips.org \ --cc=netdev@vger.kernel.org \ --cc=tklauser@distanz.ch \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.