From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753454Ab2KBUWZ (ORCPT ); Fri, 2 Nov 2012 16:22:25 -0400 Received: from ogre.sisk.pl ([193.178.161.156]:53002 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754078Ab2KBUWX (ORCPT ); Fri, 2 Nov 2012 16:22:23 -0400 From: "Rafael J. Wysocki" To: Bjorn Helgaas Cc: Huang Ying , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-pm@vger.kernel.org Subject: Re: [BUGFIX 2/2] PCI/PM: Resume device before shutdown Date: Fri, 02 Nov 2012 21:26:29 +0100 Message-ID: <16107326.eE4GfcYGSM@vostro.rjw.lan> User-Agent: KMail/4.8.5 (Linux/3.7.0-rc3; KDE/4.8.5; x86_64; ; ) In-Reply-To: References: <1351061654-8339-1-git-send-email-ying.huang@intel.com> <1351061654-8339-2-git-send-email-ying.huang@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Friday, November 02, 2012 10:52:45 AM Bjorn Helgaas wrote: > On Wed, Oct 24, 2012 at 12:54 AM, Huang Ying wrote: > > Some actions during shutdown need device to be in D0 state, such as > > MSI shutdown etc, so resume device before shutdown. > > Is there a problem report or bugzilla for this issue? What are the > symptoms by which a user could figure out that he needs this fix? > > Should this be put in the stable tree as well? If so, for v3.6 only? Yes, it should be -stable for v3.6.y. Thanks, Rafael > > Signed-off-by: Huang Ying > > --- > > drivers/pci/pci-driver.c | 12 ++---------- > > 1 file changed, 2 insertions(+), 10 deletions(-) > > > > --- a/drivers/pci/pci-driver.c > > +++ b/drivers/pci/pci-driver.c > > @@ -398,6 +398,8 @@ static void pci_device_shutdown(struct d > > struct pci_dev *pci_dev = to_pci_dev(dev); > > struct pci_driver *drv = pci_dev->driver; > > > > + pm_runtime_resume(dev); > > + > > if (drv && drv->shutdown) > > drv->shutdown(pci_dev); > > pci_msi_shutdown(pci_dev); > > @@ -408,16 +410,6 @@ static void pci_device_shutdown(struct d > > * continue to do DMA > > */ > > pci_disable_device(pci_dev); > > - > > - /* > > - * Devices may be enabled to wake up by runtime PM, but they need not > > - * be supposed to wake up the system from its "power off" state (e.g. > > - * ACPI S5). Therefore disable wakeup for all devices that aren't > > - * supposed to wake up the system at this point. The state argument > > - * will be ignored by pci_enable_wake(). > > - */ > > - if (!device_may_wakeup(dev)) > > - pci_enable_wake(pci_dev, PCI_UNKNOWN, false); > > } > > > > #ifdef CONFIG_PM > -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.