Patch "thermal/powerclamp: correct cpu support check" has been added to the 4.8-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
thermal/powerclamp: correct cpu support check
to the 4.8-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
thermal-powerclamp-correct-cpu-support-check.patch
and it can be found in the queue-4.8 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
3105f234e0aba43e44e277c20f9b32ee8add43d4Mon Sep 17 00:00:00 2001
From: Eric Ernst <[email protected]>
Date: Thu, 6 Oct 2016 08:56:49 -0700
Subject: thermal/powerclamp: correct cpu support check
From: Eric Ernst <[email protected]>
commit 3105f234e0aba43e44e277c20f9b32ee8add43d4 upstream.
Initial logic for checking CPU match resulted in OR of CPU features rather than the intended AND.
Updated to use boot_cpu_has macro rather than x86_match_cpu.
In addition, MWAIT is the only required CPU feature for idle injection to work. Drop other feature requirements since they are only needed for optimal efficiency.
--- drivers/thermal/intel_powerclamp.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
drivers/thermal/intel_powerclamp.c +2 -12
@@ -669,20 +669,10 @@ static struct thermal_cooling_device_ops .set_cur_state = powerclamp_set_cur_state, }; -static const struct x86_cpu_id intel_powerclamp_ids[]__initconst = { - {X86_VENDOR_INTEL ,X86_FAMILY_ANY ,X86_MODEL_ANY ,X86_FEATURE_MWAIT }, - {X86_VENDOR_INTEL ,X86_FAMILY_ANY ,X86_MODEL_ANY ,X86_FEATURE_ARAT }, - {X86_VENDOR_INTEL ,X86_FAMILY_ANY ,X86_MODEL_ANY ,X86_FEATURE_NONSTOP_TSC }, - {X86_VENDOR_INTEL ,X86_FAMILY_ANY ,X86_MODEL_ANY ,X86_FEATURE_CONSTANT_TSC }, - {} -}; -MODULE_DEVICE_TABLE (x86cpu, intel_powerclamp_ids); -static int __init powerclamp_probe (void ) { -if (!x86_match_cpu (intel_powerclamp_ids)) { -pr_err ("Intel powerclamp does not run on family %d model %d\n" , - boot_cpu_data.x86, boot_cpu_data.x86_model); +if (!boot_cpu_has (X86_FEATURE_MWAIT )) { +pr_err ("CPU does not support MWAIT" );return -ENODEV ; }
Patches currently in stable-queue which might be from [email protected] are
queue-4.8/thermal-powerclamp-correct-cpu-support-check.patch