Skip to content

Commit a8cbf22

Browse files
torvaldstorvalds
committed
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: (26 commits) PM / Wakeup: Show wakeup sources statistics in debugfs PM: Introduce library for device-specific OPPs (v7) PM: Add sysfs attr for rechecking dev hash from PM trace PM: Lock PM device list mutex in show_dev_hash() PM / Runtime: Remove idle notification after failing suspend PM / Hibernate: Modify signature used to mark swap PM / Runtime: Reduce code duplication in core helper functions PM: Allow wakeup events to abort freezing of tasks PM: runtime: add missed pm_request_autosuspend PM / Hibernate: Make some boot messages look less scary PM / Runtime: Implement autosuspend support PM / Runtime: Add no_callbacks flag PM / Runtime: Combine runtime PM entry points PM / Runtime: Merge synchronous and async runtime routines PM / Runtime: Replace boolean arguments with bitflags PM / Runtime: Move code in drivers/base/power/runtime.c sysfs: Add sysfs_merge_group() and sysfs_unmerge_group() PM: Fix potential issue with failing asynchronous suspend PM / Wakeup: Introduce wakeup source objects and event statistics (v3) PM: Fix signed/unsigned warning in dpm_show_time() ...
2 parents e36f561 + 9c03439 commit a8cbf22

33 files changed

+3447
-635
lines changed

‎Documentation/ABI/testing/sysfs-devices-power

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,91 @@ Description:
7777
devices this attribute is set to "enabled" by bus type code or
7878
device drivers and in that cases it should be safe to leave the
7979
default value.
80+
81+
What: /sys/devices/.../power/wakeup_count
82+
Date: September 2010
83+
Contact: Rafael J. Wysocki <[email protected]>
84+
Description:
85+
The /sys/devices/.../wakeup_count attribute contains the number
86+
of signaled wakeup events associated with the device. This
87+
attribute is read-only. If the device is not enabled to wake up
88+
the system from sleep states, this attribute is empty.
89+
90+
What: /sys/devices/.../power/wakeup_active_count
91+
Date: September 2010
92+
Contact: Rafael J. Wysocki <[email protected]>
93+
Description:
94+
The /sys/devices/.../wakeup_active_count attribute contains the
95+
number of times the processing of wakeup events associated with
96+
the device was completed (at the kernel level). This attribute
97+
is read-only. If the device is not enabled to wake up the
98+
system from sleep states, this attribute is empty.
99+
100+
What: /sys/devices/.../power/wakeup_hit_count
101+
Date: September 2010
102+
Contact: Rafael J. Wysocki <[email protected]>
103+
Description:
104+
The /sys/devices/.../wakeup_hit_count attribute contains the
105+
number of times the processing of a wakeup event associated with
106+
the device might prevent the system from entering a sleep state.
107+
This attribute is read-only. If the device is not enabled to
108+
wake up the system from sleep states, this attribute is empty.
109+
110+
What: /sys/devices/.../power/wakeup_active
111+
Date: September 2010
112+
Contact: Rafael J. Wysocki <[email protected]>
113+
Description:
114+
The /sys/devices/.../wakeup_active attribute contains either 1,
115+
or 0, depending on whether or not a wakeup event associated with
116+
the device is being processed (1). This attribute is read-only.
117+
If the device is not enabled to wake up the system from sleep
118+
states, this attribute is empty.
119+
120+
What: /sys/devices/.../power/wakeup_total_time_ms
121+
Date: September 2010
122+
Contact: Rafael J. Wysocki <[email protected]>
123+
Description:
124+
The /sys/devices/.../wakeup_total_time_ms attribute contains
125+
the total time of processing wakeup events associated with the
126+
device, in milliseconds. This attribute is read-only. If the
127+
device is not enabled to wake up the system from sleep states,
128+
this attribute is empty.
129+
130+
What: /sys/devices/.../power/wakeup_max_time_ms
131+
Date: September 2010
132+
Contact: Rafael J. Wysocki <[email protected]>
133+
Description:
134+
The /sys/devices/.../wakeup_max_time_ms attribute contains
135+
the maximum time of processing a single wakeup event associated
136+
with the device, in milliseconds. This attribute is read-only.
137+
If the device is not enabled to wake up the system from sleep
138+
states, this attribute is empty.
139+
140+
What: /sys/devices/.../power/wakeup_last_time_ms
141+
Date: September 2010
142+
Contact: Rafael J. Wysocki <[email protected]>
143+
Description:
144+
The /sys/devices/.../wakeup_last_time_ms attribute contains
145+
the value of the monotonic clock corresponding to the time of
146+
signaling the last wakeup event associated with the device, in
147+
milliseconds. This attribute is read-only. If the device is
148+
not enabled to wake up the system from sleep states, this
149+
attribute is empty.
150+
151+
What: /sys/devices/.../power/autosuspend_delay_ms
152+
Date: September 2010
153+
Contact: Alan Stern <[email protected]>
154+
Description:
155+
The /sys/devices/.../power/autosuspend_delay_ms attribute
156+
contains the autosuspend delay value (in milliseconds). Some
157+
drivers do not want their device to suspend as soon as it
158+
becomes idle at run time; they want the device to remain
159+
inactive for a certain minimum period of time first. That
160+
period is called the autosuspend delay. Negative values will
161+
prevent the device from being suspended at run time (similar
162+
to writing "on" to the power/control attribute). Values >=
163+
1000 will cause the autosuspend timer expiration to be rounded
164+
up to the nearest second.
165+
166+
Not all drivers support this attribute. If it isn't supported,
167+
attempts to read or write it will yield I/O errors.

