| Message ID | 1351061654-8339-2-git-send-email-ying.huang@intel.com |
|---|---|
| State | Accepted |
| Headers | show |
On Wednesday 24 of October 2012 14:54:14 Huang Ying wrote: > Some actions during shutdown need device to be in D0 state, such as > MSI shutdown etc, so resume device before shutdown. > > Signed-off-by: Huang Ying <ying.huang@intel.com> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > --- > 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/ >
On Wed, Oct 24, 2012 at 12:54 AM, Huang Ying <ying.huang@intel.com> 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? > Signed-off-by: Huang Ying <ying.huang@intel.com> > --- > 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-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Friday, November 02, 2012 10:52:45 AM Bjorn Helgaas wrote: > On Wed, Oct 24, 2012 at 12:54 AM, Huang Ying <ying.huang@intel.com> 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 <ying.huang@intel.com> > > --- > > 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 >
On Fri, 2012-11-02 at 10:52 -0600, Bjorn Helgaas wrote: > On Wed, Oct 24, 2012 at 12:54 AM, Huang Ying <ying.huang@intel.com> 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. Best Regards, Huang Ying > Should this be put in the stable tree as well? If so, for v3.6 only? > > > Signed-off-by: Huang Ying <ying.huang@intel.com> > > --- > > 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-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Nov 2, 2012 at 11:05 PM, Huang Ying <ying.huang@intel.com> wrote: > On Fri, 2012-11-02 at 10:52 -0600, Bjorn Helgaas wrote: >> On Wed, Oct 24, 2012 at 12:54 AM, Huang Ying <ying.huang@intel.com> 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 <ying.huang@intel.com> >> > --- >> > 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-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sat, 2012-11-03 at 11:21 -0600, Bjorn Helgaas wrote: > On Fri, Nov 2, 2012 at 11:05 PM, Huang Ying <ying.huang@intel.com> wrote: > > On Fri, 2012-11-02 at 10:52 -0600, Bjorn Helgaas wrote: > >> On Wed, Oct 24, 2012 at 12:54 AM, Huang Ying <ying.huang@intel.com> 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. The issue I encountered is Without this patch, a device may not be enumerated after a kexec because the corresponding bridge is not in D0, so that configuration space of the device is not accessible. > >> Should this be put in the stable tree as well? If so, for v3.6 only? > > What about the stable tree? Yes. This patch should be for v3.6 stable tree only. Best Regards, Huang Ying > >> > Signed-off-by: Huang Ying <ying.huang@intel.com> > >> > --- > >> > 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-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
--- 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
Some actions during shutdown need device to be in D0 state, such as MSI shutdown etc, so resume device before shutdown. Signed-off-by: Huang Ying <ying.huang@intel.com> --- drivers/pci/pci-driver.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html