include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...
[safe/jmp/linux-2.6] / drivers / acpi / thermal.c
index 3521c37..efad1f3 100644 (file)
 
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/dmi.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/proc_fs.h>
-#include <linux/timer.h>
 #include <linux/jiffies.h>
 #include <linux/kmod.h>
 #include <linux/seq_file.h>
 #include <linux/reboot.h>
+#include <linux/device.h>
 #include <asm/uaccess.h>
-
+#include <linux/thermal.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
-#define ACPI_THERMAL_COMPONENT         0x04000000
+#define PREFIX "ACPI: "
+
 #define ACPI_THERMAL_CLASS             "thermal_zone"
 #define ACPI_THERMAL_DEVICE_NAME       "Thermal Zone"
 #define ACPI_THERMAL_FILE_STATE                "state"
@@ -64,9 +67,6 @@
 #define ACPI_THERMAL_MAX_ACTIVE        10
 #define ACPI_THERMAL_MAX_LIMIT_STR_LEN 65
 
-#define KELVIN_TO_CELSIUS(t)    (long)(((long)t-2732>=0) ? ((long)t-2732+5)/10 : ((long)t-2732-5)/10)
-#define CELSIUS_TO_KELVIN(t)   ((t+273)*10)
-
 #define _COMPONENT             ACPI_THERMAL_COMPONENT
 ACPI_MODULE_NAME("thermal");
 
@@ -76,27 +76,32 @@ MODULE_LICENSE("GPL");
 
 static int act;
 module_param(act, int, 0644);
-MODULE_PARM_DESC(act, "Disable or override all lowest active trip points.\n");
+MODULE_PARM_DESC(act, "Disable or override all lowest active trip points.");
+
+static int crt;
+module_param(crt, int, 0644);
+MODULE_PARM_DESC(crt, "Disable or lower all critical trip points.");
 
 static int tzp;
 module_param(tzp, int, 0444);
-MODULE_PARM_DESC(tzp, "Thermal zone polling frequency, in 1/10 seconds.\n");
+MODULE_PARM_DESC(tzp, "Thermal zone polling frequency, in 1/10 seconds.");
 
 static int nocrt;
 module_param(nocrt, int, 0);
-MODULE_PARM_DESC(nocrt, "Set to disable action on ACPI thermal zone critical and hot trips.\n");
+MODULE_PARM_DESC(nocrt, "Set to take no action upon ACPI thermal zone critical trips points.");
 
 static int off;
 module_param(off, int, 0);
-MODULE_PARM_DESC(off, "Set to disable ACPI thermal support.\n");
+MODULE_PARM_DESC(off, "Set to disable ACPI thermal support.");
 
 static int psv;
 module_param(psv, int, 0644);
-MODULE_PARM_DESC(psv, "Disable or override all passive trip points.\n");
+MODULE_PARM_DESC(psv, "Disable or override all passive trip points.");
 
 static int acpi_thermal_add(struct acpi_device *device);
 static int acpi_thermal_remove(struct acpi_device *device, int type);
 static int acpi_thermal_resume(struct acpi_device *device);
+static void acpi_thermal_notify(struct acpi_device *device, u32 event);
 static int acpi_thermal_state_open_fs(struct inode *inode, struct file *file);
 static int acpi_thermal_temp_open_fs(struct inode *inode, struct file *file);
 static int acpi_thermal_trip_open_fs(struct inode *inode, struct file *file);
@@ -122,6 +127,7 @@ static struct acpi_driver acpi_thermal_driver = {
                .add = acpi_thermal_add,
                .remove = acpi_thermal_remove,
                .resume = acpi_thermal_resume,
+               .notify = acpi_thermal_notify,
                },
 };
 
