Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754677Ab2HOTP0 (ORCPT ); Wed, 15 Aug 2012 15:15:26 -0400 Received: from mail-gh0-f174.google.com ([209.85.160.174]:64793 "EHLO mail-gh0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754127Ab2HOTPY (ORCPT ); Wed, 15 Aug 2012 15:15:24 -0400 MIME-Version: 1.0 In-Reply-To: <201208122326.07318.rjw@sisk.pl> References: <201208112356.26719.rjw@sisk.pl> <201208122326.07318.rjw@sisk.pl> From: Bjorn Helgaas Date: Wed, 15 Aug 2012 13:15:02 -0600 Message-ID: Subject: Re: [PATCH] PCI: EHCI: fix crash during hibernation on ASUS computers To: "Rafael J. Wysocki" Cc: Alan Stern , AceLan Kao , alex.hung@canonical.com, Oleksij Rempel , Linux-pm mailing list , linux-pci@vger.kernel.org, LKML 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: 1918 Lines: 51 On Sun, Aug 12, 2012 at 3:26 PM, Rafael J. Wysocki 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 > Signed-off-by: Rafael J. Wysocki > 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-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/