‎Documentation/ABI/testing/sysfs-power

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,38 @@ Description:
9999

100100
dmesg -s 1000000 | grep 'hash matches'
101101

102+
If you do not get any matches (or they appear to be false
103+
positives), it is possible that the last PM event point
104+
referred to a device created by a loadable kernel module. In
105+
this case cat /sys/power/pm_trace_dev_match (see below) after
106+
your system is started up and the kernel modules are loaded.
107+
102108
CAUTION: Using it will cause your machine's real-time (CMOS)
103109
clock to be set to a random invalid time after a resume.
104110

111+
What; /sys/power/pm_trace_dev_match
112+
Date: October 2010
113+
Contact: James Hogan <[email protected]>
114+
Description:
115+
The /sys/power/pm_trace_dev_match file contains the name of the
116+
device associated with the last PM event point saved in the RTC
117+
across reboots when pm_trace has been used. More precisely it
118+
contains the list of current devices (including those
119+
registered by loadable kernel modules since boot) which match
120+
the device hash in the RTC at boot, with a newline after each
121+
one.
122+
123+
The advantage of this file over the hash matches printed to the
124+
kernel log (see /sys/power/pm_trace), is that it includes
125+
devices created after boot by loadable kernel modules.
126+
127+
Due to the small hash size necessary to fit in the RTC, it is
128+
possible that more than one device matches the hash, in which
129+
case further investigation is required to determine which
130+
device is causing the problem. Note that genuine RTC clock
131+
values (such as when pm_trace has not been used), can still
132+
match a device and output it's name here.
133+
105134
What: /sys/power/pm_async
106135
Date: January 2009
107136
Contact: Rafael J. Wysocki <[email protected]>

‎Documentation/kernel-parameters.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2170,6 +2170,11 @@ and is between 256 and 4096 characters. It is defined in the file
21702170
in <PAGE_SIZE> units (needed only for swap files).
21712171
See Documentation/power/swsusp-and-swap-files.txt
21722172

2173+
hibernate= [HIBERNATION]
2174+
noresume Don't check if there's a hibernation image
2175+
present during boot.
2176+
nocompress Don't compress/decompress hibernation images.
2177+
21732178
retain_initrd [RAM] Keep initrd memory after extraction
21742179

21752180
rhash_entries= [KNL,NET]

‎Documentation/power/00-INDEX

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ interface.txt
1414
- Power management user interface in /sys/power
1515
notifiers.txt
1616
- Registering suspend notifiers in device drivers
17+
opp.txt
18+
- Operating Performance Point library
1719
pci.txt
1820
- How the PCI Subsystem Does Power Management
1921
pm_qos_interface.txt

‎Documentation/power/interface.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ smallest image possible. In particular, if "0" is written to this file, the
5757
suspend image will be as small as possible.
5858

5959
Reading from this file will display the current image size limit, which
60-
is set to 500 MB by default.
60+
is set to 2/5 of available RAM by default.
6161

6262
/sys/power/pm_trace controls the code which saves the last PM event point in
6363
the RTC across reboots, so that you can debug a machine that just hangs

0 commit comments

Comments
 (0)