netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Giuseppe CAVALLARO <peppe.cavallaro@st.com>
To: Corentin Labbe <clabbe.montjoie@gmail.com>,
	<alexandre.torgue@st.com>, <netdev@vger.kernel.org>
Cc: <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2 08/16] net: stmmac: Use readl_poll_timeout
Date: Wed, 8 Feb 2017 14:18:09 +0100	[thread overview]
Message-ID: <653b51ad-bc37-e32a-daf3-625b15e652d5@st.com> (raw)
In-Reply-To: <20170208083121.27949-9-clabbe.montjoie@gmail.com>

On 2/8/2017 9:31 AM, Corentin Labbe wrote:
> 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>
Acked-by: Giuseppe Cavallaro <peppe.cavallaro@st.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;
>

  reply	other threads:[~2017-02-08 13:18 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-08  8:31 [PATCH v2 00/16] net: stmmac: misc fix Corentin Labbe
2017-02-08  8:31 ` [PATCH v2 01/16] net: stmmac: fix the typo on MAC_RNABLE_RX Corentin Labbe
2017-02-08  8:31 ` [PATCH v2 02/16] net: stmmac: Remove the bus_setup function pointer Corentin Labbe
2017-02-08 13:17   ` Giuseppe CAVALLARO
2017-02-08  8:31 ` [PATCH v2 03/16] net: stmmac: fix some typos in comments Corentin Labbe
2017-02-08  8:31 ` [PATCH v2 04/16] net: stmmac: remove freesoftware address Corentin Labbe
2017-02-08 13:17   ` Giuseppe CAVALLARO
2017-02-08  8:31 ` [PATCH v2 05/16] net: stmmac: remplace asm/io.h by linux/io.h Corentin Labbe
2017-02-08  8:31 ` [PATCH v2 06/16] net: stmmac: fix some code style problem Corentin Labbe
2017-02-08 10:41   ` Joe Perches
2017-02-08 15:06     ` Corentin Labbe
2017-02-08 11:57   ` Sergei Shtylyov
2017-02-08  8:31 ` [PATCH v2 07/16] net: stmmac: replace stmmac_mdio_busy_wait by readl_poll_timeout Corentin Labbe
2017-02-08  8:31 ` [PATCH v2 08/16] net: stmmac: Use readl_poll_timeout Corentin Labbe
2017-02-08 13:18   ` Giuseppe CAVALLARO [this message]
2017-02-08  8:31 ` [PATCH v2 09/16] net: stmmac: replace ENOSYS by EINVAL Corentin Labbe
2017-02-08  8:31 ` [PATCH v2 10/16] net: stmmac: Correct the error message about invalid speed Corentin Labbe
2017-02-08 13:18   ` Giuseppe CAVALLARO
2017-02-08  8:31 ` [PATCH v2 11/16] net: stmmac: Rewrite two test against NULL value Corentin Labbe
2017-02-08  8:31 ` [PATCH v2 12/16] net: stmmac: rename rx_crc to rx_crc_errors Corentin Labbe
2017-02-08  8:31 ` [PATCH v2 13/16] net: stmmac: print phy information Corentin Labbe
2017-02-08 13:18   ` Giuseppe CAVALLARO
2017-02-08  8:31 ` [PATCH v2 14/16] net: stmmac: remove dead code in stmmac_tx_clean Corentin Labbe
2017-02-08  8:31 ` [PATCH v2 15/16] net: stmmac: remove unused variable in sysfs_display_ring Corentin Labbe
2017-02-08  8:31 ` [PATCH v2 16/16] net: stmmac: replace unsigned by u32 Corentin Labbe

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=653b51ad-bc37-e32a-daf3-625b15e652d5@st.com \
    --to=peppe.cavallaro@st.com \
    --cc=alexandre.torgue@st.com \
    --cc=clabbe.montjoie@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --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).