diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2011-09-26 17:38:50 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-10-16 23:28:51 +0200 |
| commit | 8f88893c05f2f677f18f2ce5591b4bed5d4a7535 (patch) | |
| tree | 4368e42a2c35ee018f7cd91b8fa6643f6ff2b852 | |
| parent | 37cce26b32142f09a8967f6d238178af654b20de (diff) | |
| download | olio-linux-3.10-8f88893c05f2f677f18f2ce5591b4bed5d4a7535.tar.xz olio-linux-3.10-8f88893c05f2f677f18f2ce5591b4bed5d4a7535.zip | |
PM: Update the policy on default wakeup settings
This patch (as1485) documents a change to the kernel's default wakeup
policy. Devices that forward wakeup requests between buses should be
enabled for wakeup by default.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
| -rw-r--r-- | Documentation/power/devices.txt | 4 | ||||
| -rw-r--r-- | drivers/base/power/wakeup.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/power/devices.txt b/Documentation/power/devices.txt index 3384d5996be..29b7a9817f5 100644 --- a/Documentation/power/devices.txt +++ b/Documentation/power/devices.txt @@ -152,7 +152,9 @@ try to use its wakeup mechanism. device_set_wakeup_enable() affects this flag; for the most part drivers should not change its value. The initial value of should_wakeup is supposed to be false for the majority of devices; the major exceptions are power buttons, keyboards, and Ethernet adapters whose WoL -(wake-on-LAN) feature has been set up with ethtool. +(wake-on-LAN) feature has been set up with ethtool. It should also default +to true for devices that don't generate wakeup requests on their own but merely +forward wakeup requests from one bus to another (like PCI bridges). Whether or not a device is capable of issuing wakeup events is a hardware matter, and the kernel is responsible for keeping track of it. By contrast, diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c index 84f7c7d5a09..14ee07e9cc4 100644 --- a/drivers/base/power/wakeup.c +++ b/drivers/base/power/wakeup.c @@ -276,7 +276,9 @@ EXPORT_SYMBOL_GPL(device_set_wakeup_capable); * * By default, most devices should leave wakeup disabled. The exceptions are * devices that everyone expects to be wakeup sources: keyboards, power buttons, - * possibly network interfaces, etc. + * possibly network interfaces, etc. Also, devices that don't generate their + * own wakeup requests but merely forward requests from one bus to another + * (like PCI bridges) should have wakeup enabled by default. */ int device_init_wakeup(struct device *dev, bool enable) { |