From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757770AbYHNVjS (ORCPT ); Thu, 14 Aug 2008 17:39:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754170AbYHNViH (ORCPT ); Thu, 14 Aug 2008 17:38:07 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:56448 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751019AbYHNVh6 (ORCPT ); Thu, 14 Aug 2008 17:37:58 -0400 From: "Rafael J. Wysocki" To: netdev@vger.kernel.org Subject: [PATCH 1/3] Adapt the skge driver to the reworked PCI PM Date: Thu, 14 Aug 2008 23:37:26 +0200 User-Agent: KMail/1.9.6 (enterprise 20070904.708012) Cc: Andrew Morton , Jeff Garzik , Jesse Barnes , LKML , pm list , "Brandeburg, Jesse" , Stephen Hemminger References: <200808142335.56644.rjw@sisk.pl> In-Reply-To: <200808142335.56644.rjw@sisk.pl> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-2" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200808142337.27915.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rafael J. Wysocki Adapt the skge driver to the reworked PCI PM * Use device_set_wakeup_enable() and friends as needed * Remove an open-coded reference to the standard PCI PM registers * Use pci_prepare_to_sleep() and pci_back_from_sleep() in the ->suspend() and ->resume() callbacks * Use the observation that it is sufficient to call pci_enable_wake() once, unless it fails Tested on Asus L5D (Yukon-Lite rev 7). Signed-off-by: Rafael J. Wysocki --- drivers/net/skge.c | 38 +++++++++++--------------------------- 1 file changed, 11 insertions(+), 27 deletions(-) Index: linux-next/drivers/net/skge.c =================================================================== --- linux-next.orig/drivers/net/skge.c +++ linux-next/drivers/net/skge.c @@ -149,24 +149,6 @@ static u32 wol_supported(const struct sk return WAKE_MAGIC | WAKE_PHY; } -static u32 pci_wake_enabled(struct pci_dev *dev) -{ - int pm = pci_find_capability(dev, PCI_CAP_ID_PM); - u16 value; - - /* If device doesn't support PM Capabilities, but request is to disable - * wake events, it's a nop; otherwise fail */ - if (!pm) - return 0; - - pci_read_config_word(dev, pm + PCI_PM_PMC, &value); - - value &= PCI_PM_CAP_PME_MASK; - value >>= ffs(PCI_PM_CAP_PME_MASK) - 1; /* First bit of mask */ - - return value != 0; -} - static void skge_wol_init(struct skge_port *skge) { struct skge_hw *hw = skge->hw; @@ -254,10 +236,14 @@ static int skge_set_wol(struct net_devic struct skge_port *skge = netdev_priv(dev); struct skge_hw *hw = skge->hw; - if (wol->wolopts & ~wol_supported(hw)) + if ((wol->wolopts & ~wol_supported(hw)) + || !device_can_wakeup(&hw->pdev->dev)) return -EOPNOTSUPP; skge->wol = wol->wolopts; + + device_set_wakeup_enable(&hw->pdev->dev, skge->wol); + return 0; } @@ -3842,7 +3828,7 @@ static struct net_device *skge_devinit(s skge->speed = -1; skge->advertising = skge_supported_modes(hw); - if (pci_wake_enabled(hw->pdev)) + if (device_may_wakeup(&hw->pdev->dev)) skge->wol = wol_supported(hw) & WAKE_MAGIC; hw->dev[port] = dev; @@ -4068,8 +4054,8 @@ static int skge_suspend(struct pci_dev * } skge_write32(hw, B0_IMSK, 0); - pci_enable_wake(pdev, pci_choose_state(pdev, state), wol); - pci_set_power_state(pdev, pci_choose_state(pdev, state)); + + pci_prepare_to_sleep(pdev); return 0; } @@ -4082,7 +4068,7 @@ static int skge_resume(struct pci_dev *p if (!hw) return 0; - err = pci_set_power_state(pdev, PCI_D0); + err = pci_back_from_sleep(pdev); if (err) goto out; @@ -4090,8 +4076,6 @@ static int skge_resume(struct pci_dev *p if (err) goto out; - pci_enable_wake(pdev, PCI_D0, 0); - err = skge_reset(hw); if (err) goto out; @@ -4132,8 +4116,8 @@ static void skge_shutdown(struct pci_dev wol |= skge->wol; } - pci_enable_wake(pdev, PCI_D3hot, wol); - pci_enable_wake(pdev, PCI_D3cold, wol); + if (pci_enable_wake(pdev, PCI_D3cold, wol)) + pci_enable_wake(pdev, PCI_D3hot, wol); pci_disable_device(pdev); pci_set_power_state(pdev, PCI_D3hot);