Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752498Ab2KCRWH (ORCPT ); Sat, 3 Nov 2012 13:22:07 -0400 Received: from mail-wg0-f44.google.com ([74.125.82.44]:56564 "EHLO mail-wg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751025Ab2KCRWE (ORCPT ); Sat, 3 Nov 2012 13:22:04 -0400 MIME-Version: 1.0 In-Reply-To: <1351919112.13106.1.camel@yhuang-mobile.sh.intel.com> References: <1351061654-8339-1-git-send-email-ying.huang@intel.com> <1351061654-8339-2-git-send-email-ying.huang@intel.com> <1351919112.13106.1.camel@yhuang-mobile.sh.intel.com> From: Bjorn Helgaas Date: Sat, 3 Nov 2012 11:21:42 -0600 Message-ID: Subject: Re: [BUGFIX 2/2] PCI/PM: Resume device before shutdown To: Huang Ying Cc: linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-pm@vger.kernel.org, "Rafael J. Wysocki" Content-Type: text/plain; charset=ISO-8859-1 X-System-Of-Record: true Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2445 Lines: 61 On Fri, Nov 2, 2012 at 11:05 PM, Huang Ying wrote: > On Fri, 2012-11-02 at 10:52 -0600, 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? > > No bugzilla for this issue. This issue will cause the corresponding > device lost in kexeced kernel. So would the following be accurate changelog text? Without this patch, a device may not work correctly after a kexec because the new kernel expects devices to be in D0. >> Should this be put in the stable tree as well? If so, for v3.6 only? What about the stable tree? >> > 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 > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/