From patchwork Mon Nov 14 23:21:58 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grant Grundler X-Patchwork-Id: 125632 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 38ABFB6F87 for ; Tue, 15 Nov 2011 10:24:10 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756639Ab1KNXXF (ORCPT ); Mon, 14 Nov 2011 18:23:05 -0500 Received: from mail-fx0-f46.google.com ([209.85.161.46]:46657 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752689Ab1KNXXC (ORCPT ); Mon, 14 Nov 2011 18:23:02 -0500 Received: by fagn18 with SMTP id n18so3588028fag.19 for ; Mon, 14 Nov 2011 15:23:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=MUBQHjesxp7eSnuEDFJBmWboLiNmpENblmpjqjoUms0=; b=F/3bTyYh8qFuGaYMZTfa5RTFXJ7r83hcl4S1QhQ2bmdGs9C+SY2OSx7KZJILezVeXR RNsBzQTcWRNo/Gd72mKmFd+qCcxItniEptGPoIVyUkWCn4njp4IfM85v22Ou5cY34hn3 zOgG8cTSshYu1zk2nb0llF/UmMonUln4nl718= Received: by 10.68.12.199 with SMTP id a7mr53473067pbc.58.1321312979422; Mon, 14 Nov 2011 15:22:59 -0800 (PST) Received: from localhost.localdomain (grundler.mtv.corp.google.com [172.22.72.52]) by mx.google.com with ESMTPS id lt8sm60131511pbb.0.2011.11.14.15.22.58 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 14 Nov 2011 15:22:58 -0800 (PST) From: Grant Grundler To: davem@davemloft.net Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Allan Chou , Freddy Xin , 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> X-Mailer: git-send-email 1.7.3.1 In-Reply-To: <1321312921-7748-1-git-send-email-grundler@chromium.org> References: <1321312921-7748-1-git-send-email-grundler@chromium.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: 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;