[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <201208122326.07318.rjw@sisk.pl>
Date: Sun, 12 Aug 2012 23:26:07 +0200
From: "Rafael J. Wysocki" <rjw@...k.pl>
To: Bjorn Helgaas <bhelgaas@...gle.com>
Cc: Alan Stern <stern@...land.harvard.edu>,
AceLan Kao <acelan.kao@...onical.com>, alex.hung@...onical.com,
Oleksij Rempel <bug-track@...her-privat.net>,
"Linux-pm mailing list" <linux-pm@...r.kernel.org>,
linux-pci@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>
Subject: [PATCH] PCI: EHCI: fix crash during hibernation on ASUS computers
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@...her-privat.net>
Signed-off-by: Rafael J. Wysocki <rjw@...k.pl>
Cc: stable@...r.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(+)
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-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists