diff options
| author | John Crispin <blogic@openwrt.org> | 2014-12-07 16:52:58 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2014-12-07 16:52:58 +0000 |
| commit | 09011d5a288a65e4625abab85e2e362c6b6cd49c (patch) | |
| tree | db70ac2b75bc5d0d64284283267d86e941c8965e /target/linux/ar71xx | |
| parent | 49156d5503027c3a4a94c359672fa846475044f1 (diff) | |
| download | upstream-09011d5a288a65e4625abab85e2e362c6b6cd49c.tar.gz upstream-09011d5a288a65e4625abab85e2e362c6b6cd49c.tar.bz2 upstream-09011d5a288a65e4625abab85e2e362c6b6cd49c.zip | |
ag71xx: replace fixed PHY reset wait time in ar7240sw_setup
Replace the fixed wait time of 1s with polling for BMCR_RESET
to be cleared on all PHYs.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43538 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx')
| -rw-r--r-- | target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar7240.c | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar7240.c b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar7240.c index d4ccc02eb4..7f26196f3d 100644 --- a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar7240.c +++ b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar7240.c @@ -618,6 +618,31 @@ static void ar7240sw_setup(struct ar7240sw *as) ar7240sw_reg_rmw(mii, AR7240_REG_SERVICE_TAG, AR7240_SERVICE_TAG_M, 0); } +/* inspired by phy_poll_reset in drivers/net/phy/phy_device.c */ +static int +ar7240sw_phy_poll_reset(struct mii_bus *bus) +{ + const 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 < AR7240_NUM_PHYS; i++) { + ret = ar7240sw_phy_read(bus, i, MII_BMCR); + if (ret < 0) + return ret; + if (ret & BMCR_RESET) + break; + if (i == AR7240_NUM_PHYS - 1) { + usleep_range(1000, 2000); + return 0; + } + } + } + return -ETIMEDOUT; +} + static int ar7240sw_reset(struct ar7240sw *as) { struct mii_bus *mii = as->mii_bus; @@ -646,7 +671,9 @@ static int ar7240sw_reset(struct ar7240sw *as) ar7240sw_phy_write(mii, i, MII_BMCR, BMCR_RESET | BMCR_ANENABLE); } - msleep(1000); + ret = ar7240sw_phy_poll_reset(mii); + if (ret) + return ret; ar7240sw_setup(as); return ret; |