This patch add support of uevent notification once the thresholds
are violated.
It adds a 5 seconds debounce affect, to avoid repeated notifications and
control the rate of notifications. Since the log bit is sticky, it will
preserve the status.
Coretemp sysfs uses different sysfs path for each physical cpu id. This
patch will issue unique uevent for each physical device id.
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@xxxxxxxxxxxxxxx>
---
drivers/hwmon/coretemp.c | 106 ++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 101 insertions(+), 5 deletions(-)
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index 5a8973d..bc6d4c1 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -39,6 +39,7 @@
#include <asm/msr.h>
#include <asm/processor.h>
#include <asm/cpu_device_id.h>
+#include <asm/mce.h>
#define DRVNAME "coretemp"
@@ -115,6 +116,12 @@ struct pdev_entry {
static LIST_HEAD(pdev_list);
static DEFINE_MUTEX(pdev_list_mutex);
+/* Related to processing of PKG threshold interrupts */
+#define PKG_TEMP_NOTIFY_DELAY msecs_to_jiffies(5000)
+static unsigned long pkg_temp_scheduled;
+static DEFINE_PER_CPU(struct delayed_work, pkg_temp_threshold_work);
+static atomic_t pkg_thres_device_cnt = ATOMIC_INIT(0);
+
static ssize_t show_name(struct device *dev,
struct device_attribute *devattr, char *buf)
{
@@ -191,7 +198,7 @@ static ssize_t show_tx(struct device *dev,
static ssize_t store_tx(struct device *dev,
struct device_attribute *devattr,
const char *buf, size_t count,
- u32 mask, int shift)
+ u32 mask, int shift, int intr_bit)
{
struct platform_data *pdata = dev_get_drvdata(dev);
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
@@ -215,6 +222,10 @@ static ssize_t store_tx(struct device *dev,
mutex_lock(&tdata->update_lock);
rdmsr_on_cpu(tdata->cpu, tdata->intrpt_reg, &eax, &edx);
eax = (eax & ~mask) | (diff << shift);
+ if (diff)
+ eax |= intr_bit;
+ else
+ eax &= ~intr_bit;
wrmsr_on_cpu(tdata->cpu, tdata->intrpt_reg, eax, edx);
mutex_unlock(&tdata->update_lock);
@@ -233,7 +244,7 @@ static ssize_t store_t0(struct device *dev,
const char *buf, size_t count)
{
return store_tx(dev, devattr, buf, count, THERM_MASK_THRESHOLD0,
- THERM_SHIFT_THRESHOLD0);
+ THERM_SHIFT_THRESHOLD0, THERM_INT_THRESHOLD0_ENABLE);
}
static ssize_t show_t1(struct device *dev,
@@ -248,7 +259,7 @@ static ssize_t store_t1(struct device *dev,
const char *buf, size_t count)
{
return store_tx(dev, devattr, buf, count, THERM_MASK_THRESHOLD1,
- THERM_SHIFT_THRESHOLD1);
+ THERM_SHIFT_THRESHOLD1, THERM_INT_THRESHOLD1_ENABLE);
}
static ssize_t show_tjmax(struct device *dev,
@@ -560,6 +571,68 @@ static struct platform_device __cpuinit *coretemp_get_pdev(unsigned int cpu)
return NULL;
}
+
+static bool pkg_temp_platform_thermal_rate_control(void)
+{
+ return true;
+}
+
+static void enable_pkg_thres_interrupt(void)
+{
+ u32 l, h;
+ rdmsr(MSR_IA32_PACKAGE_THERM_INTERRUPT, l, h);
+ wrmsr(MSR_IA32_PACKAGE_THERM_INTERRUPT,
+ l | (THERM_INT_THRESHOLD0_ENABLE |
+ THERM_INT_THRESHOLD1_ENABLE), h);
+
+}
+
+static void disable_pkg_thres_interrupt(void)
+{
+ u32 l, h;
+ rdmsr(MSR_IA32_PACKAGE_THERM_INTERRUPT, l, h);
+ wrmsr(MSR_IA32_PACKAGE_THERM_INTERRUPT,
+ l & (~THERM_INT_THRESHOLD0_ENABLE) &
+ (~THERM_INT_THRESHOLD1_ENABLE), h);
+}
+
+static void pkg_temp_threshold_work_fn(struct work_struct *work)
+{
+ struct platform_device *pdev = coretemp_get_pdev(smp_processor_id());
+ __u64 msr_val;
+ bool notify = false;
+
+ clear_bit_unlock(TO_PHYS_ID(smp_processor_id()), &pkg_temp_scheduled);
+ enable_pkg_thres_interrupt();
+ rdmsrl(MSR_IA32_PACKAGE_THERM_STATUS, msr_val);
+ if (msr_val & THERM_LOG_THRESHOLD0) {
+ wrmsrl(MSR_IA32_PACKAGE_THERM_STATUS,
+ msr_val & ~THERM_LOG_THRESHOLD0);
+ notify = true;
+ }
+ if (msr_val & THERM_LOG_THRESHOLD1) {
+ wrmsrl(MSR_IA32_PACKAGE_THERM_STATUS,
+ msr_val & ~THERM_LOG_THRESHOLD1);
+ notify = true;
+ }
+ if (notify)
+ kobject_uevent(&pdev->dev.kobj, KOBJ_CHANGE);
+}
+
+static int pkg_temp_platform_thermal_notify(__u64 msr_val)
+{
+ int cpu = smp_processor_id();
+
+ if (test_and_set_bit_lock(TO_PHYS_ID(cpu), &pkg_temp_scheduled))
+ return 0;
+ disable_pkg_thres_interrupt();
+ schedule_delayed_work_on(cpu,
+ &per_cpu(pkg_temp_threshold_work, cpu),
+ PKG_TEMP_NOTIFY_DELAY);
+
+ return 0;
+}
+
static struct temp_data __cpuinit *init_temp_data(unsigned int cpu,
int pkg_flag)
{
@@ -645,9 +718,10 @@ static int __cpuinit create_core_data(struct platform_device *pdev,
* 'size' enough to support t0 and t1 attributes.
*/
err = rdmsr_safe_on_cpu(cpu, tdata->intrpt_reg, &eax, &edx);
- if (!err)
+ if (!err) {
tdata->attr_size += MAX_THRESH_ATTRS;
-
+ atomic_inc(&pkg_thres_device_cnt);
+ }
pdata->core_data[attr_no] = tdata;
@@ -865,6 +939,18 @@ static void __cpuinit get_core_online(unsigned int cpu)
* So, just add interfaces for this core.
*/
coretemp_add_core(cpu, 0);
+
+ INIT_DELAYED_WORK(&per_cpu(pkg_temp_threshold_work, cpu),
+ pkg_temp_threshold_work_fn);
+
+ if (atomic_read(&pkg_thres_device_cnt)) {
+ /* Add threshold interrupt callbacks */
+ platform_thermal_package_notify =
+ pkg_temp_platform_thermal_notify;
+ platform_thermal_package_rate_control =
+ pkg_temp_platform_thermal_rate_control;
+ }
+
}
static void __cpuinit put_core_offline(unsigned int cpu)
@@ -913,6 +999,14 @@ static void __cpuinit put_core_offline(unsigned int cpu)
*/
if (!is_any_core_online(pdata))
coretemp_device_remove(cpu);
+
+ cancel_delayed_work_sync(&per_cpu(pkg_temp_threshold_work, cpu));
+
+ if (atomic_dec_return(&pkg_thres_device_cnt) == 0) {
+ platform_thermal_package_notify = NULL;
+ platform_thermal_package_rate_control = NULL;
+ }
+
}
static int __cpuinit coretemp_cpu_callback(struct notifier_block *nfb,
@@ -986,6 +1080,8 @@ static void __exit coretemp_exit(void)
{
struct pdev_entry *p, *n;
+ platform_thermal_package_notify = NULL;
+ platform_thermal_package_rate_control = NULL;
get_online_cpus();
unregister_hotcpu_notifier(&coretemp_cpu_notifier);
mutex_lock(&pdev_list_mutex);
--
1.7.11.7
_______________________________________________
lm-sensors mailing list
lm-sensors@xxxxxxxxxxxxxx
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
