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

Commit d52fdf13 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-sleep' 

* pm-sleep:
  PM / Sleep: Require CAP_BLOCK_SUSPEND to use wake_lock/wake_unlock
  PM / Sleep: Add missing static storage class specifiers in main.c
  PM / Sleep: Fix build warning in sysfs.c for CONFIG_PM_SLEEP unset
  PM / Hibernate: Print hibernation/thaw progress indicator one line at a time.
  PM / Sleep: Separate printing suspend times from initcall_debug
  PM / Sleep: add knob for printing device resume times
  ftrace: Disable function tracing during suspend/resume and hibernation, again
  PM / Hibernate: Enable suspend to both for in-kernel hibernation.
parents 7791bd23 11388c87

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/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

drivers/base/power/main.c

+6 −6
Original line number Diff line number Diff line
@@ -45,10 +45,10 @@ typedef int (*pm_callback_t)(struct device *); 
 */



LIST_HEAD(dpm_list);

LIST_HEAD(dpm_prepared_list);

LIST_HEAD(dpm_suspended_list);

LIST_HEAD(dpm_late_early_list);

LIST_HEAD(dpm_noirq_list);

static LIST_HEAD(dpm_prepared_list);

static LIST_HEAD(dpm_suspended_list);

static LIST_HEAD(dpm_late_early_list);

static LIST_HEAD(dpm_noirq_list);



struct suspend_stats suspend_stats;

static DEFINE_MUTEX(dpm_list_mtx);
@@ -166,7 +166,7 @@ static ktime_t initcall_debug_start(struct device *dev) 
{

	ktime_t calltime = ktime_set(0, 0);



	if (initcall_debug) {

	if (pm_print_times_enabled) {

		pr_info("calling  %s+ @ %i, parent: %s\n",

			dev_name(dev), task_pid_nr(current),

			dev->parent ? dev_name(dev->parent) : "none");
@@ -181,7 +181,7 @@ static void initcall_debug_report(struct device *dev, ktime_t calltime, 
{

	ktime_t delta, rettime;



	if (initcall_debug) {

	if (pm_print_times_enabled) {

		rettime = ktime_get();

		delta = ktime_sub(rettime, calltime);

		pr_info("call %s+ returned %d after %Ld usecs\n", dev_name(dev),

drivers/base/power/sysfs.c

+4 −0
Original line number Diff line number Diff line
@@ -474,6 +474,8 @@ static DEVICE_ATTR(runtime_enabled, 0444, rtpm_enabled_show, NULL); 


#endif



#ifdef CONFIG_PM_SLEEP



static ssize_t async_show(struct device *dev, struct device_attribute *attr,

			  char *buf)

{
@@ -500,6 +502,8 @@ static ssize_t async_store(struct device *dev, struct device_attribute *attr, 
}



static DEVICE_ATTR(async, 0644, async_show, async_store);



#endif

#endif /* CONFIG_PM_ADVANCED_DEBUG */



static struct attribute *power_attrs[] = {

include/linux/suspend.h

+6 −0
Original line number Diff line number Diff line
@@ -408,6 +408,12 @@ static inline void unlock_system_sleep(void) {} 


#endif /* !CONFIG_PM_SLEEP */



#ifdef CONFIG_PM_SLEEP_DEBUG

extern bool pm_print_times_enabled;

#else

#define pm_print_times_enabled	(false)

#endif



#ifdef CONFIG_PM_AUTOSLEEP



/* kernel/power/autosleep.c */