From patchwork Fri Apr 23 03:48:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan Wu X-Patchwork-Id: 50784 X-Patchwork-Delegate: apw@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 66B68B7D20 for ; Fri, 23 Apr 2010 13:49:24 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1O59tF-0002ny-Sb; Fri, 23 Apr 2010 04:49:17 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1O59tD-0002ms-Q2 for kernel-team@lists.ubuntu.com; Fri, 23 Apr 2010 04:49:15 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1O59tD-0001ek-NF for ; Fri, 23 Apr 2010 04:49:15 +0100 Received: from [218.82.232.214] (helo=canonical.com) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1O59t9-0004I3-5H for kernel-team@lists.ubuntu.com; Fri, 23 Apr 2010 04:49:15 +0100 From: Bryan Wu To: kernel-team@lists.ubuntu.com Subject: [PATCH] netdev/fec: fix ifconfig eth0 down hang issue (v4) Date: Fri, 23 Apr 2010 11:48:38 +0800 Message-Id: <1271994518-5297-1-git-send-email-bryan.wu@canonical.com> X-Mailer: git-send-email 1.7.0.1 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com BugLink: http://bugs.launchpad.net/bugs/559065 v4: - don't touch suspend/resume functions in this patch - set fep->phy_dev = NULL in the fec_enet_mii_probe() entry v3: if fec_enet_mii_probe() fails, we should exit the open and resume functions properly and give up further operations without a proper PHY connected. v2: Check fec_enet_mii_probe() return value directly, instead of fep->phy_dev v1: In ethernet connection open/close function, we need to use phy_connect and phy_disconnect operation before we start/stop phy. Otherwise it will cause system hang. Also suspend/resume needs the same fix. Signed-off-by: Bryan Wu --- drivers/net/fec.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/drivers/net/fec.c b/drivers/net/fec.c index 2280373..dff9d96 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c @@ -691,6 +691,8 @@ static int fec_enet_mii_probe(struct net_device *dev) struct phy_device *phy_dev = NULL; int phy_addr; + fep->phy_dev = NULL; + /* find the first phy */ for (phy_addr = 0; phy_addr < PHY_MAX_ADDR; phy_addr++) { if (fep->mii_bus->phy_map[phy_addr]) { @@ -929,7 +931,13 @@ fec_enet_open(struct net_device *dev) return ret; /* schedule a link state check */ + ret = fec_enet_mii_probe(dev); + if (!ret) { + fec_enet_free_buffers(dev); + return ret; + } phy_start(fep->phy_dev); + netif_start_queue(dev); fep->opened = 1; return 0; @@ -942,10 +950,13 @@ fec_enet_close(struct net_device *dev) /* Don't know what to do yet. */ fep->opened = 0; - phy_stop(fep->phy_dev); netif_stop_queue(dev); + fec_stop(dev); + if (fep->phy_dev) + phy_disconnect(fep->phy_dev); + fec_enet_free_buffers(dev); clk_disable(fep->clk);