x86/olpc/xo15/sci: Enable lid close wakeup control

Like most systems, OLPC's ACPI LID switch wakes up the system
when the lid is opened, but not when it is closed.

Under OLPC's opportunistic suspend model, the lid may be closed
while the system was oportunistically suspended with the screen
running.  In this event, we want to wake up to turn the screen
off.

Enable control of normal ACPI wakeups through lid close events
through a new sysfs attribute "lid_wake_on_closed".  When set,
and when LID wakeups are enabled through ACPI, the system will
wake up on both open and close lid events.

Signed-off-by: Daniel Drake <dsd@laptop.org>
Cc: Andres Salomon <dilinger@queued.net>
Cc: Matthew Garrett <mjg@redhat.com>
[ Fixed sscanf checking]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Link: http://lkml.kernel.org/n/tip-bgt8hxu2wwe0x5p8edhogtf7@git.kernel.org
[ Did very minor readability tweaks ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/platform/olpc/olpc-xo15-sci.c b/arch/x86/platform/olpc/olpc-xo15-sci.c
index 2b235b77d9abb0b49d5b6262fb21786eb74b9cea..23e5b9d7977b6e528821682f2278289c73a534a2 100644 (file)
--- a/arch/x86/platform/olpc/olpc-xo15-sci.c
+++ b/arch/x86/platform/olpc/olpc-xo15-sci.c
@@ -23,7 +23,66 @@
 #define XO15_SCI_CLASS                 DRV_NAME
 #define XO15_SCI_DEVICE_NAME           "OLPC XO-1.5 SCI"
 
-static unsigned long xo15_sci_gpe;
+static unsigned long                   xo15_sci_gpe;
+static bool                            lid_wake_on_close;
+
+/*
+ * The normal ACPI LID wakeup behavior is wake-on-open, but not
+ * wake-on-close. This is implemented as standard by the XO-1.5 DSDT.
+ *
+ * We provide here a sysfs attribute that will additionally enable
+ * wake-on-close behavior. This is useful (e.g.) when we oportunistically
+ * suspend with the display running; if the lid is then closed, we want to
+ * wake up to turn the display off.
+ *
+ * This is controlled through a custom method in the XO-1.5 DSDT.
+ */
+static int set_lid_wake_behavior(bool wake_on_close)
+{
+       struct acpi_object_list arg_list;
+       union acpi_object arg;
+       acpi_status status;
+
+       arg_list.count          = 1;
+       arg_list.pointer        = &arg;
+       arg.type                = ACPI_TYPE_INTEGER;
+       arg.integer.value       = wake_on_close;
+
+       status = acpi_evaluate_object(NULL, "\\_SB.PCI0.LID.LIDW", &arg_list, NULL);
+       if (ACPI_FAILURE(status)) {
+               pr_warning(PFX "failed to set lid behavior\n");
+               return 1;
+       }
+
+       lid_wake_on_close = wake_on_close;
+
+       return 0;
+}
+
+static ssize_t
+lid_wake_on_close_show(struct kobject *s, struct kobj_attribute *attr, char *buf)
+{
+       return sprintf(buf, "%u\n", lid_wake_on_close);
+}
+
+static ssize_t lid_wake_on_close_store(struct kobject *s,
+                                      struct kobj_attribute *attr,
+                                      const char *buf, size_t n)
+{
+       unsigned int val;
+
+       if (sscanf(buf, "%u", &val) != 1)
+               return -EINVAL;
+
+       set_lid_wake_behavior(!!val);
+
+       return n;
+}
+
+static struct kobj_attribute lid_wake_on_close_attr =
+       __ATTR(lid_wake_on_close, 0644,
+              lid_wake_on_close_show,
+              lid_wake_on_close_store);
 
 static void battery_status_changed(void)
 {
@@ -91,6 +150,7 @@ static int xo15_sci_add(struct acpi_device *device)
 {
        unsigned long long tmp;
        acpi_status status;
+       int r;
 
        if (!device)
                return -EINVAL;
@@ -112,6 +172,10 @@ static int xo15_sci_add(struct acpi_device *device)
 
        dev_info(&device->dev, "Initialized, GPE = 0x%lx\n", xo15_sci_gpe);
 
+       r = sysfs_create_file(&device->dev.kobj, &lid_wake_on_close_attr.attr);
+       if (r)
+               goto err_sysfs;
+
        /* Flush queue, and enable all SCI events */
        process_sci_queue();
        olpc_ec_mask_write(EC_SCI_SRC_ALL);
@@ -123,6 +187,11 @@ static int xo15_sci_add(struct acpi_device *device)
                device_init_wakeup(&device->dev, true);
 
        return 0;
+
+err_sysfs:
+       acpi_remove_gpe_handler(NULL, xo15_sci_gpe, xo15_sci_gpe_handler);
+       cancel_work_sync(&sci_work);
+       return r;
 }
 
 static int xo15_sci_remove(struct acpi_device *device, int type)
@@ -130,6 +199,7 @@ static int xo15_sci_remove(struct acpi_device *device, int type)
        acpi_disable_gpe(NULL, xo15_sci_gpe);
        acpi_remove_gpe_handler(NULL, xo15_sci_gpe, xo15_sci_gpe_handler);
        cancel_work_sync(&sci_work);
+       sysfs_remove_file(&device->dev.kobj, &lid_wake_on_close_attr.attr);
        return 0;
 }