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

Commit 7100e505 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm-for-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management updates from Rafael Wysocki:

 - ACPI conversion to PM handling based on struct dev_pm_ops.
 - Conversion of a number of platform drivers to PM handling based on
   struct dev_pm_ops and removal of empty legacy PM callbacks from a
   couple of PCI drivers.
 - Suspend-to-both for in-kernel hibernation from Bojan Smojver.
 - cpuidle fixes and cleanups from ShuoX Liu, Daniel Lezcano and Preeti
   Murthy.
 - cpufreq bug fixes from Jonghwa Lee and Stephen Boyd.
 - Suspend and hibernate fixes from Srivatsa Bhat and Colin Cross.
 - Generic PM domains framework updates.
 - RTC CMOS wakeup signaling update from Paul Fox.
 - sparse warnings fixes from Sachin Kamat.
 - Build warnings fixes for the generic PM domains framework and PM
   sysfs code.
 - sysfs switch for printing device suspend times from Sameer Nanda.
 - Documentation fix from Oskar Schirmer.

* tag 'pm-for-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (70 commits)
  cpufreq: Fix sysfs deadlock with concurrent hotplug/frequency switch
  EXYNOS: bugfix on retrieving old_index from freqs.old
  PM / Sleep: call early resume handlers when suspend_noirq fails
  PM / QoS: Use NULL pointer instead of plain integer in qos.c
  PM / QoS: Use NULL pointer instead of plain integer in pm_qos.h
  PM / Sleep: Require CAP_BLOCK_SUSPEND to use wake_lock/wake_unlock
  PM / Sleep: Add missing static storage class specifiers in main.c
  cpuilde / ACPI: remove time from acpi_processor_cx structure
  cpuidle / ACPI: remove usage from acpi_processor_cx structure
  cpuidle / ACPI : remove latency_ticks from acpi_processor_cx structure
  rtc-cmos: report wakeups from interrupt handler
  PM / Sleep: Fix build warning in sysfs.c for CONFIG_PM_SLEEP unset
  PM / Domains: Fix build warning for CONFIG_PM_RUNTIME unset
  olpc-xo15-sci: Use struct dev_pm_ops for power management
  PM / Domains: Replace plain integer with NULL pointer in domain.c file
  PM / Domains: Add missing static storage class specifier in domain.c file
  PM / crypto / ux500: Use struct dev_pm_ops for power management
  PM / IPMI: Remove empty legacy PCI PM callbacks
  tpm_nsc: Use struct dev_pm_ops for power management
  tpm_tis: Use struct dev_pm_ops for power management
  ...
parents cb47c183 75a4161a

Documentation/ABI/testing/sysfs-power

+13 −0
Original line number Diff line number Diff line
@@ -231,3 +231,16 @@ Description: 
		Reads from this file return a string consisting of the names of

		wakeup sources created with the help of /sys/power/wake_lock

		that are inactive at the moment, separated with spaces.



What:		/sys/power/pm_print_times

Date:		May 2012

Contact:	Sameer Nanda <snanda@chromium.org>

Description:

		The /sys/power/pm_print_times file allows user space to

		control whether the time taken by devices to suspend and

		resume is printed.  These prints are useful for hunting down

		devices that take too long to suspend or resume.



		Writing a "1" enables this printing while writing a "0"

		disables it.  The default value is "0".  Reading from this file

		will display the current value.

Documentation/power/devices.txt

+5 −4
Original line number Diff line number Diff line
@@ -583,9 +583,10 @@ for the given device during all power transitions, instead of the respective 
subsystem-level callbacks.  Specifically, if a device's pm_domain pointer is

not NULL, the ->suspend() callback from the object pointed to by it will be

executed instead of its subsystem's (e.g. bus type's) ->suspend() callback and

anlogously for all of the remaining callbacks.  In other words, power management

domain callbacks, if defined for the given device, always take precedence over

the callbacks provided by the device's subsystem (e.g. bus type).

analogously for all of the remaining callbacks.  In other words, power

management domain callbacks, if defined for the given device, always take

