Commit 6453dbdd authored Jul 26, 2016 by Linus Torvalds

linux-pm

Pull power management updates from Rafael  Wysocki:
 "Again, the majority of changes go into the cpufreq subsystem, but
  there are no big features this time.  The cpufreq changes that stand
  out somewhat are the governor interface rework and improvements
  related to the handling of frequency tables.  Apart from those, there
  are fixes and new device/CPU IDs in drivers, cleanups and an
  improvement of the new schedutil governor.

  Next, there are some changes in the hibernation core, including a fix
  for a nasty problem related to the MONITOR/MWAIT usage by CPU offline
  during resume from hibernation, a few core improvements related to
  memory management during resume, a couple of additional debug features
  and cleanups.

  Finally, we have some fixes and cleanups in the devfreq subsystem,
  generic power domains framework improvements related to system
  suspend/resume, support for some new chips in intel_idle and in the
  power capping RAPL driver, a new version of the AnalyzeSuspend utility
  and some assorted fixes and cleanups.

  Specifics:

   - Rework the cpufreq governor interface to make it more
     straightforward and modify the conservative governor to avoid using
     transition notifications (Rafael Wysocki).

   - Rework the handling of frequency tables by the cpufreq core to make
     it more efficient (Viresh Kumar).

   - Modify the schedutil governor to reduce the number of wakeups it
     causes to occur in cases when the CPU frequency doesn't need to be
     changed (Steve Muckle, Viresh Kumar).

   - Fix some minor issues and clean up code in the cpufreq core and
     governors (Rafael Wysocki, Viresh Kumar).

   - Add Intel Broxton support to the intel_pstate driver (Srinivas
     Pandruvada).

   - Fix problems related to the config TDP feature and to the validity
     of the MSR_HWP_INTERRUPT register in intel_pstate (Jan Kiszka,
     Srinivas Pandruvada).

   - Make intel_pstate update the cpu_frequency tracepoint even if the
     frequency doesn't change to avoid confusing powertop (Rafael
     Wysocki).

   - Clean up the usage of __init/__initdata in intel_pstate, mark some
     of its internal variables as __read_mostly and drop an unused
     structure element from it (Jisheng Zhang, Carsten Emde).

   - Clean up the usage of some duplicate MSR symbols in intel_pstate
     and turbostat (Srinivas Pandruvada).

   - Update/fix the powernv, s3c24xx and mvebu cpufreq drivers (Akshay
     Adiga, Viresh Kumar, Ben Dooks).

   - Fix a regression (introduced during the 4.5 cycle) in the
     pcc-cpufreq driver by reverting the problematic commit (Andreas
     Herrmann).

   - Add support for Intel Denverton to intel_idle, clean up Broxton
     support in it and make it explicitly non-modular (Jacob Pan, Jan
     Beulich, Paul Gortmaker).

   - Add support for Denverton and Ivy Bridge server to the Intel RAPL
     power capping driver and make it more careful about the handing of
     MSRs that may not be present (Jacob Pan, Xiaolong Wang).

   - Fix resume from hibernation on x86-64 by making the CPU offline
     during resume avoid using MONITOR/MWAIT in the "play dead" loop
     which may lead to an inadvertent "revival" of a "dead" CPU and a
     page fault leading to a kernel crash from it (Rafael Wysocki).

   - Make memory management during resume from hibernation more
     straightforward (Rafael Wysocki).

   - Add debug features that should help to detect problems related to
     hibernation and resume from it (Rafael Wysocki, Chen Yu).

   - Clean up hibernation core somewhat (Rafael Wysocki).

   - Prevent KASAN from instrumenting the hibernation core which leads
     to large numbers of false-positives from it (James Morse).

   - Prevent PM (hibernate and suspend) notifiers from being called
     during the cleanup phase if they have not been called during the
     corresponding preparation phase which is possible if one of the
     other notifiers returns an error at that time (Lianwei Wang).

   - Improve suspend-related debug printout in the tasks freezer and
     clean up suspend-related console handling (Roger Lu, Borislav
     Petkov).

   - Update the AnalyzeSuspend script in the kernel sources to version
     4.2 (Todd Brandt).

   - Modify the generic power domains framework to make it handle system
     suspend/resume better (Ulf Hansson).

   - Make the runtime PM framework avoid resuming devices synchronously
     when user space changes the runtime PM settings for them and
     improve its error reporting (Rafael Wysocki, Linus Walleij).

   - Fix error paths in devfreq drivers (exynos, exynos-ppmu,
     exynos-bus) and in the core, make some devfreq code explicitly
     non-modular and change some of it into tristate (Bartlomiej
     Zolnierkiewicz, Peter Chen, Paul Gortmaker).

   - Add DT support to the generic PM clocks management code and make it
     export some more symbols (Jon Hunter, Paul Gortmaker).

   - Make the PCI PM core code slightly more robust against possible
     driver errors (Andy Shevchenko).

   - Make it possible to change DESTDIR and PREFIX in turbostat (Andy
     Shevchenko)"