@@ -189,10 +195,14 @@ struct acpi_thermal {
        struct acpi_thermal_state state;
        struct acpi_thermal_trips trips;
        struct acpi_handle_list devices;
-       struct timer_list timer;
+       struct thermal_zone_device *thermal_zone;
+       int tz_enabled;
+       int kelvin_offset;
+       struct mutex lock;
 };
 
 static const struct file_operations acpi_thermal_state_fops = {
+       .owner = THIS_MODULE,
        .open = acpi_thermal_state_open_fs,
        .read = seq_read,
        .llseek = seq_lseek,
@@ -200,6 +210,7 @@ static const struct file_operations acpi_thermal_state_fops = {
 };
 
 static const struct file_operations acpi_thermal_temp_fops = {
+       .owner = THIS_MODULE,
        .open = acpi_thermal_temp_open_fs,
        .read = seq_read,
        .llseek = seq_lseek,
@@ -207,6 +218,7 @@ static const struct file_operations acpi_thermal_temp_fops = {
 };
 
 static const struct file_operations acpi_thermal_trip_fops = {
+       .owner = THIS_MODULE,
        .open = acpi_thermal_trip_open_fs,
        .read = seq_read,
        .llseek = seq_lseek,
@@ -214,6 +226,7 @@ static const struct file_operations acpi_thermal_trip_fops = {
 };
 
 static const struct file_operations acpi_thermal_cooling_fops = {
+       .owner = THIS_MODULE,
        .open = acpi_thermal_cooling_open_fs,
        .read = seq_read,
        .write = acpi_thermal_write_cooling_mode,
@@ -222,6 +235,7 @@ static const struct file_operations acpi_thermal_cooling_fops = {
 };
 
 static const struct file_operations acpi_thermal_polling_fops = {
+       .owner = THIS_MODULE,
        .open = acpi_thermal_polling_open_fs,
        .read = seq_read,
        .write = acpi_thermal_write_polling,
@@ -236,18 +250,18 @@ static const struct file_operations acpi_thermal_polling_fops = {
 static int acpi_thermal_get_temperature(struct acpi_thermal *tz)
 {
        acpi_status status = AE_OK;
-
+       unsigned long long tmp;
 
        if (!tz)
                return -EINVAL;
 
        tz->last_temperature = tz->temperature;
 
-       status =
-           acpi_evaluate_integer(tz->device->handle, "_TMP", NULL, &tz->temperature);
+       status = acpi_evaluate_integer(tz->device->handle, "_TMP", NULL, &tmp);
        if (ACPI_FAILURE(status))
                return -ENODEV;
 
+       tz->temperature = tmp;
        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Temperature is %lu dK\n",
                          tz->temperature));
 
@@ -257,17 +271,16 @@ static int acpi_thermal_get_temperature(struct acpi_thermal *tz)
 static int acpi_thermal_get_polling_frequency(struct acpi_thermal *tz)
 {
        acpi_status status = AE_OK;
-
+       unsigned long long tmp;
 
        if (!tz)
                return -EINVAL;
 
-       status =
-           acpi_evaluate_integer(tz->device->handle, "_TZP", NULL,
-                                 &tz->polling_frequency);
+       status = acpi_evaluate_integer(tz->device->handle, "_TZP", NULL, &tmp);
        if (ACPI_FAILURE(status))
                return -ENODEV;
 
+       tz->polling_frequency = tmp;
        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Polling frequency is %lu dS\n",
                          tz->polling_frequency));
 
@@ -282,6 +295,11 @@ static int acpi_thermal_set_polling(struct acpi_thermal *tz, int seconds)
 
        tz->polling_frequency = seconds * 10;   /* Convert value to deci-seconds */
 
+       tz->thermal_zone->polling_delay = seconds * 1000;
+
+       if (tz->tz_enabled)
+               thermal_zone_device_update(tz->thermal_zone);
+
        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                          "Polling frequency set to %lu seconds\n",
                          tz->polling_frequency/10));
@@ -315,481 +333,643 @@ static int acpi_thermal_set_cooling_mode(struct acpi_thermal *tz, int mode)
        return 0;
 }
 
-static int acpi_thermal_get_trip_points(struct acpi_thermal *tz)
-{
-       acpi_status status = AE_OK;
-       int i = 0;
+#define ACPI_TRIPS_CRITICAL    0x01
+#define ACPI_TRIPS_HOT         0x02
+#define ACPI_TRIPS_PASSIVE     0x04
+#define ACPI_TRIPS_ACTIVE      0x08
+#define ACPI_TRIPS_DEVICES     0x10
 
+#define ACPI_TRIPS_REFRESH_THRESHOLDS  (ACPI_TRIPS_PASSIVE | ACPI_TRIPS_ACTIVE)
+#define ACPI_TRIPS_REFRESH_DEVICES     ACPI_TRIPS_DEVICES
 
-       if (!tz)
-               return -EINVAL;
+#define ACPI_TRIPS_INIT      (ACPI_TRIPS_CRITICAL | ACPI_TRIPS_HOT |   \
+                             ACPI_TRIPS_PASSIVE | ACPI_TRIPS_ACTIVE |  \
+                             ACPI_TRIPS_DEVICES)
 
-       /* Critical Shutdown (required) */
+/*
+ * This exception is thrown out in two cases:
+ * 1.An invalid trip point becomes invalid or a valid trip point becomes invalid
+ *   when re-evaluating the AML code.
+ * 2.TODO: Devices listed in _PSL, _ALx, _TZD may change.
+ *   We need to re-bind the cooling devices of a thermal zone when this occurs.
+ */
+#define ACPI_THERMAL_TRIPS_EXCEPTION(flags, str)       \
+do {   \
+       if (flags != ACPI_TRIPS_INIT)   \
+               ACPI_EXCEPTION((AE_INFO, AE_ERROR,      \
+               "ACPI thermal trip point %s changed\n"  \
+               "Please send acpidump to linux-acpi@vger.kernel.org\n", str)); \
+} while (0)
+
+static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
+{
+       acpi_status status = AE_OK;
+       unsigned long long tmp;
+       struct acpi_handle_list devices;
+       int valid = 0;
+       int i;
 
-       status = acpi_evaluate_integer(tz->device->handle, "_CRT", NULL,
-                                      &tz->trips.critical.temperature);
-       if (ACPI_FAILURE(status)) {
-               tz->trips.critical.flags.valid = 0;
-               ACPI_EXCEPTION((AE_INFO, status, "No critical threshold"));
-               return -ENODEV;
-       } else {
-               tz->trips.critical.flags.valid = 1;
-               ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                 "Found critical threshold [%lu]\n",
-                                 tz->trips.critical.temperature));
+       /* Critical Shutdown */
+       if (flag & ACPI_TRIPS_CRITICAL) {
+               status = acpi_evaluate_integer(tz->device->handle,
+                               "_CRT", NULL, &tmp);
+               tz->trips.critical.temperature = tmp;
+               /*
+                * Treat freezing temperatures as invalid as well; some
+                * BIOSes return really low values and cause reboots at startup.
+                * Below zero (Celsius) values clearly aren't right for sure..
+                * ... so lets discard those as invalid.
+                */
+               if (ACPI_FAILURE(status)) {
+                       tz->trips.critical.flags.valid = 0;
+                       ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                         "No critical threshold\n"));
+               } else if (tmp <= 2732) {
+                       printk(KERN_WARNING FW_BUG "Invalid critical threshold "
+                              "(%llu)\n", tmp);
+                       tz->trips.critical.flags.valid = 0;
+               } else {
+                       tz->trips.critical.flags.valid = 1;
+                       ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                         "Found critical threshold [%lu]\n",
+                                         tz->trips.critical.temperature));
+               }
+               if (tz->trips.critical.flags.valid == 1) {
+                       if (crt == -1) {
+                               tz->trips.critical.flags.valid = 0;
+                       } else if (crt > 0) {
+                               unsigned long crt_k = CELSIUS_TO_KELVIN(crt);
+                               /*
+                                * Allow override critical threshold
+                                */
+                               if (crt_k > tz->trips.critical.temperature)
+                                       printk(KERN_WARNING PREFIX
+                                               "Critical threshold %d C\n", crt);
+                               tz->trips.critical.temperature = crt_k;
+                       }
+               }
        }
 
        /* Critical Sleep (optional) */
-
-       status =
-           acpi_evaluate_integer(tz->device->handle, "_HOT", NULL,
-                                 &tz->trips.hot.temperature);
-       if (ACPI_FAILURE(status)) {
-               tz->trips.hot.flags.valid = 0;
-               ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No hot threshold\n"));
-       } else {
-               tz->trips.hot.flags.valid = 1;
-               ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found hot threshold [%lu]\n",
-                                 tz->trips.hot.temperature));
-       }
-
-       /* Passive: Processors (optional) */
-
-       if (psv == -1) {
-               status = AE_SUPPORT;
-       } else if (psv > 0) {
-               tz->trips.passive.temperature = CELSIUS_TO_KELVIN(psv);
-               status = AE_OK;
-       } else {
+       if (flag & ACPI_TRIPS_HOT) {
                status = acpi_evaluate_integer(tz->device->handle,
-                       "_PSV", NULL, &tz->trips.passive.temperature);
+                               "_HOT", NULL, &tmp);
+               if (ACPI_FAILURE(status)) {
+                       tz->trips.hot.flags.valid = 0;
+                       ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                       "No hot threshold\n"));
+               } else {
+                       tz->trips.hot.temperature = tmp;
+                       tz->trips.hot.flags.valid = 1;
+                       ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                       "Found hot threshold [%lu]\n",
+                                       tz->trips.critical.temperature));
+               }
        }
 
-       if (ACPI_FAILURE(status)) {
-               tz->trips.passive.flags.valid = 0;
-               ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No passive threshold\n"));
-       } else {
-               tz->trips.passive.flags.valid = 1;
-
-               status =
-                   acpi_evaluate_integer(tz->device->handle, "_TC1", NULL,
-                                         &tz->trips.passive.tc1);
-               if (ACPI_FAILURE(status))
-                       tz->trips.passive.flags.valid = 0;
-
-               status =
-                   acpi_evaluate_integer(tz->device->handle, "_TC2", NULL,
-                                         &tz->trips.passive.tc2);
-               if (ACPI_FAILURE(status))
-                       tz->trips.passive.flags.valid = 0;
+       /* Passive (optional) */
+       if (((flag & ACPI_TRIPS_PASSIVE) && tz->trips.passive.flags.valid) ||
+               (flag == ACPI_TRIPS_INIT)) {
+               valid = tz->trips.passive.flags.valid;
+               if (psv == -1) {
+                       status = AE_SUPPORT;
+               } else if (psv > 0) {
+                       tmp = CELSIUS_TO_KELVIN(psv);
+                       status = AE_OK;
+               } else {
+                       status = acpi_evaluate_integer(tz->device->handle,
+                               "_PSV", NULL, &tmp);
+               }
 
-               status =
-                   acpi_evaluate_integer(tz->device->handle, "_TSP", NULL,
-                                         &tz->trips.passive.tsp);
                if (ACPI_FAILURE(status))
                        tz->trips.passive.flags.valid = 0;
-
-               status =
-                   acpi_evaluate_reference(tz->device->handle, "_PSL", NULL,
-                                           &tz->trips.passive.devices);
-               if (ACPI_FAILURE(status))
+               else {
+                       tz->trips.passive.temperature = tmp;
+                       tz->trips.passive.flags.valid = 1;
+                       if (flag == ACPI_TRIPS_INIT) {
+                               status = acpi_evaluate_integer(
+                                               tz->device->handle, "_TC1",
+                                               NULL, &tmp);
+                               if (ACPI_FAILURE(status))
+                                       tz->trips.passive.flags.valid = 0;
+                               else
+                                       tz->trips.passive.tc1 = tmp;
+                               status = acpi_evaluate_integer(
+                                               tz->device->handle, "_TC2",
+                                               NULL, &tmp);
+                               if (ACPI_FAILURE(status))
+                                       tz->trips.passive.flags.valid = 0;
+                               else
+                                       tz->trips.passive.tc2 = tmp;
+                               status = acpi_evaluate_integer(
+                                               tz->device->handle, "_TSP",
+                                               NULL, &tmp);
+                               if (ACPI_FAILURE(status))
+                                       tz->trips.passive.flags.valid = 0;
+                               else
+                                       tz->trips.passive.tsp = tmp;
+                       }
+               }
+       }
+       if ((flag & ACPI_TRIPS_DEVICES) && tz->trips.passive.flags.valid) {
+               memset(&devices, 0, sizeof(struct acpi_handle_list));
+               status = acpi_evaluate_reference(tz->device->handle, "_PSL",
+                                                       NULL, &devices);
+               if (ACPI_FAILURE(status)) {
+                       printk(KERN_WARNING PREFIX
+                               "Invalid passive threshold\n");
                        tz->trips.passive.flags.valid = 0;
-
-               if (!tz->trips.passive.flags.valid)
-                       printk(KERN_WARNING PREFIX "Invalid passive threshold\n");
+               }
                else
-                       ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                         "Found passive threshold [%lu]\n",
-                                         tz->trips.passive.temperature));
-       }
+                       tz->trips.passive.flags.valid = 1;
 
