Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3105f234 authored by Eric Ernst's avatar Eric Ernst Committed by Zhang Rui
Browse files

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.

CC: stable@vger.kernel.org #v4.7
Signed-off-by: default avatarEric Ernst <eric.ernst@linux.intel.com>
Acked-by: default avatarJacob Pan <jacob.jun.pan@linux.intel.com>
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
parent 33086a9a

drivers/thermal/intel_powerclamp.c

+2 −12
Original line number Diff line number Diff line
@@ -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;

	}