[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <490F5E50.1000904@garzik.org>
Date: Mon, 03 Nov 2008 15:25:52 -0500
From: Jeff Garzik <jeff@...zik.org>
To: Lennert Buytenhek <buytenh@...tstofly.org>
CC: netdev@...r.kernel.org
Subject: Re: [PATCH] mv643xx_eth: fix SMI bus access timeouts
Lennert Buytenhek wrote:
> The mv643xx_eth mii bus implementation uses wait_event_timeout() to
> wait for SMI completion interrupts.
>
> If wait_event_timeout() would return zero, mv643xx_eth would conclude
> that the SMI access timed out, but this is not necessarily true --
> wait_event_timeout() can also return zero in the case where the SMI
> completion interrupt did happen in time but where it took longer than
> the requested timeout for the process performing the SMI access to be
> scheduled again. This would lead to occasional SMI access timeouts
> when the system would be under heavy load.
>
> The fix is to ignore the return value of wait_event_timeout(), and
> to re-check the SMI done bit after wait_event_timeout() returns to
> determine whether or not the SMI access timed out.
>
> Signed-off-by: Lennert Buytenhek <buytenh@...vell.com>
> ---
> The commit that introduced this was added in the .28 dev cycle, so
> this fix is for .28 only. Thanks!
>
> diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
> index d25a302..0e94ed3 100644
> --- a/drivers/net/mv643xx_eth.c
> +++ b/drivers/net/mv643xx_eth.c
> @@ -1065,9 +1065,12 @@ static int smi_wait_ready(struct mv643xx_eth_shared_private *msp)
> return 0;
> }
>
> - if (!wait_event_timeout(msp->smi_busy_wait, smi_is_done(msp),
> - msecs_to_jiffies(100)))
> - return -ETIMEDOUT;
> + if (!smi_is_done(msp)) {
> + wait_event_timeout(msp->smi_busy_wait, smi_is_done(msp),
> + msecs_to_jiffies(100));
> + if (!smi_is_done(msp))
> + return -ETIMEDOUT;
> + }
applied
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists