Skip to contentSkip to conversation

x86, mce: Thermal monitoring depends on APIC being enabled

PATCH Applied Hidetoshi Seto 2 participants 2 messages Dec 14, 2009 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 x86, mce: Thermal monitoring depends on APIC being enabled

From: Cyrill Gorcunov <[email protected]>

Add check if APIC is not disabled since thermal monitoring depends on it. As only apic gets disabled we should not try to install "thermal monitor" vector, print out that thermal monitoring is enabled and etc...

Note that "Intel Correct Machine Check Interrupts" already has such a check.

Also I decided to not add cpu_has_apic check into mcheck_intel_therm_init since even if it'll call apic_read on disabled apic -- it's safe here and allow us to save a few code bytes.

---
 arch/x86/kernel/cpu/mcheck/therm_throt.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/mcheck/therm_throt.c +3 -2
index 4fef985..687638e 100644
@@ -274,8 +274,9 @@ void intel_init_thermal(struct cpuinfo_x86 *c)
 	int tm2 = 0;
 	u32 l, h;
 
-	/* Thermal monitoring depends on ACPI and clock modulation*/
-	if (!cpu_has(c, X86_FEATURE_ACPI) || !cpu_has(c, X86_FEATURE_ACC))
+	/* Thermal monitoring depends on APIC, ACPI and clock modulation */
+	if (!cpu_has_apic || !cpu_has(c, X86_FEATURE_ACPI) ||
+		!cpu_has(c, X86_FEATURE_ACC))
 		return;
 
 	/*
Signature · 1 line
1.6.5.6
#1 lore raw
Commit-ID:  485a2e1973fd9f98c2c6776e66ac4721882b69e0
Gitweb:     http://git.kernel.org/tip/485a2e1973fd9f98c2c6776e66ac4721882b69e0
Author:     Cyrill Gorcunov <[email protected]>
AuthorDate: Mon, 14 Dec 2009 17:56:34 +0900
Committer:  Ingo Molnar <[email protected]>
CommitDate: Mon, 14 Dec 2009 10:38:41 +0100

x86, mce: Thermal monitoring depends on APIC being enabled

Add check if APIC is not disabled since thermal monitoring depends on it. As only apic gets disabled we should not try to install "thermal monitor" vector, print out that thermal monitoring is enabled and etc...

Note that "Intel Correct Machine Check Interrupts" already has such a check.

Also I decided to not add cpu_has_apic check into mcheck_intel_therm_init since even if it'll call apic_read on disabled apic -- it's safe here and allow us to save a few code bytes.

LKML-Reference: <[email protected]>

---
 arch/x86/kernel/cpu/mcheck/therm_throt.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/mcheck/therm_throt.c +3 -2
index 1003ed4..0a9b577 100644
@@ -274,8 +274,9 @@ void intel_init_thermal(struct cpuinfo_x86 *c)
 	int tm2 = 0;
 	u32 l, h;
 
-	/* Thermal monitoring depends on ACPI and clock modulation*/
-	if (!cpu_has(c, X86_FEATURE_ACPI) || !cpu_has(c, X86_FEATURE_ACC))
+	/* Thermal monitoring depends on APIC, ACPI and clock modulation */
+	if (!cpu_has_apic || !cpu_has(c, X86_FEATURE_ACPI) ||
+		!cpu_has(c, X86_FEATURE_ACC))
 		return;
 
 	/*