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

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

Pull power management fixes from Rafael Wysocki:
 "Fix a recent cpufreq initialization regression (Rafael Wysocki),
  revert a devfreq commit that made incompatible changes and broke user
  land on some systems (Orson Zhai), drop a stale reference to a
  document that has gone away recently (Jonathan Neuschäfer), and fix a
  typo in a hibernation code comment (Alexandre Belloni)"

* tag 'pm-5.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpufreq: Fix policy initialization for internal governor drivers
  Revert "PM / devfreq: Modify the device name as devfreq(X) for sysfs"
  PM / hibernate: fix typo "reserverd_size" -> "reserved_size"
  Documentation: power: Drop reference to interface.rst
parents bfeb4f99 189c6967

Documentation/power/index.rst

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ Power Management 
    drivers-testing

    energy-model

    freezing-of-tasks

    interface

    opp

    pci

    pm_qos_interface

drivers/cpufreq/cpufreq.c

+10 −2
Original line number Diff line number Diff line
@@ -1076,9 +1076,17 @@ static int cpufreq_init_policy(struct cpufreq_policy *policy) 
			pol = policy->last_policy;

		} else if (def_gov) {

			pol = cpufreq_parse_policy(def_gov->name);

		} else {

			return -ENODATA;

			/*

			 * In case the default governor is neiter "performance"

			 * nor "powersave", fall back to the initial policy

			 * value set by the driver.

			 */

			if (pol == CPUFREQ_POLICY_UNKNOWN)

				pol = policy->policy;

		}

		if (pol != CPUFREQ_POLICY_PERFORMANCE &&

		    pol != CPUFREQ_POLICY_POWERSAVE)

			return -ENODATA;

	}



	return cpufreq_set_policy(policy, gov, pol);

drivers/devfreq/devfreq.c

+1 −3
Original line number Diff line number Diff line
@@ -738,7 +738,6 @@ struct devfreq *devfreq_add_device(struct device *dev, 
{

	struct devfreq *devfreq;

	struct devfreq_governor *governor;

	static atomic_t devfreq_no = ATOMIC_INIT(-1);

	int err = 0;



	if (!dev || !profile || !governor_name) {
@@ -800,8 +799,7 @@ struct devfreq *devfreq_add_device(struct device *dev, 
	devfreq->suspend_freq = dev_pm_opp_get_suspend_opp_freq(dev);

	atomic_set(&devfreq->suspend_count, 0);



	dev_set_name(&devfreq->dev, "devfreq%d",

				atomic_inc_return(&devfreq_no));

	dev_set_name(&devfreq->dev, "%s", dev_name(dev));

	err = device_register(&devfreq->dev);

	if (err) {

		mutex_unlock(&devfreq->lock);

kernel/power/snapshot.c

+1 −1
Original line number Diff line number Diff line
@@ -1681,7 +1681,7 @@ static unsigned long minimum_image_size(unsigned long saveable) 
 * hibernation for allocations made while saving the image and for device

 * drivers, in case they need to allocate memory from their hibernation

 * callbacks (these two numbers are given by PAGES_FOR_IO (which is a rough

 * estimate) and reserverd_size divided by PAGE_SIZE (which is tunable through

 * estimate) and reserved_size divided by PAGE_SIZE (which is tunable through

 * /sys/power/reserved_size, respectively).  To make this happen, we compute the

 * total number of available page frames and allocate at least

 *

CRA Git | Maintained and supported by SUSTech CRA and CCSE