diff options
| author | Benjamin Herrenschmidt | 2017-07-24 08:59:01 +0200 |
|---|---|---|
| committer | David S. Miller | 2017-07-25 02:23:55 +0200 |
| commit | c7472ec4a00c298d2b55c0aa945b8a4c10f6f898 (patch) | |
| tree | 1728712199bf1d122bd666a75d1d41c0ae7ba75b /drivers/net/ethernet/faraday | |
| parent | openvswitch: fix potential out of bound access in parse_ct (diff) | |
| download | kernel-qcow2-linux-c7472ec4a00c298d2b55c0aa945b8a4c10f6f898.tar.gz kernel-qcow2-linux-c7472ec4a00c298d2b55c0aa945b8a4c10f6f898.tar.xz kernel-qcow2-linux-c7472ec4a00c298d2b55c0aa945b8a4c10f6f898.zip | |
ftgmac100: Increase reset timeout
We had reports of 50us not being sufficient to reset the MAC,
thus hitting the "Hardware reset failed" error bringing the
interface up on some AST2400 based machines.
This bumps the timeout to 200us.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/faraday')
| -rw-r--r-- | drivers/net/ethernet/faraday/ftgmac100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c index 95bf5e89cfd1..bfda0b2e2b82 100644 --- a/drivers/net/ethernet/faraday/ftgmac100.c +++ b/drivers/net/ethernet/faraday/ftgmac100.c @@ -125,7 +125,7 @@ static int ftgmac100_reset_mac(struct ftgmac100 *priv, u32 maccr) iowrite32(maccr, priv->base + FTGMAC100_OFFSET_MACCR); iowrite32(maccr | FTGMAC100_MACCR_SW_RST, priv->base + FTGMAC100_OFFSET_MACCR); - for (i = 0; i < 50; i++) { + for (i = 0; i < 200; i++) { unsigned int maccr; maccr = ioread32(priv->base + FTGMAC100_OFFSET_MACCR); |