thermal/powerclamp: correct cpu support check
PATCH 1/1 thermal/powerclamp: correct cpu support check
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 powerclamp_cooling_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 ; }
Signature · 1 line
1.9.1
Quoted 9 lines · On Thu, 6 Oct 2016 08:56:49 -0700 Eric Ernst <[email protected]>…
Initial logic for checking CPU match resulted in OR of CPU features rather than the intended AND.
Updated to use
boot_cpu_hasmacro rather thanx86_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.
Quoted 34 lines
Signed-off-by Eric Ernst <[email protected]>--- drivers/thermal/intel_powerclamp.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)(quoted diff) +0
-0
b/drivers/thermal/intel_powerclamp.cindex0e4dc0afcfd2..7a223074df3d100644 ---a/drivers/thermal/intel_powerclamp.c
+++b/drivers/thermal/intel_powerclamp.cdrivers/thermal/intel_powerclamp.c +0
-11@@ -669,20 +669,10 @@ static struct thermal_cooling_device_ops powerclamp_cooling_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 %dmodel %d\n",
(quoted diff) +0
-1- boot_cpu_data.x86,boot_cpu_data.x86_model);
drivers/thermal/intel_powerclamp.c static struct thermal_cooling_device_ops powerclamp_cooling_ops = { · line 677
Quoted 4 lines
drivers/thermal/intel_powerclamp.c +2
-0+if (!boot_cpu_has (X86_FEATURE_MWAIT )) { +pr_err ("CPU does not support MWAIT" );return -ENODEV ; }
[Jacob Pan]