lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'thermal-2.6.33' into release

Browse Source
This commit is contained in:
Len Brown
2009-12-15 22:35:50 -05:00
parent abdef01dac 3767cb54ac
commit 1667e399a4
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/thermal/sysfs-api.txt
View File

@@ -206,6 +206,7 @@ passive
passive trip point for the zone. Activation is done by polling with passive trip point for the zone. Activation is done by polling with
an interval of 1 second. an interval of 1 second.
Unit: millidegrees Celsius Unit: millidegrees Celsius
Valid values: 0 (disabled) or greater than 1000
RW, Optional RW, Optional
***************************** *****************************

7
drivers/acpi/thermal.c
View File

@@ -1052,6 +1052,13 @@ static int acpi_thermal_trip_seq_show(struct seq_file *seq, void *offset)
acpi_device_bid(device)); acpi_device_bid(device));
} }
seq_puts(seq, "\n"); 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++) { for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++) {

17
drivers/thermal/thermal_sys.c
View File

@@ -225,6 +225,12 @@ passive_store(struct device *dev, struct device_attribute *attr,
if (!sscanf(buf, "%d\n", &state)) if (!sscanf(buf, "%d\n", &state))
return -EINVAL; return -EINVAL;
/* sanity check: values below 1000 millicelcius don't make sense
* and can cause the system to go into a thermal heart attack
*/
if (state && state < 1000)
return -EINVAL;
if (state && !tz->forced_passive) { if (state && !tz->forced_passive) {
mutex_lock(&thermal_list_lock); mutex_lock(&thermal_list_lock);
list_for_each_entry(cdev, &thermal_cdev_list, node) { list_for_each_entry(cdev, &thermal_cdev_list, node) {
@@ -235,6 +241,8 @@ passive_store(struct device *dev, struct device_attribute *attr,
cdev); cdev);
} }
mutex_unlock(&thermal_list_lock); mutex_unlock(&thermal_list_lock);
if (!tz->passive_delay)
tz->passive_delay = 1000;
} else if (!state && tz->forced_passive) { } else if (!state && tz->forced_passive) {
mutex_lock(&thermal_list_lock); mutex_lock(&thermal_list_lock);
list_for_each_entry(cdev, &thermal_cdev_list, node) { list_for_each_entry(cdev, &thermal_cdev_list, node) {
@@ -245,17 +253,12 @@ passive_store(struct device *dev, struct device_attribute *attr,
cdev); cdev);
} }
mutex_unlock(&thermal_list_lock); mutex_unlock(&thermal_list_lock);
tz->passive_delay = 0;
} }
tz->tc1 = 1; tz->tc1 = 1;
tz->tc2 = 1; tz->tc2 = 1;
if (!tz->passive_delay)
tz->passive_delay = 1000;
if (!tz->polling_delay)
tz->polling_delay = 10000;
tz->forced_passive = state; tz->forced_passive = state;
thermal_zone_device_update(tz); thermal_zone_device_update(tz);
@@ -1016,6 +1019,8 @@ void thermal_zone_device_update(struct thermal_zone_device *tz)
thermal_zone_device_set_polling(tz, tz->passive_delay); thermal_zone_device_set_polling(tz, tz->passive_delay);
else if (tz->polling_delay) else if (tz->polling_delay)
thermal_zone_device_set_polling(tz, tz->polling_delay); thermal_zone_device_set_polling(tz, tz->polling_delay);
else
thermal_zone_device_set_polling(tz, 0);
mutex_unlock(&tz->lock); mutex_unlock(&tz->lock);
} }
EXPORT_SYMBOL(thermal_zone_device_update); EXPORT_SYMBOL(thermal_zone_device_update);