1 files changed, 59 insertions, 4 deletions

diff --git a/arch/x86/kernel/cpu/mcheck/therm_throt.c b/arch/x86/kernel/cpu/mcheck/therm_throt.c
index 98f2083832eb..41e8e00a6637 100644
--- a/arch/x86/kernel/cpu/mcheck/therm_throt.c
+++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c
@@ -55,12 +55,24 @@ struct thermal_state {
         struct _thermal_state package_power_limit;
         struct _thermal_state core_thresh0;
         struct _thermal_state core_thresh1;
+        struct _thermal_state pkg_thresh0;
+        struct _thermal_state pkg_thresh1;
 };
 
 /* Callback to handle core threshold interrupts */
 int (*platform_thermal_notify)(__u64 msr_val);
 EXPORT_SYMBOL(platform_thermal_notify);
 
+/* Callback to handle core package threshold_interrupts */
+int (*platform_thermal_package_notify)(__u64 msr_val);
+EXPORT_SYMBOL_GPL(platform_thermal_package_notify);
+
+/* Callback support of rate control, return true, if
+ * callback has rate control */
+bool (*platform_thermal_package_rate_control)(void);
+EXPORT_SYMBOL_GPL(platform_thermal_package_rate_control);
+
+
 static DEFINE_PER_CPU(struct thermal_state, thermal_state);
 
 static atomic_t therm_throt_en  = ATOMIC_INIT(0);
@@ -195,19 +207,25 @@ static int therm_throt_process(bool new_event, int event, int level)
         return 0;
 }
 
-static int thresh_event_valid(int event)
+static int thresh_event_valid(int level, int event)
 {
         struct _thermal_state *state;
         unsigned int this_cpu = smp_processor_id();
         struct thermal_state *pstate = &per_cpu(thermal_state, this_cpu);
         u64 now = get_jiffies_64();
 
-        state = (event == 0) ? &pstate->core_thresh0 : &pstate->core_thresh1;
+        if (level == PACKAGE_LEVEL)
+                state = (event == 0) ? &pstate->pkg_thresh0 :
+                                                &pstate->pkg_thresh1;
+        else
+                state = (event == 0) ? &pstate->core_thresh0 :
+                                                &pstate->core_thresh1;
 
         if (time_before64(now, state->next_check))
                 return 0;
 
         state->next_check = now + CHECK_INTERVAL;
+
         return 1;
 }
 
@@ -322,6 +340,39 @@ device_initcall(thermal_throttle_init_device);
 
 #endif /* CONFIG_SYSFS */
 
+static void notify_package_thresholds(__u64 msr_val)
+{
+        bool notify_thres_0 = false;
+        bool notify_thres_1 = false;
+
+        if (!platform_thermal_package_notify)
+                return;
+
+        /* lower threshold check */
+        if (msr_val & THERM_LOG_THRESHOLD0)
+                notify_thres_0 = true;
+        /* higher threshold check */
+        if (msr_val & THERM_LOG_THRESHOLD1)
+                notify_thres_1 = true;
+
+        if (!notify_thres_0 && !notify_thres_1)
+                return;
+
+        if (platform_thermal_package_rate_control &&
+                platform_thermal_package_rate_control()) {
+                /* Rate control is implemented in callback */
+                platform_thermal_package_notify(msr_val);
+                return;
+        }
+
+        /* lower threshold reached */
+        if (notify_thres_0 && thresh_event_valid(PACKAGE_LEVEL, 0))
+                platform_thermal_package_notify(msr_val);
+        /* higher threshold reached */
+        if (notify_thres_1 && thresh_event_valid(PACKAGE_LEVEL, 1))
+                platform_thermal_package_notify(msr_val);
+}
+
 static void notify_thresholds(__u64 msr_val)
 {
         /* check whether the interrupt handler is defined;
@@ -331,10 +382,12 @@ static void notify_thresholds(__u64 msr_val)
                 return;
 
         /* lower threshold reached */
-        if ((msr_val & THERM_LOG_THRESHOLD0) && thresh_event_valid(0))
+        if ((msr_val & THERM_LOG_THRESHOLD0) &&
+                        thresh_event_valid(CORE_LEVEL, 0))
                 platform_thermal_notify(msr_val);
         /* higher threshold reached */
-        if ((msr_val & THERM_LOG_THRESHOLD1) && thresh_event_valid(1))
+        if ((msr_val & THERM_LOG_THRESHOLD1) &&
+                        thresh_event_valid(CORE_LEVEL, 1))
                 platform_thermal_notify(msr_val);
 }
 
@@ -360,6 +413,8 @@ static void intel_thermal_interrupt(void)
 
         if (this_cpu_has(X86_FEATURE_PTS)) {
                 rdmsrl(MSR_IA32_PACKAGE_THERM_STATUS, msr_val);
+                /* check violations of package thermal thresholds */
+                notify_package_thresholds(msr_val);
                 therm_throt_process(msr_val & PACKAGE_THERM_STATUS_PROCHOT,
                                         THERMAL_THROTTLING_EVENT,
                                         PACKAGE_LEVEL);