From patchwork Fri Dec 13 09:20:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 300951 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 3EED62C009C for ; Fri, 13 Dec 2013 20:21:54 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752435Ab3LMJVf (ORCPT ); Fri, 13 Dec 2013 04:21:35 -0500 Received: from mail-ea0-f172.google.com ([209.85.215.172]:61731 "EHLO mail-ea0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752062Ab3LMJUm (ORCPT ); Fri, 13 Dec 2013 04:20:42 -0500 Received: by mail-ea0-f172.google.com with SMTP id q10so618672ead.31 for ; Fri, 13 Dec 2013 01:20:41 -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=CiWn2ABQhkQcseA8voLBGjIrihEe4UiybHCI+NBJbLA=; b=ehFO6GgexkOJAPbiCCA2tlIO0L8HLND5IVkG6R3ZYZCODt/+xujxUTkZSC9SXst2Yy VZAUSsHygS1jhf+QehZqxeoC3Vfc68c7nXxVbzBoSp/25fRFKxBqBrSqxCSP8zo1ed1z VzYzGpBhMudhSeOCgaj1ro5ahIj9IhWDfRY8wfCKiiEkYaSp+i5ZS3kJgB2bnhUfJD1C pUdonfVSqPclQgiF0peltu7Rjmyy5gmErnwzSK6t/M4JfwDXWr5aYXr4CqXcO6AP2NWL LVeyNoZrDzf72BQJx9lgNiUDmzpti7xM0s3UltBc65u7b7MS5ytd+J04dzNNwRXYvUQO 4Gtg== X-Received: by 10.15.49.193 with SMTP id j41mr1725974eew.10.1386926441599; Fri, 13 Dec 2013 01:20:41 -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 v1sm4545405eef.9.2013.12.13.01.20.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Dec 2013 01:20:40 -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 v2 5/5] net: phy: suspend phydev when going to HALTED Date: Fri, 13 Dec 2013 10:20:29 +0100 Message-Id: <1386926429-28818-6-git-send-email-sebastian.hesselbarth@gmail.com> In-Reply-To: <1386513631-11284-1-git-send-email-sebastian.hesselbarth@gmail.com> References: <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 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);