From patchwork Tue May 13 09:23:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhangfei Gao X-Patchwork-Id: 348303 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 760271400DB for ; Tue, 13 May 2014 19:23:37 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759264AbaEMJXd (ORCPT ); Tue, 13 May 2014 05:23:33 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:56374 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753559AbaEMJXb (ORCPT ); Tue, 13 May 2014 05:23:31 -0400 Received: by mail-pa0-f43.google.com with SMTP id hz1so62110pad.16 for ; Tue, 13 May 2014 02:23:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=fWb7+0X6SElGpfZwauyoTxeVQxYJwxafXnbXgPSv9oo=; b=hFjxLJegCaTU+MU9aLrMT09C/Nwr4gJT8rIINViCv2kcAZ03rdMBZ67urg3wwEm/oN 87Vio1CH3n8M1wg7Y2Gim3Kr7Zmad+8dmHsI4i/n9FnxbAeO1EVHy5CcEQ4aZepv7tKX ceiyse2PcoBpYcVjTz8Ql/RRAsu2sulj2wFknWDppfflo7p+kKu6SwzE5pkt9olXon7O EsAKOqQZ5CrQ/Em2+ug6tjzbHICoj+PqVArLrVptb/bsHbev4l5vTwnJPZXXtIbDMe70 2CDAwN15onT75eOYqRa9T17wGaBGiU8WQvsiXP+L9M5mGoR6ucKU5jCBc3TDRg+zwGYl E76Q== X-Gm-Message-State: ALoCoQk78bUiiSY/NhKs7mM8uqRjFcrcjR5cVLy5BADodUTOl/wLMATbNH4K7IrmuS+FKXjuV7Gd X-Received: by 10.68.191.39 with SMTP id gv7mr3867875pbc.90.1399973011250; Tue, 13 May 2014 02:23:31 -0700 (PDT) Received: from localhost.localdomain ([180.150.157.4]) by mx.google.com with ESMTPSA id ko10sm27159891pbd.52.2014.05.13.02.23.27 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 13 May 2014 02:23:30 -0700 (PDT) From: Zhangfei Gao To: sebastian.hesselbarth@gmail.com, f.fainelli@gmail.com, davem@davemloft.net Cc: netdev@vger.kernel.org, Zhangfei Gao , Jiancheng Xue Subject: [PATCH] net: phy: resume phydev when PHY_RESUMING Date: Tue, 13 May 2014 17:23:18 +0800 Message-Id: <1399972998-21772-1-git-send-email-zhangfei.gao@linaro.org> X-Mailer: git-send-email 1.7.9.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit be9dad1f9f26604fb suspend phydev when going to HALTED. However not to resume phydev when going to RESUMING. BMCR_PDOWN remains set "ifconfig eth0 down" -> "ifconfig eth0 up". Unless phy_attach_direct is called in open function. Fix the issue via phy_resume in PHY_RESUMING Signed-off-by: Jiancheng Xue Signed-off-by: Zhangfei Gao --- drivers/net/phy/phy.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 1b6d09a..be5d52e 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; + int needs_aneg = 0, do_suspend = 0, do_resume = 0; int err = 0; mutex_lock(&phydev->lock); @@ -865,6 +865,8 @@ void phy_state_machine(struct work_struct *work) } phydev->adjust_link(phydev->attached_dev); } + + do_resume = 1; break; } @@ -876,6 +878,9 @@ void phy_state_machine(struct work_struct *work) if (do_suspend) phy_suspend(phydev); + if (do_resume) + phy_resume(phydev); + if (err < 0) phy_error(phydev);