summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRogerio Pimentel <rogerio.pimentel@freescale.com>2011-12-27 14:07:37 -0500
committerDavid S. Miller <davem@davemloft.net>2011-12-28 12:55:18 -0500
commitc3b084c24c8a372026d95497dbb0da22c6eb591c (patch)
tree33beb0fbcef5cbfff012929b87b242afcfa4821f
parentc0d2b8376ae2d74aa862e946a372502603e9066d (diff)
downloadlinux-3.10-c3b084c24c8a372026d95497dbb0da22c6eb591c.tar.gz
linux-3.10-c3b084c24c8a372026d95497dbb0da22c6eb591c.tar.bz2
linux-3.10-c3b084c24c8a372026d95497dbb0da22c6eb591c.zip
net: fec: Adjust ENET MDIO timeouts
On extensive NFS boots on a mx6qsabrelite board it was noted that "FEC: MDIO read timeout" were occuring, which caused failure on loading the FEC driver. The original FEC_MII_TIMEOUT was set to 1 ms, which is too low when passed to the usecs_to_jiffies macro. On ARM one jiffy is 10ms, so use a timeout of 30ms, which corresponds to 3 jiffies. After running extensive NFS boots, the MDIO timeouts do not occur anymore with this change. Signed-off-by: Rogerio Pimentel <rogerio.pimentel@freescale.com> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/freescale/fec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c
index 4ea2bdc852f..b0b04453c7c 100644
--- a/drivers/net/ethernet/freescale/fec.c
+++ b/drivers/net/ethernet/freescale/fec.c
@@ -255,7 +255,7 @@ struct fec_enet_private {
#define FEC_MMFR_TA (2 << 16)
#define FEC_MMFR_DATA(v) (v & 0xffff)
-#define FEC_MII_TIMEOUT 1000 /* us */
+#define FEC_MII_TIMEOUT 30000 /* us */
/* Transmitter timeout */
#define TX_TIMEOUT (2 * HZ)