-       /* Active: Fans, etc. (optional) */
+               if (memcmp(&tz->trips.passive.devices, &devices,
+                               sizeof(struct acpi_handle_list))) {
+                       memcpy(&tz->trips.passive.devices, &devices,
+                               sizeof(struct acpi_handle_list));
+                       ACPI_THERMAL_TRIPS_EXCEPTION(flag, "device");
+               }
+       }
+       if ((flag & ACPI_TRIPS_PASSIVE) || (flag & ACPI_TRIPS_DEVICES)) {
+               if (valid != tz->trips.passive.flags.valid)
+                               ACPI_THERMAL_TRIPS_EXCEPTION(flag, "state");
+       }
 
+       /* Active (optional) */
        for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++) {
-
                char name[5] = { '_', 'A', 'C', ('0' + i), '\0' };
+               valid = tz->trips.active[i].flags.valid;
 
                if (act == -1)
-                       break;  /* disable all active trip points */
-
-               status = acpi_evaluate_integer(tz->device->handle,
-                       name, NULL, &tz->trips.active[i].temperature);
-
-               if (ACPI_FAILURE(status)) {
-                       if (i == 0)     /* no active trip points */
-                               break;
-                       if (act <= 0)   /* no override requested */
+                       break; /* disable all active trip points */
+
+               if ((flag == ACPI_TRIPS_INIT) || ((flag & ACPI_TRIPS_ACTIVE) &&
+                       tz->trips.active[i].flags.valid)) {
+                       status = acpi_evaluate_integer(tz->device->handle,
+                                                       name, NULL, &tmp);
+                       if (ACPI_FAILURE(status)) {
+                               tz->trips.active[i].flags.valid = 0;
+                               if (i == 0)
+                                       break;
+                               if (act <= 0)
+                                       break;
+                               if (i == 1)
+                                       tz->trips.active[0].temperature =
+                                               CELSIUS_TO_KELVIN(act);
+                               else
+                                       /*
+                                        * Don't allow override higher than
+                                        * the next higher trip point
+                                        */
+                                       tz->trips.active[i - 1].temperature =
+                                               (tz->trips.active[i - 2].temperature <
+                                               CELSIUS_TO_KELVIN(act) ?
+                                               tz->trips.active[i - 2].temperature :
+                                               CELSIUS_TO_KELVIN(act));
                                break;
-                       if (i == 1) {   /* 1 trip point */
-                               tz->trips.active[0].temperature =
-                                       CELSIUS_TO_KELVIN(act);
-                       } else {        /* multiple trips */
-                               /*
-                                * Don't allow override higher than
-                                * the next higher trip point
-                                */
-                               tz->trips.active[i - 1].temperature =
-                                   (tz->trips.active[i - 2].temperature <
-                                       CELSIUS_TO_KELVIN(act) ?
-                                       tz->trips.active[i - 2].temperature :
-                                       CELSIUS_TO_KELVIN(act));
+                       } else {
+                               tz->trips.active[i].temperature = tmp;
+                               tz->trips.active[i].flags.valid = 1;
                        }
-                       break;
                }
 
                name[2] = 'L';
-               status =
-                   acpi_evaluate_reference(tz->device->handle, name, NULL,
-                                           &tz->trips.active[i].devices);
-               if (ACPI_SUCCESS(status)) {
-                       tz->trips.active[i].flags.valid = 1;
-                       ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                         "Found active threshold [%d]:[%lu]\n",
-                                         i, tz->trips.active[i].temperature));
-               } else
-                       ACPI_EXCEPTION((AE_INFO, status,
-                                       "Invalid active threshold [%d]", i));
+               if ((flag & ACPI_TRIPS_DEVICES) && tz->trips.active[i].flags.valid ) {
+                       memset(&devices, 0, sizeof(struct acpi_handle_list));
+                       status = acpi_evaluate_reference(tz->device->handle,
+                                               name, NULL, &devices);
+                       if (ACPI_FAILURE(status)) {
+                               printk(KERN_WARNING PREFIX
+                                       "Invalid active%d threshold\n", i);
+                               tz->trips.active[i].flags.valid = 0;
+                       }
+                       else
+                               tz->trips.active[i].flags.valid = 1;
+
+                       if (memcmp(&tz->trips.active[i].devices, &devices,
+                                       sizeof(struct acpi_handle_list))) {
+                               memcpy(&tz->trips.active[i].devices, &devices,
+                                       sizeof(struct acpi_handle_list));
+                               ACPI_THERMAL_TRIPS_EXCEPTION(flag, "device");
+                       }
+               }
+               if ((flag & ACPI_TRIPS_ACTIVE) || (flag & ACPI_TRIPS_DEVICES))
+                       if (valid != tz->trips.active[i].flags.valid)
+                               ACPI_THERMAL_TRIPS_EXCEPTION(flag, "state");
+
+               if (!tz->trips.active[i].flags.valid)
+                       break;
+       }
+
+       if (flag & ACPI_TRIPS_DEVICES) {
+               memset(&devices, 0, sizeof(struct acpi_handle_list));
+               status = acpi_evaluate_reference(tz->device->handle, "_TZD",
+                                               NULL, &devices);
+               if (memcmp(&tz->devices, &devices,
+                               sizeof(struct acpi_handle_list))) {
+                       memcpy(&tz->devices, &devices,
+                               sizeof(struct acpi_handle_list));
+                       ACPI_THERMAL_TRIPS_EXCEPTION(flag, "device");
+               }
        }
 
        return 0;
 }
 
