[PATCH 1/2] ftgmac100: Increase reset timeout

[PATCH 1/2] ftgmac100: Increase reset timeout

[Benjamin Herrenschmidt]

We had reports of 50us not being sufficient to reset the MAC,
thus hitting the "Hardware reset failed" error bringing the
interface up on some AST2400 based machines.

This bumps the timeout to 200us.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
 drivers/net/ethernet/faraday/ftgmac100.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index b166666128d3..2b17f7023d91 100644
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -125,7 +125,7 @@ static int ftgmac100_reset_mac(struct ftgmac100 *priv, u32 maccr)
 	iowrite32(maccr, priv->base + FTGMAC100_OFFSET_MACCR);
 	iowrite32(maccr | FTGMAC100_MACCR_SW_RST,
 		  priv->base + FTGMAC100_OFFSET_MACCR);
-	for (i = 0; i < 50; i++) {
+	for (i = 0; i < 200; i++) {
 		unsigned int maccr;
 
 		maccr = ioread32(priv->base + FTGMAC100_OFFSET_MACCR);

Re: [PATCH 1/2] ftgmac100: Increase reset timeout

[David Miller]

From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Mon, 24 Jul 2017 16:59:01 +1000

> We had reports of 50us not being sufficient to reset the MAC,
> thus hitting the "Hardware reset failed" error bringing the
> interface up on some AST2400 based machines.
> 
> This bumps the timeout to 200us.
> 
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

Applied.

Re: [PATCH 1/2] ftgmac100: Increase reset timeout

[Joel Stanley]

On Mon, Jul 24, 2017 at 4:29 PM, Benjamin Herrenschmidt
<benh@kernel.crashing.org> wrote:
> We had reports of 50us not being sufficient to reset the MAC,
> thus hitting the "Hardware reset failed" error bringing the
> interface up on some AST2400 based machines.
>
> This bumps the timeout to 200us.
>
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

I gave this a spin on the problematic hardware, as well as a few other
machines. Looks good, thanks Ben.

Tested-by: Joel Stanley <joel@jms.id.au>

Cheers,

Joel


> ---
>  drivers/net/ethernet/faraday/ftgmac100.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
> index b166666128d3..2b17f7023d91 100644
> --- a/drivers/net/ethernet/faraday/ftgmac100.c
> +++ b/drivers/net/ethernet/faraday/ftgmac100.c
> @@ -125,7 +125,7 @@ static int ftgmac100_reset_mac(struct ftgmac100 *priv, u32 maccr)
>         iowrite32(maccr, priv->base + FTGMAC100_OFFSET_MACCR);
>         iowrite32(maccr | FTGMAC100_MACCR_SW_RST,
>                   priv->base + FTGMAC100_OFFSET_MACCR);
> -       for (i = 0; i < 50; i++) {
> +       for (i = 0; i < 200; i++) {
>                 unsigned int maccr;
>
>                 maccr = ioread32(priv->base + FTGMAC100_OFFSET_MACCR);