diff options
| author | Leigh Brown <leigh@solinno.co.uk> | 2013-12-19 13:09:48 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-19 19:20:44 -0500 |
| commit | 1a1f20bc9debd133549d5b289bd5494a4264a73d (patch) | |
| tree | bada4b70bf254cf95461a7221cf9d7c2c0eb3597 /drivers/net/ethernet/marvell/mvmdio.c | |
| parent | a4f63634760acfcc349a5582c77ca4a004c813f6 (diff) | |
| download | blackbird-op-linux-1a1f20bc9debd133549d5b289bd5494a4264a73d.tar.gz blackbird-op-linux-1a1f20bc9debd133549d5b289bd5494a4264a73d.zip | |
net: mvmdio: fix interrupt timeout handling
This version corrects the whitespace issue.
orion_mdio_wait_ready uses wait_event_timeout to wait for the
SMI interrupt to fire. wait_event_timeout waits for between
"timeout - 1" and "timeout" jiffies. In this case a 1ms timeout
when HZ is 1000 results in a wait of 0 to 1 jiffies, causing
premature timeouts.
This fix ensures a minimum timeout of 2 jiffies, ensuring
wait_event_timeout will always wait at least 1 jiffie.
Issue reported by Nicolas Schichan.
Tested-by: Nicolas Schichan <nschichan@freebox.fr>
Signed-off-by: Leigh Brown <leigh@solinno.co.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/marvell/mvmdio.c')
| -rw-r--r-- | drivers/net/ethernet/marvell/mvmdio.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/ethernet/marvell/mvmdio.c b/drivers/net/ethernet/marvell/mvmdio.c index 7354960b583b..c4eeb69a5bee 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); |
