4 files changed, 39 insertions, 2 deletions

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 3abe9b223ba7..5ca29b5af8d1 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -825,7 +825,7 @@ acpi_os_install_interrupt_handler(u32 gsi, acpi_osd_handler handler,
 
         acpi_irq_handler = handler;
         acpi_irq_context = context;
-        if (request_irq(irq, acpi_irq, IRQF_SHARED | IRQF_NO_SUSPEND, "acpi", acpi_irq)) {
+        if (request_irq(irq, acpi_irq, IRQF_SHARED, "acpi", acpi_irq)) {
                 printk(KERN_ERR PREFIX "SCI (IRQ%d) allocation failed\n", irq);
                 acpi_irq_handler = NULL;
                 return AE_NOT_ACQUIRED;
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 54da4a3fe65e..05a31b573fc3 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -14,6 +14,7 @@
 #include <linux/irq.h>
 #include <linux/dmi.h>
 #include <linux/device.h>
+#include <linux/interrupt.h>
 #include <linux/suspend.h>
 #include <linux/reboot.h>
 #include <linux/acpi.h>
@@ -626,6 +627,19 @@ static int acpi_freeze_begin(void)
         return 0;
 }
 
+static int acpi_freeze_prepare(void)
+{
+        acpi_enable_all_wakeup_gpes();
+        enable_irq_wake(acpi_gbl_FADT.sci_interrupt);
+        return 0;
+}
+
+static void acpi_freeze_restore(void)
+{
+        disable_irq_wake(acpi_gbl_FADT.sci_interrupt);
+        acpi_enable_all_runtime_gpes();
+}
+
 static void acpi_freeze_end(void)
 {
         acpi_scan_lock_release();
@@ -633,6 +647,8 @@ static void acpi_freeze_end(void)
 
 static const struct platform_freeze_ops acpi_freeze_ops = {
         .begin = acpi_freeze_begin,
+        .prepare = acpi_freeze_prepare,
+        .restore = acpi_freeze_restore,
         .end = acpi_freeze_end,
 };
 
diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index 06a9910827c2..3388c1b6f7d8 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -189,6 +189,8 @@ struct platform_suspend_ops {
 
 struct platform_freeze_ops {
         int (*begin)(void);
+        int (*prepare)(void);
+        void (*restore)(void);
         void (*end)(void);
 };
 
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index a25e768d92b5..4ca9a33ff620 100644
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -144,6 +144,12 @@ static int platform_suspend_prepare(suspend_state_t state)
                 suspend_ops->prepare() : 0;
 }
 
+static int platform_suspend_prepare_late(suspend_state_t state)
+{
+        return state == PM_SUSPEND_FREEZE && freeze_ops->prepare ?
+                freeze_ops->prepare() : 0;
+}
+
 static int platform_suspend_prepare_noirq(suspend_state_t state)
 {
         return state != PM_SUSPEND_FREEZE && suspend_ops->prepare_late ?
@@ -156,6 +162,12 @@ static void platform_resume_noirq(suspend_state_t state)
                 suspend_ops->wake();
 }
 
+static void platform_resume_early(suspend_state_t state)
+{
+        if (state == PM_SUSPEND_FREEZE && freeze_ops->restore)
+                freeze_ops->restore();
+}
+
 static void platform_resume_finish(suspend_state_t state)
 {
         if (state != PM_SUSPEND_FREEZE && suspend_ops->finish)
@@ -270,10 +282,14 @@ static int suspend_enter(suspend_state_t state, bool *wakeup)
                 printk(KERN_ERR "PM: late suspend of devices failed\n");
                 goto Platform_finish;
         }
+        error = platform_suspend_prepare_late(state);
+        if (error)
+                goto Devices_early_resume;
+
         error = dpm_suspend_noirq(PMSG_SUSPEND);
         if (error) {
                 printk(KERN_ERR "PM: noirq suspend of devices failed\n");
-                goto Devices_early_resume;
+                goto Platform_early_resume;
         }
         error = platform_suspend_prepare_noirq(state);
         if (error)
@@ -326,6 +342,9 @@ static int suspend_enter(suspend_state_t state, bool *wakeup)
         platform_resume_noirq(state);
         dpm_resume_noirq(PMSG_RESUME);
 
+ Platform_early_resume:
+        platform_resume_early(state);
+
  Devices_early_resume:
         dpm_resume_early(PMSG_RESUME);