3 files changed, 105 insertions, 51 deletions

diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index 0a5d2a94131e..7249ba2b7a27 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -1,6 +1,7 @@
 /*
  * sleep.c - ACPI sleep support.
  *
+ * Copyright (c) 2005 Alexey Starikovskiy <alexey.y.starikovskiy@intel.com>
  * Copyright (c) 2004 David Shaohua Li <shaohua.li@intel.com>
  * Copyright (c) 2000-2003 Patrick Mochel
  * Copyright (c) 2003 Open Source Development Lab
@@ -14,7 +15,6 @@
 #include <linux/dmi.h>
 #include <linux/device.h>
 #include <linux/suspend.h>
-#include <asm/io.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 #include "sleep.h"
@@ -27,10 +27,11 @@ extern void do_suspend_lowlevel_s4bios(void);
 extern void do_suspend_lowlevel(void);
 
 static u32 acpi_suspend_states[] = {
-        [PM_SUSPEND_ON]         = ACPI_STATE_S0,
-        [PM_SUSPEND_STANDBY]    = ACPI_STATE_S1,
-        [PM_SUSPEND_MEM]        = ACPI_STATE_S3,
-        [PM_SUSPEND_DISK]       = ACPI_STATE_S4,
+        [PM_SUSPEND_ON] = ACPI_STATE_S0,
+        [PM_SUSPEND_STANDBY] = ACPI_STATE_S1,
+        [PM_SUSPEND_MEM] = ACPI_STATE_S3,
+        [PM_SUSPEND_DISK] = ACPI_STATE_S4,
+        [PM_SUSPEND_MAX] = ACPI_STATE_S5
 };
 
 static int init_8259A_after_S1;
@@ -44,30 +45,20 @@ static int init_8259A_after_S1;
  *      wakeup code to the waking vector. 
  */
 
