Author: nbd Date: 2014-11-19 21:17:37 +0100 (Wed, 19 Nov 2014) New Revision: 43329
Modified: trunk/target/linux/generic/files/drivers/net/phy/ar8216.c Log: 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 <[email protected]> Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/target/linux/generic/files/drivers/net/phy/ar8216.c =================================================================== --- trunk/target/linux/generic/files/drivers/net/phy/ar8216.c 2014-11-19 20:17:30 UTC (rev 43328) +++ trunk/target/linux/generic/files/drivers/net/phy/ar8216.c 2014-11-19 20:17:37 UTC (rev 43329) @@ -316,6 +316,31 @@ *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,8 +901,9 @@ 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 @@ 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 @@ mdiobus_write(bus, i, MII_BMCR, BMCR_RESET | BMCR_ANENABLE); } - msleep(1000); + ar8xxx_phy_poll_reset(bus); return 0; } _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
