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

Commit 7e0bb71e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

* 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (63 commits)
  PM / Clocks: Remove redundant NULL checks before kfree()
  PM / Documentation: Update docs about suspend and CPU hotplug
  ACPI / PM: Add Sony VGN-FW21E to nonvs blacklist.
  ARM: mach-shmobile: sh7372 A4R support (v4)
  ARM: mach-shmobile: sh7372 A3SP support (v4)
  PM / Sleep: Mark devices involved in wakeup signaling during suspend
  PM / Hibernate: Improve performance of LZO/plain hibernation, checksum image
  PM / Hibernate: Do not initialize static and extern variables to 0
  PM / Freezer: Make fake_signal_wake_up() wake TASK_KILLABLE tasks too
  PM / Hibernate: Add resumedelay kernel param in addition to resumewait
  MAINTAINERS: Update linux-pm list address
  PM / ACPI: Blacklist Vaio VGN-FW520F machine known to require acpi_sleep=nonvs
  PM / ACPI: Blacklist Sony Vaio known to require acpi_sleep=nonvs
  PM / Hibernate: Add resumewait param to support MMC-like devices as resume file
  PM / Hibernate: Fix typo in a kerneldoc comment
  PM / Hibernate: Freeze kernel threads after preallocating memory
  PM: Update the policy on default wakeup settings
  PM / VT: Cleanup #if defined uglyness and fix compile error
  PM / Suspend: Off by one in pm_suspend()
  PM / Hibernate: Include storage keys in hibernation image on s390
  ...
parents b9e2780d 0ab1e79b

Documentation/ABI/testing/sysfs-class-devfreq

0 → 100644
+52 −0
Original line number Diff line number Diff line 
What:		/sys/class/devfreq/.../

Date:		September 2011

Contact:	MyungJoo Ham <myungjoo.ham@samsung.com>

Description:

		Provide a place in sysfs for the devfreq objects.

		This allows accessing various devfreq specific variables.

		The name of devfreq object denoted as ... is same as the

		name of device using devfreq.



What:		/sys/class/devfreq/.../governor

Date:		September 2011

Contact:	MyungJoo Ham <myungjoo.ham@samsung.com>

Description:

		The /sys/class/devfreq/.../governor shows the name of the

		governor used by the corresponding devfreq object.



What:		/sys/class/devfreq/.../cur_freq

Date:		September 2011

Contact:	MyungJoo Ham <myungjoo.ham@samsung.com>

Description:

		The /sys/class/devfreq/.../cur_freq shows the current

		frequency of the corresponding devfreq object.



What:		/sys/class/devfreq/.../central_polling

Date:		September 2011

Contact:	MyungJoo Ham <myungjoo.ham@samsung.com>

Description:

		The /sys/class/devfreq/.../central_polling shows whether

		the devfreq ojbect is using devfreq-provided central

		polling mechanism or not.



What:		/sys/class/devfreq/.../polling_interval

Date:		September 2011

Contact:	MyungJoo Ham <myungjoo.ham@samsung.com>

Description:

		The /sys/class/devfreq/.../polling_interval shows and sets

		the requested polling interval of the corresponding devfreq

		object. The values are represented in ms. If the value is

		less than 1 jiffy, it is considered to be 0, which means

		no polling. This value is meaningless if the governor is

		not polling; thus. If the governor is not using

		devfreq-provided central polling

		(/sys/class/devfreq/.../central_polling is 0), this value

		may be useless.



What:		/sys/class/devfreq/.../userspace/set_freq

Date:		September 2011

Contact:	MyungJoo Ham <myungjoo.ham@samsung.com>

Description:

		The /sys/class/devfreq/.../userspace/set_freq shows and

		sets the requested frequency for the devfreq object if

		userspace governor is in effect.

Documentation/kernel-parameters.txt

+7 −0
Original line number Diff line number Diff line
@@ -2246,6 +2246,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			in <PAGE_SIZE> units (needed only for swap files).

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



	resumedelay=	[HIBERNATION] Delay (in seconds) to pause before attempting to

			read the resume files



	resumewait	[HIBERNATION] Wait (indefinitely) for resume device to show up.

			Useful for devices that are detected asynchronously

			(e.g. USB and MMC devices).



	hibernate=	[HIBERNATION]

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

				present during boot.

Documentation/power/00-INDEX

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ s2ram.txt 
	- How to get suspend to ram working (and debug it when it isn't)

states.txt

	- System power management states

suspend-and-cpuhotplug.txt

	- Explains the interaction between Suspend-to-RAM (S3) and CPU hotplug

swsusp-and-swap-files.txt

	- Using swap files with software suspend (to disk)

swsusp-dmcrypt.txt

Documentation/power/basic-pm-debugging.txt

+24 −0
Original line number Diff line number Diff line
@@ -201,3 +201,27 @@ case, you may be able to search for failing drivers by following the procedure 
analogous to the one described in section 1.  If you find some failing drivers,

you will have to unload them every time before an STR transition (ie. before

you run s2ram), and please report the problems with them.



There is a debugfs entry which shows the suspend to RAM statistics. Here is an

example of its output.

	# mount -t debugfs none /sys/kernel/debug

	# cat /sys/kernel/debug/suspend_stats

	success: 20

	fail: 5

	failed_freeze: 0

	failed_prepare: 0

	failed_suspend: 5

	failed_suspend_noirq: 0

	failed_resume: 0

	failed_resume_noirq: 0

	failures:

	  last_failed_dev:	alarm

				adc

	  last_failed_errno:	-16

				-16

	  last_failed_step:	suspend

				suspend

Field success means the success number of suspend to RAM, and field fail means

the failure number. Others are the failure number of different steps of suspend

to RAM. suspend_stats just lists the last 2 failed devices, error number and

failed step of suspend.

Documentation/power/devices.txt

+3 −5
Original line number Diff line number Diff line
@@ -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,
@@ -279,10 +281,6 @@ When the system goes into the standby or memory sleep state, the phases are: 
	time.)  Unlike the other suspend-related phases, during the prepare

	phase the device tree is traversed top-down.



	In addition to that, if device drivers need to allocate additional

	memory to be able to hadle device suspend correctly, that should be

	done in the prepare phase.



	After the prepare callback method returns, no new children may be

	registered below the device.  The method may also prepare the device or

	driver in some way for the upcoming system power transition (for