* tag 'pm-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (89 commits)
  Revert "cpufreq: pcc-cpufreq: update default value of cpuinfo_transition_latency"
  PM / hibernate: Introduce test_resume mode for hibernation
  cpufreq: export cpufreq_driver_resolve_freq()
  cpufreq: Disallow ->resolve_freq() for drivers providing ->target_index()
  PCI / PM: check all fields in pci_set_platform_pm()
  cpufreq: acpi-cpufreq: use cached frequency mapping when possible
  cpufreq: schedutil: map raw required frequency to driver frequency
  cpufreq: add cpufreq_driver_resolve_freq()
  cpufreq: intel_pstate: Check cpuid for MSR_HWP_INTERRUPT
  intel_pstate: Update cpu_frequency tracepoint every time
  cpufreq: intel_pstate: clean remnant struct element
  PM / tools: scripts: AnalyzeSuspend v4.2
  x86 / hibernate: Use hlt_play_dead() when resuming from hibernation
  cpufreq: powernv: Replacing pstate_id with frequency table index
  intel_pstate: Fix MSR_CONFIG_TDP_x addressing in core_get_max_pstate()
  PM / hibernate: Image data protection during restoration
  PM / hibernate: Add missing braces in __register_nosave_region()
  PM / hibernate: Clean up comments in snapshot.c
  PM / hibernate: Clean up function headers in snapshot.c
  PM / hibernate: Add missing braces in hibernate_setup()
  ...

parents 27b79027 bc841e26

Documentation/cpu-freq/core.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -96,7 +96,7 @@ new - new frequency
		For details about OPP, see Documentation/power/opp.txt

		dev_pm_opp_init_cpufreq_table - cpufreq framework typically is initialized with
		cpufreq_frequency_table_cpuinfo which is provided with the list of
		cpufreq_table_validate_and_show() which is provided with the list of
		frequencies that are available for operation. This function provides
		a ready to use conversion routine to translate the OPP layer's internal
		information about the available frequencies into a format readily
		@@ -110,7 +110,7 @@ dev_pm_opp_init_cpufreq_table - cpufreq framework typically is initialized with
		/* Do things */
		r = dev_pm_opp_init_cpufreq_table(dev, &freq_table);
		if (!r)
		cpufreq_frequency_table_cpuinfo(policy, freq_table);
		cpufreq_table_validate_and_show(policy, freq_table);
		/* Do other things */
		}

Documentation/cpu-freq/cpu-drivers.txt

+4 −6

