Commit 20ad5494 authored Apr 04, 2019 by Linus Torvalds

linux-pm

Pull power management fixes from Rafael Wysocki:
 "These fix up the intel_pstate driver after recent changes to prevent
  it from printing pointless messages and update the turbostat utility
  (mostly fixes and new hardware support).

  Specifics:

   - Make intel_pstate only load on Intel processors and prevent it from
     printing pointless failure messages (Borislav Petkov).

   - Update the turbostat utility:
      * Assorted fixes (Ben Hutchings, Len Brown, Prarit Bhargava).
      * Support for AMD Fam 17h (Zen) RAPL and package power (Calvin
        Walton).
      * Support for Intel Icelake and for systems with more than one die
        per package (Len Brown).
      * Cleanups (Len Brown)"

* tag 'pm-5.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpufreq/intel_pstate: Load only on Intel hardware
  tools/power turbostat: update version number
  tools/power turbostat: Warn on bad ACPI LPIT data
  tools/power turbostat: Add checks for failure of fgets() and fscanf()
  tools/power turbostat: Also read package power on AMD F17h (Zen)
  tools/power turbostat: Add support for AMD Fam 17h (Zen) RAPL
  tools/power turbostat: Do not display an error on systems without a cpufreq driver
  tools/power turbostat: Add Die column
  tools/power turbostat: Add Icelake support
  tools/power turbostat: Cleanup CNL-specific code
  tools/power turbostat: Cleanup CC3-skip code
  tools/power turbostat: Restore ability to execute in topology-order

parents b512f712 58b0cf8e

drivers/cpufreq/intel_pstate.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -2596,6 +2596,9 @@ static int __init intel_pstate_init(void)
		const struct x86_cpu_id *id;
		int rc;

		if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL)
		return -ENODEV;

		if (no_load)
		return -ENODEV;

		@@ -2611,7 +2614,7 @@ static int __init intel_pstate_init(void)
		} else {
		id = x86_match_cpu(intel_pstate_cpu_ids);
		if (!id) {
		pr_info("CPU ID not supported\n");
		pr_info("CPU model not supported\n");
		return -ENODEV;
		}

tools/power/x86/turbostat/turbostat.c

+219 −58

File changed.

Preview size limit exceeded, changes collapsed.