-static int acpi_thermal_get_devices(struct acpi_thermal *tz)
+static int acpi_thermal_get_trip_points(struct acpi_thermal *tz)
 {
-       acpi_status status = AE_OK;
+       int i, valid, ret = acpi_thermal_trips_update(tz, ACPI_TRIPS_INIT);
 
+       if (ret)
+               return ret;
 
-       if (!tz)
-               return -EINVAL;
+       valid = tz->trips.critical.flags.valid |
+               tz->trips.hot.flags.valid |
+               tz->trips.passive.flags.valid;
 
-       status =
-           acpi_evaluate_reference(tz->device->handle, "_TZD", NULL, &tz->devices);
-       if (ACPI_FAILURE(status))
-               return -ENODEV;
+       for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++)
+               valid |= tz->trips.active[i].flags.valid;
 
+       if (!valid) {
+               printk(KERN_WARNING FW_BUG "No valid trip found\n");
+               return -ENODEV;
+       }
        return 0;
 }
 
-static int acpi_thermal_critical(struct acpi_thermal *tz)
+static void acpi_thermal_check(void *data)
 {
-       if (!tz || !tz->trips.critical.flags.valid || nocrt)
-               return -EINVAL;
+       struct acpi_thermal *tz = data;
 
-       if (tz->temperature >= tz->trips.critical.temperature) {
-               printk(KERN_WARNING PREFIX "Critical trip point\n");
-               tz->trips.critical.flags.enabled = 1;
-       } else if (tz->trips.critical.flags.enabled)
-               tz->trips.critical.flags.enabled = 0;
+       thermal_zone_device_update(tz->thermal_zone);
+}
 
-       printk(KERN_EMERG
-              "Critical temperature reached (%ld C), shutting down.\n",
-              KELVIN_TO_CELSIUS(tz->temperature));
-       acpi_bus_generate_event(tz->device, ACPI_THERMAL_NOTIFY_CRITICAL,
-                               tz->trips.critical.flags.enabled);
+/* sys I/F for generic thermal sysfs support */
+#define KELVIN_TO_MILLICELSIUS(t, off) (((t) - (off)) * 100)
 
-       orderly_poweroff(true);
+static int thermal_get_temp(struct thermal_zone_device *thermal,
+                           unsigned long *temp)
+{
+       struct acpi_thermal *tz = thermal->devdata;
+       int result;
 
+       if (!tz)
+               return -EINVAL;
+
+       result = acpi_thermal_get_temperature(tz);
+       if (result)
+               return result;
+
+       *temp = KELVIN_TO_MILLICELSIUS(tz->temperature, tz->kelvin_offset);
        return 0;
 }
 
-static int acpi_thermal_hot(struct acpi_thermal *tz)
+static const char enabled[] = "kernel";
+static const char disabled[] = "user";
+static int thermal_get_mode(struct thermal_zone_device *thermal,
+                               enum thermal_device_mode *mode)
 {
-       if (!tz || !tz->trips.hot.flags.valid || nocrt)
+       struct acpi_thermal *tz = thermal->devdata;
+
+       if (!tz)
                return -EINVAL;
 
-       if (tz->temperature >= tz->trips.hot.temperature) {
-               printk(KERN_WARNING PREFIX "Hot trip point\n");
-               tz->trips.hot.flags.enabled = 1;
-       } else if (tz->trips.hot.flags.enabled)
-               tz->trips.hot.flags.enabled = 0;
+       *mode = tz->tz_enabled ? THERMAL_DEVICE_ENABLED :
+               THERMAL_DEVICE_DISABLED;
+
+       return 0;
+}
 
-       acpi_bus_generate_event(tz->device, ACPI_THERMAL_NOTIFY_HOT,
-                               tz->trips.hot.flags.enabled);
+static int thermal_set_mode(struct thermal_zone_device *thermal,
+                               enum thermal_device_mode mode)
+{
+       struct acpi_thermal *tz = thermal->devdata;
+       int enable;
+
+       if (!tz)
+               return -EINVAL;
 
-       /* TBD: Call user-mode "sleep(S4)" function */
+       /*
+        * enable/disable thermal management from ACPI thermal driver
+        */
+       if (mode == THERMAL_DEVICE_ENABLED)
+               enable = 1;
+       else if (mode == THERMAL_DEVICE_DISABLED)
+               enable = 0;
+       else
+               return -EINVAL;
 
+       if (enable != tz->tz_enabled) {
+               tz->tz_enabled = enable;
+               ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                       "%s ACPI thermal control\n",
+                       tz->tz_enabled ? enabled : disabled));
+               acpi_thermal_check(tz);
+       }
        return 0;
 }
 
-static void acpi_thermal_passive(struct acpi_thermal *tz)
+static int thermal_get_trip_type(struct thermal_zone_device *thermal,
+                                int trip, enum thermal_trip_type *type)
 {
-       int result = 1;
-       struct acpi_thermal_passive *passive = NULL;
-       int trend = 0;
-       int i = 0;
+       struct acpi_thermal *tz = thermal->devdata;
+       int i;
 
+       if (!tz || trip < 0)
+               return -EINVAL;
 
-       if (!tz || !tz->trips.passive.flags.valid)
-               return;
+       if (tz->trips.critical.flags.valid) {
+               if (!trip) {
+                       *type = THERMAL_TRIP_CRITICAL;
+                       return 0;
+               }
+               trip--;
+       }
 
-       passive = &(tz->trips.passive);
+       if (tz->trips.hot.flags.valid) {
+               if (!trip) {
+                       *type = THERMAL_TRIP_HOT;
+                       return 0;
+               }
+               trip--;
+       }
 
-       /*
-        * Above Trip?
-        * -----------
-        * Calculate the thermal trend (using the passive cooling equation)
-        * and modify the performance limit for all passive cooling devices
-        * accordingly.  Note that we assume symmetry.
-        */
-       if (tz->temperature >= passive->temperature) {
-               trend =
-                   (passive->tc1 * (tz->temperature - tz->last_temperature)) +
-                   (passive->tc2 * (tz->temperature - passive->temperature));
-               ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                 "trend[%d]=(tc1[%lu]*(tmp[%lu]-last[%lu]))+(tc2[%lu]*(tmp[%lu]-psv[%lu]))\n",
-                                 trend, passive->tc1, tz->temperature,
-                                 tz->last_temperature, passive->tc2,
-                                 tz->temperature, passive->temperature));
-               passive->flags.enabled = 1;
-               /* Heating up? */
-               if (trend > 0)
-                       for (i = 0; i < passive->devices.count; i++)
-                               acpi_processor_set_thermal_limit(passive->
-                                                                devices.
-                                                                handles[i],
-                                                                ACPI_PROCESSOR_LIMIT_INCREMENT);
-               /* Cooling off? */
-               else if (trend < 0) {
-                       for (i = 0; i < passive->devices.count; i++)
-                               /*
-                                * assume that we are on highest
-                                * freq/lowest thrott and can leave
-                                * passive mode, even in error case
-                                */
-                               if (!acpi_processor_set_thermal_limit
-                                   (passive->devices.handles[i],
-                                    ACPI_PROCESSOR_LIMIT_DECREMENT))
-                                       result = 0;
-                       /*
-                        * Leave cooling mode, even if the temp might
-                        * higher than trip point This is because some
-                        * machines might have long thermal polling
-                        * frequencies (tsp) defined. We will fall back
-                        * into passive mode in next cycle (probably quicker)
-                        */
-                       if (result) {
-                               passive->flags.enabled = 0;
-                               ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                                 "Disabling passive cooling, still above threshold,"
-                                                 " but we are cooling down\n"));
-                       }
+       if (tz->trips.passive.flags.valid) {
+               if (!trip) {
+                       *type = THERMAL_TRIP_PASSIVE;
+                       return 0;
                }
-               return;
+               trip--;
        }
 
