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

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

Pull power management updates from Rafael Wysocki:
 "These fix fallout after starting to use hrtimers in the runtime PM
  framework, fix a few cpufreq issues, fix a recently broken reference
  to cpuidle documentation, update MAINTAINERS entries for cpufreq and
  cpuidle and make the recently added system suspend and resume support
  in devfreq actually work.

  Specifics:

   - Prevent integer overflows from occurring on 32-bit when converting
     milliseconds to nanoseconds in the runtime PM framework and update
     comments that still refer to jiffies in it (Vincent Guittot,
     Ladislav Michl).

   - Fix the SCMI cpufreq driver to always use the same frequency units
     for arch_set_freq_scale() and make the scale-invariant load
     tracking acutally work with this driver (Quentin Perret).

   - Fix freeing of dynamic OPPs in the SCPI and SCMI cpufreq drivers
     broken during the 4.20 defelopment cycle (Viresh Kumar).

   - Prevent the cpufreq core from attempting to return the current
     frequency of offline CPUs (Sudeep Holla).

   - Add devfreq suspend and resume hooks (missed previously) to the PM
     core to make the recently added system suspend and resume support
     in devfreq actually work (Lukasz Luba).

   - Update MAINTAINERS entries for cpufreq and cpuidle, mostly to add
     references to new/current documentation to them (Rafael Wysocki).

   - Fix a recently broken reference to cpuidle documentation (Otto
     Sabart)"

* tag 'pm-5.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM-runtime: Fix autosuspend_delay on 32bits arch
  PM-runtime: Fix 'jiffies' in comments after switch to hrtimers
  cpufreq: scmi: Fix frequency invariance in slow path
  doc: trace: fix reference to cpuidle documentation file
  cpufreq: check if policy is inactive early in __cpufreq_get()
  cpufreq: scpi/scmi: Fix freeing of dynamic OPPs
  cpuidle / Documentation: Update cpuidle MAINTAINERS entry
  cpufreq / Documentation: Update cpufreq MAINTAINERS entry
  PM: sleep: call devfreq suspend/resume
parents 385c59c7 343e60e5

Documentation/trace/coresight-cpu-debug.txt

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ Do some work... 
The same can also be done from an application program.



Disable specific CPU's specific idle state from cpuidle sysfs (see

Documentation/cpuidle/sysfs.txt):

Documentation/admin-guide/pm/cpuidle.rst):

# echo 1 > /sys/devices/system/cpu/cpu$cpu/cpuidle/state$state/disable

MAINTAINERS

+5 −2
Original line number Diff line number Diff line
@@ -3951,7 +3951,7 @@ L: netdev@vger.kernel.org 
S:	Maintained

F:	drivers/net/ethernet/ti/cpmac.c



CPU FREQUENCY DRIVERS

CPU FREQUENCY SCALING FRAMEWORK

M:	"Rafael J. Wysocki" <rjw@rjwysocki.net>

M:	Viresh Kumar <viresh.kumar@linaro.org>

L:	linux-pm@vger.kernel.org
@@ -3959,6 +3959,8 @@ S: Maintained 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git

T:	git git://git.linaro.org/people/vireshk/linux.git (For ARM Updates)

B:	https://bugzilla.kernel.org

F:	Documentation/admin-guide/pm/cpufreq.rst

F:	Documentation/admin-guide/pm/intel_pstate.rst

F:	Documentation/cpu-freq/

F:	Documentation/devicetree/bindings/cpufreq/

F:	drivers/cpufreq/
@@ -4006,13 +4008,14 @@ S: Supported 
F:	drivers/cpuidle/cpuidle-exynos.c

F:	arch/arm/mach-exynos/pm.c



CPUIDLE DRIVERS

CPU IDLE TIME MANAGEMENT FRAMEWORK

M:	"Rafael J. Wysocki" <rjw@rjwysocki.net>

M:	Daniel Lezcano <daniel.lezcano@linaro.org>

L:	linux-pm@vger.kernel.org

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git

B:	https://bugzilla.kernel.org

F:	Documentation/admin-guide/pm/cpuidle.rst

