From mboxrd@z Thu Jan 1 00:00:00 1970 From: Grant Grundler Subject: [PATCH 2/5] net-next:asix: poll in asix_get_phyid in case phy not ready Date: Mon, 14 Nov 2011 15:21:58 -0800 Message-ID: <1321312921-7748-2-git-send-email-grundler@chromium.org> References: <1321312921-7748-1-git-send-email-grundler@chromium.org> Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Allan Chou , Freddy Xin , Grant Grundler To: davem@davemloft.net Return-path: In-Reply-To: <1321312921-7748-1-git-send-email-grundler@chromium.org> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org Sometimes the phy isn't ready after reset...poll and pray it will be soon. Signed-off-by: Freddy Xin Signed-off-by: Grant Grundler --- drivers/net/usb/asix.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) 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; -- 1.7.3.1