-       /*
-        * Below Trip?
-        * -----------
-        * Implement passive cooling hysteresis to slowly increase performance
-        * and avoid thrashing around the passive trip point.  Note that we
-        * assume symmetry.
-        */
-       if (!passive->flags.enabled)
-               return;
-       for (i = 0; i < passive->devices.count; i++)
-               if (!acpi_processor_set_thermal_limit
-                   (passive->devices.handles[i],
-                    ACPI_PROCESSOR_LIMIT_DECREMENT))
-                       result = 0;
-       if (result) {
-               passive->flags.enabled = 0;
-               ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                 "Disabling passive cooling (zone is cool)\n"));
+       for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE &&
+               tz->trips.active[i].flags.valid; i++) {
+               if (!trip) {
+                       *type = THERMAL_TRIP_ACTIVE;
+                       return 0;
+               }
+               trip--;
        }
+
+       return -EINVAL;
 }
 
-static void acpi_thermal_active(struct acpi_thermal *tz)
+static int thermal_get_trip_temp(struct thermal_zone_device *thermal,
+                                int trip, unsigned long *temp)
 {
-       int result = 0;
-       struct acpi_thermal_active *active = NULL;
-       int i = 0;
-       int j = 0;
-       unsigned long maxtemp = 0;
+       struct acpi_thermal *tz = thermal->devdata;
+       int i;
 
+       if (!tz || trip < 0)
+               return -EINVAL;
 
-       if (!tz)
-               return;
+       if (tz->trips.critical.flags.valid) {
+               if (!trip) {
+                       *temp = KELVIN_TO_MILLICELSIUS(
+                               tz->trips.critical.temperature,
+                               tz->kelvin_offset);
+                       return 0;
+               }
+               trip--;
+       }
 
-       for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++) {
-               active = &(tz->trips.active[i]);
-               if (!active || !active->flags.valid)
-                       break;
-               if (tz->temperature >= active->temperature) {
-                       /*
-                        * Above Threshold?
-                        * ----------------
-                        * If not already enabled, turn ON all cooling devices
-                        * associated with this active threshold.
-                        */
-                       if (active->temperature > maxtemp)
-                               tz->state.active_index = i;
-                       maxtemp = active->temperature;
-                       if (active->flags.enabled)
-                               continue;
-                       for (j = 0; j < active->devices.count; j++) {
-                               result =
-                                   acpi_bus_set_power(active->devices.
-                                                      handles[j],
-                                                      ACPI_STATE_D0);
-                               if (result) {
-                                       printk(KERN_WARNING PREFIX
-                                                     "Unable to turn cooling device [%p] 'on'\n",
-                                                     active->devices.
-                                                     handles[j]);
-                                       continue;
-                               }
-                               active->flags.enabled = 1;
-                               ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                                 "Cooling device [%p] now 'on'\n",
-                                                 active->devices.handles[j]));
-                       }
-                       continue;
+       if (tz->trips.hot.flags.valid) {
+               if (!trip) {
+                       *temp = KELVIN_TO_MILLICELSIUS(
+                               tz->trips.hot.temperature,
+                               tz->kelvin_offset);
+                       return 0;
                }
-               if (!active->flags.enabled)
-                       continue;
-               /*
-                * Below Threshold?
-                * ----------------
-                * Turn OFF all cooling devices associated with this
-                * threshold.
-                */
-               for (j = 0; j < active->devices.count; j++) {
-                       result = acpi_bus_set_power(active->devices.handles[j],
-                                                   ACPI_STATE_D3);
-                       if (result) {
-                               printk(KERN_WARNING PREFIX
-                                             "Unable to turn cooling device [%p] 'off'\n",
-                                             active->devices.handles[j]);
-                               continue;
-                       }
-                       active->flags.enabled = 0;
-                       ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                         "Cooling device [%p] now 'off'\n",
-                                         active->devices.handles[j]));
+               trip--;
+       }
+
+       if (tz->trips.passive.flags.valid) {
+               if (!trip) {
+                       *temp = KELVIN_TO_MILLICELSIUS(
+                               tz->trips.passive.temperature,
+                               tz->kelvin_offset);
+                       return 0;
+               }
+               trip--;
+       }
+
+       for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE &&
+               tz->trips.active[i].flags.valid; i++) {
+               if (!trip) {
+                       *temp = KELVIN_TO_MILLICELSIUS(
+                               tz->trips.active[i].temperature,
+                               tz->kelvin_offset);
+                       return 0;
                }
+               trip--;
        }
+
+       return -EINVAL;
 }
 
-static void acpi_thermal_check(void *context);
+static int thermal_get_crit_temp(struct thermal_zone_device *thermal,
+                               unsigned long *temperature) {
+       struct acpi_thermal *tz = thermal->devdata;
 
-static void acpi_thermal_run(unsigned long data)
+       if (tz->trips.critical.flags.valid) {
+               *temperature = KELVIN_TO_MILLICELSIUS(
+                               tz->trips.critical.temperature,
+                               tz->kelvin_offset);
+               return 0;
+       } else
+               return -EINVAL;
+}
+
+static int thermal_notify(struct thermal_zone_device *thermal, int trip,
+                          enum thermal_trip_type trip_type)
 {
-       struct acpi_thermal *tz = (struct acpi_thermal *)data;
-       if (!tz->zombie)
-               acpi_os_execute(OSL_GPE_HANDLER, acpi_thermal_check, (void *)data);
+       u8 type = 0;
+       struct acpi_thermal *tz = thermal->devdata;
+
+       if (trip_type == THERMAL_TRIP_CRITICAL)
+               type = ACPI_THERMAL_NOTIFY_CRITICAL;
+       else if (trip_type == THERMAL_TRIP_HOT)
+               type = ACPI_THERMAL_NOTIFY_HOT;
+       else
+               return 0;
+
+       acpi_bus_generate_proc_event(tz->device, type, 1);
+       acpi_bus_generate_netlink_event(tz->device->pnp.device_class,
+                                       dev_name(&tz->device->dev), type, 1);
+
+       if (trip_type == THERMAL_TRIP_CRITICAL && nocrt)
+               return 1;
+
+       return 0;
 }
 
