linux-stable.git/drivers/thermal, branch linux-2.6.33.y

Merge branch 'misc-2.6.33' into release

2009-12-16T19:22:32+00:00

thermal: Fix test of unsigned in thermal_cooling_device_cur_state_store()

2009-12-16T05:07:21+00:00

state is unsigned long so the test did not work.

Signed-off-by: Roel Kluin 
Acked-by: Zhang Rui 
Signed-off-by: Len Brown

thermal: disable polling if passive_delay and polling_delay are both unset

2009-11-05T23:19:01+00:00

Otherwise polling will continue for the thermal zone even when
it is no longer needed, for example because forced passive cooling
was disabled.

Signed-off-by: Frans Pop 
Acked-by: Matthew Garrett 
Acked-by: Zhang Rui 
Signed-off-by: Andrew Morton 
Signed-off-by: Len Brown

thermal: Only set passive_delay for forced_passive cooling

2009-11-05T23:18:36+00:00

Setting polling_delay is useless as passive_delay has priority,
so the value shown in proc isn't the actual polling delay. It
also gives the impression to the user that he can change the
polling interval through proc, while in fact he can't.

Also, unset passive_delay when the forced passive trip point is
unbound to allow polling to be disabled.

Signed-off-by: Frans Pop 
Acked-by: Matthew Garrett 
Acked-by: Zhang Rui 
Signed-off-by: Andrew Morton 
Signed-off-by: Len Brown

thermal: add sanity check for the passive attribute

2009-11-05T23:18:10+00:00

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

Signed-off-by: Frans Pop 
Acked-by: Zhang Rui 
Signed-off-by: Andrew Morton 
Signed-off-by: Len Brown

acpi: thermal: Add EOL to the trip_point_N_type strings

2009-11-05T22:33:24+00:00

Make the trip_point_N_type sysfs files return a string ending in EOL for
consistency with other sysfs files.

Signed-off-by: Amit Kucheria 
Acked-by: Zhang Rui 
Signed-off-by: Andrew Morton 
Signed-off-by: Len Brown

thermal: add missing Kconfig dependency

2009-09-19T05:41:49+00:00

Otherwise THERMAL_HWMON can be selected when HWMON=n and THERMAL=n, which
fails to build.

Signed-off-by: Jan Beulich 
Cc: Zhang Rui 
Cc: Matthew Garrett 
Signed-off-by: Andrew Morton 
Signed-off-by: Len Brown

thermal_sys: check get_temp return value

2009-08-27T03:06:52+00:00

The return value of the get_temp function is not checked when doing a
thermal zone update.  This may lead to a critical shutdown if get_temp
fails and the content of the temp variable is incorrectly set higher than
the critical trip point.

This has been observed on a system with incorrect ACPI implementation
where the corresponding methods were not serialized and therefore
sometimes triggered ACPI errors (AE_ALREADY_EXISTS).  The following
critical shutdowns indicated a temperature of 2097 C, which was obviously
wrong.

The patch adds a return value check that jumps over all trip point
evaluations printing a warning if get_temp fails.  The trip points are
evaluated again on the next polling interval with successful get_temp
execution.

Signed-off-by: Michael Brunner 
Acked-by: Zhang Rui 
Cc: Len Brown 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

thermal: remove driver_data direct access of struct device

2009-06-16T04:30:27+00:00

In the near future, the driver core is going to not allow direct access
to the driver_data pointer in struct device.  Instead, the functions
dev_get_drvdata() and dev_set_drvdata() should be used.  These functions
have been around since the beginning, so are backwards compatible with
all older kernel versions.


Signed-off-by: Greg Kroah-Hartman

thermal: fix off-by-1 error in trip point trigger condition

2009-05-14T17:40:53+00:00

This patch fixes a regression caused by commit
b1569e99c795bf83b4ddf41c4f1c42761ab7f75e
"ACPI: move thermal trip handling to generic thermal layer"
which accidentally changed trip point trigger condition to
  temp > trip_temp

This patch changes the trigger condition back to
  temp >= trip_temp

Signed-off-by: Vladimir Zajac 
Acked-by: Zhang Rui 
Acked-by: Matthew Garrett 
Signed-off-by: Andrew Morton 
Signed-off-by: Len Brown