Original line number	Diff line number	Diff line
		@@ -231,7 +231,7 @@ if you want to skip one entry in the table, set the frequency to
		CPUFREQ_ENTRY_INVALID. The entries don't need to be in ascending
		order.

		By calling cpufreq_frequency_table_cpuinfo(struct cpufreq_policy *policy,
		By calling cpufreq_table_validate_and_show(struct cpufreq_policy *policy,
		struct cpufreq_frequency_table *table);
		the cpuinfo.min_freq and cpuinfo.max_freq values are detected, and
		policy->min and policy->max are set to the same values. This is
		@@ -244,14 +244,12 @@ policy->max, and all other criteria are met. This is helpful for the
		->verify call.

		int cpufreq_frequency_table_target(struct cpufreq_policy *policy,
		struct cpufreq_frequency_table *table,
		unsigned int target_freq,
		unsigned int relation,
		unsigned int *index);
		unsigned int relation);

		is the corresponding frequency table helper for the ->target
		stage. Just pass the values to this function, and the unsigned int
		index returns the number of the frequency table entry which contains
		stage. Just pass the values to this function, and this function
		returns the number of the frequency table entry which contains
		the frequency the CPU shall be set to.

		The following macros can be used as iterators over cpufreq_frequency_table:

Documentation/cpu-freq/pcc-cpufreq.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -159,8 +159,8 @@ to be strictly associated with a P-state.

		2.2 cpuinfo_transition_latency:
		-------------------------------
		The cpuinfo_transition_latency field is CPUFREQ_ETERNAL. The PCC specification
		does not include a field to expose this value currently.
		The cpuinfo_transition_latency field is 0. The PCC specification does
		not include a field to expose this value currently.

		2.3 cpuinfo_cur_freq:
		---------------------

Documentation/kernel-parameters.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -3598,6 +3598,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
		present during boot.
		nocompress Don't compress/decompress hibernation images.
		no Disable hibernation and resume.
		protect_image Turn on image protection during restoration
		(that will set all pages holding image data
		during restoration read-only).

		retain_initrd [RAM] Keep initrd memory after extraction

arch/powerpc/platforms/cell/cpufreq_spudemand.c

+34 −38

Original line number	Diff line number	Diff line
		@@ -85,27 +85,21 @@ static void spu_gov_cancel_work(struct spu_gov_info_struct *info)
		cancel_delayed_work_sync(&info->work);
		}

		static int spu_gov_govern(struct cpufreq_policy *policy, unsigned int event)
		static int spu_gov_start(struct cpufreq_policy *policy)
		{
		unsigned int cpu = policy->cpu;
		struct spu_gov_info_struct info, affected_info;
		struct spu_gov_info_struct *info = &per_cpu(spu_gov_info, cpu);
		struct spu_gov_info_struct *affected_info;
		int i;
		int ret = 0;

		info = &per_cpu(spu_gov_info, cpu);

		switch (event) {
		case CPUFREQ_GOV_START:
		if (!cpu_online(cpu)) {
		printk(KERN_ERR "cpu %d is not online\n", cpu);
		ret = -EINVAL;
		break;
		return -EINVAL;
		}

		if (!policy->cur) {
		printk(KERN_ERR "no cpu specified in policy\n");
		ret = -EINVAL;
		break;
		return -EINVAL;
		}

		/* initialize spu_gov_info for all affected cpus */
		@@ -119,9 +113,15 @@ static int spu_gov_govern(struct cpufreq_policy *policy, unsigned int event)
		/* setup timer */
		spu_gov_init_work(info);

		break;
		return 0;
		}

		static void spu_gov_stop(struct cpufreq_policy *policy)
		{
		unsigned int cpu = policy->cpu;
		struct spu_gov_info_struct *info = &per_cpu(spu_gov_info, cpu);
		int i;

		case CPUFREQ_GOV_STOP:
		/* cancel timer */
		spu_gov_cancel_work(info);

		@@ -130,16 +130,12 @@ static int spu_gov_govern(struct cpufreq_policy *policy, unsigned int event)
		info = &per_cpu(spu_gov_info, i);
		info->policy = NULL;
		}

		break;
		}

		return ret;
		}

		static struct cpufreq_governor spu_governor = {
		.name = "spudemand",
		.governor = spu_gov_govern,
		.start = spu_gov_start,
		.stop = spu_gov_stop,
		.owner = THIS_MODULE,
		};