-static void acpi_thermal_check(void *data)
+typedef int (*cb)(struct thermal_zone_device *, int,
+                 struct thermal_cooling_device *);
+static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal,
+                                       struct thermal_cooling_device *cdev,
+                                       cb action)
 {
+       struct acpi_device *device = cdev->devdata;
+       struct acpi_thermal *tz = thermal->devdata;
+       struct acpi_device *dev;
+       acpi_status status;
+       acpi_handle handle;
+       int i;
+       int j;
+       int trip = -1;
        int result = 0;
-       struct acpi_thermal *tz = data;
-       unsigned long sleep_time = 0;
-       int i = 0;
-       struct acpi_thermal_state state;
 
+       if (tz->trips.critical.flags.valid)
+               trip++;
 
-       if (!tz) {
-               printk(KERN_ERR PREFIX "Invalid (NULL) context\n");
-               return;
+       if (tz->trips.hot.flags.valid)
+               trip++;
+
+       if (tz->trips.passive.flags.valid) {
+               trip++;
+               for (i = 0; i < tz->trips.passive.devices.count;
+                   i++) {
+                       handle = tz->trips.passive.devices.handles[i];
+                       status = acpi_bus_get_device(handle, &dev);
+                       if (ACPI_SUCCESS(status) && (dev == device)) {
+                               result = action(thermal, trip, cdev);
+                               if (result)
+                                       goto failed;
+                       }
+               }
        }
 
-       state = tz->state;
+       for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++) {
+               if (!tz->trips.active[i].flags.valid)
+                       break;
+               trip++;
+               for (j = 0;
+                   j < tz->trips.active[i].devices.count;
+                   j++) {
+                       handle = tz->trips.active[i].devices.handles[j];
+                       status = acpi_bus_get_device(handle, &dev);
+                       if (ACPI_SUCCESS(status) && (dev == device)) {
+                               result = action(thermal, trip, cdev);
+                               if (result)
+                                       goto failed;
+                       }
+               }
+       }
 
-       result = acpi_thermal_get_temperature(tz);
-       if (result)
-               return;
+       for (i = 0; i < tz->devices.count; i++) {
+               handle = tz->devices.handles[i];
+               status = acpi_bus_get_device(handle, &dev);
+               if (ACPI_SUCCESS(status) && (dev == device)) {
+                       result = action(thermal, -1, cdev);
+                       if (result)
+                               goto failed;
+               }
+       }
 
-       memset(&tz->state, 0, sizeof(tz->state));
+failed:
+       return result;
+}
+
+static int
+acpi_thermal_bind_cooling_device(struct thermal_zone_device *thermal,
+                                       struct thermal_cooling_device *cdev)
+{
+       return acpi_thermal_cooling_device_cb(thermal, cdev,
+                               thermal_zone_bind_cooling_device);
+}
+
+static int
+acpi_thermal_unbind_cooling_device(struct thermal_zone_device *thermal,
+                                       struct thermal_cooling_device *cdev)
+{
+       return acpi_thermal_cooling_device_cb(thermal, cdev,
+                               thermal_zone_unbind_cooling_device);
+}
+
+static struct thermal_zone_device_ops acpi_thermal_zone_ops = {
+       .bind = acpi_thermal_bind_cooling_device,
+       .unbind = acpi_thermal_unbind_cooling_device,
+       .get_temp = thermal_get_temp,
+       .get_mode = thermal_get_mode,
+       .set_mode = thermal_set_mode,
+       .get_trip_type = thermal_get_trip_type,
+       .get_trip_temp = thermal_get_trip_temp,
+       .get_crit_temp = thermal_get_crit_temp,
+       .notify = thermal_notify,
+};
+
+static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)
+{
+       int trips = 0;
+       int result;
+       acpi_status status;
+       int i;
 
-       /*
-        * Check Trip Points
-        * -----------------
-        * Compare the current temperature to the trip point values to see
-        * if we've entered one of the thermal policy states.  Note that
-        * this function determines when a state is entered, but the 
-        * individual policy decides when it is exited (e.g. hysteresis).
-        */
        if (tz->trips.critical.flags.valid)
-               state.critical |=
-                   (tz->temperature >= tz->trips.critical.temperature);
+               trips++;
+
        if (tz->trips.hot.flags.valid)
-               state.hot |= (tz->temperature >= tz->trips.hot.temperature);
+               trips++;
+
        if (tz->trips.passive.flags.valid)
-               state.passive |=
-                   (tz->temperature >= tz->trips.passive.temperature);
-       for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++)
-               if (tz->trips.active[i].flags.valid)
-                       state.active |=
-                           (tz->temperature >=
-                            tz->trips.active[i].temperature);
+               trips++;
 
-       /*
-        * Invoke Policy
-        * -------------
-        * Separated from the above check to allow individual policy to 
-        * determine when to exit a given state.
-        */
-       if (state.critical)
-               acpi_thermal_critical(tz);
-       if (state.hot)
-               acpi_thermal_hot(tz);
-       if (state.passive)
-               acpi_thermal_passive(tz);
-       if (state.active)
-               acpi_thermal_active(tz);
+       for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE &&
+                       tz->trips.active[i].flags.valid; i++, trips++);
 
-       /*
-        * Calculate State
-        * ---------------
-        * Again, separated from the above two to allow independent policy
-        * decisions.
-        */
-       tz->state.critical = tz->trips.critical.flags.enabled;
-       tz->state.hot = tz->trips.hot.flags.enabled;
-       tz->state.passive = tz->trips.passive.flags.enabled;
-       tz->state.active = 0;
-       for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++)
-               tz->state.active |= tz->trips.active[i].flags.enabled;
+       if (tz->trips.passive.flags.valid)
+               tz->thermal_zone =
+                       thermal_zone_device_register("acpitz", trips, tz,
+                                                    &acpi_thermal_zone_ops,
+                                                    tz->trips.passive.tc1,
+                                                    tz->trips.passive.tc2,
+                                                    tz->trips.passive.tsp*100,
+                                                    tz->polling_frequency*100);
+       else
+               tz->thermal_zone =
+                       thermal_zone_device_register("acpitz", trips, tz,
+                                                    &acpi_thermal_zone_ops,
+                                                    0, 0, 0,
+                                                    tz->polling_frequency*100);
+       if (IS_ERR(tz->thermal_zone))
+               return -ENODEV;
 
-       /*
-        * Calculate Sleep Time
-        * --------------------
-        * If we're in the passive state, use _TSP's value.  Otherwise
-        * use the default polling frequency (e.g. _TZP).  If no polling
-        * frequency is specified then we'll wait forever (at least until
-        * a thermal event occurs).  Note that _TSP and _TZD values are
-        * given in 1/10th seconds (we must covert to milliseconds).
-        */
-       if (tz->state.passive)
-               sleep_time = tz->trips.passive.tsp * 100;
-       else if (tz->polling_frequency > 0)
-               sleep_time = tz->polling_frequency * 100;
+       result = sysfs_create_link(&tz->device->dev.kobj,
+                                  &tz->thermal_zone->device.kobj, "thermal_zone");
+       if (result)
+               return result;
 
-       ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%s: temperature[%lu] sleep[%lu]\n",
-                         tz->name, tz->temperature, sleep_time));
+       result = sysfs_create_link(&tz->thermal_zone->device.kobj,
+                                  &tz->device->dev.kobj, "device");
+       if (result)
+               return result;
 
-       /*
-        * Schedule Next Poll
-        * ------------------
-        */
-       if (!sleep_time) {
-               if (timer_pending(&(tz->timer)))
-                       del_timer(&(tz->timer));
-       } else {
-               if (timer_pending(&(tz->timer)))
-                       mod_timer(&(tz->timer),
-                                       jiffies + (HZ * sleep_time) / 1000);
-               else {
-                       tz->timer.data = (unsigned long)tz;
-                       tz->timer.function = acpi_thermal_run;
-                       tz->timer.expires = jiffies + (HZ * sleep_time) / 1000;
-                       add_timer(&(tz->timer));
-               }
+       status = acpi_attach_data(tz->device->handle,
+                                 acpi_bus_private_data_handler,
+                                 tz->thermal_zone);
+       if (ACPI_FAILURE(status)) {
+               printk(KERN_ERR PREFIX
+                               "Error attaching device data\n");
+               return -ENODEV;
        }
 
-       return;
+       tz->tz_enabled = 1;
+
+       dev_info(&tz->device->dev, "registered as thermal_zone%d\n",
+                tz->thermal_zone->id);
+       return 0;
 }
 
+static void acpi_thermal_unregister_thermal_zone(struct acpi_thermal *tz)
+{
+       sysfs_remove_link(&tz->device->dev.kobj, "thermal_zone");
+       sysfs_remove_link(&tz->thermal_zone->device.kobj, "device");
+       thermal_zone_device_unregister(tz->thermal_zone);
+       tz->thermal_zone = NULL;
+       acpi_detach_data(tz->device->handle, acpi_bus_private_data_handler);
+}
+
+
 /* --------------------------------------------------------------------------
                               FS Interface (/proc)
    -------------------------------------------------------------------------- */
