From patchwork Tue Feb 14 18:31:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sameer Nanda X-Patchwork-Id: 141165 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 28EA2B6FAB for ; Wed, 15 Feb 2012 05:31:30 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759523Ab2BNSbX (ORCPT ); Tue, 14 Feb 2012 13:31:23 -0500 Received: from mail-gx0-f202.google.com ([209.85.161.202]:53256 "EHLO mail-gx0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759476Ab2BNSbV (ORCPT ); Tue, 14 Feb 2012 13:31:21 -0500 Received: by ggnp1 with SMTP id p1so31995ggn.1 for ; Tue, 14 Feb 2012 10:31:21 -0800 (PST) MIME-Version: 1.0 Received: by 10.101.151.34 with SMTP id d34mr823535ano.10.1329244281222; Tue, 14 Feb 2012 10:31:21 -0800 (PST) Received: by 10.101.151.34 with SMTP id d34mr823508ano.10.1329244281055; Tue, 14 Feb 2012 10:31:21 -0800 (PST) Received: from wpzn4.hot.corp.google.com (216-239-44-65.google.com [216.239.44.65]) by gmr-mx.google.com with ESMTPS id b68si113796yho.2.2012.02.14.10.31.21 (version=TLSv1/SSLv3 cipher=AES128-SHA); Tue, 14 Feb 2012 10:31:21 -0800 (PST) Received: from snanda.mtv.corp.google.com (snanda.mtv.corp.google.com [172.22.72.213]) by wpzn4.hot.corp.google.com (Postfix) with ESMTP id ED3451E0061; Tue, 14 Feb 2012 10:31:20 -0800 (PST) Received: by snanda.mtv.corp.google.com (Postfix, from userid 66203) id B7FB0A9EBF; Tue, 14 Feb 2012 10:31:20 -0800 (PST) From: Sameer Nanda To: omieu@fr.zoreil.com, jw@sisk.pl, hayeswang@realtek.com Cc: netdev@vger.kernel.org, linux-pm@lists.linux-foundation.org, Sameer Nanda Subject: [PATCH 2/2] r8169: transition to D0 state at shutdown Date: Tue, 14 Feb 2012 10:31:15 -0800 Message-Id: <1329244275-28130-1-git-send-email-snanda@chromium.org> X-Mailer: git-send-email 1.7.7.3 X-Gm-Message-State: ALoCoQkJb8bUL0s2v2FSpx8U+mKrNp78u/ogOtr++u7Djcfqt5ZctAYGl6kAXHBw0CVnvBgWsHDSMwA9b8gcC43YzI7Ol+yqCOBzCZlm88yeBwKcrRbEQ5apz9pproZHRClE5u46EBrYFQYJp2e5Krch7vvX/2Nl8JN3nmgOgLGzabtxNtK2UDk= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org With runtime PM, if the ethernet cable is disconnected, the device is transitioned to D3 state to conserve energy. If the system is shutdown in this state, any register accesses in rtl_shutdown are dropped on the floor. This patch transitions the device back to D0 state in rtl_shutdown if the device was runtime PM suspended. In addition, since runtiome PM also mucks around with WOL options, the saved WOL options are also restored in rtl_shutdown. Signed-off-by: Sameer Nanda --- drivers/net/ethernet/realtek/r8169.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index a6921b7..4a894e6 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -691,6 +691,7 @@ struct rtl8169_private { u16 intr_event; u16 napi_event; u16 intr_mask; + bool runtime_suspended; struct mdio_ops { void (*write)(void __iomem *, int, int); @@ -4308,6 +4309,7 @@ static int rtl8169_open(struct net_device *dev) rtl_hw_start(dev); tp->saved_wolopts = 0; + tp->runtime_suspended = false; pm_runtime_put_noidle(&pdev->dev); rtl8169_check_link_status(dev, tp, ioaddr); @@ -6106,6 +6108,7 @@ static int rtl8169_runtime_suspend(struct device *device) spin_lock_irq(&tp->lock); tp->saved_wolopts = __rtl8169_get_wol(tp); __rtl8169_set_wol(tp, WAKE_ANY); + tp->runtime_suspended = true; spin_unlock_irq(&tp->lock); rtl8169_net_suspend(dev); @@ -6125,6 +6128,7 @@ static int rtl8169_runtime_resume(struct device *device) spin_lock_irq(&tp->lock); __rtl8169_set_wol(tp, tp->saved_wolopts); tp->saved_wolopts = 0; + tp->runtime_suspended = false; spin_unlock_irq(&tp->lock); rtl8169_init_phy(dev, tp); @@ -6188,6 +6192,10 @@ static void rtl_shutdown(struct pci_dev *pdev) struct net_device *dev = pci_get_drvdata(pdev); struct rtl8169_private *tp = netdev_priv(dev); + /* Get the device back to D0 state if it was runtime suspended. */ + if (tp->runtime_suspended) + pci_set_power_state(pdev, PCI_D0); + rtl8169_net_suspend(dev); /* Restore original MAC address */ @@ -6195,6 +6203,10 @@ static void rtl_shutdown(struct pci_dev *pdev) spin_lock_irq(&tp->lock); + /* Restore WOL flags if they were messed around with. */ + if (tp->saved_wolopts) + __rtl8169_set_wol(tp, tp->saved_wolopts); + rtl8169_hw_reset(tp); spin_unlock_irq(&tp->lock);