diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-11-19 20:17:37 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-11-19 20:17:37 +0000 |
| commit | 37fefea79b74e6017becfb20caf6e0fa70649170 (patch) | |
| tree | 6788c151a00ebcf95a15111f5adb8a0e6b5dc25e /target/linux/generic/files/drivers | |
| parent | 6dcdc2bb05923ee26a1403859ae05ee31cfab580 (diff) | |
| download | upstream-37fefea79b74e6017becfb20caf6e0fa70649170.tar.gz upstream-37fefea79b74e6017becfb20caf6e0fa70649170.tar.bz2 upstream-37fefea79b74e6017becfb20caf6e0fa70649170.zip | |
ar8216: after a switch reset poll until BCMR_RESET is cleared
Currently there is a fixed 1000ms wait time after the switch was reset.
Most if not all switches need much less time to perform a reset.
Therefore replace the fixed wait time with polling for BMCR_RESET to
be cleared.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 43329
Diffstat (limited to 'target/linux/generic/files/drivers')
| -rw-r--r-- | target/linux/generic/files/drivers/net/phy/ar8216.c | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/target/linux/generic/files/drivers/net/phy/ar8216.c b/target/linux/generic/files/drivers/net/phy/ar8216.c index d57f9e5e14..276932bacc 100644 --- a/target/linux/generic/files/drivers/net/phy/ar8216.c +++ b/target/linux/generic/files/drivers/net/phy/ar8216.c @@ -316,6 +316,31 @@ split_addr(u32 regaddr, u16 *r1, u16 *r2, u16 *page) *page = regaddr & 0x1ff; } +/* inspired by phy_poll_reset in drivers/net/phy/phy_device.c */ +static int +ar8xxx_phy_poll_reset(struct mii_bus *bus) +{ + unsigned int sleep_msecs = 20; + int ret, elapsed, i; + + for (elapsed = sleep_msecs; elapsed <= 600; + elapsed += sleep_msecs) { + msleep(sleep_msecs); + for (i = 0; i < AR8XXX_NUM_PHYS; i++) { + ret = mdiobus_read(bus, i, MII_BMCR); + if (ret < 0) + return ret; + if (ret & BMCR_RESET) + break; + if (i == AR8XXX_NUM_PHYS - 1) { + usleep_range(1000, 2000); + return 0; + } + } + } + return -ETIMEDOUT; +} + static u32 ar8xxx_mii_read(struct ar8xxx_priv *priv, int reg) { @@ -876,7 +901,8 @@ ar8236_hw_init(struct ar8xxx_priv *priv) ADVERTISE_PAUSE_ASYM); mdiobus_write(bus, i, MII_BMCR, BMCR_RESET | BMCR_ANENABLE); } - msleep(1000); + + ar8xxx_phy_poll_reset(bus); priv->initialized = true; return 0; @@ -964,7 +990,7 @@ ar8316_hw_init(struct ar8xxx_priv *priv) mdiobus_write(bus, i, MII_BMCR, BMCR_RESET | BMCR_ANENABLE); } - msleep(1000); + ar8xxx_phy_poll_reset(bus); out: priv->initialized = true; @@ -1622,7 +1648,7 @@ ar8327_hw_init(struct ar8xxx_priv *priv) mdiobus_write(bus, i, MII_BMCR, BMCR_RESET | BMCR_ANENABLE); } - msleep(1000); + ar8xxx_phy_poll_reset(bus); return 0; } |