Hi Colin! On Wed, Jan 21, 2004 at 05:41:41PM +0100, Colin Leroy wrote: > > could the ones here with Albooks and an ADT7460 chip for the fans try > this > > patch and tell whether it works fine or not ? > > > updated patch (i messed up two registers) here. > --
As I told you in my last email, your patch did not apply cleanly to the kernel I rsynced today (v2.6.1-ben1). In the meanwhile I tracked down the differences and producede the attached patch. Best regards, Wolfi
--- drivers/macintosh/therm_adt7467.c 2004-01-21 22:18:41.000000000 +0100 +++ ../linux-2.6-rsync-clean-2004-01-21/drivers/macintosh/therm_adt7467.c 2004-01-04 01:19:22.000000000 +0100 @@ -1,11 +1,10 @@ /* - * Device driver for the i2c thermostat found on the iBook G4, Albook G4 + * Device driver for the i2c thermostat found on the iBook G4 * - * Copyright (C) 2003, 2004 Colin Leroy, Rasmus Rohde, Benjamin Herrenschmidt + * Copyright (C) 2003 Colin Leroy, Benjamin Herrenschmidt * * Documentation from * http://www.analog.com/UploadedFiles/Data_Sheets/115254175ADT7467_pra.pdf - * http://www.analog.com/UploadedFiles/Data_Sheets/3686221171167ADT7460_b.pdf * */ @@ -31,18 +30,18 @@ #undef DEBUG -#define CONFIG_REG 0x40 +#define TEMP_LOCAL 0x26 +#define TEMP_REMOTE1 0x25 +#define TEMP_REMOTE2 0x27 +#define LIM_LOCAL 0x6a +#define LIM_REMOTE1 0x6b +#define LIM_REMOTE2 0x6c +#define FAN0_SPEED 0x28 + +#define MANUAL_MODE 0x5c #define MANUAL_MASK 0xe0 #define AUTO_MASK 0x20 - -static u8 TEMP_REG[3] = {0x26, 0x25, 0x27}; /* local, cpu, gpu */ -static u8 LIMIT_REG[3] = {0x6b, 0x6a, 0x6c}; /* local, cpu, gpu */ -static u8 MANUAL_MODE[2] = {0x5c, 0x5d}; -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[3] = {70, 50, 70}; /* local, cpu, gpu */ +#define FAN_SPD_SET 0x30 static int limit_decrease = 0; static int fan_speed = -1; @@ -61,11 +60,10 @@ u8 cached_temp[3]; u8 initial_limits[3]; u8 limits[3]; - int last_speed[2]; - int overriding[2]; + int last_speed; + int overriding; }; -static enum {ADT7460, ADT7467} therm_type; static int therm_bus, therm_address; static struct of_device * of_dev; static struct thermostat* thermostat; @@ -74,8 +72,7 @@ static struct completion monitor_task_compl; static int attach_one_thermostat(struct i2c_adapter *adapter, int addr, int busno); -static void write_both_fan_speed(struct thermostat *th, int speed); -static void write_fan_speed(struct thermostat *th, int speed, int fan); +static void write_fan_speed(struct thermostat *th, int speed); static int write_reg(struct thermostat* th, int reg, u8 data) @@ -128,7 +125,6 @@ detach_thermostat(struct i2c_adapter *adapter) { struct thermostat* th; - int i; if (thermostat == NULL) return 0; @@ -140,15 +136,14 @@ wait_for_completion(&monitor_task_compl); } - printk(KERN_INFO "adt746x: Putting max temperatures back from %d, %d, %d," + printk(KERN_INFO "adt7467: Putting max temperatures back from %d, %d, %d," " to %d, %d, %d, (?C)\n", th->limits[0], th->limits[1], th->limits[2], th->initial_limits[0], th->initial_limits[1], th->initial_limits[2]); - - for (i = 0; i < 3; i++) - write_reg(th, LIMIT_REG[i], th->initial_limits[i]); - - write_both_fan_speed(th, -1); + write_reg(th, LIM_LOCAL, th->initial_limits[0]); + write_reg(th, LIM_REMOTE1, th->initial_limits[1]); + write_reg(th, LIM_REMOTE2, th->initial_limits[2]); + write_fan_speed(th, -1); i2c_detach_client(&th->clt); @@ -180,14 +175,7 @@ return (90000*60)/res; } -static void write_both_fan_speed(struct thermostat *th, int speed) -{ - write_fan_speed(th, speed, 0); - if (therm_type == ADT7460) - write_fan_speed(th, speed, 1); -} - -static void write_fan_speed(struct thermostat *th, int speed, int fan) +static void write_fan_speed(struct thermostat *th, int speed) { u8 manual; @@ -196,35 +184,21 @@ else if (speed < -1) speed = 0; - if (therm_type == ADT7467 && fan == 1) - return; - - if (th->last_speed[fan] != speed) { - if (speed == -1) - printk(KERN_INFO "adt746x: Setting speed to: automatic for %s fan.\n", - fan?"GPU":"CPU"); - else - printk(KERN_INFO "adt746x: Setting speed to: %d for %s fan.\n", - speed, fan?"GPU":"CPU"); - } else - return; - if (speed >= 0) { - manual = read_reg(th, MANUAL_MODE[fan]); - write_reg(th, MANUAL_MODE[fan], manual|MANUAL_MASK); - write_reg(th, FAN_SPD_SET[fan], speed); + manual = read_reg(th, MANUAL_MODE); + write_reg(th, MANUAL_MODE, manual|MANUAL_MASK); + if (th->last_speed != speed) + printk(KERN_INFO "adt7467: Setting speed to: %d\n", speed); + th->last_speed = speed; + write_reg(th, FAN_SPD_SET, speed); } else { /* back to automatic */ - if(therm_type == ADT7460) { - manual = read_reg(th, MANUAL_MODE[fan]) & (~MANUAL_MASK); - write_reg(th, MANUAL_MODE[fan], manual|REM_CONTROL[fan]); - } else { - manual = read_reg(th, MANUAL_MODE[fan]); - write_reg(th, MANUAL_MODE[fan], manual&(~AUTO_MASK)); - } + manual = read_reg(th, MANUAL_MODE); + if (th->last_speed != -1) + printk(KERN_INFO "adt7467: Setting speed to: automatic\n"); + th->last_speed = -1; + write_reg(th, MANUAL_MODE, manual&(~AUTO_MASK)); } - - th->last_speed[fan] = speed; } static int monitor_task(void *arg) @@ -232,7 +206,6 @@ struct thermostat* th = arg; u8 temps[3]; u8 lims[3]; - int i; #ifdef DEBUG int mfan_speed; #endif @@ -255,60 +228,53 @@ #ifndef DEBUG if (fan_speed != -1) { #endif - for (i = 0; i < 3; i++) { - temps[i] = read_reg(th, TEMP_REG[i]); - lims[i] = th->limits[i]; - } + temps[0] = read_reg(th, TEMP_LOCAL); + temps[1] = read_reg(th, TEMP_REMOTE1); + temps[2] = read_reg(th, TEMP_REMOTE2); + lims[0] = th->limits[0]; + lims[1] = th->limits[1]; + lims[2] = th->limits[2]; #ifndef DEBUG } #endif if (fan_speed != -1) { - int lastvar = 0; /* for iBook */ - for (i = 1; i < 3; i++) { /* we don't care about local sensor */ - int started = 0; - int fan_number = (therm_type == ADT7460 && i == 2); - int var = temps[i] - lims[i]; + if (temps[0] > lims[0] + || temps[1] > lims[1] + || temps[2] > lims[2]) { + int var = 0; + var = (temps[0] - lims[0] > var) ? temps[0] - lims[0] : var; + var = (temps[1] - lims[1] > var) ? temps[1] - lims[1] : var; + var = (temps[2] - lims[2] > var) ? temps[2] - lims[2] : var; if (var > 8) { - if (th->overriding[fan_number] == 0) - printk(KERN_INFO "adt746x: Limit exceeded by %d?C, overriding specified fan speed for %s.\n", - var, fan_number?"GPU":"CPU"); - th->overriding[fan_number] = 1; - write_fan_speed(th, 255, fan_number); /* could be (th, -1, fan_number) here */ - started = 1; - } else if ((!th->overriding[fan_number] || var < 6) && var > 0) { - if (th->overriding[fan_number] == 1) - printk(KERN_INFO "adt746x: Limit exceeded by %d?C, setting speed to specified for %s.\n", - var, fan_number?"GPU":"CPU"); - th->overriding[fan_number] = 0; - write_fan_speed(th, fan_speed, fan_number); - started = 1; - } else if (var < -1) { - /* don't stop iBook fan if GPU is cold and CPU is not - * so cold (lastvar >= -1) */ - if (therm_type == ADT7460 || lastvar < -1 || i == 1) { - if (th->last_speed[fan_number] != 0) - printk(KERN_INFO "adt746x: Stopping %s fan.\n", - fan_number?"GPU":"CPU"); - write_fan_speed(th, 0, fan_number); - } + if (th->overriding == 0) + printk(KERN_INFO "adt7467: Limit exceeded by %d?C, overriding specified fan speed.\n", + var); + th->overriding = 1; + write_fan_speed(th, -1); + } else if (!th->overriding || var < 6) { + if (th->overriding == 1) + printk(KERN_INFO "adt7467: Limit exceeded by %d?C, setting speed to specified.\n", + var); + th->overriding = 0; + write_fan_speed(th, fan_speed); } } else { - - lastvar = var; - - if (started && therm_type == ADT7467) - break; /* we don't want to re-stop the fan - * if CPU is heating and GPU is not */ + int var = 10; + var = (lims[0] - temps[0] < var) ? lims[0] - temps[0] : var; + var = (lims[1] - temps[1] < var) ? lims[1] - temps[1] : var; + var = (lims[2] - temps[2] < var) ? lims[2] - temps[2] : var; + if (var >= 2) /* pseudo hysteresis */ + write_fan_speed(th, 0); } } #ifdef DEBUG - mfan_speed = read_fan_speed(th, FAN_SPEED[0]); + mfan_speed = read_fan_speed(th, FAN0_SPEED); /* only one fan in the iBook G4 */ if (temps[0] != th->cached_temp[0] || temps[1] != th->cached_temp[1] || temps[2] != th->cached_temp[2]) { - printk(KERN_INFO "adt746x: Temperature infos:" + printk(KERN_INFO "adt7467: Temperature infos:" " thermostats: %d,%d,%d ?C;" " limits: %d,%d,%d ?C;" " fan speed: %d RPM\n", @@ -331,7 +297,6 @@ { struct thermostat* th; int rc; - int i; if (thermostat) return 0; @@ -347,46 +312,41 @@ rc = read_reg(th, 0); if (rc < 0) { - printk(KERN_ERR "adt746x: Thermostat failed to read config from bus %d !\n", + printk(KERN_ERR "adt7467: Thermostat failed to read config from bus %d !\n", busno); kfree(th); return -ENODEV; } - if(therm_type == ADT7460) { - printk(KERN_INFO "adt746x: ADT7460 initializing\n"); - /* The 7460 needs to be started explicitly */ - write_reg(th, CONFIG_REG, 1); - } else - printk(KERN_INFO "adt746x: ADT7467 initializing\n"); - - for (i = 0; i < 3; i++) { - th->initial_limits[i] = read_reg(th, LIMIT_REG[i]); - th->limits[i] = default_limits[i] - limit_decrease; - write_reg(th, LIMIT_REG[i], th->limits[i]); - } + printk(KERN_INFO "adt7467: ADT7467 initializing\n"); + + th->initial_limits[0] = read_reg(th, LIM_LOCAL); + th->initial_limits[1] = read_reg(th, LIM_REMOTE1); + th->initial_limits[2] = read_reg(th, LIM_REMOTE2); + th->limits[0] = 70 - limit_decrease; /* Local */ + th->limits[1] = 50 - limit_decrease; /* CPU */ + th->limits[2] = 70 - limit_decrease; /* GPU */ - printk(KERN_INFO "adt746x: Lowering max temperatures from %d, %d, %d" + printk(KERN_INFO "adt7467: Lowering max temperatures from %d, %d, %d" " to %d, %d, %d (?C)\n", th->initial_limits[0], th->initial_limits[1], th->initial_limits[2], th->limits[0], th->limits[1], th->limits[2]); + write_reg(th, LIM_LOCAL, th->limits[0]); + write_reg(th, LIM_REMOTE1, th->limits[1]); + write_reg(th, LIM_REMOTE2, th->limits[2]); thermostat = th; if (i2c_attach_client(&th->clt)) { - printk("adt746x: Thermostat failed to attach client !\n"); + printk("adt7467: Thermostat failed to attach client !\n"); thermostat = NULL; kfree(th); return -ENODEV; } - /* be sure to really write fan speed the first time */ - th->last_speed[0] = -2; - th->last_speed[1] = -2; - if (fan_speed != -1) { - write_both_fan_speed(th, 0); + write_fan_speed(th, 0); } else { - write_both_fan_speed(th, -1); + write_fan_speed(th, -1); } init_completion(&monitor_task_compl); @@ -414,20 +374,18 @@ return sprintf(buf, "%d", data); \ } -BUILD_SHOW_FUNC_DEG(cpu_temperature, (read_reg(thermostat, TEMP_REG[1]))) -BUILD_SHOW_FUNC_DEG(gpu_temperature, (read_reg(thermostat, TEMP_REG[2]))) +BUILD_SHOW_FUNC_DEG(cpu_temperature, (read_reg(thermostat, TEMP_REMOTE1))) +BUILD_SHOW_FUNC_DEG(gpu_temperature, (read_reg(thermostat, TEMP_REMOTE2))) BUILD_SHOW_FUNC_DEG(cpu_limit, thermostat->limits[1]) BUILD_SHOW_FUNC_DEG(gpu_limit, thermostat->limits[2]) -BUILD_SHOW_FUNC_INT(fan_speed, (read_fan_speed(thermostat, FAN_SPEED[0]))) -BUILD_SHOW_FUNC_INT(fan_gpu_speed, (read_fan_speed(thermostat, FAN_SPEED[1]))) - +BUILD_SHOW_FUNC_INT(fan_speed, (read_fan_speed(thermostat, FAN0_SPEED))) + static DEVICE_ATTR(cpu_temperature,S_IRUGO,show_cpu_temperature,NULL); static DEVICE_ATTR(gpu_temperature,S_IRUGO,show_gpu_temperature,NULL); static DEVICE_ATTR(cpu_limit,S_IRUGO,show_cpu_limit,NULL); static DEVICE_ATTR(gpu_limit,S_IRUGO,show_gpu_limit,NULL); static DEVICE_ATTR(fan_speed,S_IRUGO,show_fan_speed,NULL); -static DEVICE_ATTR(fan_gpu_speed,S_IRUGO,show_fan_gpu_speed,NULL); static int __init thermostat_init(void) @@ -441,11 +399,7 @@ np = of_find_node_by_name(NULL, "fan"); if (!np) return -ENODEV; - if (device_is_compatible(np, "adt7460")) - therm_type = ADT7460; - else if (device_is_compatible(np, "adt7467")) - therm_type = ADT7467; - else + if (!device_is_compatible(np, "adt7467")) return -ENODEV; prop = (u32 *)get_property(np, "reg", NULL); @@ -454,7 +408,7 @@ therm_bus = ((*prop) >> 8) & 0x0f; therm_address = ((*prop) & 0xff) >> 1; - printk(KERN_INFO "adt746x: Thermostat bus: %d, address: 0x%02x, limit_decrease: %d, fan_speed: %d\n", + printk(KERN_INFO "adt7467: Thermostat bus: %d, address: 0x%02x, limit_decrease: %d, fan_speed: %d\n", therm_bus, therm_address, limit_decrease, fan_speed); of_dev = of_platform_device_create(np, "temperatures"); @@ -469,9 +423,6 @@ device_create_file(&of_dev->dev, &dev_attr_cpu_limit); device_create_file(&of_dev->dev, &dev_attr_gpu_limit); device_create_file(&of_dev->dev, &dev_attr_fan_speed); - if(therm_type == ADT7460) - device_create_file(&of_dev->dev, &dev_attr_fan_gpu_speed); - return i2c_add_driver(&thermostat_driver); } @@ -485,8 +436,6 @@ device_remove_file(&of_dev->dev, &dev_attr_cpu_limit); device_remove_file(&of_dev->dev, &dev_attr_gpu_limit); device_remove_file(&of_dev->dev, &dev_attr_fan_speed); - if(therm_type == ADT7460) - device_remove_file(&of_dev->dev, &dev_attr_fan_gpu_speed); of_device_unregister(of_dev); } i2c_del_driver(&thermostat_driver);