+extern int acpi_sleep_prepare(u32 acpi_state);
+extern void acpi_power_off(void);
+
 static int acpi_pm_prepare(suspend_state_t pm_state)
 {
         u32 acpi_state = acpi_suspend_states[pm_state];
 
-        if (!sleep_states[acpi_state])
+        if (!sleep_states[acpi_state]) {
+                printk("acpi_pm_prepare does not support %d \n", pm_state);
                 return -EPERM;
-
-        /* do we have a wakeup address for S2 and S3? */
-        /* Here, we support only S4BIOS, those we set the wakeup address */
-        /* S4OS is only supported for now via swsusp.. */
-        if (pm_state == PM_SUSPEND_MEM || pm_state == PM_SUSPEND_DISK) {
-                if (!acpi_wakeup_address)
-                        return -EFAULT;
-                acpi_set_firmware_waking_vector(
-                        (acpi_physical_address) virt_to_phys(
-                                (void *)acpi_wakeup_address));
         }
-        ACPI_FLUSH_CPU_CACHE();
-        acpi_enable_wakeup_device_prep(acpi_state);
-        acpi_enter_sleep_state_prep(acpi_state);
-        return 0;
+        return acpi_sleep_prepare(acpi_state);
 }
 
-
 /**
  *      acpi_pm_enter - Actually enter a sleep state.
  *      @pm_state:              State we're entering.
@@ -92,11 +83,9 @@ static int acpi_pm_enter(suspend_state_t pm_state)
                         return error;
         }
 
-
         local_irq_save(flags);
         acpi_enable_wakeup_device(acpi_state);
-        switch (pm_state)
-        {
+        switch (pm_state) {
         case PM_SUSPEND_STANDBY:
                 barrier();
                 status = acpi_enter_sleep_state(acpi_state);
@@ -112,6 +101,10 @@ static int acpi_pm_enter(suspend_state_t pm_state)
                 else
                         do_suspend_lowlevel_s4bios();
                 break;
+        case PM_SUSPEND_MAX:
+                acpi_power_off();
+                break;
+
         default:
                 return -EINVAL;
         }
@@ -126,11 +119,9 @@ static int acpi_pm_enter(suspend_state_t pm_state)
         if (pm_state > PM_SUSPEND_STANDBY)
                 acpi_restore_state_mem();
 
-
         return ACPI_SUCCESS(status) ? 0 : -EFAULT;
 }
 
-
 /**
  *      acpi_pm_finish - Finish up suspend sequence.
  *      @pm_state:              State we're coming out of.
@@ -156,27 +147,26 @@ static int acpi_pm_finish(suspend_state_t pm_state)
         return 0;
 }
 
-
 int acpi_suspend(u32 acpi_state)
 {
         suspend_state_t states[] = {
-                [1]     = PM_SUSPEND_STANDBY,
-                [3]     = PM_SUSPEND_MEM,
-                [4]     = PM_SUSPEND_DISK,
+                [1] = PM_SUSPEND_STANDBY,
+                [3] = PM_SUSPEND_MEM,
+                [4] = PM_SUSPEND_DISK,
+                [5] = PM_SUSPEND_MAX
         };
 
-        if (acpi_state <= 4 && states[acpi_state])
+        if (acpi_state < 6 && states[acpi_state])
                 return pm_suspend(states[acpi_state]);
         return -EINVAL;
 }
 
 static struct pm_ops acpi_pm_ops = {
-        .prepare        = acpi_pm_prepare,
-        .enter          = acpi_pm_enter,
-        .finish         = acpi_pm_finish,
+        .prepare = acpi_pm_prepare,
+        .enter = acpi_pm_enter,
+        .finish = acpi_pm_finish,
 };
 
-
 /*
  * Toshiba fails to preserve interrupts over S1, reinitialization
  * of 8259 is needed after S1 resume.
@@ -190,16 +180,16 @@ static int __init init_ints_after_s1(struct dmi_system_id *d)
 
 static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
         {
-                .callback = init_ints_after_s1,
-                .ident = "Toshiba Satellite 4030cdt",
-                .matches = { DMI_MATCH(DMI_PRODUCT_NAME, "S4030CDT/4.3"), },
-        },
-        { },
+         .callback = init_ints_after_s1,
+         .ident = "Toshiba Satellite 4030cdt",
+         .matches = {DMI_MATCH(DMI_PRODUCT_NAME, "S4030CDT/4.3"),},
+         },
+        {},
 };
 
 static int __init acpi_sleep_init(void)
 {
-        int                     i = 0;
+        int i = 0;
 
         dmi_check_system(acpisleep_dmi_table);
 
@@ -207,7 +197,7 @@ static int __init acpi_sleep_init(void)
                 return 0;
 
         printk(KERN_INFO PREFIX "(supports");
-        for (i=0; i < ACPI_S_STATE_COUNT; i++) {
+        for (i = 0; i < ACPI_S_STATE_COUNT; i++) {
                 acpi_status status;
                 u8 type_a, type_b;
                 status = acpi_get_sleep_type_data(i, &type_a, &type_b);
diff --git a/drivers/acpi/sleep/poweroff.c b/drivers/acpi/sleep/poweroff.c
index da237754ded9..1fc86e6b5ab9 100644
--- a/drivers/acpi/sleep/poweroff.c
+++ b/drivers/acpi/sleep/poweroff.c
@@ -3,35 +3,100 @@
  *
  * AKA S5, but it is independent of whether or not the kernel supports
  * any other sleep support in the system.
+ *
+ * Copyright (c) 2005 Alexey Starikovskiy <alexey.y.starikovskiy@intel.com>
+ *
+ * This file is released under the GPLv2.
  */
 
 #include <linux/pm.h>
 #include <linux/init.h>
 #include <acpi/acpi_bus.h>
 #include <linux/sched.h>
+#include <linux/sysdev.h>
+#include <asm/io.h>
 #include "sleep.h"
 
-static void
-acpi_power_off (void)
+int acpi_sleep_prepare(u32 acpi_state)
+{
+        /* Flag to do not allow second time invocation for S5 state */
+        static int shutdown_prepared = 0;
+#ifdef CONFIG_ACPI_SLEEP
+        /* do we have a wakeup address for S2 and S3? */
+        /* Here, we support only S4BIOS, those we set the wakeup address */
+        /* S4OS is only supported for now via swsusp.. */
+        if (acpi_state == ACPI_STATE_S3 || acpi_state == ACPI_STATE_S4) {
+                if (!acpi_wakeup_address) {
+                        return -EFAULT;
+                }
+                acpi_set_firmware_waking_vector((acpi_physical_address)
+                                                virt_to_phys((void *)
+                                                             acpi_wakeup_address));
+
+        }
+        ACPI_FLUSH_CPU_CACHE();
+        acpi_enable_wakeup_device_prep(acpi_state);
+#endif
+        if (acpi_state == ACPI_STATE_S5) {
+                /* Check if we were already called */
+                if (shutdown_prepared)
+                        return 0;
+                acpi_wakeup_gpe_poweroff_prepare();
+                shutdown_prepared = 1;
+        }
+        acpi_enter_sleep_state_prep(acpi_state);
+        return 0;
+}
+
+void acpi_power_off(void)
 {
-        printk("%s called\n",__FUNCTION__);
+        printk("%s called\n", __FUNCTION__);
+        acpi_sleep_prepare(ACPI_STATE_S5);
+        local_irq_disable();
         /* Some SMP machines only can poweroff in boot CPU */
         set_cpus_allowed(current, cpumask_of_cpu(0));
-        acpi_wakeup_gpe_poweroff_prepare();
-        acpi_enter_sleep_state_prep(ACPI_STATE_S5);
-        ACPI_DISABLE_IRQS();
         acpi_enter_sleep_state(ACPI_STATE_S5);
 }
 
+#ifdef CONFIG_PM
+
+static int acpi_shutdown(struct sys_device *x)
+{
+        return acpi_sleep_prepare(ACPI_STATE_S5);
+}
+
+static struct sysdev_class acpi_sysclass = {
+        set_kset_name("acpi"),
+        .shutdown = acpi_shutdown
+};
+
+static struct sys_device device_acpi = {
+        .id = 0,
+        .cls = &acpi_sysclass,
+};
+
+#endif
+
 static int acpi_poweroff_init(void)
 {
         if (!acpi_disabled) {
                 u8 type_a, type_b;
                 acpi_status status;
 
-                status = acpi_get_sleep_type_data(ACPI_STATE_S5, &type_a, &type_b);
-                if (ACPI_SUCCESS(status))
+                status =
+                    acpi_get_sleep_type_data(ACPI_STATE_S5, &type_a, &type_b);
+                if (ACPI_SUCCESS(status)) {
                         pm_power_off = acpi_power_off;
+#ifdef CONFIG_PM
+                        {
+                                int error;
+                                error = sysdev_class_register(&acpi_sysclass);
+                                if (!error)
+                                        error = sysdev_register(&device_acpi);
+                                return error;
+                        }
+#endif
+                }
         }
         return 0;
 }
diff --git a/drivers/base/sys.c b/drivers/base/sys.c
index 9102e3756f95..5474bf9622d5 100644
--- a/drivers/base/sys.c
+++ b/drivers/base/sys.c
@@ -22,7 +22,6 @@
 #include <linux/string.h>
 #include <linux/pm.h>
 
-
 extern struct subsystem devices_subsys;
 
 #define to_sysdev(k) container_of(k, struct sys_device, kobj)