| Message ID | 201208122326.07318.rjw@sisk.pl |
|---|---|
| State | Accepted |
| Headers | show |
On Sun, Aug 12, 2012 at 3:26 PM, Rafael J. Wysocki <rjw@sisk.pl> wrote: > > Commit dbf0e4c (PCI: EHCI: fix crash during suspend on ASUS > computers) added a workaround for an ASUS suspend issue related to > USB EHCI and a bug in a number of ASUS BIOSes that attemt to shut > down the EHCI controller during system suspend if its PCI command > register doesn't contain 0 at that time. > > It turns out that the same workaround is necessary in the analogous > hibernation code path, so add it. > > References: https://bugzilla.kernel.org/show_bug.cgi?id=45811 > Reported-and-tested-by: Oleksij Rempel <bug-track@fisher-privat.net> > Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> > Cc: stable@vger.kernel.org > --- > > Hi Bjorn, > > Please push this to Linus ASAP, we need it in 3.6 and -stable. Applied to my for-linus branch, thanks. I'll ask Linus to pull it in a couple days, after it's had a chance in -next. > --- > drivers/pci/pci-driver.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > Index: linux/drivers/pci/pci-driver.c > =================================================================== > --- linux.orig/drivers/pci/pci-driver.c > +++ linux/drivers/pci/pci-driver.c > @@ -959,6 +959,13 @@ static int pci_pm_poweroff_noirq(struct > if (!pci_dev->state_saved && !pci_is_bridge(pci_dev)) > pci_prepare_to_sleep(pci_dev); > > + /* > + * The reason for doing this here is the same as for the analogous code > + * in pci_pm_suspend_noirq(). > + */ > + if (pci_dev->class == PCI_CLASS_SERIAL_USB_EHCI) > + pci_write_config_word(pci_dev, PCI_COMMAND, 0); > + > return 0; > } > -- 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
Index: linux/drivers/pci/pci-driver.c =================================================================== --- linux.orig/drivers/pci/pci-driver.c +++ linux/drivers/pci/pci-driver.c @@ -959,6 +959,13 @@ static int pci_pm_poweroff_noirq(struct if (!pci_dev->state_saved && !pci_is_bridge(pci_dev)) pci_prepare_to_sleep(pci_dev); + /* + * The reason for doing this here is the same as for the analogous code + * in pci_pm_suspend_noirq(). + */ + if (pci_dev->class == PCI_CLASS_SERIAL_USB_EHCI) + pci_write_config_word(pci_dev, PCI_COMMAND, 0); + return 0; }
Commit dbf0e4c (PCI: EHCI: fix crash during suspend on ASUS computers) added a workaround for an ASUS suspend issue related to USB EHCI and a bug in a number of ASUS BIOSes that attemt to shut down the EHCI controller during system suspend if its PCI command register doesn't contain 0 at that time. It turns out that the same workaround is necessary in the analogous hibernation code path, so add it. References: https://bugzilla.kernel.org/show_bug.cgi?id=45811 Reported-and-tested-by: Oleksij Rempel <bug-track@fisher-privat.net> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Cc: stable@vger.kernel.org --- Hi Bjorn, Please push this to Linus ASAP, we need it in 3.6 and -stable. Thanks, Rafael --- drivers/pci/pci-driver.c | 7 +++++++ 1 file changed, 7 insertions(+) -- 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