diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2012-03-21 12:18:44 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-03-23 08:23:11 +0100 |
| commit | b7c9126750a2cea7173af170de1093e1c7b2651a (patch) | |
| tree | 54ea7fa3bfb00f47fdd821d0b96e82a72fbc6ed1 /drivers | |
| parent | 76ed3bd9efa0131864fac529e0e0c9a6cca48dce (diff) | |
| download | barebox-b7c9126750a2cea7173af170de1093e1c7b2651a.tar.gz barebox-b7c9126750a2cea7173af170de1093e1c7b2651a.tar.xz | |
net: miidev: Refactor timeout for aneg
First check the status at least once, then do timeout checks. Minor
cleanups also.
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/miidev.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/drivers/net/miidev.c b/drivers/net/miidev.c index 83b6fe9ceb..16a3461d45 100644 --- a/drivers/net/miidev.c +++ b/drivers/net/miidev.c @@ -91,27 +91,22 @@ int miidev_restart_aneg(struct mii_device *mdev) int miidev_wait_aneg(struct mii_device *mdev) { - uint64_t start; int status; + uint64_t start = get_time_ns(); if (mdev->flags & MIIDEV_FORCE_LINK) return 0; - /* - * Wait for AN completion - */ - start = get_time_ns(); do { + status = mii_read(mdev, mdev->address, MII_BMSR); + if (status < 0) + return status; + if (is_timeout(start, 5 * SECOND)) { printf("%s: Autonegotiation timeout\n", mdev->cdev.name); - return -1; + return -ETIMEDOUT; } - status = mii_read(mdev, mdev->address, MII_BMSR); - if (status < 0) { - printf("%s: Autonegotiation failed. status: 0x%04x\n", mdev->cdev.name, status); - return -1; - } } while (!(status & BMSR_LSTATUS)); return 0; |