From patchwork Thu May 15 05:35:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhangfei Gao X-Patchwork-Id: 30217 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f69.google.com (mail-yh0-f69.google.com [209.85.213.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 30BC12055D for ; Thu, 15 May 2014 05:36:19 +0000 (UTC) Received: by mail-yh0-f69.google.com with SMTP id i57sf10881575yha.4 for ; Wed, 14 May 2014 22:36:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=2+kgWlkzTFyP3rhszz6gR1s2H/MEkUSpl2Az13W03Sg=; b=NXtRomtEplYyOYLUpJDRCJZNhTwXyJ4Ug2f6YqJGEicrFwZjT4AVhz0GWsT7dY5pmV I1Aa2F7Yva3NaIlJzfgjhAzQQGu/sUPmjH6g+pGAgEgRRovOb6x7n+ibspmxD8BjVkY7 NA93DOV1izvKH5KQ9Yi0mGDKRednWW0aMTHRifK5/H28fZsUtgSYTPBjZ6PE1UqOKEbe 5BSApUZrIpgr8Hczpr2Qf5HoeHZ6Vgrx2RcWQqWxjjPcxUDDCRw5M48fnLrcPMx+Kt0M PbYnseQpK9h+opOQJzYIoGYzBbcSQ1/40z24juyHc2lP3rL1VY28A4BoT/szlENAUKqR qi1A== X-Gm-Message-State: ALoCoQmYfjsa2MkO9vHxx9kkeJUPeH6t6kscMU/ma6XCFRxaOtS2U9QPXfknTZ/vRhQG50K94KV9 X-Received: by 10.236.137.50 with SMTP id x38mr3870807yhi.9.1400132178754; Wed, 14 May 2014 22:36:18 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.17.19 with SMTP id 19ls91902qgc.69.gmail; Wed, 14 May 2014 22:36:18 -0700 (PDT) X-Received: by 10.58.216.34 with SMTP id on2mr6672073vec.22.1400132178664; Wed, 14 May 2014 22:36:18 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id w5si731358vcl.174.2014.05.14.22.36.18 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 14 May 2014 22:36:18 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id if17so3657180vcb.8 for ; Wed, 14 May 2014 22:36:18 -0700 (PDT) X-Received: by 10.52.125.198 with SMTP id ms6mr5668935vdb.28.1400132178560; Wed, 14 May 2014 22:36:18 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp295004vcb; Wed, 14 May 2014 22:36:18 -0700 (PDT) X-Received: by 10.66.172.167 with SMTP id bd7mr9937522pac.72.1400132177607; Wed, 14 May 2014 22:36:17 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id sd8si4193947pac.119.2014.05.14.22.36.17; Wed, 14 May 2014 22:36:17 -0700 (PDT) Received-SPF: none (google.com: netdev-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751882AbaEOFgO (ORCPT + 3 others); Thu, 15 May 2014 01:36:14 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:60161 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751431AbaEOFgN (ORCPT ); Thu, 15 May 2014 01:36:13 -0400 Received: by mail-pa0-f47.google.com with SMTP id lf10so603774pab.20 for ; Wed, 14 May 2014 22:36:13 -0700 (PDT) X-Received: by 10.68.168.5 with SMTP id zs5mr9763059pbb.107.1400132173424; Wed, 14 May 2014 22:36:13 -0700 (PDT) Received: from localhost.localdomain ([60.166.209.254]) by mx.google.com with ESMTPSA id fu12sm16442270pad.42.2014.05.14.22.36.05 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 14 May 2014 22:36:12 -0700 (PDT) From: Zhangfei Gao To: sebastian.hesselbarth@gmail.com, f.fainelli@gmail.com, davem@davemloft.net, sergei.shtylyov@cogentembedded.com, joe@perches.com Cc: netdev@vger.kernel.org, Zhangfei Gao , Jiancheng Xue Subject: [PATCH v2] net: phy: resume phydev when going to RESUMING Date: Thu, 15 May 2014 13:35:34 +0800 Message-Id: <1400132134-19490-1-git-send-email-zhangfei.gao@linaro.org> X-Mailer: git-send-email 1.7.9.5 Sender: netdev-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: netdev@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: zhangfei.gao@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , With commit be9dad1f9f26604fb ("net: phy: suspend phydev when going to HALTED"), an unused PHY device will be put in a low-power mode using BMCR_PDOWN. Some Ethernet drivers might be calling phy_start() and phy_stop() from ndo_open and ndo_close() respectively, while calling phy_connect() and phy_disconnect() from probe and remove. In such a case, the PHY will be powered down during the phy_stop() call, but will fail to be powered up in phy_start(). This patch fixes this scenario. Signed-off-by: Jiancheng Xue Signed-off-by: Zhangfei Gao --- drivers/net/phy/phy.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 1b6d09a..8bf6c3d 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -715,7 +715,7 @@ void phy_state_machine(struct work_struct *work) struct delayed_work *dwork = to_delayed_work(work); struct phy_device *phydev = container_of(dwork, struct phy_device, state_queue); - int needs_aneg = 0, do_suspend = 0; + bool needs_aneg = false, do_suspend = false, do_resume = false; int err = 0; mutex_lock(&phydev->lock); @@ -727,7 +727,7 @@ void phy_state_machine(struct work_struct *work) case PHY_PENDING: break; case PHY_UP: - needs_aneg = 1; + needs_aneg = true; phydev->link_timeout = PHY_AN_TIMEOUT; @@ -757,7 +757,7 @@ void phy_state_machine(struct work_struct *work) phydev->adjust_link(phydev->attached_dev); } else if (0 == phydev->link_timeout--) - needs_aneg = 1; + needs_aneg = true; break; case PHY_NOLINK: err = phy_read_status(phydev); @@ -780,7 +780,7 @@ void phy_state_machine(struct work_struct *work) netif_carrier_on(phydev->attached_dev); } else { if (0 == phydev->link_timeout--) - needs_aneg = 1; + needs_aneg = true; } phydev->adjust_link(phydev->attached_dev); @@ -816,7 +816,7 @@ void phy_state_machine(struct work_struct *work) phydev->link = 0; netif_carrier_off(phydev->attached_dev); phydev->adjust_link(phydev->attached_dev); - do_suspend = 1; + do_suspend = true; } break; case PHY_RESUMING: @@ -865,6 +865,7 @@ void phy_state_machine(struct work_struct *work) } phydev->adjust_link(phydev->attached_dev); } + do_resume = true; break; } @@ -872,9 +873,10 @@ void phy_state_machine(struct work_struct *work) if (needs_aneg) err = phy_start_aneg(phydev); - - if (do_suspend) + else if (do_suspend) phy_suspend(phydev); + else if (do_resume) + phy_resume(phydev); if (err < 0) phy_error(phydev);