F:	drivers/cpuidle/*

F:	include/linux/cpuidle.h

drivers/base/power/main.c

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <trace/events/power.h>

#include <linux/cpufreq.h>

#include <linux/cpuidle.h>

#include <linux/devfreq.h>

#include <linux/timer.h>



#include "../base.h"
@@ -1078,6 +1079,7 @@ void dpm_resume(pm_message_t state) 
	dpm_show_time(starttime, state, 0, NULL);



	cpufreq_resume();

	devfreq_resume();

	trace_suspend_resume(TPS("dpm_resume"), state.event, false);

}
@@ -1852,6 +1854,7 @@ int dpm_suspend(pm_message_t state) 
	trace_suspend_resume(TPS("dpm_suspend"), state.event, true);

	might_sleep();



	devfreq_suspend();

	cpufreq_suspend();



	mutex_lock(&dpm_list_mtx);

drivers/base/power/runtime.c

+7 −4
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static void pm_runtime_cancel_pending(struct device *dev) 
 * Compute the autosuspend-delay expiration time based on the device's

 * power.last_busy time.  If the delay has already expired or is disabled

 * (negative) or the power.use_autosuspend flag isn't set, return 0.

 * Otherwise return the expiration time in jiffies (adjusted to be nonzero).

 * Otherwise return the expiration time in nanoseconds (adjusted to be nonzero).

 *

 * This function may be called either with or without dev->power.lock held.

 * Either way it can be racy, since power.last_busy may be updated at any time.
@@ -141,7 +141,7 @@ u64 pm_runtime_autosuspend_expiration(struct device *dev) 


	last_busy = READ_ONCE(dev->power.last_busy);



	expires = last_busy + autosuspend_delay * NSEC_PER_MSEC;

	expires = last_busy + (u64)autosuspend_delay * NSEC_PER_MSEC;

	if (expires <= now)

		expires = 0;	/* Already expired. */
@@ -525,7 +525,7 @@ static int rpm_suspend(struct device *dev, int rpmflags) 
				 * We add a slack of 25% to gather wakeups

				 * without sacrificing the granularity.

				 */

				u64 slack = READ_ONCE(dev->power.autosuspend_delay) *

				u64 slack = (u64)READ_ONCE(dev->power.autosuspend_delay) *

						    (NSEC_PER_MSEC >> 2);



				dev->power.timer_expires = expires;
@@ -905,7 +905,10 @@ static enum hrtimer_restart pm_suspend_timer_fn(struct hrtimer *timer) 
	spin_lock_irqsave(&dev->power.lock, flags);



	expires = dev->power.timer_expires;

	/* If 'expire' is after 'jiffies' we've been called too early. */

	/*

	 * If 'expires' is after the current time, we've been called

	 * too early.

	 */

	if (expires > 0 && expires < ktime_to_ns(ktime_get())) {

		dev->power.timer_expires = 0;

		rpm_suspend(dev, dev->power.timer_autosuspends ?

drivers/cpufreq/cpufreq.c

+4 −8
Original line number Diff line number Diff line
@@ -1530,17 +1530,16 @@ static unsigned int __cpufreq_get(struct cpufreq_policy *policy) 
{

	unsigned int ret_freq = 0;



	if (!cpufreq_driver->get)

	if (unlikely(policy_is_inactive(policy)) || !cpufreq_driver->get)

		return ret_freq;



	ret_freq = cpufreq_driver->get(policy->cpu);



	/*

	 * Updating inactive policies is invalid, so avoid doing that.  Also

	 * if fast frequency switching is used with the given policy, the check

	 * If fast frequency switching is used with the given policy, the check

	 * against policy->cur is pointless, so skip it in that case too.

	 */

	if (unlikely(policy_is_inactive(policy)) || policy->fast_switch_enabled)

	if (policy->fast_switch_enabled)

		return ret_freq;



	if (ret_freq && policy->cur &&
@@ -1569,10 +1568,7 @@ unsigned int cpufreq_get(unsigned int cpu) 


	if (policy) {

		down_read(&policy->rwsem);



		if (!policy_is_inactive(policy))

		ret_freq = __cpufreq_get(policy);



		up_read(&policy->rwsem);



		cpufreq_cpu_put(policy);

CRA Git | Maintained and supported by SUSTech CRA and CCSE