Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / base / power / sysfs.c

diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
index 6ac9634..40d7242 100644 (file)
--- a/drivers/base/power/sysfs.c
+++ b/drivers/base/power/sysfs.c
@@ -3,6 +3,7 @@
  */
 
 #include <linux/device.h>
+#include <linux/string.h>
 #include "power.h"
 
 
@@ -24,32 +25,113 @@
  *     low-power state.
  */
 
-static ssize_t state_show(struct device * dev, char * buf)
+static ssize_t state_show(struct device * dev, struct device_attribute *attr, char * buf)
 {
-       return sprintf(buf, "%u\n", dev->power.power_state);
+       if (dev->power.power_state.event)
+               return sprintf(buf, "2\n");
+       else
+               return sprintf(buf, "0\n");
 }
 
-static ssize_t state_store(struct device * dev, const char * buf, size_t n)
+static ssize_t state_store(struct device * dev, struct device_attribute *attr, const char * buf, size_t n)
 {
-       u32 state;
-       char * rest;
-       int error = 0;
+       pm_message_t state;
+       int error = -EINVAL;
 
-       state = simple_strtoul(buf, &rest, 10);
-       if (*rest)
-               return -EINVAL;
-       if (state)
+       state.event = PM_EVENT_SUSPEND;
+       /* Older apps expected to write "3" here - confused with PCI D3 */
+       if ((n == 1) && !strcmp(buf, "3"))
                error = dpm_runtime_suspend(dev, state);
-       else
+
+       if ((n == 1) && !strcmp(buf, "2"))
+               error = dpm_runtime_suspend(dev, state);
+
+       if ((n == 1) && !strcmp(buf, "0")) {
                dpm_runtime_resume(dev);
+               error = 0;
+       }
+
        return error ? error : n;
 }
 
 static DEVICE_ATTR(state, 0644, state_show, state_store);
 
 
+/*
+ *     wakeup - Report/change current wakeup option for device
+ *
+ *     Some devices support "wakeup" events, which are hardware signals
+ *     used to activate devices from suspended or low power states.  Such
+ *     devices have one of three values for the sysfs power/wakeup file:
+ *
+ *      + "enabled\n" to issue the events;
+ *      + "disabled\n" not to do so; or
+ *      + "\n" for temporary or permanent inability to issue wakeup.
+ *
+ *     (For example, unconfigured USB devices can't issue wakeups.)
+ *
+ *     Familiar examples of devices that can issue wakeup events include
+ *     keyboards and mice (both PS2 and USB styles), power buttons, modems,
+ *     "Wake-On-LAN" Ethernet links, GPIO lines, and more.  Some events
+ *     will wake the entire system from a suspend state; others may just
+ *     wake up the device (if the system as a whole is already active).
+ *     Some wakeup events use normal IRQ lines; other use special out
+ *     of band signaling.
+ *
+ *     It is the responsibility of device drivers to enable (or disable)
+ *     wakeup signaling as part of changing device power states, respecting
+ *     the policy choices provided through the driver model.
+ *
+ *     Devices may not be able to generate wakeup events from all power
+ *     states.  Also, the events may be ignored in some configurations;
+ *     for example, they might need help from other devices that aren't
+ *     active, or which may have wakeup disabled.  Some drivers rely on
+ *     wakeup events internally (unless they are disabled), keeping
+ *     their hardware in low power modes whenever they're unused.  This
+ *     saves runtime power, without requiring system-wide sleep states.
+ */
+
+static const char enabled[] = "enabled";
+static const char disabled[] = "disabled";
+
+static ssize_t
+wake_show(struct device * dev, struct device_attribute *attr, char * buf)
+{
+       return sprintf(buf, "%s\n", device_can_wakeup(dev)
+               ? (device_may_wakeup(dev) ? enabled : disabled)
+               : "");
+}
+
+static ssize_t
+wake_store(struct device * dev, struct device_attribute *attr,
+       const char * buf, size_t n)
+{
+       char *cp;
+       int len = n;
+
+       if (!device_can_wakeup(dev))
+               return -EINVAL;
+
+       cp = memchr(buf, '\n', n);
+       if (cp)
+               len = cp - buf;
+       if (len == sizeof enabled - 1
+                       && strncmp(buf, enabled, sizeof enabled - 1) == 0)
+               device_set_wakeup_enable(dev, 1);
+       else if (len == sizeof disabled - 1
+                       && strncmp(buf, disabled, sizeof disabled - 1) == 0)
+               device_set_wakeup_enable(dev, 0);
+       else
+               return -EINVAL;
+       return n;
+}
+
+static DEVICE_ATTR(wakeup, 0644, wake_show, wake_store);
+
+
 static struct attribute * power_attrs[] = {
        &dev_attr_state.attr,
+       &dev_attr_wakeup.attr,
        NULL,
 };
 static struct attribute_group pm_attr_group = {