Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8cbf225 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
  ...
parents e36f561a 9c034392

Documentation/ABI/testing/sysfs-devices-power

+88 −0
Original line number Diff line number Diff line
@@ -77,3 +77,91 @@ Description: 
		devices this attribute is set to "enabled" by bus type code or

		device drivers and in that cases it should be safe to leave the

		default value.



What:		/sys/devices/.../power/wakeup_count

Date:		September 2010

Contact:	Rafael J. Wysocki <rjw@sisk.pl>

Description:

		The /sys/devices/.../wakeup_count attribute contains the number

		of signaled wakeup events associated with the device.  This

		attribute is read-only.  If the device is not enabled to wake up

		the system from sleep states, this attribute is empty.



What:		/sys/devices/.../power/wakeup_active_count

Date:		September 2010

Contact:	Rafael J. Wysocki <rjw@sisk.pl>

Description:

		The /sys/devices/.../wakeup_active_count attribute contains the

		number of times the processing of wakeup events associated with

		the device was completed (at the kernel level).  This attribute

		is read-only.  If the device is not enabled to wake up the

		system from sleep states, this attribute is empty.



What:		/sys/devices/.../power/wakeup_hit_count

Date:		September 2010

Contact:	Rafael J. Wysocki <rjw@sisk.pl>

Description:

		The /sys/devices/.../wakeup_hit_count attribute contains the

		number of times the processing of a wakeup event associated with

		the device might prevent the system from entering a sleep state.

		This attribute is read-only.  If the device is not enabled to

		wake up the system from sleep states, this attribute is empty.



What:		/sys/devices/.../power/wakeup_active

Date:		September 2010

Contact:	Rafael J. Wysocki <rjw@sisk.pl>

Description:

		The /sys/devices/.../wakeup_active attribute contains either 1,

		or 0, depending on whether or not a wakeup event associated with

		the device is being processed (1).  This attribute is read-only.

		If the device is not enabled to wake up the system from sleep

		states, this attribute is empty.



What:		/sys/devices/.../power/wakeup_total_time_ms

Date:		September 2010

Contact:	Rafael J. Wysocki <rjw@sisk.pl>

Description:

		The /sys/devices/.../wakeup_total_time_ms attribute contains

		the total time of processing wakeup events associated with the

		device, in milliseconds.  This attribute is read-only.  If the

		device is not enabled to wake up the system from sleep states,

		this attribute is empty.



What:		/sys/devices/.../power/wakeup_max_time_ms

Date:		September 2010

Contact:	Rafael J. Wysocki <rjw@sisk.pl>

Description:

		The /sys/devices/.../wakeup_max_time_ms attribute contains

		the maximum time of processing a single wakeup event associated

		with the device, in milliseconds.  This attribute is read-only.

		If the device is not enabled to wake up the system from sleep

		states, this attribute is empty.



What:		/sys/devices/.../power/wakeup_last_time_ms

Date:		September 2010

Contact:	Rafael J. Wysocki <rjw@sisk.pl>

Description:

		The /sys/devices/.../wakeup_last_time_ms attribute contains

		the value of the monotonic clock corresponding to the time of

		signaling the last wakeup event associated with the device, in

		milliseconds.  This attribute is read-only.  If the device is

		not enabled to wake up the system from sleep states, this

		attribute is empty.



What:		/sys/devices/.../power/autosuspend_delay_ms

Date:		September 2010

Contact:	Alan Stern <stern@rowland.harvard.edu>

Description:

		The /sys/devices/.../power/autosuspend_delay_ms attribute

		contains the autosuspend delay value (in milliseconds).  Some

		drivers do not want their device to suspend as soon as it

		becomes idle at run time; they want the device to remain

		inactive for a certain minimum period of time first.  That

		period is called the autosuspend delay.  Negative values will

		prevent the device from being suspended at run time (similar

		to writing "on" to the power/control attribute).  Values >=

		1000 will cause the autosuspend timer expiration to be rounded

		up to the nearest second.



		Not all drivers support this attribute.  If it isn't supported,

		attempts to read or write it will yield I/O errors.

Documentation/ABI/testing/sysfs-power

+29 −0
Original line number Diff line number Diff line
@@ -99,9 +99,38 @@ Description: 


		dmesg -s 1000000 | grep 'hash matches'



		If you do not get any matches (or they appear to be false

		positives), it is possible that the last PM event point

		referred to a device created by a loadable kernel module.  In

		this case cat /sys/power/pm_trace_dev_match (see below) after

		your system is started up and the kernel modules are loaded.



		CAUTION: Using it will cause your machine's real-time (CMOS)

		clock to be set to a random invalid time after a resume.



What;		/sys/power/pm_trace_dev_match

Date:		October 2010

Contact:	James Hogan <james@albanarts.com>

Description:

		The /sys/power/pm_trace_dev_match file contains the name of the

		device associated with the last PM event point saved in the RTC

		across reboots when pm_trace has been used.  More precisely it

		contains the list of current devices (including those

		registered by loadable kernel modules since boot) which match

		the device hash in the RTC at boot, with a newline after each

		one.



		The advantage of this file over the hash matches printed to the

		kernel log (see /sys/power/pm_trace), is that it includes

		devices created after boot by loadable kernel modules.



		Due to the small hash size necessary to fit in the RTC, it is

		possible that more than one device matches the hash, in which

		case further investigation is required to determine which

		device is causing the problem.  Note that genuine RTC clock

		values (such as when pm_trace has not been used), can still

		match a device and output it's name here.



What:		/sys/power/pm_async

Date:		January 2009

Contact:	Rafael J. Wysocki <rjw@sisk.pl>

Documentation/kernel-parameters.txt

+5 −0
Original line number Diff line number Diff line
@@ -2170,6 +2170,11 @@ and is between 256 and 4096 characters. It is defined in the file 
			in <PAGE_SIZE> units (needed only for swap files).

			See  Documentation/power/swsusp-and-swap-files.txt



	hibernate=	[HIBERNATION]

		noresume	Don't check if there's a hibernation image

				present during boot.

		nocompress	Don't compress/decompress hibernation images.



	retain_initrd	[RAM] Keep initrd memory after extraction



	rhash_entries=	[KNL,NET]

Documentation/power/00-INDEX

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ interface.txt 
	- Power management user interface in /sys/power

notifiers.txt

	- Registering suspend notifiers in device drivers

opp.txt

	- Operating Performance Point library

pci.txt

	- How the PCI Subsystem Does Power Management

pm_qos_interface.txt

Documentation/power/interface.txt

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ smallest image possible. In particular, if "0" is written to this file, the 
suspend image will be as small as possible.



Reading from this file will display the current image size limit, which

is set to 500 MB by default.

is set to 2/5 of available RAM by default.



/sys/power/pm_trace controls the code which saves the last PM event point in

the RTC across reboots, so that you can debug a machine that just hangs