mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-16 22:38:04 +00:00
Koen Kooi
2177f80076
Duplicate patches between PSP and 3.2.17 have been dropped from the 3.2.17 series Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
From e132279cab18984918fc3cc9f8f02c8bd71e2931 Mon Sep 17 00:00:00 2001
|
|
From: Christian Riesch <christian.riesch@omicron.at>
|
|
Date: Mon, 16 Apr 2012 04:35:25 +0000
|
|
Subject: [PATCH 015/165] 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: Ben Hutchings <ben@decadent.org.uk>
|
|
---
|
|
drivers/net/ethernet/ti/davinci_mdio.c | 5 +++++
|
|
1 files changed, 5 insertions(+), 0 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/ti/davinci_mdio.c b/drivers/net/ethernet/ti/davinci_mdio.c
|
|
index 1f14be6..3802de3 100644
|
|
--- a/drivers/net/ethernet/ti/davinci_mdio.c
|
|
+++ b/drivers/net/ethernet/ti/davinci_mdio.c
|
|
@@ -185,6 +185,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;
|
|
}
|
|
--
|
|
1.7.7.6
|
|
|