[PATCH] x86: Refactor thermal throttle processing

Refactor the event processing (syslog messaging and rate limiting)
into separate file therm_throt.c. This allows consistent reporting
of CPU thermal throttle events.

After ACK'ing the interrupt, if the event is current, the user
(p4.c/mce_intel.c) calls therm_throt_process to log (and rate limit)
the event. If that function returns 1, the user has the option to log
things further (such as to mce_log in x86_64).

AK: minor cleanup

Signed-off-by: Dmitriy Zavin <dmitriyz@google.com>
Signed-off-by: Andi Kleen <ak@suse.de>

1 files changed, 6 insertions, 21 deletions

diff --git a/arch/x86_64/kernel/mce_intel.c b/arch/x86_64/kernel/mce_intel.c
index 8f533d2c40cb..dec11219e278 100644
--- a/arch/x86_64/kernel/mce_intel.c
+++ b/arch/x86_64/kernel/mce_intel.c
@@ -11,36 +11,21 @@
 #include <asm/mce.h>
 #include <asm/hw_irq.h>
 #include <asm/idle.h>
-
-static DEFINE_PER_CPU(unsigned long, next_check);
+#include <asm/therm_throt.h>
 
 asmlinkage void smp_thermal_interrupt(void)
 {
-        struct mce m;
+        __u64 msr_val;
 
         ack_APIC_irq();
 
         exit_idle();
         irq_enter();
-        if (time_before(jiffies, __get_cpu_var(next_check)))
-                goto done;
-
-        __get_cpu_var(next_check) = jiffies + HZ*300;
-        memset(&m, 0, sizeof(m));
-        m.cpu = smp_processor_id();
-        m.bank = MCE_THERMAL_BANK;
-        rdtscll(m.tsc);
-        rdmsrl(MSR_IA32_THERM_STATUS, m.status);
-        if (m.status & 0x1) {
-                printk(KERN_EMERG
-                        "CPU%d: Temperature above threshold, cpu clock throttled\n", m.cpu);
-                add_taint(TAINT_MACHINE_CHECK);
-        } else {
-                printk(KERN_EMERG "CPU%d: Temperature/speed normal\n", m.cpu);
-        }
 
-        mce_log(&m);
-done:
+        rdmsrl(MSR_IA32_THERM_STATUS, msr_val);
+        if (therm_throt_process(msr_val & 1))
+                mce_log_therm_throt_event(smp_processor_id(), msr_val);
+
         irq_exit();
 }