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

Commit f3ed0a17 authored by Srinivas Pandruvada's avatar Srinivas Pandruvada Committed by Zhang Rui
Browse files

Thermal: x86 package temp thermal crash 



On systems with no package MSR support this caused crash as there
is a bug in the logic to check presence of DTHERM and PTS feature
together. Added a change so that when there is no PTS support, module
doesn't get loaded. Even if some CPU comes online with the PTS
feature disabled, and other CPUs has this support, this patch
will still prevent such MSR accesses.

Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Reported-by: default avatarDaniel Walker <dwalker@fifo99.com>
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
parent 47188d39

drivers/thermal/x86_pkg_temp_thermal.c

+2 −2
Original line number Diff line number Diff line
@@ -511,7 +511,7 @@ static int get_core_online(unsigned int cpu) 


	/* Check if there is already an instance for this package */

	if (!phdev) {

		if (!cpu_has(c, X86_FEATURE_DTHERM) &&

		if (!cpu_has(c, X86_FEATURE_DTHERM) ||

					!cpu_has(c, X86_FEATURE_PTS))

			return -ENODEV;

		if (pkg_temp_thermal_device_add(cpu))
@@ -562,7 +562,7 @@ static struct notifier_block pkg_temp_thermal_notifier __refdata = { 
};



static const struct x86_cpu_id __initconst pkg_temp_thermal_ids[] = {

	{ X86_VENDOR_INTEL, X86_FAMILY_ANY, X86_MODEL_ANY, X86_FEATURE_DTHERM },

	{ X86_VENDOR_INTEL, X86_FAMILY_ANY, X86_MODEL_ANY, X86_FEATURE_PTS },

	{}

};

MODULE_DEVICE_TABLE(x86cpu, pkg_temp_thermal_ids);