Re: [PATCH 1/1]: thermal driver therm_adt746.c
Hello,
Here's an updated version taking your suggested changements into account
(merged the two loops into one, changed a hardcoded value into a constant).
Just to keep everything together, here are the changements:
1. changes in sensors limits, we are down from 70, 50, 70
to 45, 50, 70, where the first value is the environement sensor that is
located on the bottumside of the Harddrive. Empirical testing
shows that this speeds up the Fan almoast in the same moment as in OS X
2. A function has been added in order to take the environement sensor into
account on SingleFan Apple Notebooks (i.e. those that have air inlets
next to the harddrive and that are cooling, besides other components
using the single fan in these machines.
3. Output values in /sys/devices/temperatures/ etc.. have been changed.
First: All three sensors can be monitored right now instead of only the
GPU and CPU sensors.
Second: The units have been changed in order to correspond to the units
given by other temperature sensors, such as the coretemp (intel) sensor.
This allows to monitor them using several applications, notably xosview.
Signed-off-by: Thomas Haschka
---
drivers/macintosh/therm_adt746x.c | 123 +++---
1 file changed, 114 insertions(+), 9 deletions(-)
diff --git a/drivers/macintosh/therm_adt746x.c
b/drivers/macintosh/therm_adt746x.c
index f433521..1a36ea44 100644
--- a/drivers/macintosh/therm_adt746x.c
+++ b/drivers/macintosh/therm_adt746x.c
@@ -1,7 +1,8 @@
/*
* Device driver for the i2c thermostat found on the iBook G4, Albook G4
*
- * Copyright (C) 2003, 2004 Colin Leroy, Rasmus Rohde, Benjamin Herrenschmidt
+ * Copyright (C) 2003, 2004, 2015
+ * Colin Leroy, Rasmus Rohde, Benjamin Herrenschmidt, Thomas Haschka
*
* Documentation from 115254175ADT7467_pra.pdf and 3686221171167ADT7460_b.pdf
* http://www.onsemi.com/PowerSolutions/product.do?id=ADT7467
@@ -45,8 +46,10 @@ static u8 REM_CONTROL[2] = {0x00, 0x40};
static u8 FAN_SPEED[2] = {0x28, 0x2a};
static u8 FAN_SPD_SET[2] = {0x30, 0x31};
-static u8 default_limits_local[3] = {70, 50, 70};/* local, sensor1,
sensor2 */
-static u8 default_limits_chip[3] = {80, 65, 80};/* local, sensor1, sensor2
*/
+/* Local sensor is down to 45 in order to assure stable harddrive and
+ * components temperature on single fan machines */
+static u8 default_limits_local[3] = {45, 50, 70}; /* local, sensor1, sensor2 */
+static u8 default_limits_chip[3] = {80, 65, 80}; /* local, sensor1, sensor2 */
static const char *sensor_location[3] = { "?", "?", "?" };
static int limit_adjust;
@@ -223,7 +226,7 @@ static void display_stats(struct thermostat *th)
}
#endif
-static void update_fans_speed (struct thermostat *th)
+static void update_fans_speed_multifan (struct thermostat *th)
{
int lastvar = 0; /* last variation, for iBook */
int i = 0;
@@ -278,6 +281,88 @@ static void update_fans_speed (struct thermostat *th)
}
}
+static void update_fans_speed_singlefan (struct thermostat *th) {
+
+ /* Single Fan Laptops i.e. 12 inch Powerbook, Ibook etc.
+* Necessites the readout of all three thermal sensors
+* in order to avoid the harddisk and other components to overheat
+* in the case of cold CPU. */
+
+ int lastvar = 0; /* last variation, for iBook */
+ int i = 0;
+ int var = 0;
+ int var_sensor[3];
+ int started = 0;
+ const int fan_number = 0;
+
+ /* select the highest delta from all three sensors and store it to var
+*/
+
+ var_sensor[0] = th->temps[0] - th->limits[0];
+ var = var_sensor[0];
+
+ for (i = 1; i < 3; i++) {
+ var_sensor[i] = th->temps[i] - th->limits[i];
+ if (var_sensor[i] > var) {
+ var = var_sensor[i];
+ }
+ }
+
+ if (var > -1) {
+ int step = (255 - fan_speed) / 7;
+ int new_speed = 0;
+ /* hysteresis : change fan speed only if variation is
+* more than two degrees */
+ if (abs(var - th->last_var[fan_number]) > 2) {
+
+ started = 1;
+ new_speed = fan_speed + ((var-1)*step);
+
+ if (new_speed < fan_speed)
+ new_speed = fan_speed;
+ if (new_speed > 255)
+ new_speed = 255;
+
+ if (verbose)
+ printk(KERN_DEBUG "adt746x:"
+ " Setting fans speed to %d "
+ "(limit exceeded by %d on %s)\n",
+ new_speed, var,
+ sensor_location[fan_number+1]);
Re: [PATCH 1/1]: thermal driver therm_adt746.c
Hello,
I hope I get it correct this time, thanks again.
Just to recapitulate, here's a quick list of the changes made:
1. changes in sensors limits, we are down from 70, 50, 70
to 45, 50, 70, where the first value is the environement sensor that is
located on the bottumside of the Harddrive. Empirical testing
shows that this speeds up the Fan almoast in the same moment as in OS X
2. A function has been added in order to take the environement sensor into
account on SingleFan Apple Notebooks (i.e. those that have air inlets
next to the harddrive and that are cooling, besides other components
using the single fan in these machines.
3. Output values in /sys/devices/temperatures/ etc.. have been changed.
First: All three sensors can be monitored right now instead of only the
GPU and CPU sensors.
Second: The units have been changed in order to correspond to the units
given by other temperature sensors, such as the coretemp (intel) sensor.
This allows to monitor them using several applications, notably xosview.
cheers,
Signed-off-by: Thomas Haschka
---
drivers/macintosh/therm_adt746x.c | 118 +++---
1 file changed, 109 insertions(+), 9 deletions(-)
diff --git a/drivers/macintosh/therm_adt746x.c
b/drivers/macintosh/therm_adt746x.c
index f433521..3ade51a 100644
--- a/drivers/macintosh/therm_adt746x.c
+++ b/drivers/macintosh/therm_adt746x.c
@@ -1,7 +1,8 @@
/*
* Device driver for the i2c thermostat found on the iBook G4, Albook G4
*
- * Copyright (C) 2003, 2004 Colin Leroy, Rasmus Rohde, Benjamin Herrenschmidt
+ * Copyright (C) 2003, 2004, 2015
+ * Colin Leroy, Rasmus Rohde, Benjamin Herrenschmidt, Thomas Haschka
*
* Documentation from 115254175ADT7467_pra.pdf and 3686221171167ADT7460_b.pdf
* http://www.onsemi.com/PowerSolutions/product.do?id=ADT7467
@@ -45,8 +46,10 @@ static u8 REM_CONTROL[2] = {0x00, 0x40};
static u8 FAN_SPEED[2] = {0x28, 0x2a};
static u8 FAN_SPD_SET[2] = {0x30, 0x31};
-static u8 default_limits_local[3] = {70, 50, 70};/* local, sensor1,
sensor2 */
-static u8 default_limits_chip[3] = {80, 65, 80};/* local, sensor1, sensor2
*/
+/* Local sensor is down to 45 in order to assure stable harddrive and
+ * components temperature on single fan machines */
+static u8 default_limits_local[3] = {45, 50, 70}; /* local, sensor1, sensor2 */
+static u8 default_limits_chip[3] = {80, 65, 80}; /* local, sensor1, sensor2 */
static const char *sensor_location[3] = { "?", "?", "?" };
static int limit_adjust;
@@ -223,7 +226,7 @@ static void display_stats(struct thermostat *th)
}
#endif
-static void update_fans_speed (struct thermostat *th)
+static void update_fans_speed_multifan (struct thermostat *th)
{
int lastvar = 0; /* last variation, for iBook */
int i = 0;
@@ -278,6 +281,83 @@ static void update_fans_speed (struct thermostat *th)
}
}
+static void update_fans_speed_singlefan (struct thermostat *th) {
+
+ /* Single Fan Laptops i.e. 12 inch Powerbook, Ibook etc.
+* Necessites the readout of all three thermal sensors
+* in order to avoid the harddisk and other components to overheat
+* in the case of cold CPU. */
+
+ int lastvar = 0; /* last variation, for iBook */
+ int i = 0;
+ int var = 0;
+ int var_sensor[3];
+ int started = 0;
+ int fan_number = 0;
+ for (i = 0; i < 3; i++) {
+ var_sensor[i] = th->temps[i] - th->limits[i];
+ }
+ var = var_sensor[0];
+ for (i = 1; i < 3; i++) {
+ if (var_sensor[i] > var) {
+ var = var_sensor[i];
+ }
+ }
+ if (var > -1) {
+ int step = (255 - fan_speed) / 7;
+ int new_speed = 0;
+ /* hysteresis : change fan speed only if variation is
+* more than two degrees */
+ if (abs(var - th->last_var[fan_number]) > 2) {
+
+ started = 1;
+ new_speed = fan_speed + ((var-1)*step);
+
+ if (new_speed < fan_speed)
+ new_speed = fan_speed;
+ if (new_speed > 255)
+ new_speed = 255;
+
+ if (verbose)
+ printk(KERN_DEBUG "adt746x:"
+ " Setting fans speed to %d "
+ "(limit exceeded by %d on %s)\n",
+ new_speed, var,
+ sensor_location[fan_number+1]);
+ write_both_fan_speed(th, new_speed);
+ th->last_var[fan_number] = var;
+ }
+ } else if (var < -2) {
+ /* don't stop fan if sensor2 is c
Re: [PATCH 1/1]: thermal driver therm_adt746.c
Hi,
Thanks for your comments. Here's a new patch taking them into account.
Cheers,
(a) The contribution was created in whole or in part by me and I
have the right to submit it under the GPL v2
(Gnu Public License Version 2)
(b) The contribution is based upon previous work that, to the best
of my knowledge, is covered under an appropriate open source
license and I have the right under that license to submit that
work with modifications, whether created in whole or in part
by me, under the same open source license (unless I am
permitted to submit under a different license), as indicated
in the file; or
(c) I understand and agree that this project and the contribution
are public and that a record of the contribution (including all
personal information I submit with it, including my sign-off) is
maintained indefinitely and may be redistributed consistent with
this project or the open source license(s) involved.
Signed-off-by: Thomas Haschka
--- linux/drivers/macintosh/therm_adt746x.c.orig2015-02-25
11:26:43.16400 +0100
+++ linux/drivers/macintosh/therm_adt746x.c 2015-02-25 11:40:54.24000
+0100
@@ -1,7 +1,8 @@
/*
* Device driver for the i2c thermostat found on the iBook G4, Albook G4
*
- * Copyright (C) 2003, 2004 Colin Leroy, Rasmus Rohde, Benjamin Herrenschmidt
+ * Copyright (C) 2003, 2004, 2015
+ * Colin Leroy, Rasmus Rohde, Benjamin Herrenschmidt, Thomas Haschka
*
* Documentation from 115254175ADT7467_pra.pdf and 3686221171167ADT7460_b.pdf
* http://www.onsemi.com/PowerSolutions/product.do?id=ADT7467
@@ -45,8 +46,10 @@ static u8 REM_CONTROL[2] = {0x00, 0x40};
static u8 FAN_SPEED[2] = {0x28, 0x2a};
static u8 FAN_SPD_SET[2] = {0x30, 0x31};
-static u8 default_limits_local[3] = {70, 50, 70};/* local, sensor1,
sensor2 */
-static u8 default_limits_chip[3] = {80, 65, 80};/* local, sensor1, sensor2
*/
+/* Local sensor is down to 45 in order to assure stable harddrive and
+ * components temperature on single fan machines */
+static u8 default_limits_local[3] = {45, 50, 70}; /* local, sensor1, sensor2 */
+static u8 default_limits_chip[3] = {80, 65, 80}; /* local, sensor1, sensor2 */
static const char *sensor_location[3] = { "?", "?", "?" };
static int limit_adjust;
@@ -223,7 +226,7 @@ static void display_stats(struct thermos
}
#endif
-static void update_fans_speed (struct thermostat *th)
+static void update_fans_speed_multifan (struct thermostat *th)
{
int lastvar = 0; /* last variation, for iBook */
int i = 0;
@@ -278,6 +281,83 @@ static void update_fans_speed (struct th
}
}
+static void update_fans_speed_singlefan (struct thermostat *th) {
+
+ /* Single Fan Laptops i.e. 12 inch Powerbook, Ibook etc.
+* Necessites the readout of all three thermal sensors
+* in order to avoid the harddisk and other components to overheat
+* in the case of cold CPU. */
+
+ int lastvar = 0; /* last variation, for iBook */
+ int i = 0;
+ int var = 0;
+ int var_sensor[3];
+ int started = 0;
+ int fan_number = 0;
+ for (i = 0; i < 3; i++) {
+ var_sensor[i] = th->temps[i] - th->limits[i];
+ }
+ var = var_sensor[0];
+ for (i = 1; i < 3; i++) {
+ if (var_sensor[i] > var) {
+ var = var_sensor[i];
+ }
+ }
+ if (var > -1) {
+ int step = (255 - fan_speed) / 7;
+ int new_speed = 0;
+ /* hysteresis : change fan speed only if variation is
+* more than two degrees */
+ if (abs(var - th->last_var[fan_number]) > 2) {
+
+ started = 1;
+ new_speed = fan_speed + ((var-1)*step);
+
+ if (new_speed < fan_speed)
+ new_speed = fan_speed;
+ if (new_speed > 255)
+ new_speed = 255;
+
+ if (verbose)
+ printk(KERN_DEBUG "adt746x:"
+ " Setting fans speed to %d "
+ "(limit exceeded by %d on %s)\n",
+ new_speed, var,
+ sensor_location[fan_number+1]);
+ write_both_fan_speed(th, new_speed);
+ th->last_var[fan_number] = var;
+ }
+ } else if (var < -2) {
+ /* don't stop fan if sensor2 is cold and sensor1 is not
+* so cold (lastvar >= -1) */
+ if (i == 2 && las
[PATCH] Changes in therm_adt746x.c in order to support all three sensors. This should avoid overheating of components such as the harddisk inside singe fan driven powerbooks/ibooks such as the 12inch
Signed-off-by: Thomas Haschka
---
drivers/macintosh/therm_adt746x.c | 158 +-
1 file changed, 121 insertions(+), 37 deletions(-)
diff --git a/drivers/macintosh/therm_adt746x.c
b/drivers/macintosh/therm_adt746x.c
index f433521..a29f15d 100644
--- a/drivers/macintosh/therm_adt746x.c
+++ b/drivers/macintosh/therm_adt746x.c
@@ -1,7 +1,8 @@
/*
* Device driver for the i2c thermostat found on the iBook G4, Albook G4
*
- * Copyright (C) 2003, 2004 Colin Leroy, Rasmus Rohde, Benjamin Herrenschmidt
+ * Copyright (C) 2003, 2004, 2015
+ * Colin Leroy, Rasmus Rohde, Benjamin Herrenschmidt, Thomas Haschka
*
* Documentation from 115254175ADT7467_pra.pdf and 3686221171167ADT7460_b.pdf
* http://www.onsemi.com/PowerSolutions/product.do?id=ADT7467
@@ -45,8 +46,8 @@ static u8 REM_CONTROL[2] = {0x00, 0x40};
static u8 FAN_SPEED[2] = {0x28, 0x2a};
static u8 FAN_SPD_SET[2] = {0x30, 0x31};
-static u8 default_limits_local[3] = {70, 50, 70};/* local, sensor1,
sensor2 */
-static u8 default_limits_chip[3] = {80, 65, 80};/* local, sensor1, sensor2
*/
+static u8 default_limits_local[3] = {45, 50, 70}; /* local, sensor1, sensor2 */
+static u8 default_limits_chip[3] = {80, 65, 80}; /* local, sensor1, sensor2 */
static const char *sensor_location[3] = { "?", "?", "?" };
static int limit_adjust;
@@ -225,47 +226,114 @@ static void display_stats(struct thermostat *th)
static void update_fans_speed (struct thermostat *th)
{
- int lastvar = 0; /* last variation, for iBook */
- int i = 0;
+
+ /* Multfan Laptops */
+ if ( th->type == ADT7460 ) {
+ int lastvar = 0; /* last variation, for iBook */
+ int i = 0;
+ /* we don't care about local sensor, so we start at sensor 1 */
+ for (i = 1; i < 3; i++) {
+ int started = 0;
+ int fan_number = (th->type == ADT7460 && i == 2);
+ int var = th->temps[i] - th->limits[i];
+
+ if (var > -1) {
+ int step = (255 - fan_speed) / 7;
+ int new_speed = 0;
- /* we don't care about local sensor, so we start at sensor 1 */
- for (i = 1; i < 3; i++) {
- int started = 0;
- int fan_number = (th->type == ADT7460 && i == 2);
- int var = th->temps[i] - th->limits[i];
+ /* hysteresis : change fan speed only if variation is
+* more than two degrees */
+ if (abs(var - th->last_var[fan_number]) < 2)
+ continue;
+
+ started = 1;
+ new_speed = fan_speed + ((var-1)*step);
+
+ if (new_speed < fan_speed)
+ new_speed = fan_speed;
+ if (new_speed > 255)
+ new_speed = 255;
+
+ if (verbose)
+ printk(KERN_DEBUG
+ "adt746x: Setting fans speed"
+ " to %d "
+ "(limit exceeded by %d on %s)\n",
+ new_speed, var,
+ sensor_location[fan_number+1]);
+ write_both_fan_speed(th, new_speed);
+ th->last_var[fan_number] = var;
+ } else if (var < -2) {
+/* don't stop fan if sensor2 is cold and sensor1 is not
+* so cold (lastvar >= -1) */
+ if (i == 2 && lastvar < -1) {
+ if (th->last_speed[fan_number] != 0)
+ if (verbose)
+ printk(KERN_DEBUG
+ "adt746x:"
+ " Stopping "
+ "fans.\n");
+ write_both_fan_speed(th, 0);
+ }
+ }
+ lastvar = var;
+
+ if (started)
+ return; /* we don't want to re-stop the fan
+* if sensor1 is heating and sensor2
+* is not */
+ }
+ } else
[PATCH 1/1]: thermal driver therm_adt746.c
Hi everyone,
The current driver linux/drivers/macintosh/therm_adt746x.c does not take
the HDD BUTTOMSIDE sensor into account. It actually should as the 12"
Powerbooks and IBooks are build in a way that the airflow cools the
harddrive and components around it. Actually there are air intake openings
just beneath the Harddrive. If you experiance hot enviromental temperatures
as I did in summer on certain occations, you will find out that in MacOSX
the fan spins up while it doesn't in linux. As this probably causes
harddrives, and maybe other components to fail early I think this should be
regarded as a fix to a severe bug.
Hence, I created this patch for single fan 12" Albooks, Ibooks etc.
Further I changed the output /sys/devices/temperatures so that all 3
sensors are readable from this locations. The output is furhter multiplied
by 1000 in order correspond to the ranges printed by other sensor readings.
( This also makes the readings monitorable with tools such as xosview )
I sign this contribution as demanded, and hope that it will help keeping
several Powerbooks and Ibooks out there running a bit longer:
(a) The contribution was created in whole by me and I
have the right to submit it under the GPLv2
(Gnu Public License version 2)
(b) The contribution is based upon previous work that, to the best
of my knowledge, is covered under an appropriate open source
license and I have the right under that license to submit that
work with modifications, whether created in whole or in part
by me, under the same open source license
(d) I understand and agree that this project and the contribution
are public and that a record of the contribution (including all
personal information I submit with it, including my sign-off) is
maintained indefinitely and may be redistributed consistent with
this project or the open source license(s) involved.
Signed-off-by: Thomas Haschka (hasc...@gmail.com)
--- linux/drivers/macintosh/therm_adt746x.c.orig 2015-02-23 12:19:03.98400 +0100
+++ linux/drivers/macintosh/therm_adt746x.c 2015-02-23 12:22:34.98000 +0100
@@ -1,7 +1,8 @@
/*
* Device driver for the i2c thermostat found on the iBook G4, Albook G4
*
- * Copyright (C) 2003, 2004 Colin Leroy, Rasmus Rohde, Benjamin Herrenschmidt
+ * Copyright (C) 2003, 2004, 2015
+ * Colin Leroy, Rasmus Rohde, Benjamin Herrenschmidt, Thomas Haschka
*
* Documentation from 115254175ADT7467_pra.pdf and 3686221171167ADT7460_b.pdf
* http://www.onsemi.com/PowerSolutions/product.do?id=ADT7467
@@ -45,7 +46,7 @@ static u8 REM_CONTROL[2] = {0x00, 0x40};
static u8 FAN_SPEED[2] = {0x28, 0x2a};
static u8 FAN_SPD_SET[2] = {0x30, 0x31};
-static u8 default_limits_local[3] = {70, 50, 70};/* local, sensor1, sensor2 */
+static u8 default_limits_local[3] = {45, 50, 70};/* local, sensor1, sensor2 */
static u8 default_limits_chip[3] = {80, 65, 80};/* local, sensor1, sensor2 */
static const char *sensor_location[3] = { "?", "?", "?" };
@@ -225,59 +226,123 @@ static void display_stats(struct thermos
static void update_fans_speed (struct thermostat *th)
{
- int lastvar = 0; /* last variation, for iBook */
- int i = 0;
-
- /* we don't care about local sensor, so we start at sensor 1 */
- for (i = 1; i < 3; i++) {
- int started = 0;
- int fan_number = (th->type == ADT7460 && i == 2);
- int var = th->temps[i] - th->limits[i];
-
- if (var > -1) {
- int step = (255 - fan_speed) / 7;
- int new_speed = 0;
+
+ /* Multfan Laptops */
+ if ( th->type == ADT7460 ) {
+int lastvar = 0; /* last variation, for iBook */
+ int i = 0;
+/* we don't care about local sensor, so we start at sensor 1 */
+ for (i = 1; i < 3; i++) {
+ int started = 0;
+ int fan_number = (th->type == ADT7460 && i == 2);
+ int var = th->temps[i] - th->limits[i];
+
+ if (var > -1) {
+ int step = (255 - fan_speed) / 7;
+ int new_speed = 0;
/* hysteresis : change fan speed only if variation is
* more than two degrees */
- if (abs(var - th->last_var[fan_number]) < 2)
-continue;
-
- started = 1;
- new_speed = fan_speed + ((var-1)*step);
+ if (abs(var - th->last_var[fan_number]) < 2)
+continue;
- if (new_speed < fan_speed)
-new_speed = fan_speed;
- if (new_speed > 255)
-new_speed = 255;
+ started = 1;
+ new_speed = fan_speed + ((var-1)*step);
- if (verbose)
-printk(KERN_DEBUG "adt746x: Setting fans speed to %d "
- "(limit exceeded by %d on %s)\n",
- new_speed, var,
- sensor_location[fan_number+1]);
- write_both_fan_speed(th, new_speed);
- th->last_var[fan_number] = var;
- } else if (var
