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

Commit 9352ca58 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull more power management updates from Rafael Wysocki:
 "These are mostly fixes and cleanups on top of the previously merged
  power management material for 5.1-rc1 with one cpupower utility update
  that wasn't pushed earlier due to unfortunate timing.

  Specifics:

   - Fix registration of new cpuidle governors partially broken during
     the 5.0 development cycle by mistake (Rafael Wysocki).

   - Avoid integer overflows in the menu cpuidle governor by making it
     discard the overflowing data points upfront (Rafael Wysocki).

   - Fix minor mistake in the recent update of the iowait boost
     computation in the intel_pstate driver (Rafael Wysocki).

   - Drop incorrect __init annotation from one function in the pxa2xx
     cpufreq driver (Arnd Bergmann).

   - Fix the operating performance points (OPP) framework initialization
     for devices in multiple power domains if only one of them is
     scalable (Rajendra Nayak).

   - Fix mistake in dev_pm_opp_set_rate() which causes it to skip
     updating the performance state if the new frequency is the same as
     the old one (Viresh Kumar).

   - Rework the cancellation of wakeup source timers to avoid potential
     issues with it and do some cleanups unlocked by that change (Viresh
     Kumar, Rafael Wysocki).

   - Clean up the code computing the active/suspended time of devices in
     the PM-runtime framework after recent changes (Ulf Hansson).

   - Make the power management infrastructure code use pr_fmt()
     consistently (Joe Perches).

   - Clean up the generic power domains (genpd) framework somewhat
     (Aisheng Dong).

   - Improve kerneldoc comments for two functions in the cpufreq core
     (Rafael Wysocki).

   - Fix typo in a PM QoS file description comment (Aisheng Dong).

   - Update the handling of CPU boost frequencies in the cpupower
     utility (Abhishek Goel)"

* tag 'pm-5.1-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpuidle: governor: Add new governors to cpuidle_governors again
  cpufreq: intel_pstate: Fix up iowait_boost computation
  PM / OPP: Update performance state when freq == old_freq
  PM / wakeup: Drop wakeup_source_drop()
  PM / wakeup: Rework wakeup source timer cancellation
  PM / domains: Remove one unnecessary blank line
  PM / Domains: Return early for all errors in _genpd_power_off()
  PM / Domains: Improve warn for multiple states but no governor
  OPP: Fix handling of multiple power domains
  PM / QoS: Fix typo in file description
  cpufreq: pxa2xx: remove incorrect __init annotation
  PM-runtime: Call pm_runtime_active|suspended_time() from sysfs
  PM-runtime: Consolidate code to get active/suspended time
  PM: Add and use pr_fmt()
  cpufreq: Improve kerneldoc comments for cpufreq_cpu_get/put()
  cpuidle: menu: Avoid overflows when computing variance
  tools/power/cpupower: Display boost frequency separately
parents 9bc44610 b444e1aa

drivers/base/power/domain.c

+11 −9
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 
 * This file is released under the GPLv2.

 */



#define pr_fmt(fmt) "PM: " fmt



#include <linux/delay.h>

#include <linux/kernel.h>

#include <linux/io.h>
@@ -457,19 +459,19 @@ static int _genpd_power_off(struct generic_pm_domain *genpd, bool timed) 


	time_start = ktime_get();

	ret = genpd->power_off(genpd);

	if (ret == -EBUSY)

	if (ret)

		return ret;



	elapsed_ns = ktime_to_ns(ktime_sub(ktime_get(), time_start));

	if (elapsed_ns <= genpd->states[state_idx].power_off_latency_ns)

		return ret;

		return 0;



	genpd->states[state_idx].power_off_latency_ns = elapsed_ns;

	genpd->max_off_time_changed = true;

	pr_debug("%s: Power-%s latency exceeded, new value %lld ns\n",

		 genpd->name, "off", elapsed_ns);



	return ret;

	return 0;

}



/**
@@ -1657,8 +1659,8 @@ int pm_genpd_remove_subdomain(struct generic_pm_domain *genpd, 
	genpd_lock_nested(genpd, SINGLE_DEPTH_NESTING);



	if (!list_empty(&subdomain->master_links) || subdomain->device_count) {

		pr_warn("%s: unable to remove subdomain %s\n", genpd->name,

			subdomain->name);

		pr_warn("%s: unable to remove subdomain %s\n",

			genpd->name, subdomain->name);

		ret = -EBUSY;

		goto out;

	}
@@ -1766,7 +1768,7 @@ int pm_genpd_init(struct generic_pm_domain *genpd, 
		ret = genpd_set_default_power_state(genpd);

		if (ret)

			return ret;

	} else if (!gov) {

	} else if (!gov && genpd->state_count > 1) {

		pr_warn("%s: no governor for states\n", genpd->name);

	}

drivers/base/power/domain_governor.c

+0 −1
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ static bool __default_power_down_ok(struct dev_pm_domain *pd, 
	off_on_time_ns = genpd->states[state].power_off_latency_ns +

		genpd->states[state].power_on_latency_ns;





	min_off_time_ns = -1;

	/*

	 * Check if subdomains can be off for enough time.

drivers/base/power/main.c

+11 −10
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
 * subsystem list maintains.

 */



