From patchwork Wed Dec 4 15:44:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 296571 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 4CE3B2C0089 for ; Thu, 5 Dec 2013 02:46:02 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932780Ab3LDPpr (ORCPT ); Wed, 4 Dec 2013 10:45:47 -0500 Received: from mail-ea0-f170.google.com ([209.85.215.170]:53186 "EHLO mail-ea0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932794Ab3LDPpC (ORCPT ); Wed, 4 Dec 2013 10:45:02 -0500 Received: by mail-ea0-f170.google.com with SMTP id k10so10824157eaj.29 for ; Wed, 04 Dec 2013 07:45:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=CbG9OKKoPj2D0d+d4qFFbD74Snx0YylBW5vjjQ73uX0=; b=AODGeR8oME/GxAkS8/pp3TzfYYTggtl2pMxcpk4XMeXp5JL0CNZolVgv8kKCHroUKe +f/vvM7IkxrDFX2stw51/AvFWg20nS04g3hDAvUuw9+7eBvVDx6ntIZi6l/Z25sMvcam 7iZHFZwtdtmhbQ/tW9I0eMrmun/hAlRDWmd5rvk8xWX+oEsOFysSRK3YScFr2yfB0t1P qq1fMZko5Ru6g4IukIWxwQaeCdrerkpY3Q7B0B6IP1nHJfrhblHclnAbY0+MWK/w/f3F g3h6avR9XG6oqVoz4jxbsv+o2ukFQFjmoHuEoR9WhB+yXko3CjW7Q6Xp0xiSmdSCPlnl vWtQ== X-Received: by 10.15.26.200 with SMTP id n48mr2398882eeu.46.1386171900748; Wed, 04 Dec 2013 07:45:00 -0800 (PST) Received: from topkick.lan (dslc-082-083-251-183.pools.arcor-ip.net. [82.83.251.183]) by mx.google.com with ESMTPSA id 1sm95492120eeg.4.2013.12.04.07.44.57 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Dec 2013 07:44:59 -0800 (PST) From: Sebastian Hesselbarth To: Sebastian Hesselbarth Cc: Sebastian Hesselbarth , David Miller , Florian Fainelli , Mugunthan V N , netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH RFCv2 6/6] net: phy: suspend phydev when going to HALTED Date: Wed, 4 Dec 2013 16:44:48 +0100 Message-Id: <1386171888-28190-7-git-send-email-sebastian.hesselbarth@gmail.com> In-Reply-To: <1384978913-8052-1-git-send-email-sebastian.hesselbarth@gmail.com> References: <1384978913-8052-1-git-send-email-sebastian.hesselbarth@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When phydev is going to HALTED state, we can try to suspend it to safe more power. phy_suspend helper will check if PHY can be suspended, so just call it when entering HALTED state. Signed-off-by: Sebastian Hesselbarth --- Changelog: RFCv1->RFCv2: - initial, integrate phy_suspend to phy state machine (Suggested by Mugunthan and Florian) Cc: David Miller Cc: Florian Fainelli Cc: Mugunthan V N Cc: netdev@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- drivers/net/phy/phy.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 36c6994..6429942 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -740,7 +740,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; + int needs_aneg = 0, do_suspend = 0; int err = 0; mutex_lock(&phydev->lock); @@ -855,6 +855,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; } break; case PHY_RESUMING: @@ -913,6 +914,9 @@ void phy_state_machine(struct work_struct *work) if (needs_aneg) err = phy_start_aneg(phydev); + if (do_suspend) + phy_suspend(phydev); + if (err < 0) phy_error(phydev);