Merge branch 'pm-cpuidle'

[linux-block.git] / drivers / pci / pci-driver.c

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index e6515e21afa3d7fdccd9edb1cbe68ea97253255c..98f7b9b89507e05a331cceacc8defad13e7d9534 100644 (file)
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -763,6 +763,13 @@ static int pci_pm_resume(struct device *dev)
 
 #ifdef CONFIG_HIBERNATE_CALLBACKS
 
+
+/*
+ * pcibios_pm_ops - provide arch-specific hooks when a PCI device is doing
+ * a hibernate transition
+ */
+struct dev_pm_ops __weak pcibios_pm_ops;
+
 static int pci_pm_freeze(struct device *dev)
 {
        struct pci_dev *pci_dev = to_pci_dev(dev);
@@ -786,6 +793,9 @@ static int pci_pm_freeze(struct device *dev)
                        return error;
        }
 
+       if (pcibios_pm_ops.freeze)
+               return pcibios_pm_ops.freeze(dev);
+
        return 0;
 }
 
@@ -811,6 +821,9 @@ static int pci_pm_freeze_noirq(struct device *dev)
 
        pci_pm_set_unknown_state(pci_dev);
 
+       if (pcibios_pm_ops.freeze_noirq)
+               return pcibios_pm_ops.freeze_noirq(dev);
+
        return 0;
 }
 
@@ -820,6 +833,12 @@ static int pci_pm_thaw_noirq(struct device *dev)
        struct device_driver *drv = dev->driver;
        int error = 0;
 
+       if (pcibios_pm_ops.thaw_noirq) {
+               error = pcibios_pm_ops.thaw_noirq(dev);
+               if (error)
+                       return error;
+       }
+
        if (pci_has_legacy_pm_support(pci_dev))
                return pci_legacy_resume_early(dev);
 
@@ -837,6 +856,12 @@ static int pci_pm_thaw(struct device *dev)
        const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
        int error = 0;
 
+       if (pcibios_pm_ops.thaw) {
+               error = pcibios_pm_ops.thaw(dev);
+               if (error)
+                       return error;
+       }
+
        if (pci_has_legacy_pm_support(pci_dev))
                return pci_legacy_resume(dev);
 
@@ -878,6 +903,9 @@ static int pci_pm_poweroff(struct device *dev)
  Fixup:
        pci_fixup_device(pci_fixup_suspend, pci_dev);
 
+       if (pcibios_pm_ops.poweroff)
+               return pcibios_pm_ops.poweroff(dev);
+
        return 0;
 }
 
@@ -911,6 +939,9 @@ static int pci_pm_poweroff_noirq(struct device *dev)
        if (pci_dev->class == PCI_CLASS_SERIAL_USB_EHCI)
                pci_write_config_word(pci_dev, PCI_COMMAND, 0);
 
+       if (pcibios_pm_ops.poweroff_noirq)
+               return pcibios_pm_ops.poweroff_noirq(dev);
+
        return 0;
 }
 
@@ -920,6 +951,12 @@ static int pci_pm_restore_noirq(struct device *dev)
        struct device_driver *drv = dev->driver;
        int error = 0;
 
+       if (pcibios_pm_ops.restore_noirq) {
+               error = pcibios_pm_ops.restore_noirq(dev);
+               if (error)
+                       return error;
+       }
+
        pci_pm_default_resume_early(pci_dev);
 
        if (pci_has_legacy_pm_support(pci_dev))
@@ -937,6 +974,12 @@ static int pci_pm_restore(struct device *dev)
        const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
        int error = 0;
 
+       if (pcibios_pm_ops.restore) {
+               error = pcibios_pm_ops.restore(dev);
+               if (error)
+                       return error;
+       }
+
        /*
         * This is necessary for the hibernation error path in which restore is
         * called without restoring the standard config registers of the device.