@@ -891,6 +1071,13 @@ static int acpi_thermal_trip_seq_show(struct seq_file *seq, void *offset)
                                   acpi_device_bid(device));
                }
                seq_puts(seq, "\n");
+       } else {
+               seq_printf(seq, "passive (forced):");
+               if (tz->thermal_zone->forced_passive)
+                       seq_printf(seq, "        %i C\n",
+                                  tz->thermal_zone->forced_passive / 1000);
+               else
+                       seq_printf(seq, "<not set>\n");
        }
 
        for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++) {
@@ -982,13 +1169,13 @@ static int acpi_thermal_polling_seq_show(struct seq_file *seq, void *offset)
        if (!tz)
                goto end;
 
-       if (!tz->polling_frequency) {
+       if (!tz->thermal_zone->polling_delay) {
                seq_puts(seq, "<polling disabled>\n");
                goto end;
        }
 
-       seq_printf(seq, "polling frequency:       %lu seconds\n",
-                  (tz->polling_frequency / 10));
+       seq_printf(seq, "polling frequency:       %d seconds\n",
+                  (tz->thermal_zone->polling_delay / 1000));
 
       end:
        return 0;
@@ -1041,67 +1228,50 @@ static int acpi_thermal_add_fs(struct acpi_device *device)
                                                     acpi_thermal_dir);
                if (!acpi_device_dir(device))
                        return -ENODEV;
-               acpi_device_dir(device)->owner = THIS_MODULE;
        }
 
        /* 'state' [R] */
-       entry = create_proc_entry(ACPI_THERMAL_FILE_STATE,
-                                 S_IRUGO, acpi_device_dir(device));
+       entry = proc_create_data(ACPI_THERMAL_FILE_STATE,
+                                S_IRUGO, acpi_device_dir(device),
+                                &acpi_thermal_state_fops,
+                                acpi_driver_data(device));
        if (!entry)
                return -ENODEV;
-       else {
-               entry->proc_fops = &acpi_thermal_state_fops;
-               entry->data = acpi_driver_data(device);
-               entry->owner = THIS_MODULE;
-       }
 
        /* 'temperature' [R] */
-       entry = create_proc_entry(ACPI_THERMAL_FILE_TEMPERATURE,
-                                 S_IRUGO, acpi_device_dir(device));
+       entry = proc_create_data(ACPI_THERMAL_FILE_TEMPERATURE,
+                                S_IRUGO, acpi_device_dir(device),
+                                &acpi_thermal_temp_fops,
+                                acpi_driver_data(device));
        if (!entry)
                return -ENODEV;
-       else {
-               entry->proc_fops = &acpi_thermal_temp_fops;
-               entry->data = acpi_driver_data(device);
-               entry->owner = THIS_MODULE;
-       }
 
-       /* 'trip_points' [R/W] */
-       entry = create_proc_entry(ACPI_THERMAL_FILE_TRIP_POINTS,
-                                 S_IFREG | S_IRUGO | S_IWUSR,
-                                 acpi_device_dir(device));
+       /* 'trip_points' [R] */
+       entry = proc_create_data(ACPI_THERMAL_FILE_TRIP_POINTS,
+                                S_IRUGO,
+                                acpi_device_dir(device),
+                                &acpi_thermal_trip_fops,
+                                acpi_driver_data(device));
        if (!entry)
                return -ENODEV;
-       else {
-               entry->proc_fops = &acpi_thermal_trip_fops;
-               entry->data = acpi_driver_data(device);
-               entry->owner = THIS_MODULE;
-       }
 
        /* 'cooling_mode' [R/W] */
-       entry = create_proc_entry(ACPI_THERMAL_FILE_COOLING_MODE,
-                                 S_IFREG | S_IRUGO | S_IWUSR,
-                                 acpi_device_dir(device));
+       entry = proc_create_data(ACPI_THERMAL_FILE_COOLING_MODE,
+                                S_IFREG | S_IRUGO | S_IWUSR,
+                                acpi_device_dir(device),
+                                &acpi_thermal_cooling_fops,
+                                acpi_driver_data(device));
        if (!entry)
                return -ENODEV;
-       else {
-               entry->proc_fops = &acpi_thermal_cooling_fops;
-               entry->data = acpi_driver_data(device);
-               entry->owner = THIS_MODULE;
-       }
 
        /* 'polling_frequency' [R/W] */
-       entry = create_proc_entry(ACPI_THERMAL_FILE_POLLING_FREQ,
-                                 S_IFREG | S_IRUGO | S_IWUSR,
-                                 acpi_device_dir(device));
+       entry = proc_create_data(ACPI_THERMAL_FILE_POLLING_FREQ,
+                                S_IFREG | S_IRUGO | S_IWUSR,
+                                acpi_device_dir(device),
+                                &acpi_thermal_polling_fops,
+                                acpi_driver_data(device));
        if (!entry)
                return -ENODEV;
-       else {
-               entry->proc_fops = &acpi_thermal_polling_fops;
-               entry->data = acpi_driver_data(device);
-               entry->owner = THIS_MODULE;
-       }
-
        return 0;
 }
 
@@ -1130,38 +1300,37 @@ static int acpi_thermal_remove_fs(struct acpi_device *device)
                                  Driver Interface
    -------------------------------------------------------------------------- */
 
-static void acpi_thermal_notify(acpi_handle handle, u32 event, void *data)
+static void acpi_thermal_notify(struct acpi_device *device, u32 event)
 {
-       struct acpi_thermal *tz = data;
-       struct acpi_device *device = NULL;
+       struct acpi_thermal *tz = acpi_driver_data(device);
 
 
        if (!tz)
                return;
 
-       device = tz->device;
-
        switch (event) {
        case ACPI_THERMAL_NOTIFY_TEMPERATURE:
                acpi_thermal_check(tz);
                break;
        case ACPI_THERMAL_NOTIFY_THRESHOLDS:
-               acpi_thermal_get_trip_points(tz);
+               acpi_thermal_trips_update(tz, ACPI_TRIPS_REFRESH_THRESHOLDS);
                acpi_thermal_check(tz);
-               acpi_bus_generate_event(device, event, 0);
+               acpi_bus_generate_proc_event(device, event, 0);
+               acpi_bus_generate_netlink_event(device->pnp.device_class,
+                                                 dev_name(&device->dev), event, 0);
                break;
        case ACPI_THERMAL_NOTIFY_DEVICES:
-               if (tz->flags.devices)
-                       acpi_thermal_get_devices(tz);
-               acpi_bus_generate_event(device, event, 0);
+               acpi_thermal_trips_update(tz, ACPI_TRIPS_REFRESH_DEVICES);
+               acpi_thermal_check(tz);
+               acpi_bus_generate_proc_event(device, event, 0);
+               acpi_bus_generate_netlink_event(device->pnp.device_class,
+                                                 dev_name(&device->dev), event, 0);
                break;
        default:
                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                  "Unsupported event [0x%x]\n", event));
                break;
        }
-
-       return;
 }
 
 static int acpi_thermal_get_info(struct acpi_thermal *tz)
@@ -1193,18 +1362,31 @@ static int acpi_thermal_get_info(struct acpi_thermal *tz)
        else
                acpi_thermal_get_polling_frequency(tz);
 
-       /* Get devices in this thermal zone [_TZD] (optional) */
-       result = acpi_thermal_get_devices(tz);
-       if (!result)
-               tz->flags.devices = 1;
-
        return 0;
 }
 
