From patchwork Sun Dec 8 14:40:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 298830 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 B48092C00C9 for ; Mon, 9 Dec 2013 01:41:21 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759486Ab3LHOlC (ORCPT ); Sun, 8 Dec 2013 09:41:02 -0500 Received: from mail-ea0-f170.google.com ([209.85.215.170]:60045 "EHLO mail-ea0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759290Ab3LHOkl (ORCPT ); Sun, 8 Dec 2013 09:40:41 -0500 Received: by mail-ea0-f170.google.com with SMTP id k10so1111039eaj.1 for ; Sun, 08 Dec 2013 06:40:39 -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=fxI2a7+Axqj1oQFK2eRtqBa3MOevz0MUQs1zZKG9K/0=; b=SeOYJq9ZLGok2tA3uiNUfHf0jGXr2xM3RwjGbwGUOBvQ0GK4pC4EC7XtbBBQ/u8gMQ o57e9P94dWRRICvvmTeHdMMwyg1gWJip/pFuJOpMqRk8lc1AQlsLEHAXfFszB7SGotjA SuhVUpnm0/769dNntH/7L5scox54oFFv8OXNQyp5T1tODpAAk3Xi86Viit8j51Zd+Zix A4tLbqYciOh6SIkC1oHe/UmK9fIsFSkm4A2yC2rMakS7w/1kJXcblAOS9jDCE9R+M0rw dzggmKa4DO94RY346aHXqAQokScJnZYpd8BkpNaPQnt/dsHekgXBZneCgqUr8UZJu4SF lPuA== X-Received: by 10.15.91.3 with SMTP id r3mr9477962eez.18.1386513639925; Sun, 08 Dec 2013 06:40:39 -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 44sm17915327eek.5.2013.12.08.06.40.38 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Dec 2013 06:40:39 -0800 (PST) From: Sebastian Hesselbarth To: Sebastian Hesselbarth Cc: David Miller , Florian Fainelli , Mugunthan V N , netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 6/6] net: phy: suspend phydev when going to HALTED Date: Sun, 8 Dec 2013 15:40:31 +0100 Message-Id: <1386513631-11284-7-git-send-email-sebastian.hesselbarth@gmail.com> In-Reply-To: <1386513631-11284-1-git-send-email-sebastian.hesselbarth@gmail.com> References: <1386171888-28190-1-git-send-email-sebastian.hesselbarth@gmail.com> <1386513631-11284-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 Acked-by: Mugunthan V N Reviewed-by: Florian Fainelli --- 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 file changed, 5 insertions(+), 1 deletion(-) 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);