From: Corentin Labbe <clabbe.montjoie@gmail.com>
To: peppe.cavallaro@st.com, alexandre.torgue@st.com, netdev@vger.kernel.org
Cc: davem@davemloft.net, linux-kernel@vger.kernel.org,
Corentin Labbe <clabbe.montjoie@gmail.com>
Subject: [PATCH 08/17] net: stmmac: Use readl_poll_timeout
Date: Tue, 31 Jan 2017 10:11:43 +0100 [thread overview]
Message-ID: <20170131091152.13842-9-clabbe.montjoie@gmail.com> (raw)
In-Reply-To: <20170131091152.13842-1-clabbe.montjoie@gmail.com>
The dwmac_dma_reset function use an open coded of readl_poll_timeout().
Replace the open coded handling with the proper function.
Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
---
drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c b/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c
index e4cda39..e60bfca 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c
@@ -17,6 +17,7 @@
*******************************************************************************/
#include <linux/io.h>
+#include <linux/iopoll.h>
#include "common.h"
#include "dwmac_dma.h"
@@ -25,19 +26,16 @@
int dwmac_dma_reset(void __iomem *ioaddr)
{
u32 value = readl(ioaddr + DMA_BUS_MODE);
- int limit;
+ int err;
/* DMA SW reset */
value |= DMA_BUS_MODE_SFT_RESET;
writel(value, ioaddr + DMA_BUS_MODE);
- limit = 10;
- while (limit--) {
- if (!(readl(ioaddr + DMA_BUS_MODE) & DMA_BUS_MODE_SFT_RESET))
- break;
- mdelay(10);
- }
- if (limit < 0)
+ err = readl_poll_timeout(ioaddr + DMA_BUS_MODE, value,
+ !(value & DMA_BUS_MODE_SFT_RESET),
+ 100000, 10000);
+ if (err)
return -EBUSY;
return 0;
--
2.10.2
next prev parent reply other threads:[~2017-01-31 9:27 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-31 9:11 [PATCH 00/17] net: stmmac: misc fix Corentin Labbe
2017-01-31 9:11 ` [PATCH 01/17] net: stmmac: fix the typo on MAC_RNABLE_RX Corentin Labbe
2017-01-31 10:03 ` Giuseppe CAVALLARO
2017-01-31 9:11 ` [PATCH 02/17] net: stmmac: Remove the bus_setup function pointer Corentin Labbe
2017-01-31 10:02 ` Giuseppe CAVALLARO
2017-01-31 9:11 ` [PATCH 03/17] net: stmmac: fix some typos in comments Corentin Labbe
2017-01-31 10:03 ` Giuseppe CAVALLARO
2017-01-31 9:11 ` [PATCH 04/17] net: stmmac: remove freesoftware address Corentin Labbe
2017-01-31 9:11 ` [PATCH 05/17] net: stmmac: remplace asm/io.h by linux/io.h Corentin Labbe
2017-01-31 9:11 ` [PATCH 06/17] net: stmmac: fix some code style problem Corentin Labbe
2017-01-31 10:05 ` Giuseppe CAVALLARO
2017-01-31 9:11 ` [PATCH 07/17] net: stmmac: replace stmmac_mdio_busy_wait by readl_poll_timeout Corentin Labbe
2017-01-31 10:13 ` Giuseppe CAVALLARO
2017-01-31 10:39 ` Corentin Labbe
2017-01-31 10:44 ` Giuseppe CAVALLARO
2017-01-31 9:11 ` Corentin Labbe [this message]
2017-01-31 9:11 ` [PATCH 09/17] net: stmmac: replace ENOSYS by EINVAL Corentin Labbe
2017-01-31 10:06 ` Giuseppe CAVALLARO
2017-01-31 9:11 ` [PATCH 10/17] net: stmmac: Correct the error message about invalid speed Corentin Labbe
2017-01-31 10:07 ` Giuseppe CAVALLARO
2017-01-31 9:11 ` [PATCH 11/17] net: stmmac: Rewrite two test against NULL value Corentin Labbe
2017-01-31 10:07 ` Giuseppe CAVALLARO
2017-01-31 9:11 ` [PATCH 12/17] net: stmmac: rename rx_crc to rx_crc_errors Corentin Labbe
2017-01-31 10:08 ` Giuseppe CAVALLARO
2017-01-31 9:11 ` [PATCH 13/17] net: stmmac: Implement NAPI for TX Corentin Labbe
2017-01-31 10:28 ` Giuseppe CAVALLARO
2017-01-31 13:38 ` Corentin Labbe
2017-02-01 4:12 ` David Miller
2017-02-03 13:41 ` Corentin Labbe
2017-02-03 15:15 ` David Miller
2017-02-03 15:58 ` Corentin Labbe
2017-01-31 9:11 ` [PATCH 14/17] net: stmmac: print phy information Corentin Labbe
2017-01-31 10:10 ` Giuseppe CAVALLARO
2017-02-03 13:16 ` Corentin Labbe
2017-01-31 9:11 ` [PATCH 15/17] net: stmmac: remove dead code in stmmac_tx_clean Corentin Labbe
2017-01-31 10:21 ` Giuseppe CAVALLARO
2017-01-31 9:11 ` [PATCH 16/17] net: stmmac: remove unused variable in sysfs_display_ring Corentin Labbe
2017-01-31 10:11 ` Giuseppe CAVALLARO
2017-01-31 9:11 ` [PATCH 17/17] net: stmmac: replace unsigned by u32 Corentin Labbe
2017-01-31 10:12 ` Giuseppe CAVALLARO
2017-01-31 10:00 ` [PATCH 00/17] net: stmmac: misc fix Giuseppe CAVALLARO
2017-01-31 10:23 ` Joao Pinto
2017-01-31 10:33 ` Giuseppe CAVALLARO
2017-01-31 10:37 ` Joao Pinto
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=20170131091152.13842-9-clabbe.montjoie@gmail.com \
--to=clabbe.montjoie@gmail.com \
--cc=alexandre.torgue@st.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=peppe.cavallaro@st.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
all inboxes | Powered by JetHome®