#define pr_fmt(fmt) "PM: " fmt



#include <linux/device.h>

#include <linux/export.h>

#include <linux/mutex.h>
@@ -128,7 +130,7 @@ void device_pm_add(struct device *dev) 
	if (device_pm_not_required(dev))

		return;



	pr_debug("PM: Adding info for %s:%s\n",

	pr_debug("Adding info for %s:%s\n",

		 dev->bus ? dev->bus->name : "No Bus", dev_name(dev));

	device_pm_check_callbacks(dev);

	mutex_lock(&dpm_list_mtx);
@@ -149,7 +151,7 @@ void device_pm_remove(struct device *dev) 
	if (device_pm_not_required(dev))

		return;



	pr_debug("PM: Removing info for %s:%s\n",

	pr_debug("Removing info for %s:%s\n",

		 dev->bus ? dev->bus->name : "No Bus", dev_name(dev));

	complete_all(&dev->power.completion);

	mutex_lock(&dpm_list_mtx);
@@ -168,7 +170,7 @@ void device_pm_remove(struct device *dev) 
 */

void device_pm_move_before(struct device *deva, struct device *devb)

{

	pr_debug("PM: Moving %s:%s before %s:%s\n",

	pr_debug("Moving %s:%s before %s:%s\n",

		 deva->bus ? deva->bus->name : "No Bus", dev_name(deva),

		 devb->bus ? devb->bus->name : "No Bus", dev_name(devb));

	/* Delete deva from dpm_list and reinsert before devb. */
@@ -182,7 +184,7 @@ void device_pm_move_before(struct device *deva, struct device *devb) 
 */

void device_pm_move_after(struct device *deva, struct device *devb)

{

	pr_debug("PM: Moving %s:%s after %s:%s\n",

	pr_debug("Moving %s:%s after %s:%s\n",

		 deva->bus ? deva->bus->name : "No Bus", dev_name(deva),

		 devb->bus ? devb->bus->name : "No Bus", dev_name(devb));

	/* Delete deva from dpm_list and reinsert after devb. */
@@ -195,7 +197,7 @@ void device_pm_move_after(struct device *deva, struct device *devb) 
 */

void device_pm_move_last(struct device *dev)

{

	pr_debug("PM: Moving %s:%s to end of list\n",

	pr_debug("Moving %s:%s to end of list\n",

		 dev->bus ? dev->bus->name : "No Bus", dev_name(dev));

	list_move_tail(&dev->power.entry, &dpm_list);

}
@@ -418,7 +420,7 @@ static void pm_dev_dbg(struct device *dev, pm_message_t state, const char *info) 
static void pm_dev_err(struct device *dev, pm_message_t state, const char *info,

			int error)

{

	printk(KERN_ERR "PM: Device %s failed to %s%s: error %d\n",

	pr_err("Device %s failed to %s%s: error %d\n",

	       dev_name(dev), pm_verb(state.event), info, error);

}
@@ -2022,8 +2024,7 @@ int dpm_prepare(pm_message_t state) 
				error = 0;

				continue;

			}

			printk(KERN_INFO "PM: Device %s not prepared "

				"for power transition: code %d\n",

			pr_info("Device %s not prepared for power transition: code %d\n",

				dev_name(dev), error);

			put_device(dev);

			break;
@@ -2062,7 +2063,7 @@ EXPORT_SYMBOL_GPL(dpm_suspend_start); 
void __suspend_report_result(const char *function, void *fn, int ret)

{

	if (ret)

		printk(KERN_ERR "%s(): %pF returns %d\n", function, fn, ret);

		pr_err("%s(): %pF returns %d\n", function, fn, ret);

}

EXPORT_SYMBOL_GPL(__suspend_report_result);

drivers/base/power/power.h

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ static inline void pm_runtime_early_init(struct device *dev) 
extern void pm_runtime_init(struct device *dev);

extern void pm_runtime_reinit(struct device *dev);

extern void pm_runtime_remove(struct device *dev);

extern u64 pm_runtime_active_time(struct device *dev);



#define WAKE_IRQ_DEDICATED_ALLOCATED	BIT(0)

#define WAKE_IRQ_DEDICATED_MANAGED	BIT(1)

drivers/base/power/qos.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
 * per-device constraint data struct.

 *

 * Note about the per-device constraint data struct allocation:

 * . The per-device constraints data struct ptr is tored into the device

 * . The per-device constraints data struct ptr is stored into the device

 *    dev_pm_info.

 * . To minimize the data usage by the per-device constraints, the data struct

 *   is only allocated at the first call to dev_pm_qos_add_request.