diff options
| author | Christian Riesch <christian.riesch@omicron.at> | 2012-04-16 04:35:25 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-27 09:51:06 -0700 |
| commit | 590999cbb260ae3a2907d4070bdd535c28e86868 (patch) | |
| tree | a263728c891f768b5988098e8c009f96ee625ce0 /drivers/net | |
| parent | c85ed6a569612f2e35c4543fbb8228394aa20c61 (diff) | |
davinci_mdio: Fix MDIO timeout check
commit 5b76d0600b2b08eef77f8e9226938b7b6bde3099 upstream.
Under heavy load (flood ping) it is possible for the MDIO timeout to
expire before the loop checks the GO bit again. This patch adds an
additional check whether the operation was done before actually
returning -ETIMEDOUT.
To reproduce this bug, flood ping the device, e.g., ping -f -l 1000
After some time, a "timed out waiting for user access" warning
may appear. And even worse, link may go down since the PHY reported a
timeout.
Signed-off-by: Christian Riesch <christian.riesch@omicron.at>
Cc: Cyril Chemparathy <cyril@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/davinci_mdio.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/davinci_mdio.c b/drivers/net/davinci_mdio.c index 7615040df756..f470ab64b093 100644 --- a/drivers/net/davinci_mdio.c +++ b/drivers/net/davinci_mdio.c @@ -181,6 +181,11 @@ static inline int wait_for_user_access(struct davinci_mdio_data *data) __davinci_mdio_reset(data); return -EAGAIN; } + + reg = __raw_readl(®s->user[0].access); + if ((reg & USERACCESS_GO) == 0) + return 0; + dev_err(data->dev, "timed out waiting for user access\n"); return -ETIMEDOUT; } |