Messages in this thread | | | Date | Tue, 17 Dec 2013 14:49:07 +0100 | From | Nicolas Schichan <> | Subject | Re: Spurious timeouts in mvmdio |
| |
On 12/16/2013 07:28 PM, Leigh Brown wrote:
> I prefer this patch (which I think you originally proposed) because it is just as > correct and the code size is a bit smaller in arm mode, and the same size in > thumb > mode (on my compiler gcc 4.7.2, at least). I coded the loop in that way to > make it > small. > > I don't mind submitting it to David as I made the mistake in the first place. > > Regards, > > Leigh. > > diff --git a/drivers/net/ethernet/marvell/mvmdio.c > b/drivers/net/ethernet/marvell/mvmdio.c > index 7354960..a42a750 100644 > --- a/drivers/net/ethernet/marvell/mvmdio.c > +++ b/drivers/net/ethernet/marvell/mvmdio.c > @@ -92,6 +92,12 @@ static int orion_mdio_wait_ready(struct mii_bus *bus) > if (time_is_before_jiffies(end)) > ++timedout; > } else { > + /* wait_event_timeout does not guarantee a delay of at > + * least one whole jiffie, so timeout must be no less > + * than two. > + */ > + if (timeout < 2) > + timeout = 2; > wait_event_timeout(dev->smi_busy_wait, > orion_mdio_smi_is_done(dev), > timeout);
Hi Leigh,
My original patch changed "timeout" before the entering the while loop, but I'm fine with your patch too.
Feel free to add my:
Tested-by: Nicolas Schichan <nschichan@freebox.fr>
Regards,
-- Nicolas Schichan Freebox SAS
| |