Commit 670f94a7 authored by Frans Pop's avatar Frans Pop Committed by james toy

Values below 1000 milli-celsius don't make sense and can cause the system

to go into a thermal heart attack: the actual temperature will always be
lower and thus the system will be throttled down to its lowest setting.

An additional problem is that values below 1000 will show as 0 in
/proc/acpi/thermal/TZx/trip_points:passive.

cat passive
0
echo -n 90 >passive
bash: echo: write error: Invalid argument
echo -n 90000 >passive
cat passive
90000

Addresses http://bugzilla.kernel.org/show_bug.cgi?id=13918Signed-off-by: default avatarFrans Pop <elendil@planet.nl>
Cc: Matthew Garrett <mjg@redhat.com>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Len Brown <lenb@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent c3b6da78
...@@ -206,6 +206,7 @@ passive ...@@ -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
***************************** *****************************
......
...@@ -225,6 +225,12 @@ passive_store(struct device *dev, struct device_attribute *attr, ...@@ -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) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment