Suspend/Resume bug in PCI layer wrt quirks

Some quirks should be called with interrupt disabled, we can't directly
call them in .resume_early. Also the patch introduces
pci_fixup_resume_early and pci_fixup_suspend, which matches current
device core callbacks (.suspend/.resume_early).

TBD: Somebody knows why we need quirk resume should double check if a
quirk should be called in resume or resume_early. I changed some per my
understanding, but can't make sure I fixed all.

Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 72cf61ed8f96..677fd9d6db12 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -292,6 +292,9 @@ static int pci_device_suspend(struct device * dev, pm_message_t state)
                 if (pci_dev->current_state == PCI_D0)
                         pci_dev->current_state = PCI_UNKNOWN;
         }
+
+        pci_fixup_device(pci_fixup_suspend, pci_dev);
+
         return i;
 }
 
@@ -337,6 +340,7 @@ static int pci_device_resume(struct device * dev)
                 error = drv->resume(pci_dev);
         else
                 error = pci_default_resume(pci_dev);
+        pci_fixup_device(pci_fixup_resume, pci_dev);
         return error;
 }
 
@@ -346,7 +350,7 @@ static int pci_device_resume_early(struct device * dev)
         struct pci_dev * pci_dev = to_pci_dev(dev);
         struct pci_driver * drv = pci_dev->driver;
 
-        pci_fixup_device(pci_fixup_resume, pci_dev);
+        pci_fixup_device(pci_fixup_resume_early, pci_dev);
 
         if (drv && drv->resume_early)
                 error = drv->resume_early(pci_dev);