+/*
+ * The exact offset between Kelvin and degree Celsius is 273.15. However ACPI
+ * handles temperature values with a single decimal place. As a consequence,
+ * some implementations use an offset of 273.1 and others use an offset of
+ * 273.2. Try to find out which one is being used, to present the most
+ * accurate and visually appealing number.
+ *
+ * The heuristic below should work for all ACPI thermal zones which have a
+ * critical trip point with a value being a multiple of 0.5 degree Celsius.
+ */
+static void acpi_thermal_guess_offset(struct acpi_thermal *tz)
+{
+       if (tz->trips.critical.flags.valid &&
+           (tz->trips.critical.temperature % 5) == 1)
+               tz->kelvin_offset = 2731;
+       else
+               tz->kelvin_offset = 2732;
+}
+
 static int acpi_thermal_add(struct acpi_device *device)
 {
        int result = 0;
-       acpi_status status = AE_OK;
        struct acpi_thermal *tz = NULL;
 
 
@@ -1219,78 +1401,49 @@ static int acpi_thermal_add(struct acpi_device *device)
        strcpy(tz->name, device->pnp.bus_id);
        strcpy(acpi_device_name(device), ACPI_THERMAL_DEVICE_NAME);
        strcpy(acpi_device_class(device), ACPI_THERMAL_CLASS);
-       acpi_driver_data(device) = tz;
+       device->driver_data = tz;
+       mutex_init(&tz->lock);
 
-       result = acpi_thermal_get_info(tz);
-       if (result)
-               goto end;
 
-       result = acpi_thermal_add_fs(device);
+       result = acpi_thermal_get_info(tz);
        if (result)
-               goto end;
+               goto free_memory;
 
-       init_timer(&tz->timer);
+       acpi_thermal_guess_offset(tz);
 
-       acpi_thermal_check(tz);
+       result = acpi_thermal_register_thermal_zone(tz);
+       if (result)
+               goto free_memory;
 
-       status = acpi_install_notify_handler(device->handle,
-                                            ACPI_DEVICE_NOTIFY,
-                                            acpi_thermal_notify, tz);
-       if (ACPI_FAILURE(status)) {
-               result = -ENODEV;
-               goto end;
-       }
+       result = acpi_thermal_add_fs(device);
+       if (result)
+               goto unregister_thermal_zone;
 
        printk(KERN_INFO PREFIX "%s [%s] (%ld C)\n",
               acpi_device_name(device), acpi_device_bid(device),
               KELVIN_TO_CELSIUS(tz->temperature));
+       goto end;
 
-      end:
-       if (result) {
-               acpi_thermal_remove_fs(device);
-               kfree(tz);
-       }
-
+unregister_thermal_zone:
+       thermal_zone_device_unregister(tz->thermal_zone);
+free_memory:
+       kfree(tz);
+end:
        return result;
 }
 
 static int acpi_thermal_remove(struct acpi_device *device, int type)
 {
-       acpi_status status = AE_OK;
        struct acpi_thermal *tz = NULL;
 
-
        if (!device || !acpi_driver_data(device))
                return -EINVAL;
 
        tz = acpi_driver_data(device);
 
-       /* avoid timer adding new defer task */
-       tz->zombie = 1;
-       /* wait for running timer (on other CPUs) finish */
-       del_timer_sync(&(tz->timer));
-       /* synchronize deferred task */
-       acpi_os_wait_events_complete(NULL);
-       /* deferred task may reinsert timer */
-       del_timer_sync(&(tz->timer));
-
-       status = acpi_remove_notify_handler(device->handle,
-                                           ACPI_DEVICE_NOTIFY,
-                                           acpi_thermal_notify);
-
-       /* Terminate policy */
-       if (tz->trips.passive.flags.valid && tz->trips.passive.flags.enabled) {
-               tz->trips.passive.flags.enabled = 0;
-               acpi_thermal_passive(tz);
-       }
-       if (tz->trips.active[0].flags.valid
-           && tz->trips.active[0].flags.enabled) {
-               tz->trips.active[0].flags.enabled = 0;
-               acpi_thermal_active(tz);
-       }
-
        acpi_thermal_remove_fs(device);
-
+       acpi_thermal_unregister_thermal_zone(tz);
+       mutex_destroy(&tz->lock);
        kfree(tz);
        return 0;
 }
@@ -1328,10 +1481,87 @@ static int acpi_thermal_resume(struct acpi_device *device)
        return AE_OK;
 }
 
+static int thermal_act(const struct dmi_system_id *d) {
+
+       if (act == 0) {
+               printk(KERN_NOTICE "ACPI: %s detected: "
+                       "disabling all active thermal trip points\n", d->ident);
+               act = -1;
+       }
+       return 0;
+}
+static int thermal_nocrt(const struct dmi_system_id *d) {
+
+       printk(KERN_NOTICE "ACPI: %s detected: "
+               "disabling all critical thermal trip point actions.\n", d->ident);
+       nocrt = 1;
+       return 0;
+}
+static int thermal_tzp(const struct dmi_system_id *d) {
+
+       if (tzp == 0) {
+               printk(KERN_NOTICE "ACPI: %s detected: "
+                       "enabling thermal zone polling\n", d->ident);
+               tzp = 300;      /* 300 dS = 30 Seconds */
+       }
+       return 0;
+}
+static int thermal_psv(const struct dmi_system_id *d) {
+
+       if (psv == 0) {
+               printk(KERN_NOTICE "ACPI: %s detected: "
+                       "disabling all passive thermal trip points\n", d->ident);
+               psv = -1;
+       }
+       return 0;
+}
+
+static struct dmi_system_id thermal_dmi_table[] __initdata = {
+       /*
+        * Award BIOS on this AOpen makes thermal control almost worthless.
+        * http://bugzilla.kernel.org/show_bug.cgi?id=8842
+        */
+       {
+        .callback = thermal_act,
+        .ident = "AOpen i915GMm-HFS",
+        .matches = {
+               DMI_MATCH(DMI_BOARD_VENDOR, "AOpen"),
+               DMI_MATCH(DMI_BOARD_NAME, "i915GMm-HFS"),
+               },
+       },
+       {
+        .callback = thermal_psv,
+        .ident = "AOpen i915GMm-HFS",
+        .matches = {
+               DMI_MATCH(DMI_BOARD_VENDOR, "AOpen"),
+               DMI_MATCH(DMI_BOARD_NAME, "i915GMm-HFS"),
+               },
+       },
+       {
+        .callback = thermal_tzp,
+        .ident = "AOpen i915GMm-HFS",
+        .matches = {
+               DMI_MATCH(DMI_BOARD_VENDOR, "AOpen"),
+               DMI_MATCH(DMI_BOARD_NAME, "i915GMm-HFS"),
+               },
+       },
+       {
+        .callback = thermal_nocrt,
+        .ident = "Gigabyte GA-7ZX",
+        .matches = {
+               DMI_MATCH(DMI_BOARD_VENDOR, "Gigabyte Technology Co., Ltd."),
+               DMI_MATCH(DMI_BOARD_NAME, "7ZX"),
+               },
+       },
+       {}
+};
+
 static int __init acpi_thermal_init(void)
 {
        int result = 0;
 
+       dmi_check_system(thermal_dmi_table);
+
        if (off) {
                printk(KERN_NOTICE "ACPI: thermal control disabled\n");
                return -ENODEV;
@@ -1339,7 +1569,6 @@ static int __init acpi_thermal_init(void)
        acpi_thermal_dir = proc_mkdir(ACPI_THERMAL_CLASS, acpi_root_dir);
        if (!acpi_thermal_dir)
                return -ENODEV;
-       acpi_thermal_dir->owner = THIS_MODULE;
 
        result = acpi_bus_register_driver(&acpi_thermal_driver);
        if (result < 0) {