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

Commit 23b168d4 authored by Pavel Machek's avatar Pavel Machek Committed by Len Brown
Browse files

PM: documentation cleanups 



Signed-off-by: default avatarPavel Machek <pavel@suse.cz>
Acked-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 1a3b77ae

Documentation/kernel-parameters.txt

+4 −2
Original line number Diff line number Diff line
@@ -147,8 +147,10 @@ and is between 256 and 4096 characters. It is defined in the file 
			default: 0



	acpi_sleep=	[HW,ACPI] Sleep options

			Format: { s3_bios, s3_mode }

			See Documentation/power/video.txt

			Format: { s3_bios, s3_mode, s3_beep }

			See Documentation/power/video.txt for s3_bios and s3_mode.

			s3_beep is for debugging; it makes the PC's speaker beep

			as soon as the kernel's real-mode entry point is called.



	acpi_sci=	[HW,ACPI] ACPI System Control Interrupt trigger mode

			Format: { level | edge | high | low }

Documentation/power/swsusp.txt

+5 −0
Original line number Diff line number Diff line
@@ -386,6 +386,11 @@ before suspending; then remount them after resuming. 
There is a work-around for this problem.  For more information, see

Documentation/usb/persist.txt.



Q: Can I suspend-to-disk using a swap partition under LVM?



A: No. You can suspend successfully, but you'll not be able to

resume. uswsusp should be able to work with LVM. See suspend.sf.net.



Q: I upgraded the kernel from 2.6.15 to 2.6.16. Both kernels were

compiled with the similar configuration files. Anyway I found that

suspend to disk (and resume) is much slower on 2.6.16 compared to

drivers/acpi/hardware/hwsleep.c

+1 −1
Original line number Diff line number Diff line
@@ -286,13 +286,13 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state) 
	}



	/*

	 * 1) Disable/Clear all GPEs

	 * 2) Enable all wakeup GPEs

	 */

	status = acpi_hw_disable_all_gpes();

	if (ACPI_FAILURE(status)) {

		return_ACPI_STATUS(status);

	}



	acpi_gbl_system_awake_and_running = FALSE;



	status = acpi_hw_enable_all_wakeup_gpes();

drivers/acpi/sleep/main.c

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static int acpi_pm_enter(suspend_state_t pm_state) 
	/* Reprogram control registers and execute _BFS */

	acpi_leave_sleep_state_prep(acpi_state);



	/* ACPI 3.0 specs (P62) says that it's the responsabilty

	/* ACPI 3.0 specs (P62) says that it's the responsibility

	 * of the OSPM to clear the status bit [ implying that the

	 * POWER_BUTTON event should not reach userspace ]

	 */

kernel/power/Kconfig

+6 −3
Original line number Diff line number Diff line
@@ -74,8 +74,8 @@ config PM_TRACE_RTC 
	RTC across reboots, so that you can debug a machine that just hangs

	during suspend (or more commonly, during resume).



	To use this debugging feature you should attempt to suspend the machine,

	then reboot it, then run

	To use this debugging feature you should attempt to suspend the

	machine, reboot it and then run



		dmesg -s 1000000 | grep 'hash matches'
@@ -123,7 +123,10 @@ config HIBERNATION 
	  called "hibernation" in user interfaces.  STD checkpoints the

	  system and powers it off; and restores that checkpoint on reboot.



	  You can suspend your machine with 'echo disk > /sys/power/state'.

	  You can suspend your machine with 'echo disk > /sys/power/state'

	  after placing resume=/dev/swappartition on the kernel command line

	  in your bootloader's configuration file.



	  Alternatively, you can use the additional userland tools available

	  from <http://suspend.sf.net>.