Merge branch 'pm-genirq' into acpi-pm

3 files changed, 69 insertions, 15 deletions

diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
index eb1bd2ecad8b..c2744b30d5d9 100644
--- a/drivers/base/power/wakeup.c
+++ b/drivers/base/power/wakeup.c
@@ -24,6 +24,9 @@
  */
 bool events_check_enabled __read_mostly;
 
+/* If set and the system is suspending, terminate the suspend. */
+static bool pm_abort_suspend __read_mostly;
+
 /*
  * Combined counters of registered wakeup events and wakeup events in progress.
  * They need to be modified together atomically, so it's better to use one
@@ -719,7 +722,18 @@ bool pm_wakeup_pending(void)
                 pm_print_active_wakeup_sources();
         }
 
-        return ret;
+        return ret || pm_abort_suspend;
+}
+
+void pm_system_wakeup(void)
+{
+        pm_abort_suspend = true;
+        freeze_wake();
+}
+
+void pm_wakeup_clear(void)
+{
+        pm_abort_suspend = false;
 }
 
 /**
diff --git a/drivers/base/syscore.c b/drivers/base/syscore.c
index dbb8350ea8dc..8d98a329f6ea 100644
--- a/drivers/base/syscore.c
+++ b/drivers/base/syscore.c
@@ -9,7 +9,7 @@
 #include <linux/syscore_ops.h>
 #include <linux/mutex.h>
 #include <linux/module.h>
-#include <linux/interrupt.h>
+#include <linux/suspend.h>
 #include <trace/events/power.h>
 
 static LIST_HEAD(syscore_ops_list);
@@ -54,9 +54,8 @@ int syscore_suspend(void)
         pr_debug("Checking wakeup interrupts\n");
 
         /* Return error code if there are any wakeup interrupts pending. */
-        ret = check_wakeup_irqs();
-        if (ret)
-                return ret;
+        if (pm_wakeup_pending())
+                return -EBUSY;
 
         WARN_ONCE(!irqs_disabled(),
                 "Interrupts enabled before system core suspend.\n");
diff --git a/drivers/pci/pcie/pme.c b/drivers/pci/pcie/pme.c
index 82e06a86cd77..a9f9c46e5022 100644
--- a/drivers/pci/pcie/pme.c
+++ b/drivers/pci/pcie/pme.c
@@ -41,11 +41,17 @@ static int __init pcie_pme_setup(char *str)
 }
 __setup("pcie_pme=", pcie_pme_setup);
 
+enum pme_suspend_level {
+        PME_SUSPEND_NONE = 0,
+        PME_SUSPEND_WAKEUP,
+        PME_SUSPEND_NOIRQ,
+};
+
 struct pcie_pme_service_data {
         spinlock_t lock;
         struct pcie_device *srv;
         struct work_struct work;
-        bool noirq; /* Don't enable the PME interrupt used by this service. */
+        enum pme_suspend_level suspend_level;
 };
 
 /**
@@ -223,7 +229,7 @@ static void pcie_pme_work_fn(struct work_struct *work)
         spin_lock_irq(&data->lock);
 
         for (;;) {
-                if (data->noirq)
+                if (data->suspend_level != PME_SUSPEND_NONE)
                         break;
 
                 pcie_capability_read_dword(port, PCI_EXP_RTSTA, &rtsta);
@@ -250,7 +256,7 @@ static void pcie_pme_work_fn(struct work_struct *work)
                 spin_lock_irq(&data->lock);
         }
 
-        if (!data->noirq)
+        if (data->suspend_level == PME_SUSPEND_NONE)
                 pcie_pme_interrupt_enable(port, true);
 
         spin_unlock_irq(&data->lock);
@@ -367,6 +373,21 @@ static int pcie_pme_probe(struct pcie_device *srv)
         return ret;
 }
 
+static bool pcie_pme_check_wakeup(struct pci_bus *bus)
+{
+        struct pci_dev *dev;
+
+        if (!bus)
+                return false;
+
+        list_for_each_entry(dev, &bus->devices, bus_list)
+                if (device_may_wakeup(&dev->dev)
+                    || pcie_pme_check_wakeup(dev->subordinate))
+                        return true;
+
+        return false;
+}
+
 /**
  * pcie_pme_suspend - Suspend PCIe PME service device.
  * @srv: PCIe service device to suspend.
@@ -375,11 +396,26 @@ static int pcie_pme_suspend(struct pcie_device *srv)
 {
         struct pcie_pme_service_data *data = get_service_data(srv);
         struct pci_dev *port = srv->port;
+        bool wakeup;
 
+        if (device_may_wakeup(&port->dev)) {
+                wakeup = true;
+        } else {
+                down_read(&pci_bus_sem);
+                wakeup = pcie_pme_check_wakeup(port->subordinate);
+                up_read(&pci_bus_sem);
+        }
         spin_lock_irq(&data->lock);
-        pcie_pme_interrupt_enable(port, false);
-        pcie_clear_root_pme_status(port);
-        data->noirq = true;
+        if (wakeup) {
+                enable_irq_wake(srv->irq);
+                data->suspend_level = PME_SUSPEND_WAKEUP;
+        } else {
+                struct pci_dev *port = srv->port;
+
+                pcie_pme_interrupt_enable(port, false);
+                pcie_clear_root_pme_status(port);
+                data->suspend_level = PME_SUSPEND_NOIRQ;
+        }
         spin_unlock_irq(&data->lock);
 
         synchronize_irq(srv->irq);
@@ -394,12 +430,17 @@ static int pcie_pme_suspend(struct pcie_device *srv)
 static int pcie_pme_resume(struct pcie_device *srv)
 {
         struct pcie_pme_service_data *data = get_service_data(srv);
-        struct pci_dev *port = srv->port;
 
         spin_lock_irq(&data->lock);
-        data->noirq = false;
-        pcie_clear_root_pme_status(port);
-        pcie_pme_interrupt_enable(port, true);
+        if (data->suspend_level == PME_SUSPEND_NOIRQ) {
+                struct pci_dev *port = srv->port;
+
+                pcie_clear_root_pme_status(port);
+                pcie_pme_interrupt_enable(port, true);
+        } else {
+                disable_irq_wake(srv->irq);
+        }
+        data->suspend_level = PME_SUSPEND_NONE;
         spin_unlock_irq(&data->lock);
 
         return 0;