diff options
| author | Stefan Roese <sr@denx.de> | 2015-08-11 17:12:44 +0200 |
|---|---|---|
| committer | Joe Hershberger <joe.hershberger@ni.com> | 2015-08-12 14:15:29 -0500 |
| commit | faa765d40760d84bff0de26a5a5f605621dbff39 (patch) | |
| tree | a600d3e502db68b34f4585d6ca67cbf47f58dfbe /drivers/net | |
| parent | 7628afebe9685a333e0a42398ed8be749a1fef0d (diff) | |
| download | blackbird-obmc-uboot-faa765d40760d84bff0de26a5a5f605621dbff39.tar.gz blackbird-obmc-uboot-faa765d40760d84bff0de26a5a5f605621dbff39.zip | |
net: e1000: Increase autoneg timeout to 8 seconds
The current 4.5 timeout for the autonegotiation are not enough to
complete it on my platform. Using the Intel E1000 PCIe card in the
Marvell db-mv784mp-gp eval board. So lets increase the timeout to
8 seconds.
Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Joe Hershberger <joe.hershberger@ni.com>
Cc: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/e1000.c | 2 | ||||
| -rw-r--r-- | drivers/net/e1000.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index ecd1a52e47..d5d48b1e7d 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -4017,7 +4017,7 @@ e1000_wait_autoneg(struct e1000_hw *hw) DEBUGFUNC(); DEBUGOUT("Waiting for Auto-Neg to complete.\n"); - /* We will wait for autoneg to complete or 4.5 seconds to expire. */ + /* We will wait for autoneg to complete or timeout to expire. */ for (i = PHY_AUTO_NEG_TIME; i > 0; i--) { /* Read the MII Status Register and wait for Auto-Neg * Complete bit to be set. diff --git a/drivers/net/e1000.h b/drivers/net/e1000.h index 232c95d2a4..23a81e6c2d 100644 --- a/drivers/net/e1000.h +++ b/drivers/net/e1000.h @@ -2460,7 +2460,7 @@ struct e1000_hw { #define MII_CR_SPEED_100 0x2000 #define MII_CR_SPEED_10 0x0000 #define E1000_PHY_ADDRESS 0x01 -#define PHY_AUTO_NEG_TIME 45 /* 4.5 Seconds */ +#define PHY_AUTO_NEG_TIME 80 /* 8.0 Seconds */ #define PHY_FORCE_TIME 20 /* 2.0 Seconds */ #define PHY_REVISION_MASK 0xFFFFFFF0 #define DEVICE_SPEED_MASK 0x00000300 /* Device Ctrl Reg Speed Mask */ |
