Message ID | 1321377163-26308-2-git-send-email-grundler@chromium.org |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Grant Grundler <grundler@chromium.org> Date: Tue, 15 Nov 2011 09:12:40 -0800 > From: Grant Grundler <grundler@google.com> > > Sometimes the phy isn't ready after reset...poll and pray it will be soon. > > Signed-off-by: Freddy Xin <freddy@asix.com.tw> > Signed-off-by: Grant Grundler <grundler@chromium.org> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c index 873860d..b4675e8 100644 --- a/drivers/net/usb/asix.c +++ b/drivers/net/usb/asix.c @@ -652,9 +652,17 @@ static u32 asix_get_phyid(struct usbnet *dev) { int phy_reg; u32 phy_id; + int i; - phy_reg = asix_mdio_read(dev->net, dev->mii.phy_id, MII_PHYSID1); - if (phy_reg < 0) + /* Poll for the rare case the FW or phy isn't ready yet. */ + for (i = 0; i < 100; i++) { + phy_reg = asix_mdio_read(dev->net, dev->mii.phy_id, MII_PHYSID1); + if (phy_reg != 0 && phy_reg != 0xFFFF) + break; + mdelay(1); + } + + if (phy_reg <= 0 || phy_reg == 0xFFFF) return 0; phy_id = (phy_reg & 0xffff) << 16;