precedence over the callbacks provided by the device's subsystem (e.g. bus

type).



The support for device power management domains is only relevant to platforms

needing to use the same device driver power management callbacks in many
@@ -598,7 +599,7 @@ it into account in any way. 
Device Low Power (suspend) States

---------------------------------

Device low-power states aren't standard.  One device might only handle

"on" and "off, while another might support a dozen different versions of

"on" and "off", while another might support a dozen different versions of

"on" (how many engines are active?), plus a state that gets back to "on"

faster than from a full "off".

Documentation/power/swsusp.txt

+5 −0
Original line number Diff line number Diff line
@@ -33,6 +33,11 @@ echo shutdown > /sys/power/disk; echo disk > /sys/power/state 


echo platform > /sys/power/disk; echo disk > /sys/power/state



. If you would like to write hibernation image to swap and then suspend

to RAM (provided your platform supports it), you can try



echo suspend > /sys/power/disk; echo disk > /sys/power/state



. If you have SATA disks, you'll need recent kernels with SATA suspend

support. For suspend and resume to work, make sure your disk drivers

are built into kernel -- not modules. [There's way to make

arch/x86/platform/olpc/olpc-xo15-sci.c

+4 −2
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ static int xo15_sci_remove(struct acpi_device *device, int type) 
	return 0;

}



static int xo15_sci_resume(struct acpi_device *device)

static int xo15_sci_resume(struct device *dev)

{

	/* Enable all EC events */

	olpc_ec_mask_write(EC_SCI_SRC_ALL);
@@ -215,6 +215,8 @@ static int xo15_sci_resume(struct acpi_device *device) 
	return 0;

}



static SIMPLE_DEV_PM_OPS(xo15_sci_pm, NULL, xo15_sci_resume);



static const struct acpi_device_id xo15_sci_device_ids[] = {

	{"XO15EC", 0},

	{"", 0},
@@ -227,8 +229,8 @@ static struct acpi_driver xo15_sci_drv = { 
	.ops = {

		.add = xo15_sci_add,

		.remove = xo15_sci_remove,

		.resume = xo15_sci_resume,

	},

	.drv.pm = &xo15_sci_pm,

};



static int __init xo15_sci_init(void)

drivers/acpi/ac.c

+12 −5
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ static int acpi_ac_open_fs(struct inode *inode, struct file *file); 


static int acpi_ac_add(struct acpi_device *device);

static int acpi_ac_remove(struct acpi_device *device, int type);

static int acpi_ac_resume(struct acpi_device *device);

static void acpi_ac_notify(struct acpi_device *device, u32 event);



static const struct acpi_device_id ac_device_ids[] = {
@@ -70,6 +69,9 @@ static const struct acpi_device_id ac_device_ids[] = { 
};

MODULE_DEVICE_TABLE(acpi, ac_device_ids);



static int acpi_ac_resume(struct device *dev);

static SIMPLE_DEV_PM_OPS(acpi_ac_pm, NULL, acpi_ac_resume);



static struct acpi_driver acpi_ac_driver = {

	.name = "ac",

	.class = ACPI_AC_CLASS,
@@ -78,9 +80,9 @@ static struct acpi_driver acpi_ac_driver = { 
	.ops = {

		.add = acpi_ac_add,

		.remove = acpi_ac_remove,

		.resume = acpi_ac_resume,

		.notify = acpi_ac_notify,

		},

	.drv.pm = &acpi_ac_pm,

};



struct acpi_ac {
@@ -309,13 +311,18 @@ static int acpi_ac_add(struct acpi_device *device) 
	return result;

}



static int acpi_ac_resume(struct acpi_device *device)

static int acpi_ac_resume(struct device *dev)

{

	struct acpi_ac *ac;

	unsigned old_state;

	if (!device || !acpi_driver_data(device))



	if (!dev)

		return -EINVAL;

	ac = acpi_driver_data(device);



	ac = acpi_driver_data(to_acpi_device(dev));

	if (!ac)

		return -EINVAL;



	old_state = ac->state;

	if (acpi_ac_get_state(ac))

		return 0;