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

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

Merge tag 'pm-4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management fixes from Rafael Wysocki:
 "These fix two bugs in error code paths in the PM core (system-wide
  suspend of devices), a device reference leak in the boot-time suspend
  test code and a cpupower utility regression from the 4.7 cycle.

  Specifics:

   - Prevent the PM core from attempting to suspend parent devices if
     any of their children, whose suspend callbacks were invoked
     asynchronously, have failed to suspend during the "late" and
     "noirq" phases of system-wide suspend of devices (Brian Norris).

   - Prevent the boot-time system suspend test code from leaking a
     reference to the RTC device used by it (Johan Hovold).

   - Fix cpupower to use the return value of one of its library
     functions correctly and restore the correct behavior of it when
     used for setting cpufreq tunables broken during the 4.7 development
     cycle (Laura Abbott)"

* tag 'pm-4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM / sleep: don't suspend parent when async child suspend_{noirq, late} fails
  PM / sleep: fix device reference leak in test_suspend
  cpupower: Correct return type of cpu_power_is_cpu_online() in cpufreq-set
parents e6251f00 cd16f3dc

drivers/base/power/main.c

+4 −4
Original line number Diff line number Diff line
@@ -1027,6 +1027,8 @@ static int __device_suspend_noirq(struct device *dev, pm_message_t state, bool a 
	TRACE_DEVICE(dev);

	TRACE_SUSPEND(0);



	dpm_wait_for_children(dev, async);



	if (async_error)

		goto Complete;
@@ -1038,8 +1040,6 @@ static int __device_suspend_noirq(struct device *dev, pm_message_t state, bool a 
	if (dev->power.syscore || dev->power.direct_complete)

		goto Complete;



	dpm_wait_for_children(dev, async);



	if (dev->pm_domain) {

		info = "noirq power domain ";

		callback = pm_noirq_op(&dev->pm_domain->ops, state);
@@ -1174,6 +1174,8 @@ static int __device_suspend_late(struct device *dev, pm_message_t state, bool as 


	__pm_runtime_disable(dev, false);



	dpm_wait_for_children(dev, async);



	if (async_error)

		goto Complete;
@@ -1185,8 +1187,6 @@ static int __device_suspend_late(struct device *dev, pm_message_t state, bool as 
	if (dev->power.syscore || dev->power.direct_complete)

		goto Complete;



	dpm_wait_for_children(dev, async);



	if (dev->pm_domain) {

		info = "late power domain ";

		callback = pm_late_early_op(&dev->pm_domain->ops, state);

kernel/power/suspend_test.c

+3 −1
Original line number Diff line number Diff line
@@ -203,8 +203,10 @@ static int __init test_suspend(void) 


	/* RTCs have initialized by now too ... can we use one? */

	dev = class_find_device(rtc_class, NULL, NULL, has_wakealarm);

	if (dev)

	if (dev) {

		rtc = rtc_class_open(dev_name(dev));

		put_device(dev);

	}

	if (!rtc) {

		printk(warn_no_rtc);

		return 0;

tools/power/cpupower/utils/cpufreq-set.c

+2 −5
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ int cmd_freq_set(int argc, char **argv) 
			struct cpufreq_affected_cpus *cpus;



			if (!bitmask_isbitset(cpus_chosen, cpu) ||

			    cpupower_is_cpu_online(cpu))

			    cpupower_is_cpu_online(cpu) != 1)

				continue;



			cpus = cpufreq_get_related_cpus(cpu);
@@ -316,10 +316,7 @@ int cmd_freq_set(int argc, char **argv) 
	     cpu <= bitmask_last(cpus_chosen); cpu++) {



		if (!bitmask_isbitset(cpus_chosen, cpu) ||

		    cpupower_is_cpu_online(cpu))

			continue;



		if (cpupower_is_cpu_online(cpu) != 1)

		    cpupower_is_cpu_online(cpu) != 1)

			continue;



		printf(_("Setting cpu: %d\n"), cpu);