From: Paul Burton <paul.burton@mips.com>
To: <netdev@vger.kernel.org>
Cc: Hassan Naveed <hassan.naveed@mips.com>,
Matt Redfearn <matt.redfearn@mips.com>,
"David S . Miller" <davem@davemloft.net>,
<linux-mips@linux-mips.org>, Paul Burton <paul.burton@mips.com>
Subject: [PATCH v5 06/14] net: pch_gbe: Allow longer for resets
Date: Sat, 17 Feb 2018 12:10:29 -0800 [thread overview]
Message-ID: <20180217201037.3006-7-paul.burton@mips.com> (raw)
In-Reply-To: <20180217201037.3006-1-paul.burton@mips.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@mips.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: linux-mips@linux-mips.org
Cc: netdev@vger.kernel.org
---
Changes in v5:
- Bump up the timeout based on feedback from Marcin.
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 90e795d5cc1c..77f7fbd98e8f 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, 25000);
+ if (err)
pr_err("Error: busy bit is not cleared\n");
}
--
2.16.1
next prev parent reply other threads:[~2018-02-17 20:14 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-17 20:10 [PATCH v5 00/14] net: pch_gbe: Fixes & MIPS support Paul Burton
2018-02-17 20:10 ` [PATCH v5 01/14] net: pch_gbe: Mark Minnow PHY reset GPIO active low Paul Burton
2018-02-17 22:14 ` Andrew Lunn
2018-02-17 20:10 ` [PATCH v5 02/14] net: pch_gbe: Pull PHY GPIO handling out of Minnow code Paul Burton
2018-02-17 22:29 ` Andrew Lunn
2018-02-17 22:50 ` Paul Burton
2018-02-17 23:34 ` Andrew Lunn
2018-02-18 15:51 ` Paul Burton
2018-02-18 16:14 ` Andrew Lunn
2018-02-17 20:10 ` [PATCH v5 03/14] dt-bindings: net: Document Intel pch_gbe binding Paul Burton
[not found] ` <20180217201037.3006-4-paul.burton-8NJIiSa5LzA@public.gmane.org>
2018-02-17 22:32 ` Andrew Lunn
2018-02-17 20:10 ` [PATCH v5 04/14] net: pch_gbe: Add device tree support Paul Burton
2018-02-17 20:10 ` [PATCH v5 05/14] net: pch_gbe: Always reset PHY along with MAC Paul Burton
2018-02-17 20:10 ` Paul Burton [this message]
2018-02-18 15:29 ` [PATCH v5 06/14] net: pch_gbe: Allow longer for resets kbuild test robot
2018-02-17 20:10 ` [PATCH v5 07/14] net: pch_gbe: Fix handling of TX padding Paul Burton
2018-02-19 14:01 ` David Laight
2018-02-19 16:42 ` Paul Burton
2018-02-19 16:41 ` David Miller
2018-02-17 20:10 ` [PATCH v5 08/14] net: pch_gbe: Fold pch_gbe_setup_[rt]ctl into pch_gbe_configure_[rt]x Paul Burton
2018-02-17 20:10 ` [PATCH v5 09/14] net: pch_gbe: Use pch_gbe_disable_dma_rx() in pch_gbe_configure_rx() Paul Burton
2018-02-17 20:10 ` [PATCH v5 10/14] net: pch_gbe: Disable TX DMA whilst configuring descriptors Paul Burton
2018-02-17 20:10 ` [PATCH v5 11/14] net: pch_gbe: Ensure DMA is ordered with descriptor writes Paul Burton
2018-02-17 20:10 ` [PATCH v5 12/14] net: pch_gbe: Fix TX RX descriptor accesses for big endian systems Paul Burton
2018-02-18 16:01 ` kbuild test robot
2018-02-17 20:10 ` [PATCH v5 13/14] ptp: pch: Allow build on MIPS platforms Paul Burton
2018-02-17 20:10 ` [PATCH v5 14/14] net: pch_gbe: " Paul Burton
2018-02-18 15:31 ` [PATCH v5 00/14] net: pch_gbe: Fixes & MIPS support David Miller
2018-02-18 17:03 ` Paul Burton
2018-02-18 17:56 ` Andrew Lunn
2018-02-18 22:09 ` Paul Burton
2018-02-19 1:15 ` David Miller
2018-02-19 2:17 ` Florian Fainelli
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=20180217201037.3006-7-paul.burton@mips.com \
--to=paul.burton@mips.com \
--cc=davem@davemloft.net \
--cc=hassan.naveed@mips.com \
--cc=linux-mips@linux-mips.org \
--cc=matt.redfearn@mips.com \
--cc=netdev@vger.kernel.org \
/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).