Skip to content

Commit 20ad549

Browse files
torvaldstorvalds
committed
Merge tag 'pm-5.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/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
2 parents b512f71 + 58b0cf8 commit 20ad549

File tree

2 files changed

+223
-59
lines changed

2 files changed

+223
-59
lines changed

‎drivers/cpufreq/intel_pstate.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2596,6 +2596,9 @@ static int __init intel_pstate_init(void)
25962596
const struct x86_cpu_id *id;
25972597
int rc;
25982598

2599+
if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL)
2600+
return -ENODEV;
2601+
25992602
if (no_load)
26002603
return -ENODEV;
26012604

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

0 commit comments

Comments
 (0)