6 files changed, 33 insertions, 19 deletions

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index d549bbc93cd..bf401aead87 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1682,6 +1682,11 @@ int pci_prepare_to_sleep(struct pci_dev *dev)
         if (target_state == PCI_POWER_ERROR)
                 return -EIO;
 
+        /* Some devices mustn't be in D3 during system sleep */
+        if (target_state == PCI_D3hot &&
+                        (dev->dev_flags & PCI_DEV_FLAGS_NO_D3_DURING_SLEEP))
+                return 0;
+
         pci_enable_wake(dev, target_state, device_may_wakeup(&dev->dev));
 
         error = pci_set_power_state(dev, target_state);
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index a6b07ddad71..975af4353e7 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -2856,6 +2856,32 @@ static void __devinit disable_igfx_irq(struct pci_dev *dev)
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0102, disable_igfx_irq);
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
 
+/*
+ * The Intel 6 Series/C200 Series chipset's EHCI controllers on many
+ * ASUS motherboards will cause memory corruption or a system crash
+ * if they are in D3 while the system is put into S3 sleep.
+ */
+static void __devinit asus_ehci_no_d3(struct pci_dev *dev)
+{
+        const char *sys_info;
+        static const char good_Asus_board[] = "P8Z68-V";
+
+        if (dev->dev_flags & PCI_DEV_FLAGS_NO_D3_DURING_SLEEP)
+                return;
+        if (dev->subsystem_vendor != PCI_VENDOR_ID_ASUSTEK)
+                return;
+        sys_info = dmi_get_system_info(DMI_BOARD_NAME);
+        if (sys_info && memcmp(sys_info, good_Asus_board,
+                        sizeof(good_Asus_board) - 1) == 0)
+                return;
+
+        dev_info(&dev->dev, "broken D3 during system sleep on ASUS\n");
+        dev->dev_flags |= PCI_DEV_FLAGS_NO_D3_DURING_SLEEP;
+        device_set_wakeup_capable(&dev->dev, false);
+}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x1c26, asus_ehci_no_d3);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x1c2d, asus_ehci_no_d3);
+
 static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f,
                           struct pci_fixup *end)
 {
diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c
index aa7bbbcf9d8..6c1642b382f 100644
--- a/drivers/usb/core/hcd-pci.c
+++ b/drivers/usb/core/hcd-pci.c
@@ -495,15 +495,6 @@ static int hcd_pci_suspend_noirq(struct device *dev)
 
         pci_save_state(pci_dev);
 
-        /*
-         * Some systems crash if an EHCI controller is in D3 during
-         * a sleep transition.  We have to leave such controllers in D0.
-         */
-        if (hcd->broken_pci_sleep) {
-                dev_dbg(dev, "Staying in PCI D0\n");
-                return retval;
-        }
-
         /* If the root hub is dead rather than suspended, disallow remote
          * wakeup.  usb_hc_died() should ensure that both hosts are marked as
          * dying, so we only need to check the primary roothub.
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index efb9efcffe4..f76831480c6 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -144,14 +144,6 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
                         hcd->has_tt = 1;
                         tdi_reset(ehci);
                 }
-                if (pdev->subsystem_vendor == PCI_VENDOR_ID_ASUSTEK) {
-                        /* EHCI #1 or #2 on 6 Series/C200 Series chipset */
-                        if (pdev->device == 0x1c26 || pdev->device == 0x1c2d) {
-                                ehci_info(ehci, "broken D3 during system sleep on ASUS\n");
-                                hcd->broken_pci_sleep = 1;
-                                device_set_wakeup_capable(&pdev->dev, false);
-                        }
-                }
                 break;
         case PCI_VENDOR_ID_TDI:
                 if (pdev->device == PCI_DEVICE_ID_TDI_EHCI) {
diff --git a/include/linux/pci.h b/include/linux/pci.h
index c446b5ca2d3..ff5970b7a17 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -174,6 +174,8 @@ enum pci_dev_flags {
         PCI_DEV_FLAGS_MSI_INTX_DISABLE_BUG = (__force pci_dev_flags_t) 1,
         /* Device configuration is irrevocably lost if disabled into D3 */
         PCI_DEV_FLAGS_NO_D3 = (__force pci_dev_flags_t) 2,
+        /* Device causes system crash if in D3 during S3 sleep */
+        PCI_DEV_FLAGS_NO_D3_DURING_SLEEP = (__force pci_dev_flags_t) 8,
 };
 
 enum pci_irq_reroute_variant {
diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
index 32ba8c55b3a..c0ecc5a2ef9 100644
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
@@ -128,8 +128,6 @@ struct usb_hcd {
         unsigned                wireless:1;     /* Wireless USB HCD */
         unsigned                authorized_default:1;
         unsigned                has_tt:1;       /* Integrated TT in root hub */
-        unsigned                broken_pci_sleep:1;     /* Don't put the
-                        controller in PCI-D3 for system sleep */
 
         int                     irq;            /* irq allocated */
         void __iomem            *regs;          /* device memory/io */