* i2c driver changes for 2.5.66; adding w83781d support. @ 2003-03-25 8:53 Martin Schlemmer 2003-03-25 17:56 ` Greg KH 0 siblings, 1 reply; 89+ messages in thread From: Martin Schlemmer @ 2003-03-25 8:53 UTC (permalink / raw) To: Greg KH; +Cc: KML Hi I am interested in this, but I only have LKML at work. Mind sending me all the changes to 2.5.66 as one bulk patch? Also, I did some initial patch to get w83781d support in, but it very rough. I will try to get to doing it according to your 'How to convert i2c adapter drivers into good kernel code' ... Who do I sent it to if completed ? Thanks, -- Martin Schlemmer ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: i2c driver changes for 2.5.66; adding w83781d support. 2003-03-25 8:53 i2c driver changes for 2.5.66; adding w83781d support Martin Schlemmer @ 2003-03-25 17:56 ` Greg KH 2005-05-19 6:23 ` Martin Schlemmer 0 siblings, 1 reply; 89+ messages in thread From: Greg KH @ 2003-03-25 17:56 UTC (permalink / raw) To: Martin Schlemmer; +Cc: KML On Tue, Mar 25, 2003 at 10:53:14AM +0200, Martin Schlemmer wrote: > Hi > > I am interested in this, but I only have LKML at work. Mind > sending me all the changes to 2.5.66 as one bulk patch? They should be all in the patch-2.5.66-bk1 file on kernel.org right now. > Also, I did some initial patch to get w83781d support in, but > it very rough. I will try to get to doing it according to your > 'How to convert i2c adapter drivers into good kernel code' ... > Who do I sent it to if completed ? I have a port of this driver in my kernel tree, if you really want to use it right now. But I'd recommend waiting on converting the chip drivers until we get the sysfs interface conversion done, otherwise we will have to go back and modify all files again :) See my other post about the eeprom.c driver for more info on the sysfs changes needed for i2c chip drivers, it isn't as simple. But if you really want to do it, great. Send it on to lkml, and probably the sensors list. You can cc me if you want to. thanks, greg k-h ^ permalink raw reply [flat|nested] 89+ messages in thread
* w83781d i2c driver updated for 2.5.66 (without sysfs support) 2003-03-25 17:56 ` Greg KH @ 2005-05-19 6:23 ` Martin Schlemmer 0 siblings, 0 replies; 89+ messages in thread From: Martin Schlemmer @ 2003-03-26 19:04 UTC (permalink / raw) To: Greg KH; +Cc: KML, Dominik Brodowski, sensors [-- Attachment #1.1: Type: text/plain, Size: 385 bytes --] Hi Ok, this is the w83781d driver updated for 2.5.66bk2. It works over here. I did look at the changes needed for sysfs, but this beast have about 6 ctl_tables, and is hairy in general. I am not sure what is the best way to do it for the different chips, so here is what I have until I or somebody else can do the sysfs stuff. Regards, -- Martin Schlemmer [-- Attachment #1.2: i2c-chip-w83781d-2.5.66bk2.patch --] [-- Type: text/plain, Size: 78352 bytes --] --- linux-2.5.66bk2/drivers/i2c/chips/Kconfig 2003-03-25 00:00:45.000000000 +0200 +++ linux-2.5.66bk2/drivers/i2c/chips/Kconfig 2003-03-25 18:54:07.000000000 +0200 @@ -36,5 +36,19 @@ config SENSORS_LM75 You will also need the latest user-space utilties: you can find them in the lm_sensors package, which you can download at http://www.lm-sensors.nu + +config SENSORS_W83781D + tristate " Winbond W83781D, W83782D, W83783S, W83627HF, Asus AS99127F" + depends on I2C && I2C_PROC + help + If you say yes here you get support for the Winbond W8378x series + of sensor chips: the W83781D, W83782D, W83783S and W83682HF, + and the similar Asus AS99127F. This + can also be built as a module which can be inserted and removed + while the kernel is running. + + You will also need the latest user-space utilties: you can find them + in the lm_sensors package, which you can download at + http://www.lm-sensors.nu endmenu --- linux-2.5.66bk2/drivers/i2c/chips/Makefile 2003-03-24 23:59:53.000000000 +0200 +++ linux-2.5.66bk2/drivers/i2c/chips/Makefile 2003-03-25 18:54:11.000000000 +0200 @@ -4,3 +4,4 @@ obj-$(CONFIG_SENSORS_ADM1021) += adm1021.o obj-$(CONFIG_SENSORS_LM75) += lm75.o +obj-$(CONFIG_SENSORS_W83781D) += w83781d.o --- linux-2.5.66bk2/drivers/i2c/chips/w83781d.c 1970-01-01 02:00:00.000000000 +0200 +++ linux-2.5.66bk2/drivers/i2c/chips/w83781d.c 2003-03-26 20:21:14.000000000 +0200 @@ -0,0 +1,2073 @@ +/* + w83781d.c - Part of lm_sensors, Linux kernel modules for hardware + monitoring + Copyright (c) 1998 - 2001 Frodo Looijaard <frodol@dds.nl>, + Philip Edelbrock <phil@netroedge.com>, + and Mark Studebaker <mdsxyz123@yahoo.com> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +/* + Supports following chips: + + Chip #vin #fanin #pwm #temp wchipid vendid i2c ISA + as99127f 7 3 1? 3 0x30 0x12c3 yes no + asb100 "bach" (type_name = as99127f) 0x30 0x0694 yes no + w83781d 7 3 0 3 0x10 0x5ca3 yes yes + w83627hf 9 3 2 3 0x20 0x5ca3 yes yes(LPC) + w83782d 9 3 2-4 3 0x30 0x5ca3 yes yes + w83783s 5-6 3 2 1-2 0x40 0x5ca3 yes no + w83697hf 8 2 2 2 0x60 0x5ca3 no yes(LPC) + +*/ + +#include <linux/module.h> +#include <linux/init.h> +#include <linux/slab.h> +#include <linux/i2c.h> +#include <linux/i2c-proc.h> +#include <asm/io.h> + + +/* Registers */ +#define W83781D_SYSCTL_IN0 1000 /* Volts * 100 */ +#define W83781D_SYSCTL_IN1 1001 +#define W83781D_SYSCTL_IN2 1002 +#define W83781D_SYSCTL_IN3 1003 +#define W83781D_SYSCTL_IN4 1004 +#define W83781D_SYSCTL_IN5 1005 +#define W83781D_SYSCTL_IN6 1006 +#define W83781D_SYSCTL_IN7 1007 +#define W83781D_SYSCTL_IN8 1008 +#define W83781D_SYSCTL_FAN1 1101 /* Rotations/min */ +#define W83781D_SYSCTL_FAN2 1102 +#define W83781D_SYSCTL_FAN3 1103 +#define W83781D_SYSCTL_TEMP1 1200 /* Degrees Celcius * 10 */ +#define W83781D_SYSCTL_TEMP2 1201 /* Degrees Celcius * 10 */ +#define W83781D_SYSCTL_TEMP3 1202 /* Degrees Celcius * 10 */ +#define W83781D_SYSCTL_VID 1300 /* Volts * 1000 */ +#define W83781D_SYSCTL_VRM 1301 +#define W83781D_SYSCTL_PWM1 1401 +#define W83781D_SYSCTL_PWM2 1402 +#define W83781D_SYSCTL_PWM3 1403 +#define W83781D_SYSCTL_PWM4 1404 +#define W83781D_SYSCTL_SENS1 1501 /* 1, 2, or Beta (3000-5000) */ +#define W83781D_SYSCTL_SENS2 1502 +#define W83781D_SYSCTL_SENS3 1503 +#define W83781D_SYSCTL_RT1 1601 /* 32-entry table */ +#define W83781D_SYSCTL_RT2 1602 /* 32-entry table */ +#define W83781D_SYSCTL_RT3 1603 /* 32-entry table */ +#define W83781D_SYSCTL_FAN_DIV 2000 /* 1, 2, 4 or 8 */ +#define W83781D_SYSCTL_ALARMS 2001 /* bitvector */ +#define W83781D_SYSCTL_BEEP 2002 /* bitvector */ + +#define W83781D_ALARM_IN0 0x0001 +#define W83781D_ALARM_IN1 0x0002 +#define W83781D_ALARM_IN2 0x0004 +#define W83781D_ALARM_IN3 0x0008 +#define W83781D_ALARM_IN4 0x0100 +#define W83781D_ALARM_IN5 0x0200 +#define W83781D_ALARM_IN6 0x0400 +#define W83782D_ALARM_IN7 0x10000 +#define W83782D_ALARM_IN8 0x20000 +#define W83781D_ALARM_FAN1 0x0040 +#define W83781D_ALARM_FAN2 0x0080 +#define W83781D_ALARM_FAN3 0x0800 +#define W83781D_ALARM_TEMP1 0x0010 +#define W83781D_ALARM_TEMP23 0x0020 /* 781D only */ +#define W83781D_ALARM_TEMP2 0x0020 /* 782D/783S */ +#define W83781D_ALARM_TEMP3 0x2000 /* 782D only */ +#define W83781D_ALARM_CHAS 0x1000 + +/* RT Table support #defined so we can take it out if it gets bothersome */ +#define W83781D_RT 1 + +/* Addresses to scan */ +static unsigned short normal_i2c[] = { SENSORS_I2C_END }; +static unsigned short normal_i2c_range[] = { 0x20, 0x2f, SENSORS_I2C_END }; +static unsigned int normal_isa[] = { 0x0290, SENSORS_ISA_END }; +static unsigned int normal_isa_range[] = { SENSORS_ISA_END }; + +/* Insmod parameters */ +SENSORS_INSMOD_6(w83781d, w83782d, w83783s, w83627hf, as99127f, w83697hf); +SENSORS_MODULE_PARM(force_subclients, "List of subclient addresses: " + "{bus, clientaddr, subclientaddr1, subclientaddr2}"); + +static int init = 1; +MODULE_PARM(init, "i"); +MODULE_PARM_DESC(init, "Set to zero to bypass chip initialization"); + +/* Constants specified below */ + +/* Length of ISA address segment */ +#define W83781D_EXTENT 8 + +/* Where are the ISA address/data registers relative to the base address */ +#define W83781D_ADDR_REG_OFFSET 5 +#define W83781D_DATA_REG_OFFSET 6 + +/* The W83781D registers */ +/* The W83782D registers for nr=7,8 are in bank 5 */ +#define W83781D_REG_IN_MAX(nr) ((nr < 7) ? (0x2b + (nr) * 2) : \ + (0x554 + (((nr) - 7) * 2))) +#define W83781D_REG_IN_MIN(nr) ((nr < 7) ? (0x2c + (nr) * 2) : \ + (0x555 + (((nr) - 7) * 2))) +#define W83781D_REG_IN(nr) ((nr < 7) ? (0x20 + (nr)) : \ + (0x550 + (nr) - 7)) + +#define W83781D_REG_FAN_MIN(nr) (0x3a + (nr)) +#define W83781D_REG_FAN(nr) (0x27 + (nr)) + +#define W83781D_REG_TEMP2 0x0150 +#define W83781D_REG_TEMP3 0x0250 +#define W83781D_REG_TEMP2_HYST 0x153 +#define W83781D_REG_TEMP3_HYST 0x253 +#define W83781D_REG_TEMP2_CONFIG 0x152 +#define W83781D_REG_TEMP3_CONFIG 0x252 +#define W83781D_REG_TEMP2_OVER 0x155 +#define W83781D_REG_TEMP3_OVER 0x255 + +#define W83781D_REG_TEMP 0x27 +#define W83781D_REG_TEMP_OVER 0x39 +#define W83781D_REG_TEMP_HYST 0x3A +#define W83781D_REG_BANK 0x4E + +#define W83781D_REG_CONFIG 0x40 +#define W83781D_REG_ALARM1 0x41 +#define W83781D_REG_ALARM2 0x42 +#define W83781D_REG_ALARM3 0x450 /* not on W83781D */ + +#define W83781D_REG_IRQ 0x4C +#define W83781D_REG_BEEP_CONFIG 0x4D +#define W83781D_REG_BEEP_INTS1 0x56 +#define W83781D_REG_BEEP_INTS2 0x57 +#define W83781D_REG_BEEP_INTS3 0x453 /* not on W83781D */ + +#define W83781D_REG_VID_FANDIV 0x47 + +#define W83781D_REG_CHIPID 0x49 +#define W83781D_REG_WCHIPID 0x58 +#define W83781D_REG_CHIPMAN 0x4F +#define W83781D_REG_PIN 0x4B + +/* 782D/783S only */ +#define W83781D_REG_VBAT 0x5D + +/* PWM 782D (1-4) and 783S (1-2) only */ +#define W83781D_REG_PWM1 0x5B /* 782d and 783s/627hf datasheets disagree */ + /* on which is which; */ +#define W83781D_REG_PWM2 0x5A /* We follow the 782d convention here, */ + /* However 782d is probably wrong. */ +#define W83781D_REG_PWM3 0x5E +#define W83781D_REG_PWM4 0x5F +#define W83781D_REG_PWMCLK12 0x5C +#define W83781D_REG_PWMCLK34 0x45C +static const u8 regpwm[] = { W83781D_REG_PWM1, W83781D_REG_PWM2, + W83781D_REG_PWM3, W83781D_REG_PWM4 +}; + +#define W83781D_REG_PWM(nr) (regpwm[(nr) - 1]) + +#define W83781D_REG_I2C_ADDR 0x48 +#define W83781D_REG_I2C_SUBADDR 0x4A + +/* The following are undocumented in the data sheets however we + received the information in an email from Winbond tech support */ +/* Sensor selection - not on 781d */ +#define W83781D_REG_SCFG1 0x5D +static const u8 BIT_SCFG1[] = { 0x02, 0x04, 0x08 }; + +#define W83781D_REG_SCFG2 0x59 +static const u8 BIT_SCFG2[] = { 0x10, 0x20, 0x40 }; + +#define W83781D_DEFAULT_BETA 3435 + +/* RT Table registers */ +#define W83781D_REG_RT_IDX 0x50 +#define W83781D_REG_RT_VAL 0x51 + +/* Conversions. Rounding and limit checking is only done on the TO_REG + variants. Note that you should be a bit careful with which arguments + these macros are called: arguments may be evaluated more than once. + Fixing this is just not worth it. */ +#define IN_TO_REG(val) (SENSORS_LIMIT((((val) * 10 + 8)/16),0,255)) +#define IN_FROM_REG(val) (((val) * 16) / 10) + +static inline u8 +FAN_TO_REG(long rpm, int div) +{ + if (rpm == 0) + return 255; + rpm = SENSORS_LIMIT(rpm, 1, 1000000); + return SENSORS_LIMIT((1350000 + rpm * div / 2) / (rpm * div), 1, 254); +} + +#define FAN_FROM_REG(val,div) ((val)==0?-1:(val)==255?0:1350000/((val)*(div))) + +#define TEMP_TO_REG(val) (SENSORS_LIMIT(((val)<0?(((val)-5)/10):\ + ((val)+5)/10),0,255)) +#define TEMP_FROM_REG(val) (((val)>0x80?(val)-0x100:(val))*10) + +#define TEMP_ADD_TO_REG(val) (SENSORS_LIMIT(((((val) + 2) / 5) << 7),\ + 0,0xffff)) +#define TEMP_ADD_FROM_REG(val) (((val) >> 7) * 5) + +#define AS99127_TEMP_ADD_TO_REG(val) (SENSORS_LIMIT((((((val) + 2)*4)/10) \ + << 7),0,0xffff)) +#define AS99127_TEMP_ADD_FROM_REG(val) ((((val) >> 7) * 10) / 4) + +#define ALARMS_FROM_REG(val) (val) +#define PWM_FROM_REG(val) (val) +#define PWM_TO_REG(val) (SENSORS_LIMIT((val),0,255)) +#define BEEPS_FROM_REG(val) (val) +#define BEEPS_TO_REG(val) ((val) & 0xffffff) + +#define BEEP_ENABLE_TO_REG(val) ((val)?1:0) +#define BEEP_ENABLE_FROM_REG(val) ((val)?1:0) + +#define DIV_FROM_REG(val) (1 << (val)) + +#define DEFAULT_VRM 82 + +/* + * Legal val values 00 - 1F. + * vrm is the Intel VRM document version. + * Note: vrm version is scaled by 10 and the return value is scaled + * by 1000 to avoid floating point in the kernel. + * + */ + +static inline int +vid_from_reg(int val, int vrm) +{ + switch (vrm) { + + case 91: /* VRM 9.1 */ + case 90: /* VRM 9.0 */ + return (val == 0x1f ? 0 : 1850 - val * 25); + + case 85: /* VRM 8.5 */ + return ((val & 0x10 ? 25 : 0) + + ((val & 0x0f) > 0x04 ? 2050 : 1250) - + ((val & 0x0f) * 50)); + + case 84: /* VRM 8.4 */ + val &= 0x0f; + /* fall through */ + default: /* VRM 8.2 */ + return (val == 0x1f ? 0 : + val & 0x10 ? 5100 - (val) * 100 : 2050 - (val) * 50); + } +} + +static inline u8 +DIV_TO_REG(long val, enum chips type) +{ + int i; + val = SENSORS_LIMIT(val, 1, + ((type == w83781d + || type == as99127f) ? 8 : 128)) >> 1; + for (i = 0; i < 6; i++) { + if (val == 0) + break; + val >>= 1; + } + return ((u8) i); +} + +/* Initial limits */ +#define W83781D_INIT_IN_0 (vid==3500?280:vid/10) +#define W83781D_INIT_IN_1 (vid==3500?280:vid/10) +#define W83781D_INIT_IN_2 330 +#define W83781D_INIT_IN_3 (((500) * 100)/168) +#define W83781D_INIT_IN_4 (((1200) * 10)/38) +#define W83781D_INIT_IN_5 (((-1200) * -604)/2100) +#define W83781D_INIT_IN_6 (((-500) * -604)/909) +#define W83781D_INIT_IN_7 (((500) * 100)/168) +#define W83781D_INIT_IN_8 300 +/* Initial limits for 782d/783s negative voltages */ +/* Note level shift. Change min/max below if you change these. */ +#define W83782D_INIT_IN_5 ((((-1200) + 1491) * 100)/514) +#define W83782D_INIT_IN_6 ((( (-500) + 771) * 100)/314) + +#define W83781D_INIT_IN_PERCENTAGE 10 + +#define W83781D_INIT_IN_MIN_0 \ + (W83781D_INIT_IN_0 - W83781D_INIT_IN_0 * W83781D_INIT_IN_PERCENTAGE \ + / 100) +#define W83781D_INIT_IN_MAX_0 \ + (W83781D_INIT_IN_0 + W83781D_INIT_IN_0 * W83781D_INIT_IN_PERCENTAGE \ + / 100) +#define W83781D_INIT_IN_MIN_1 \ + (W83781D_INIT_IN_1 - W83781D_INIT_IN_1 * W83781D_INIT_IN_PERCENTAGE \ + / 100) +#define W83781D_INIT_IN_MAX_1 \ + (W83781D_INIT_IN_1 + W83781D_INIT_IN_1 * W83781D_INIT_IN_PERCENTAGE \ + / 100) +#define W83781D_INIT_IN_MIN_2 \ + (W83781D_INIT_IN_2 - W83781D_INIT_IN_2 * W83781D_INIT_IN_PERCENTAGE \ + / 100) +#define W83781D_INIT_IN_MAX_2 \ + (W83781D_INIT_IN_2 + W83781D_INIT_IN_2 * W83781D_INIT_IN_PERCENTAGE \ + / 100) +#define W83781D_INIT_IN_MIN_3 \ + (W83781D_INIT_IN_3 - W83781D_INIT_IN_3 * W83781D_INIT_IN_PERCENTAGE \ + / 100) +#define W83781D_INIT_IN_MAX_3 \ + (W83781D_INIT_IN_3 + W83781D_INIT_IN_3 * W83781D_INIT_IN_PERCENTAGE \ + / 100) +#define W83781D_INIT_IN_MIN_4 \ + (W83781D_INIT_IN_4 - W83781D_INIT_IN_4 * W83781D_INIT_IN_PERCENTAGE \ + / 100) +#define W83781D_INIT_IN_MAX_4 \ + (W83781D_INIT_IN_4 + W83781D_INIT_IN_4 * W83781D_INIT_IN_PERCENTAGE \ + / 100) +#define W83781D_INIT_IN_MIN_5 \ + (W83781D_INIT_IN_5 - W83781D_INIT_IN_5 * W83781D_INIT_IN_PERCENTAGE \ + / 100) +#define W83781D_INIT_IN_MAX_5 \ + (W83781D_INIT_IN_5 + W83781D_INIT_IN_5 * W83781D_INIT_IN_PERCENTAGE \ + / 100) +#define W83781D_INIT_IN_MIN_6 \ + (W83781D_INIT_IN_6 - W83781D_INIT_IN_6 * W83781D_INIT_IN_PERCENTAGE \ + / 100) +#define W83781D_INIT_IN_MAX_6 \ + (W83781D_INIT_IN_6 + W83781D_INIT_IN_6 * W83781D_INIT_IN_PERCENTAGE \ + / 100) +#define W83781D_INIT_IN_MIN_7 \ + (W83781D_INIT_IN_7 - W83781D_INIT_IN_7 * W83781D_INIT_IN_PERCENTAGE \ + / 100) +#define W83781D_INIT_IN_MAX_7 \ + (W83781D_INIT_IN_7 + W83781D_INIT_IN_7 * W83781D_INIT_IN_PERCENTAGE \ + / 100) +#define W83781D_INIT_IN_MIN_8 \ + (W83781D_INIT_IN_8 - W83781D_INIT_IN_8 * W83781D_INIT_IN_PERCENTAGE \ + / 100) +#define W83781D_INIT_IN_MAX_8 \ + (W83781D_INIT_IN_8 + W83781D_INIT_IN_8 * W83781D_INIT_IN_PERCENTAGE \ + / 100) +/* Initial limits for 782d/783s negative voltages */ +/* These aren't direct multiples because of level shift */ +/* Beware going negative - check */ +#define W83782D_INIT_IN_MIN_5_TMP \ + (((-1200 * (100 + W83781D_INIT_IN_PERCENTAGE)) + (1491 * 100))/514) +#define W83782D_INIT_IN_MIN_5 \ + ((W83782D_INIT_IN_MIN_5_TMP > 0) ? W83782D_INIT_IN_MIN_5_TMP : 0) +#define W83782D_INIT_IN_MAX_5 \ + (((-1200 * (100 - W83781D_INIT_IN_PERCENTAGE)) + (1491 * 100))/514) +#define W83782D_INIT_IN_MIN_6_TMP \ + ((( -500 * (100 + W83781D_INIT_IN_PERCENTAGE)) + (771 * 100))/314) +#define W83782D_INIT_IN_MIN_6 \ + ((W83782D_INIT_IN_MIN_6_TMP > 0) ? W83782D_INIT_IN_MIN_6_TMP : 0) +#define W83782D_INIT_IN_MAX_6 \ + ((( -500 * (100 - W83781D_INIT_IN_PERCENTAGE)) + (771 * 100))/314) + +#define W83781D_INIT_FAN_MIN_1 3000 +#define W83781D_INIT_FAN_MIN_2 3000 +#define W83781D_INIT_FAN_MIN_3 3000 + +#define W83781D_INIT_TEMP_OVER 600 +#define W83781D_INIT_TEMP_HYST 1270 /* must be 127 for ALARM to work */ +#define W83781D_INIT_TEMP2_OVER 600 +#define W83781D_INIT_TEMP2_HYST 500 +#define W83781D_INIT_TEMP3_OVER 600 +#define W83781D_INIT_TEMP3_HYST 500 + +/* There are some complications in a module like this. First off, W83781D chips + may be both present on the SMBus and the ISA bus, and we have to handle + those cases separately at some places. Second, there might be several + W83781D chips available (well, actually, that is probably never done; but + it is a clean illustration of how to handle a case like that). Finally, + a specific chip may be attached to *both* ISA and SMBus, and we would + not like to detect it double. Fortunately, in the case of the W83781D at + least, a register tells us what SMBus address we are on, so that helps + a bit - except if there could be more than one SMBus. Groan. No solution + for this yet. */ + +/* This module may seem overly long and complicated. In fact, it is not so + bad. Quite a lot of bookkeeping is done. A real driver can often cut + some corners. */ + +/* For each registered W83781D, we need to keep some data in memory. That + data is pointed to by w83781d_list[NR]->data. The structure itself is + dynamically allocated, at the same time when a new w83781d client is + allocated. */ +struct w83781d_data { + struct semaphore lock; + int sysctl_id; + enum chips type; + + struct semaphore update_lock; + char valid; /* !=0 if following fields are valid */ + unsigned long last_updated; /* In jiffies */ + + struct i2c_client *lm75; /* for secondary I2C addresses */ + /* pointer to array of 2 subclients */ + + u8 in[9]; /* Register value - 8 & 9 for 782D only */ + u8 in_max[9]; /* Register value - 8 & 9 for 782D only */ + u8 in_min[9]; /* Register value - 8 & 9 for 782D only */ + u8 fan[3]; /* Register value */ + u8 fan_min[3]; /* Register value */ + u8 temp; + u8 temp_over; /* Register value */ + u8 temp_hyst; /* Register value */ + u16 temp_add[2]; /* Register value */ + u16 temp_add_over[2]; /* Register value */ + u16 temp_add_hyst[2]; /* Register value */ + u8 fan_div[3]; /* Register encoding, shifted right */ + u8 vid; /* Register encoding, combined */ + u32 alarms; /* Register encoding, combined */ + u32 beeps; /* Register encoding, combined */ + u8 beep_enable; /* Boolean */ + u8 pwm[4]; /* Register value */ + u8 pwmenable[4]; /* bool */ + u16 sens[3]; /* 782D/783S only. + 1 = pentium diode; 2 = 3904 diode; + 3000-5000 = thermistor beta. + Default = 3435. + Other Betas unimplemented */ +#ifdef W83781D_RT + u8 rt[3][32]; /* Register value */ +#endif + u8 vrm; +}; + +static int w83781d_attach_adapter(struct i2c_adapter *adapter); +static int w83781d_detect(struct i2c_adapter *adapter, int address, + unsigned short flags, int kind); +static int w83781d_detach_client(struct i2c_client *client); + +static int w83781d_read_value(struct i2c_client *client, u16 register); +static int w83781d_write_value(struct i2c_client *client, u16 register, + u16 value); +static void w83781d_update_client(struct i2c_client *client); +static void w83781d_init_client(struct i2c_client *client); + +static void w83781d_in(struct i2c_client *client, int operation, + int ctl_name, int *nrels_mag, long *results); +static void w83781d_fan(struct i2c_client *client, int operation, + int ctl_name, int *nrels_mag, long *results); +static void w83781d_temp(struct i2c_client *client, int operation, + int ctl_name, int *nrels_mag, long *results); +static void w83781d_temp_add(struct i2c_client *client, int operation, + int ctl_name, int *nrels_mag, long *results); +static void w83781d_vid(struct i2c_client *client, int operation, + int ctl_name, int *nrels_mag, long *results); +static void w83781d_vrm(struct i2c_client *client, int operation, + int ctl_name, int *nrels_mag, long *results); +static void w83781d_alarms(struct i2c_client *client, int operation, + int ctl_name, int *nrels_mag, long *results); +static void w83781d_beep(struct i2c_client *client, int operation, + int ctl_name, int *nrels_mag, long *results); +static void w83781d_fan_div(struct i2c_client *client, int operation, + int ctl_name, int *nrels_mag, long *results); +static void w83781d_pwm(struct i2c_client *client, int operation, + int ctl_name, int *nrels_mag, long *results); +static void w83781d_sens(struct i2c_client *client, int operation, + int ctl_name, int *nrels_mag, long *results); +#ifdef W83781D_RT +static void w83781d_rt(struct i2c_client *client, int operation, + int ctl_name, int *nrels_mag, long *results); +#endif +static u16 swap_bytes(u16 val); + +static int w83781d_id = 0; + +static struct i2c_driver w83781d_driver = { + .owner = THIS_MODULE, + .name = "W83781D sensor", + .id = I2C_DRIVERID_W83781D, + .flags = I2C_DF_NOTIFY, + .attach_adapter = w83781d_attach_adapter, + .detach_client = w83781d_detach_client, +}; + +/* These files are created for each detected chip. This is just a template; + though at first sight, you might think we could use a statically + allocated list, we need some way to get back to the parent - which + is done through one of the 'extra' fields which are initialized + when a new copy is allocated. */ + +/* just a guess - no datasheet */ +static ctl_table as99127f_dir_table_template[] = { + {W83781D_SYSCTL_IN0, "in0", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN1, "in1", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN2, "in2", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN3, "in3", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN4, "in4", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN5, "in5", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN6, "in6", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_FAN1, "fan1", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_fan}, + {W83781D_SYSCTL_FAN2, "fan2", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_fan}, + {W83781D_SYSCTL_FAN3, "fan3", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_fan}, + {W83781D_SYSCTL_TEMP1, "temp1", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_temp}, + {W83781D_SYSCTL_TEMP2, "temp2", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_temp_add}, + {W83781D_SYSCTL_TEMP3, "temp3", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_temp_add}, + {W83781D_SYSCTL_VID, "vid", NULL, 0, 0444, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_vid}, + {W83781D_SYSCTL_VRM, "vrm", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_vrm}, + {W83781D_SYSCTL_FAN_DIV, "fan_div", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_fan_div}, + {W83781D_SYSCTL_ALARMS, "alarms", NULL, 0, 0444, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_alarms}, + {W83781D_SYSCTL_BEEP, "beep", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_beep}, + {W83781D_SYSCTL_PWM1, "pwm1", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_pwm}, + {W83781D_SYSCTL_PWM2, "pwm2", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_pwm}, + {0} +}; + +static ctl_table w83781d_dir_table_template[] = { + {W83781D_SYSCTL_IN0, "in0", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN1, "in1", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN2, "in2", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN3, "in3", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN4, "in4", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN5, "in5", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN6, "in6", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_FAN1, "fan1", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_fan}, + {W83781D_SYSCTL_FAN2, "fan2", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_fan}, + {W83781D_SYSCTL_FAN3, "fan3", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_fan}, + {W83781D_SYSCTL_TEMP1, "temp1", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_temp}, + {W83781D_SYSCTL_TEMP2, "temp2", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_temp_add}, + {W83781D_SYSCTL_TEMP3, "temp3", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_temp_add}, + {W83781D_SYSCTL_VID, "vid", NULL, 0, 0444, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_vid}, + {W83781D_SYSCTL_VRM, "vrm", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_vrm}, + {W83781D_SYSCTL_FAN_DIV, "fan_div", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_fan_div}, + {W83781D_SYSCTL_ALARMS, "alarms", NULL, 0, 0444, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_alarms}, + {W83781D_SYSCTL_BEEP, "beep", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_beep}, +#ifdef W83781D_RT + {W83781D_SYSCTL_RT1, "rt1", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_rt}, + {W83781D_SYSCTL_RT2, "rt2", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_rt}, + {W83781D_SYSCTL_RT3, "rt3", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_rt}, +#endif + {0} +}; + +/* without pwm3-4 */ +static ctl_table w83782d_isa_dir_table_template[] = { + {W83781D_SYSCTL_IN0, "in0", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN1, "in1", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN2, "in2", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN3, "in3", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN4, "in4", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN5, "in5", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN6, "in6", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN7, "in7", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN8, "in8", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_FAN1, "fan1", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_fan}, + {W83781D_SYSCTL_FAN2, "fan2", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_fan}, + {W83781D_SYSCTL_FAN3, "fan3", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_fan}, + {W83781D_SYSCTL_TEMP1, "temp1", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_temp}, + {W83781D_SYSCTL_TEMP2, "temp2", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_temp_add}, + {W83781D_SYSCTL_TEMP3, "temp3", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_temp_add}, + {W83781D_SYSCTL_VID, "vid", NULL, 0, 0444, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_vid}, + {W83781D_SYSCTL_VRM, "vrm", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_vrm}, + {W83781D_SYSCTL_FAN_DIV, "fan_div", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_fan_div}, + {W83781D_SYSCTL_ALARMS, "alarms", NULL, 0, 0444, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_alarms}, + {W83781D_SYSCTL_BEEP, "beep", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_beep}, + {W83781D_SYSCTL_PWM1, "pwm1", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_pwm}, + {W83781D_SYSCTL_PWM2, "pwm2", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_pwm}, + {W83781D_SYSCTL_SENS1, "sensor1", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_sens}, + {W83781D_SYSCTL_SENS2, "sensor2", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_sens}, + {W83781D_SYSCTL_SENS3, "sensor3", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_sens}, + {0} +}; + +/* with pwm3-4 */ +static ctl_table w83782d_i2c_dir_table_template[] = { + {W83781D_SYSCTL_IN0, "in0", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN1, "in1", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN2, "in2", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN3, "in3", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN4, "in4", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN5, "in5", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN6, "in6", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN7, "in7", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN8, "in8", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_FAN1, "fan1", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_fan}, + {W83781D_SYSCTL_FAN2, "fan2", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_fan}, + {W83781D_SYSCTL_FAN3, "fan3", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_fan}, + {W83781D_SYSCTL_TEMP1, "temp1", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_temp}, + {W83781D_SYSCTL_TEMP2, "temp2", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_temp_add}, + {W83781D_SYSCTL_TEMP3, "temp3", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_temp_add}, + {W83781D_SYSCTL_VID, "vid", NULL, 0, 0444, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_vid}, + {W83781D_SYSCTL_VRM, "vrm", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_vrm}, + {W83781D_SYSCTL_FAN_DIV, "fan_div", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_fan_div}, + {W83781D_SYSCTL_ALARMS, "alarms", NULL, 0, 0444, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_alarms}, + {W83781D_SYSCTL_BEEP, "beep", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_beep}, + {W83781D_SYSCTL_PWM1, "pwm1", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_pwm}, + {W83781D_SYSCTL_PWM2, "pwm2", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_pwm}, + {W83781D_SYSCTL_PWM3, "pwm3", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_pwm}, + {W83781D_SYSCTL_PWM4, "pwm4", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_pwm}, + {W83781D_SYSCTL_SENS1, "sensor1", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_sens}, + {W83781D_SYSCTL_SENS2, "sensor2", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_sens}, + {W83781D_SYSCTL_SENS3, "sensor3", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_sens}, + {0} +}; + +static ctl_table w83783s_dir_table_template[] = { + {W83781D_SYSCTL_IN0, "in0", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + /* no in1 to maintain compatibility with 781d and 782d. */ + {W83781D_SYSCTL_IN2, "in2", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN3, "in3", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN4, "in4", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN5, "in5", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN6, "in6", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_FAN1, "fan1", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_fan}, + {W83781D_SYSCTL_FAN2, "fan2", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_fan}, + {W83781D_SYSCTL_FAN3, "fan3", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_fan}, + {W83781D_SYSCTL_TEMP1, "temp1", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_temp}, + {W83781D_SYSCTL_TEMP2, "temp2", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_temp_add}, + {W83781D_SYSCTL_VID, "vid", NULL, 0, 0444, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_vid}, + {W83781D_SYSCTL_VRM, "vrm", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_vrm}, + {W83781D_SYSCTL_FAN_DIV, "fan_div", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_fan_div}, + {W83781D_SYSCTL_ALARMS, "alarms", NULL, 0, 0444, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_alarms}, + {W83781D_SYSCTL_BEEP, "beep", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_beep}, + {W83781D_SYSCTL_PWM1, "pwm1", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_pwm}, + {W83781D_SYSCTL_PWM2, "pwm2", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_pwm}, + {W83781D_SYSCTL_SENS1, "sensor1", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_sens}, + {W83781D_SYSCTL_SENS2, "sensor2", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_sens}, + {0} +}; + +/* similar to w83782d but no fan3, no vid */ +static ctl_table w83697hf_dir_table_template[] = { + {W83781D_SYSCTL_IN0, "in0", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + /* no in1 to maintain compatibility with 781d and 782d. */ + {W83781D_SYSCTL_IN2, "in2", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN3, "in3", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN4, "in4", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN5, "in5", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN6, "in6", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN7, "in7", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_IN8, "in8", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_in}, + {W83781D_SYSCTL_FAN1, "fan1", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_fan}, + {W83781D_SYSCTL_FAN2, "fan2", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_fan}, + {W83781D_SYSCTL_TEMP1, "temp1", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_temp}, + {W83781D_SYSCTL_TEMP2, "temp2", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_temp_add}, + {W83781D_SYSCTL_FAN_DIV, "fan_div", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_fan_div}, + {W83781D_SYSCTL_ALARMS, "alarms", NULL, 0, 0444, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_alarms}, + {W83781D_SYSCTL_BEEP, "beep", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_beep}, + {W83781D_SYSCTL_PWM1, "pwm1", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_pwm}, + {W83781D_SYSCTL_PWM2, "pwm2", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_pwm}, + {W83781D_SYSCTL_SENS1, "sensor1", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_sens}, + {W83781D_SYSCTL_SENS2, "sensor2", NULL, 0, 0644, NULL, &i2c_proc_real, + &i2c_sysctl_real, NULL, &w83781d_sens}, + {0} +}; + +/* This function is called when: + * w83781d_driver is inserted (when this module is loaded), for each + available adapter + * when a new adapter is inserted (and w83781d_driver is still present) */ +static int +w83781d_attach_adapter(struct i2c_adapter *adapter) +{ + return i2c_detect(adapter, &addr_data, w83781d_detect); +} + +static int +w83781d_detect(struct i2c_adapter *adapter, int address, + unsigned short flags, int kind) +{ + int i = 0, val1 = 0, val2, id; + struct i2c_client *new_client; + struct w83781d_data *data; + int err = 0; + const char *type_name = ""; + const char *client_name = ""; + int is_isa = i2c_is_isa_adapter(adapter); + enum vendor { winbond, asus } vendid; + + if (!is_isa + && !i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) + goto ERROR0; + + if (is_isa) { + if (!request_region(address, W83781D_EXTENT, "w83781d")) + goto ERROR0; + release_region(address, W83781D_EXTENT); + } + + /* Probe whether there is anything available on this address. Already + done for SMBus clients */ + if (kind < 0) { + if (is_isa) { + +#define REALLY_SLOW_IO + /* We need the timeouts for at least some LM78-like chips. But only + if we read 'undefined' registers. */ + i = inb_p(address + 1); + if (inb_p(address + 2) != i) + goto ERROR0; + if (inb_p(address + 3) != i) + goto ERROR0; + if (inb_p(address + 7) != i) + goto ERROR0; +#undef REALLY_SLOW_IO + + /* Let's just hope nothing breaks here */ + i = inb_p(address + 5) & 0x7f; + outb_p(~i & 0x7f, address + 5); + if ((inb_p(address + 5) & 0x7f) != (~i & 0x7f)) { + outb_p(i, address + 5); + return 0; + } + } + } + + /* OK. For now, we presume we have a valid client. We now create the + client structure, even though we cannot fill it completely yet. + But it allows us to access w83781d_{read,write}_value. */ + + if (!(new_client = kmalloc(sizeof (struct i2c_client) + + sizeof (struct w83781d_data), GFP_KERNEL))) { + err = -ENOMEM; + goto ERROR0; + } + + memset(new_client, 0x00, sizeof (struct i2c_client) + + sizeof (struct w83781d_data)); + + data = (struct w83781d_data *) (new_client + 1); + i2c_set_clientdata(new_client, data); + new_client->addr = address; + init_MUTEX(&data->lock); + new_client->adapter = adapter; + new_client->driver = &w83781d_driver; + new_client->flags = 0; + + /* Now, we do the remaining detection. */ + + /* The w8378?d may be stuck in some other bank than bank 0. This may + make reading other information impossible. Specify a force=... or + force_*=... parameter, and the Winbond will be reset to the right + bank. */ + if (kind < 0) { + if (w83781d_read_value(new_client, W83781D_REG_CONFIG) & 0x80) + goto ERROR1; + val1 = w83781d_read_value(new_client, W83781D_REG_BANK); + val2 = w83781d_read_value(new_client, W83781D_REG_CHIPMAN); + /* Check for Winbond or Asus ID if in bank 0 */ + if ((!(val1 & 0x07)) && + (((!(val1 & 0x80)) && (val2 != 0xa3) && (val2 != 0xc3) + && (val2 != 0x94)) + || ((val1 & 0x80) && (val2 != 0x5c) && (val2 != 0x12) + && (val2 != 0x06)))) + goto ERROR1; + /* If Winbond SMBus, check address at 0x48. Asus doesn't support */ + if ((!is_isa) && (((!(val1 & 0x80)) && (val2 == 0xa3)) || + ((val1 & 0x80) && (val2 == 0x5c)))) { + if (w83781d_read_value + (new_client, W83781D_REG_I2C_ADDR) != address) + goto ERROR1; + } + } + + /* We have either had a force parameter, or we have already detected the + Winbond. Put it now into bank 0 and Vendor ID High Byte */ + w83781d_write_value(new_client, W83781D_REG_BANK, + (w83781d_read_value(new_client, + W83781D_REG_BANK) & 0x78) | + 0x80); + + /* Determine the chip type. */ + if (kind <= 0) { + /* get vendor ID */ + val2 = w83781d_read_value(new_client, W83781D_REG_CHIPMAN); + if (val2 == 0x5c) + vendid = winbond; + else if ((val2 == 0x12) || (val2 == 0x06)) + vendid = asus; + else + goto ERROR1; + /* mask off lower bit, not reliable */ + val1 = + w83781d_read_value(new_client, W83781D_REG_WCHIPID) & 0xfe; + if (val1 == 0x10 && vendid == winbond) + kind = w83781d; + else if (val1 == 0x30 && vendid == winbond) + kind = w83782d; + else if (val1 == 0x40 && vendid == winbond && !is_isa) + kind = w83783s; + else if (val1 == 0x20 && vendid == winbond) + kind = w83627hf; + else if (val1 == 0x30 && vendid == asus && !is_isa) + kind = as99127f; + else if (val1 == 0x60 && vendid == winbond && is_isa) + kind = w83697hf; + else { + if (kind == 0) + printk(KERN_WARNING + "Ignoring 'force' parameter for unknown chip at" + "adapter %d, address 0x%02x\n", + i2c_adapter_id(adapter), address); + goto ERROR1; + } + } + + if (kind == w83781d) { + type_name = "w83781d"; + client_name = "W83781D chip"; + } else if (kind == w83782d) { + type_name = "w83782d"; + client_name = "W83782D chip"; + } else if (kind == w83783s) { + type_name = "w83783s"; + client_name = "W83783S chip"; + } else if (kind == w83627hf) { + type_name = "w83627hf"; + client_name = "W83627HF chip"; + } else if (kind == as99127f) { + type_name = "as99127f"; + client_name = "AS99127F chip"; + } else if (kind == w83697hf) { + type_name = "w83697hf"; + client_name = "W83697HF chip"; + } else { + printk(KERN_ERR "Internal error: unknown kind (%d)?!?", kind); + goto ERROR1; + } + + /* Reserve the ISA region */ + if (is_isa) + request_region(address, W83781D_EXTENT, type_name); + + /* Fill in the remaining client fields and put it into the global list */ + strncpy(new_client->dev.name, client_name, DEVICE_NAME_SIZE); + data->type = kind; + + new_client->id = w83781d_id++; + data->valid = 0; + init_MUTEX(&data->update_lock); + + /* Tell the I2C layer a new client has arrived */ + if ((err = i2c_attach_client(new_client))) + goto ERROR3; + + /* attach secondary i2c lm75-like clients */ + if (!is_isa) { + if (!(data->lm75 = kmalloc(2 * sizeof (struct i2c_client), + GFP_KERNEL))) { + err = -ENOMEM; + goto ERROR4; + } + + memset(data->lm75, 0x00, 2 * sizeof (struct i2c_client)); + + id = i2c_adapter_id(adapter); + if (force_subclients[0] == id && force_subclients[1] == address) { + for (i = 2; i <= 3; i++) { + if (force_subclients[i] < 0x48 || + force_subclients[i] > 0x4f) { + printk(KERN_ERR + "Invalid subclient address %d; must be 0x48-0x4f\n", + force_subclients[i]); + goto ERROR5; + } + } + w83781d_write_value(new_client, + W83781D_REG_I2C_SUBADDR, + (force_subclients[2] & 0x07) | + ((force_subclients[3] & 0x07) << + 4)); + data->lm75[0].addr = force_subclients[2]; + } else { + val1 = w83781d_read_value(new_client, + W83781D_REG_I2C_SUBADDR); + data->lm75[0].addr = 0x48 + (val1 & 0x07); + } + if (kind != w83783s) { + if (force_subclients[0] == id && + force_subclients[1] == address) { + data->lm75[1].addr = force_subclients[3]; + } else { + data->lm75[1].addr = + 0x48 + ((val1 >> 4) & 0x07); + } + if (data->lm75[0].addr == data->lm75[1].addr) { + printk(KERN_ERR + "Duplicate addresses 0x%x for subclients.\n", + data->lm75[0].addr); + goto ERROR5; + } + } + if (kind == w83781d) + client_name = "W83781D subclient"; + else if (kind == w83782d) + client_name = "W83782D subclient"; + else if (kind == w83783s) + client_name = "W83783S subclient"; + else if (kind == w83627hf) + client_name = "W83627HF subclient"; + else if (kind == as99127f) + client_name = "AS99127F subclient"; + + for (i = 0; i <= 1; i++) { + i2c_set_clientdata(&data->lm75[i], NULL); /* store all data in w83781d */ + data->lm75[i].adapter = adapter; + data->lm75[i].driver = &w83781d_driver; + data->lm75[i].flags = 0; + strncpy(data->lm75[i].dev.name, client_name, DEVICE_NAME_SIZE); + data->lm75[i].id = w83781d_id++; + if ((err = i2c_attach_client(&(data->lm75[i])))) { + printk(KERN_ERR + "Subclient %d registration at address 0x%x failed.\n", + i, data->lm75[i].addr); + if (i == 1) + goto ERROR6; + goto ERROR5; + } + if (kind == w83783s) + break; + } + } else { + data->lm75 = NULL; + } + + /* Register a new directory entry with module sensors */ + if ((i = i2c_register_entry(new_client, + type_name, + (kind == as99127f) ? + as99127f_dir_table_template : + (kind == w83781d) ? + w83781d_dir_table_template : + (kind == w83783s) ? + w83783s_dir_table_template : + (kind == w83697hf) ? + w83697hf_dir_table_template : + (is_isa || kind == w83627hf) ? + w83782d_isa_dir_table_template : + w83782d_i2c_dir_table_template)) < 0) { + err = i; + goto ERROR7; + } + data->sysctl_id = i; + + /* Initialize the chip */ + w83781d_init_client(new_client); + return 0; + +/* OK, this is not exactly good programming practice, usually. But it is + very code-efficient in this case. */ + + ERROR7: + if (!is_isa) + i2c_detach_client(& + (((struct w83781d_data + *) (i2c_get_clientdata(new_client)))-> + lm75[1])); + ERROR6: + if (!is_isa) + i2c_detach_client(& + (((struct w83781d_data + *) (i2c_get_clientdata(new_client)))-> + lm75[0])); + ERROR5: + if (!is_isa) + kfree(((struct w83781d_data *) (i2c_get_clientdata(new_client)))-> + lm75); + ERROR4: + i2c_detach_client(new_client); + ERROR3: + if (is_isa) + release_region(address, W83781D_EXTENT); + ERROR1: + kfree(new_client); + ERROR0: + return err; +} + +static int +w83781d_detach_client(struct i2c_client *client) +{ + struct w83781d_data *data = i2c_get_clientdata(client); + int err; + + i2c_deregister_entry(data->sysctl_id); + + if ((err = i2c_detach_client(client))) { + printk(KERN_ERR + "Client deregistration failed, client not detached.\n"); + return err; + } + + if (i2c_is_isa_client(client)) { + release_region(client->addr, W83781D_EXTENT); + } else { + i2c_detach_client(&data->lm75[0]); + if (data->type != w83783s) + i2c_detach_client(&data->lm75[1]); + kfree(data->lm75); + } + kfree(client); + + return 0; +} + +static inline u16 +swap_bytes(u16 val) +{ + return (val >> 8) | (val << 8); +} + +/* The SMBus locks itself, usually, but nothing may access the Winbond between + bank switches. ISA access must always be locked explicitly! + We ignore the W83781D BUSY flag at this moment - it could lead to deadlocks, + would slow down the W83781D access and should not be necessary. + There are some ugly typecasts here, but the good news is - they should + nowhere else be necessary! */ +static int +w83781d_read_value(struct i2c_client *client, u16 reg) +{ + struct w83781d_data *data = i2c_get_clientdata(client); + int res, word_sized, bank; + struct i2c_client *cl; + + down(&data->lock); + if (i2c_is_isa_client(client)) { + word_sized = (((reg & 0xff00) == 0x100) + || ((reg & 0xff00) == 0x200)) + && (((reg & 0x00ff) == 0x50) + || ((reg & 0x00ff) == 0x53) + || ((reg & 0x00ff) == 0x55)); + if (reg & 0xff00) { + outb_p(W83781D_REG_BANK, + client->addr + W83781D_ADDR_REG_OFFSET); + outb_p(reg >> 8, + client->addr + W83781D_DATA_REG_OFFSET); + } + outb_p(reg & 0xff, client->addr + W83781D_ADDR_REG_OFFSET); + res = inb_p(client->addr + W83781D_DATA_REG_OFFSET); + if (word_sized) { + outb_p((reg & 0xff) + 1, + client->addr + W83781D_ADDR_REG_OFFSET); + res = + (res << 8) + inb_p(client->addr + + W83781D_DATA_REG_OFFSET); + } + if (reg & 0xff00) { + outb_p(W83781D_REG_BANK, + client->addr + W83781D_ADDR_REG_OFFSET); + outb_p(0, client->addr + W83781D_DATA_REG_OFFSET); + } + } else { + bank = (reg >> 8) & 0x0f; + if (bank > 2) + /* switch banks */ + i2c_smbus_write_byte_data(client, W83781D_REG_BANK, + bank); + if (bank == 0 || bank > 2) { + res = i2c_smbus_read_byte_data(client, reg & 0xff); + } else { + /* switch to subclient */ + cl = &data->lm75[bank - 1]; + /* convert from ISA to LM75 I2C addresses */ + switch (reg & 0xff) { + case 0x50: /* TEMP */ + res = + swap_bytes(i2c_smbus_read_word_data(cl, 0)); + break; + case 0x52: /* CONFIG */ + res = i2c_smbus_read_byte_data(cl, 1); + break; + case 0x53: /* HYST */ + res = + swap_bytes(i2c_smbus_read_word_data(cl, 2)); + break; + case 0x55: /* OVER */ + default: + res = + swap_bytes(i2c_smbus_read_word_data(cl, 3)); + break; + } + } + if (bank > 2) + i2c_smbus_write_byte_data(client, W83781D_REG_BANK, 0); + } + up(&data->lock); + return res; +} + +static int +w83781d_write_value(struct i2c_client *client, u16 reg, u16 value) +{ + struct w83781d_data *data = i2c_get_clientdata(client); + int word_sized, bank; + struct i2c_client *cl; + + down(&data->lock); + if (i2c_is_isa_client(client)) { + word_sized = (((reg & 0xff00) == 0x100) + || ((reg & 0xff00) == 0x200)) + && (((reg & 0x00ff) == 0x53) + || ((reg & 0x00ff) == 0x55)); + if (reg & 0xff00) { + outb_p(W83781D_REG_BANK, + client->addr + W83781D_ADDR_REG_OFFSET); + outb_p(reg >> 8, + client->addr + W83781D_DATA_REG_OFFSET); + } + outb_p(reg & 0xff, client->addr + W83781D_ADDR_REG_OFFSET); + if (word_sized) { + outb_p(value >> 8, + client->addr + W83781D_DATA_REG_OFFSET); + outb_p((reg & 0xff) + 1, + client->addr + W83781D_ADDR_REG_OFFSET); + } + outb_p(value & 0xff, client->addr + W83781D_DATA_REG_OFFSET); + if (reg & 0xff00) { + outb_p(W83781D_REG_BANK, + client->addr + W83781D_ADDR_REG_OFFSET); + outb_p(0, client->addr + W83781D_DATA_REG_OFFSET); + } + } else { + bank = (reg >> 8) & 0x0f; + if (bank > 2) + /* switch banks */ + i2c_smbus_write_byte_data(client, W83781D_REG_BANK, + bank); + if (bank == 0 || bank > 2) { + i2c_smbus_write_byte_data(client, reg & 0xff, + value & 0xff); + } else { + /* switch to subclient */ + cl = &data->lm75[bank - 1]; + /* convert from ISA to LM75 I2C addresses */ + switch (reg & 0xff) { + case 0x52: /* CONFIG */ + i2c_smbus_write_byte_data(cl, 1, value & 0xff); + break; + case 0x53: /* HYST */ + i2c_smbus_write_word_data(cl, 2, + swap_bytes(value)); + break; + case 0x55: /* OVER */ + i2c_smbus_write_word_data(cl, 3, + swap_bytes(value)); + break; + } + } + if (bank > 2) + i2c_smbus_write_byte_data(client, W83781D_REG_BANK, 0); + } + up(&data->lock); + return 0; +} + +/* Called when we have found a new W83781D. It should set limits, etc. */ +static void +w83781d_init_client(struct i2c_client *client) +{ + struct w83781d_data *data = i2c_get_clientdata(client); + int vid = 0, i, p; + int type = data->type; + u8 tmp; + + if (init && type != as99127f) { /* this resets registers we don't have + documentation for on the as99127f */ + /* save these registers */ + i = w83781d_read_value(client, W83781D_REG_BEEP_CONFIG); + p = w83781d_read_value(client, W83781D_REG_PWMCLK12); + /* Reset all except Watchdog values and last conversion values + This sets fan-divs to 2, among others */ + w83781d_write_value(client, W83781D_REG_CONFIG, 0x80); + /* Restore the registers and disable power-on abnormal beep. + This saves FAN 1/2/3 input/output values set by BIOS. */ + w83781d_write_value(client, W83781D_REG_BEEP_CONFIG, i | 0x80); + w83781d_write_value(client, W83781D_REG_PWMCLK12, p); + /* Disable master beep-enable (reset turns it on). + Individual beeps should be reset to off but for some reason + disabling this bit helps some people not get beeped */ + w83781d_write_value(client, W83781D_REG_BEEP_INTS2, 0); + } + + if (type != w83697hf) { + vid = w83781d_read_value(client, W83781D_REG_VID_FANDIV) & 0x0f; + vid |= + (w83781d_read_value(client, W83781D_REG_CHIPID) & 0x01) << + 4; + data->vrm = DEFAULT_VRM; + vid = vid_from_reg(vid, data->vrm); + } + + if ((type != w83781d) && (type != as99127f)) { + tmp = w83781d_read_value(client, W83781D_REG_SCFG1); + for (i = 1; i <= 3; i++) { + if (!(tmp & BIT_SCFG1[i - 1])) { + data->sens[i - 1] = W83781D_DEFAULT_BETA; + } else { + if (w83781d_read_value + (client, + W83781D_REG_SCFG2) & BIT_SCFG2[i - 1]) + data->sens[i - 1] = 1; + else + data->sens[i - 1] = 2; + } + if ((type == w83783s || type == w83697hf) && (i == 2)) + break; + } + } +#ifdef W83781D_RT +/* + Fill up the RT Tables. + We assume that they are 32 bytes long, in order for temp 1-3. + Data sheet documentation is sparse. + We also assume that it is only for the 781D although I suspect + that the others support it as well.... +*/ + + if (init && type == w83781d) { + u16 k = 0; +/* + Auto-indexing doesn't seem to work... + w83781d_write_value(client,W83781D_REG_RT_IDX,0); +*/ + for (i = 0; i < 3; i++) { + int j; + for (j = 0; j < 32; j++) { + w83781d_write_value(client, + W83781D_REG_RT_IDX, k++); + data->rt[i][j] = + w83781d_read_value(client, + W83781D_REG_RT_VAL); + } + } + } +#endif /* W83781D_RT */ + + if (init) { + w83781d_write_value(client, W83781D_REG_IN_MIN(0), + IN_TO_REG(W83781D_INIT_IN_MIN_0)); + w83781d_write_value(client, W83781D_REG_IN_MAX(0), + IN_TO_REG(W83781D_INIT_IN_MAX_0)); + if (type != w83783s && type != w83697hf) { + w83781d_write_value(client, W83781D_REG_IN_MIN(1), + IN_TO_REG(W83781D_INIT_IN_MIN_1)); + w83781d_write_value(client, W83781D_REG_IN_MAX(1), + IN_TO_REG(W83781D_INIT_IN_MAX_1)); + } + + w83781d_write_value(client, W83781D_REG_IN_MIN(2), + IN_TO_REG(W83781D_INIT_IN_MIN_2)); + w83781d_write_value(client, W83781D_REG_IN_MAX(2), + IN_TO_REG(W83781D_INIT_IN_MAX_2)); + w83781d_write_value(client, W83781D_REG_IN_MIN(3), + IN_TO_REG(W83781D_INIT_IN_MIN_3)); + w83781d_write_value(client, W83781D_REG_IN_MAX(3), + IN_TO_REG(W83781D_INIT_IN_MAX_3)); + w83781d_write_value(client, W83781D_REG_IN_MIN(4), + IN_TO_REG(W83781D_INIT_IN_MIN_4)); + w83781d_write_value(client, W83781D_REG_IN_MAX(4), + IN_TO_REG(W83781D_INIT_IN_MAX_4)); + if (type == w83781d || type == as99127f) { + w83781d_write_value(client, W83781D_REG_IN_MIN(5), + IN_TO_REG(W83781D_INIT_IN_MIN_5)); + w83781d_write_value(client, W83781D_REG_IN_MAX(5), + IN_TO_REG(W83781D_INIT_IN_MAX_5)); + } else { + w83781d_write_value(client, W83781D_REG_IN_MIN(5), + IN_TO_REG(W83782D_INIT_IN_MIN_5)); + w83781d_write_value(client, W83781D_REG_IN_MAX(5), + IN_TO_REG(W83782D_INIT_IN_MAX_5)); + } + if (type == w83781d || type == as99127f) { + w83781d_write_value(client, W83781D_REG_IN_MIN(6), + IN_TO_REG(W83781D_INIT_IN_MIN_6)); + w83781d_write_value(client, W83781D_REG_IN_MAX(6), + IN_TO_REG(W83781D_INIT_IN_MAX_6)); + } else { + w83781d_write_value(client, W83781D_REG_IN_MIN(6), + IN_TO_REG(W83782D_INIT_IN_MIN_6)); + w83781d_write_value(client, W83781D_REG_IN_MAX(6), + IN_TO_REG(W83782D_INIT_IN_MAX_6)); + } + if ((type == w83782d) || (type == w83627hf) || + (type == w83697hf)) { + w83781d_write_value(client, W83781D_REG_IN_MIN(7), + IN_TO_REG(W83781D_INIT_IN_MIN_7)); + w83781d_write_value(client, W83781D_REG_IN_MAX(7), + IN_TO_REG(W83781D_INIT_IN_MAX_7)); + w83781d_write_value(client, W83781D_REG_IN_MIN(8), + IN_TO_REG(W83781D_INIT_IN_MIN_8)); + w83781d_write_value(client, W83781D_REG_IN_MAX(8), + IN_TO_REG(W83781D_INIT_IN_MAX_8)); + w83781d_write_value(client, W83781D_REG_VBAT, + (w83781d_read_value + (client, + W83781D_REG_VBAT) | 0x01)); + } + w83781d_write_value(client, W83781D_REG_FAN_MIN(1), + FAN_TO_REG(W83781D_INIT_FAN_MIN_1, 2)); + w83781d_write_value(client, W83781D_REG_FAN_MIN(2), + FAN_TO_REG(W83781D_INIT_FAN_MIN_2, 2)); + if (type != w83697hf) { + w83781d_write_value(client, W83781D_REG_FAN_MIN(3), + FAN_TO_REG(W83781D_INIT_FAN_MIN_3, + 2)); + } + + w83781d_write_value(client, W83781D_REG_TEMP_OVER, + TEMP_TO_REG(W83781D_INIT_TEMP_OVER)); + w83781d_write_value(client, W83781D_REG_TEMP_HYST, + TEMP_TO_REG(W83781D_INIT_TEMP_HYST)); + + if (type == as99127f) { + w83781d_write_value(client, W83781D_REG_TEMP2_OVER, + AS99127_TEMP_ADD_TO_REG + (W83781D_INIT_TEMP2_OVER)); + w83781d_write_value(client, W83781D_REG_TEMP2_HYST, + AS99127_TEMP_ADD_TO_REG + (W83781D_INIT_TEMP2_HYST)); + } else { + w83781d_write_value(client, W83781D_REG_TEMP2_OVER, + TEMP_ADD_TO_REG + (W83781D_INIT_TEMP2_OVER)); + w83781d_write_value(client, W83781D_REG_TEMP2_HYST, + TEMP_ADD_TO_REG + (W83781D_INIT_TEMP2_HYST)); + } + w83781d_write_value(client, W83781D_REG_TEMP2_CONFIG, 0x00); + + if (type == as99127f) { + w83781d_write_value(client, W83781D_REG_TEMP3_OVER, + AS99127_TEMP_ADD_TO_REG + (W83781D_INIT_TEMP3_OVER)); + w83781d_write_value(client, W83781D_REG_TEMP3_HYST, + AS99127_TEMP_ADD_TO_REG + (W83781D_INIT_TEMP3_HYST)); + } else if (type != w83783s && type != w83697hf) { + w83781d_write_value(client, W83781D_REG_TEMP3_OVER, + TEMP_ADD_TO_REG + (W83781D_INIT_TEMP3_OVER)); + w83781d_write_value(client, W83781D_REG_TEMP3_HYST, + TEMP_ADD_TO_REG + (W83781D_INIT_TEMP3_HYST)); + } + if (type != w83783s && type != w83697hf) { + w83781d_write_value(client, W83781D_REG_TEMP3_CONFIG, + 0x00); + } + if (type != w83781d) { + /* enable comparator mode for temp2 and temp3 so + alarm indication will work correctly */ + w83781d_write_value(client, W83781D_REG_IRQ, 0x41); + for (i = 0; i < 3; i++) + data->pwmenable[i] = 1; + } + } + + /* Start monitoring */ + w83781d_write_value(client, W83781D_REG_CONFIG, + (w83781d_read_value(client, + W83781D_REG_CONFIG) & 0xf7) + | 0x01); +} + +static void +w83781d_update_client(struct i2c_client *client) +{ + struct w83781d_data *data = i2c_get_clientdata(client); + int i; + + down(&data->update_lock); + + if (time_after(jiffies - data->last_updated, (unsigned long)(HZ + HZ / 2)) || + time_before(jiffies, data->last_updated) || !data->valid) { + pr_debug(KERN_DEBUG "Starting device update\n"); + + for (i = 0; i <= 8; i++) { + if ((data->type == w83783s || data->type == w83697hf) + && (i == 1)) + continue; /* 783S has no in1 */ + data->in[i] = + w83781d_read_value(client, W83781D_REG_IN(i)); + data->in_min[i] = + w83781d_read_value(client, W83781D_REG_IN_MIN(i)); + data->in_max[i] = + w83781d_read_value(client, W83781D_REG_IN_MAX(i)); + if ((data->type != w83782d) && (data->type != w83697hf) + && (data->type != w83627hf) && (i == 6)) + break; + } + for (i = 1; i <= 3; i++) { + data->fan[i - 1] = + w83781d_read_value(client, W83781D_REG_FAN(i)); + data->fan_min[i - 1] = + w83781d_read_value(client, W83781D_REG_FAN_MIN(i)); + } + if (data->type != w83781d) { + for (i = 1; i <= 4; i++) { + data->pwm[i - 1] = + w83781d_read_value(client, + W83781D_REG_PWM(i)); + if (((data->type == w83783s) + || (data->type == w83627hf) + || (data->type == as99127f) + || (data->type == w83697hf) + || ((data->type == w83782d) + && i2c_is_isa_client(client))) + && i == 2) + break; + } + } + + data->temp = w83781d_read_value(client, W83781D_REG_TEMP); + data->temp_over = + w83781d_read_value(client, W83781D_REG_TEMP_OVER); + data->temp_hyst = + w83781d_read_value(client, W83781D_REG_TEMP_HYST); + data->temp_add[0] = + w83781d_read_value(client, W83781D_REG_TEMP2); + data->temp_add_over[0] = + w83781d_read_value(client, W83781D_REG_TEMP2_OVER); + data->temp_add_hyst[0] = + w83781d_read_value(client, W83781D_REG_TEMP2_HYST); + if (data->type != w83783s && data->type != w83697hf) { + data->temp_add[1] = + w83781d_read_value(client, W83781D_REG_TEMP3); + data->temp_add_over[1] = + w83781d_read_value(client, W83781D_REG_TEMP3_OVER); + data->temp_add_hyst[1] = + w83781d_read_value(client, W83781D_REG_TEMP3_HYST); + } + i = w83781d_read_value(client, W83781D_REG_VID_FANDIV); + if (data->type != w83697hf) { + data->vid = i & 0x0f; + data->vid |= + (w83781d_read_value(client, W83781D_REG_CHIPID) & + 0x01) + << 4; + } + data->fan_div[0] = (i >> 4) & 0x03; + data->fan_div[1] = (i >> 6) & 0x03; + if (data->type != w83697hf) { + data->fan_div[2] = (w83781d_read_value(client, + W83781D_REG_PIN) + >> 6) & 0x03; + } + if ((data->type != w83781d) && (data->type != as99127f)) { + i = w83781d_read_value(client, W83781D_REG_VBAT); + data->fan_div[0] |= (i >> 3) & 0x04; + data->fan_div[1] |= (i >> 4) & 0x04; + if (data->type != w83697hf) + data->fan_div[2] |= (i >> 5) & 0x04; + } + data->alarms = + w83781d_read_value(client, + W83781D_REG_ALARM1) + + (w83781d_read_value(client, W83781D_REG_ALARM2) << 8); + if ((data->type == w83782d) || (data->type == w83627hf)) { + data->alarms |= + w83781d_read_value(client, + W83781D_REG_ALARM3) << 16; + } + i = w83781d_read_value(client, W83781D_REG_BEEP_INTS2); + data->beep_enable = i >> 7; + data->beeps = ((i & 0x7f) << 8) + + w83781d_read_value(client, W83781D_REG_BEEP_INTS1); + if ((data->type != w83781d) && (data->type != as99127f)) { + data->beeps |= + w83781d_read_value(client, + W83781D_REG_BEEP_INTS3) << 16; + } + data->last_updated = jiffies; + data->valid = 1; + } + + up(&data->update_lock); +} + +/* The next few functions are the call-back functions of the /proc/sys and + sysctl files. Which function is used is defined in the ctl_table in + the extra1 field. + Each function must return the magnitude (power of 10 to divide the date + with) if it is called with operation==SENSORS_PROC_REAL_INFO. It must + put a maximum of *nrels elements in results reflecting the data of this + file, and set *nrels to the number it actually put in it, if operation== + SENSORS_PROC_REAL_READ. Finally, it must get upto *nrels elements from + results and write them to the chip, if operations==SENSORS_PROC_REAL_WRITE. + Note that on SENSORS_PROC_REAL_READ, I do not check whether results is + large enough (by checking the incoming value of *nrels). This is not very + good practice, but as long as you put less than about 5 values in results, + you can assume it is large enough. */ +static void +w83781d_in(struct i2c_client *client, int operation, int ctl_name, + int *nrels_mag, long *results) +{ + struct w83781d_data *data = i2c_get_clientdata(client); + int nr = ctl_name - W83781D_SYSCTL_IN0; + + if (operation == SENSORS_PROC_REAL_INFO) + *nrels_mag = 2; + else if (operation == SENSORS_PROC_REAL_READ) { + w83781d_update_client(client); + results[0] = IN_FROM_REG(data->in_min[nr]); + results[1] = IN_FROM_REG(data->in_max[nr]); + results[2] = IN_FROM_REG(data->in[nr]); + *nrels_mag = 3; + } else if (operation == SENSORS_PROC_REAL_WRITE) { + if (*nrels_mag >= 1) { + data->in_min[nr] = IN_TO_REG(results[0]); + w83781d_write_value(client, W83781D_REG_IN_MIN(nr), + data->in_min[nr]); + } + if (*nrels_mag >= 2) { + data->in_max[nr] = IN_TO_REG(results[1]); + w83781d_write_value(client, W83781D_REG_IN_MAX(nr), + data->in_max[nr]); + } + } +} + +static void +w83781d_fan(struct i2c_client *client, int operation, int ctl_name, + int *nrels_mag, long *results) +{ + struct w83781d_data *data = i2c_get_clientdata(client); + int nr = ctl_name - W83781D_SYSCTL_FAN1 + 1; + + if (operation == SENSORS_PROC_REAL_INFO) + *nrels_mag = 0; + else if (operation == SENSORS_PROC_REAL_READ) { + w83781d_update_client(client); + results[0] = FAN_FROM_REG(data->fan_min[nr - 1], + DIV_FROM_REG(data->fan_div[nr - 1])); + results[1] = FAN_FROM_REG(data->fan[nr - 1], + DIV_FROM_REG(data->fan_div[nr - 1])); + *nrels_mag = 2; + } else if (operation == SENSORS_PROC_REAL_WRITE) { + if (*nrels_mag >= 1) { + data->fan_min[nr - 1] = + FAN_TO_REG(results[0], + DIV_FROM_REG(data->fan_div[nr - 1])); + w83781d_write_value(client, + W83781D_REG_FAN_MIN(nr), + data->fan_min[nr - 1]); + } + } +} + +static void +w83781d_temp(struct i2c_client *client, int operation, int ctl_name, + int *nrels_mag, long *results) +{ + struct w83781d_data *data = i2c_get_clientdata(client); + if (operation == SENSORS_PROC_REAL_INFO) + *nrels_mag = 1; + else if (operation == SENSORS_PROC_REAL_READ) { + w83781d_update_client(client); + results[0] = TEMP_FROM_REG(data->temp_over); + results[1] = TEMP_FROM_REG(data->temp_hyst); + results[2] = TEMP_FROM_REG(data->temp); + *nrels_mag = 3; + } else if (operation == SENSORS_PROC_REAL_WRITE) { + if (*nrels_mag >= 1) { + data->temp_over = TEMP_TO_REG(results[0]); + w83781d_write_value(client, W83781D_REG_TEMP_OVER, + data->temp_over); + } + if (*nrels_mag >= 2) { + data->temp_hyst = TEMP_TO_REG(results[1]); + w83781d_write_value(client, W83781D_REG_TEMP_HYST, + data->temp_hyst); + } + } +} + +static void +w83781d_temp_add(struct i2c_client *client, int operation, + int ctl_name, int *nrels_mag, long *results) +{ + struct w83781d_data *data = i2c_get_clientdata(client); + int nr = ctl_name - W83781D_SYSCTL_TEMP2; + + if (operation == SENSORS_PROC_REAL_INFO) + *nrels_mag = 1; + else if (operation == SENSORS_PROC_REAL_READ) { + w83781d_update_client(client); + if (data->type == as99127f) { + results[0] = + AS99127_TEMP_ADD_FROM_REG(data->temp_add_over[nr]); + results[1] = + AS99127_TEMP_ADD_FROM_REG(data->temp_add_hyst[nr]); + results[2] = + AS99127_TEMP_ADD_FROM_REG(data->temp_add[nr]); + } else { + results[0] = TEMP_ADD_FROM_REG(data->temp_add_over[nr]); + results[1] = TEMP_ADD_FROM_REG(data->temp_add_hyst[nr]); + results[2] = TEMP_ADD_FROM_REG(data->temp_add[nr]); + } + *nrels_mag = 3; + } else if (operation == SENSORS_PROC_REAL_WRITE) { + if (*nrels_mag >= 1) { + if (data->type == as99127f) + data->temp_add_over[nr] = + AS99127_TEMP_ADD_TO_REG(results[0]); + else + data->temp_add_over[nr] = + TEMP_ADD_TO_REG(results[0]); + w83781d_write_value(client, + nr ? W83781D_REG_TEMP3_OVER : + W83781D_REG_TEMP2_OVER, + data->temp_add_over[nr]); + } + if (*nrels_mag >= 2) { + if (data->type == as99127f) + data->temp_add_hyst[nr] = + AS99127_TEMP_ADD_TO_REG(results[1]); + else + data->temp_add_hyst[nr] = + TEMP_ADD_TO_REG(results[1]); + w83781d_write_value(client, + nr ? W83781D_REG_TEMP3_HYST : + W83781D_REG_TEMP2_HYST, + data->temp_add_hyst[nr]); + } + } +} + +static void +w83781d_vid(struct i2c_client *client, int operation, int ctl_name, + int *nrels_mag, long *results) +{ + struct w83781d_data *data = i2c_get_clientdata(client); + if (operation == SENSORS_PROC_REAL_INFO) + *nrels_mag = 3; + else if (operation == SENSORS_PROC_REAL_READ) { + w83781d_update_client(client); + results[0] = vid_from_reg(data->vid, data->vrm); + *nrels_mag = 1; + } +} + +static void +w83781d_vrm(struct i2c_client *client, int operation, int ctl_name, + int *nrels_mag, long *results) +{ + struct w83781d_data *data = i2c_get_clientdata(client); + if (operation == SENSORS_PROC_REAL_INFO) + *nrels_mag = 1; + else if (operation == SENSORS_PROC_REAL_READ) { + results[0] = data->vrm; + *nrels_mag = 1; + } else if (operation == SENSORS_PROC_REAL_WRITE) { + if (*nrels_mag >= 1) + data->vrm = results[0]; + } +} + +static void +w83781d_alarms(struct i2c_client *client, int operation, int ctl_name, + int *nrels_mag, long *results) +{ + struct w83781d_data *data = i2c_get_clientdata(client); + if (operation == SENSORS_PROC_REAL_INFO) + *nrels_mag = 0; + else if (operation == SENSORS_PROC_REAL_READ) { + w83781d_update_client(client); + results[0] = ALARMS_FROM_REG(data->alarms); + *nrels_mag = 1; + } +} + +static void +w83781d_beep(struct i2c_client *client, int operation, int ctl_name, + int *nrels_mag, long *results) +{ + struct w83781d_data *data = i2c_get_clientdata(client); + int val; + + if (operation == SENSORS_PROC_REAL_INFO) + *nrels_mag = 0; + else if (operation == SENSORS_PROC_REAL_READ) { + w83781d_update_client(client); + results[0] = BEEP_ENABLE_FROM_REG(data->beep_enable); + results[1] = BEEPS_FROM_REG(data->beeps); + *nrels_mag = 2; + } else if (operation == SENSORS_PROC_REAL_WRITE) { + if (*nrels_mag >= 2) { + data->beeps = BEEPS_TO_REG(results[1]); + w83781d_write_value(client, W83781D_REG_BEEP_INTS1, + data->beeps & 0xff); + if ((data->type != w83781d) && (data->type != as99127f)) { + w83781d_write_value(client, + W83781D_REG_BEEP_INTS3, + ((data->beeps) >> 16) & + 0xff); + } + val = (data->beeps >> 8) & 0x7f; + } else if (*nrels_mag >= 1) + val = + w83781d_read_value(client, + W83781D_REG_BEEP_INTS2) & 0x7f; + if (*nrels_mag >= 1) { + data->beep_enable = BEEP_ENABLE_TO_REG(results[0]); + w83781d_write_value(client, W83781D_REG_BEEP_INTS2, + val | data->beep_enable << 7); + } + } +} + +/* w83697hf only has two fans */ +static void +w83781d_fan_div(struct i2c_client *client, int operation, + int ctl_name, int *nrels_mag, long *results) +{ + struct w83781d_data *data = i2c_get_clientdata(client); + int old, old2, old3 = 0; + + if (operation == SENSORS_PROC_REAL_INFO) + *nrels_mag = 0; + else if (operation == SENSORS_PROC_REAL_READ) { + w83781d_update_client(client); + results[0] = DIV_FROM_REG(data->fan_div[0]); + results[1] = DIV_FROM_REG(data->fan_div[1]); + if (data->type == w83697hf) { + *nrels_mag = 2; + } else { + results[2] = DIV_FROM_REG(data->fan_div[2]); + *nrels_mag = 3; + } + } else if (operation == SENSORS_PROC_REAL_WRITE) { + old = w83781d_read_value(client, W83781D_REG_VID_FANDIV); + /* w83781d and as99127f don't have extended divisor bits */ + if ((data->type != w83781d) && data->type != as99127f) { + old3 = w83781d_read_value(client, W83781D_REG_VBAT); + } + if (*nrels_mag >= 3 && data->type != w83697hf) { + data->fan_div[2] = DIV_TO_REG(results[2], data->type); + old2 = w83781d_read_value(client, W83781D_REG_PIN); + old2 = (old2 & 0x3f) | ((data->fan_div[2] & 0x03) << 6); + w83781d_write_value(client, W83781D_REG_PIN, old2); + if ((data->type != w83781d) && (data->type != as99127f)) { + old3 = + (old3 & 0x7f) | + ((data->fan_div[2] & 0x04) << 5); + } + } + if (*nrels_mag >= 2) { + data->fan_div[1] = DIV_TO_REG(results[1], data->type); + old = (old & 0x3f) | ((data->fan_div[1] & 0x03) << 6); + if ((data->type != w83781d) && (data->type != as99127f)) { + old3 = + (old3 & 0xbf) | + ((data->fan_div[1] & 0x04) << 4); + } + } + if (*nrels_mag >= 1) { + data->fan_div[0] = DIV_TO_REG(results[0], data->type); + old = (old & 0xcf) | ((data->fan_div[0] & 0x03) << 4); + w83781d_write_value(client, W83781D_REG_VID_FANDIV, + old); + if ((data->type != w83781d) && (data->type != as99127f)) { + old3 = + (old3 & 0xdf) | + ((data->fan_div[0] & 0x04) << 3); + w83781d_write_value(client, + W83781D_REG_VBAT, old3); + } + } + } +} + +static void +w83781d_pwm(struct i2c_client *client, int operation, int ctl_name, + int *nrels_mag, long *results) +{ + struct w83781d_data *data = i2c_get_clientdata(client); + int nr = 1 + ctl_name - W83781D_SYSCTL_PWM1; + int j, k; + + if (operation == SENSORS_PROC_REAL_INFO) + *nrels_mag = 0; + else if (operation == SENSORS_PROC_REAL_READ) { + w83781d_update_client(client); + results[0] = PWM_FROM_REG(data->pwm[nr - 1]); + results[1] = data->pwmenable[nr - 1]; + *nrels_mag = 2; + } else if (operation == SENSORS_PROC_REAL_WRITE) { + if (*nrels_mag >= 1) { + data->pwm[nr - 1] = PWM_TO_REG(results[0]); + w83781d_write_value(client, W83781D_REG_PWM(nr), + data->pwm[nr - 1]); + } + /* only PWM2 can be enabled/disabled */ + if (*nrels_mag >= 2 && nr == 2) { + j = w83781d_read_value(client, W83781D_REG_PWMCLK12); + k = w83781d_read_value(client, W83781D_REG_BEEP_CONFIG); + if (results[1]) { + if (!(j & 0x08)) + w83781d_write_value(client, + W83781D_REG_PWMCLK12, + j | 0x08); + if (k & 0x10) + w83781d_write_value(client, + W83781D_REG_BEEP_CONFIG, + k & 0xef); + data->pwmenable[1] = 1; + } else { + if (j & 0x08) + w83781d_write_value(client, + W83781D_REG_PWMCLK12, + j & 0xf7); + if (!(k & 0x10)) + w83781d_write_value(client, + W83781D_REG_BEEP_CONFIG, + j | 0x10); + data->pwmenable[1] = 0; + } + } + } +} + +static void +w83781d_sens(struct i2c_client *client, int operation, int ctl_name, + int *nrels_mag, long *results) +{ + struct w83781d_data *data = i2c_get_clientdata(client); + int nr = 1 + ctl_name - W83781D_SYSCTL_SENS1; + u8 tmp; + + if (operation == SENSORS_PROC_REAL_INFO) + *nrels_mag = 0; + else if (operation == SENSORS_PROC_REAL_READ) { + results[0] = data->sens[nr - 1]; + *nrels_mag = 1; + } else if (operation == SENSORS_PROC_REAL_WRITE) { + if (*nrels_mag >= 1) { + switch (results[0]) { + case 1: /* PII/Celeron diode */ + tmp = w83781d_read_value(client, + W83781D_REG_SCFG1); + w83781d_write_value(client, + W83781D_REG_SCFG1, + tmp | BIT_SCFG1[nr - 1]); + tmp = w83781d_read_value(client, + W83781D_REG_SCFG2); + w83781d_write_value(client, + W83781D_REG_SCFG2, + tmp | BIT_SCFG2[nr - 1]); + data->sens[nr - 1] = results[0]; + break; + case 2: /* 3904 */ + tmp = w83781d_read_value(client, + W83781D_REG_SCFG1); + w83781d_write_value(client, + W83781D_REG_SCFG1, + tmp | BIT_SCFG1[nr - 1]); + tmp = w83781d_read_value(client, + W83781D_REG_SCFG2); + w83781d_write_value(client, + W83781D_REG_SCFG2, + tmp & ~BIT_SCFG2[nr - 1]); + data->sens[nr - 1] = results[0]; + break; + case W83781D_DEFAULT_BETA: /* thermistor */ + tmp = w83781d_read_value(client, + W83781D_REG_SCFG1); + w83781d_write_value(client, + W83781D_REG_SCFG1, + tmp & ~BIT_SCFG1[nr - 1]); + data->sens[nr - 1] = results[0]; + break; + default: + printk(KERN_ERR + "Invalid sensor type %ld; must be 1, 2, or %d\n", + results[0], W83781D_DEFAULT_BETA); + break; + } + } + } +} + +#ifdef W83781D_RT +static void +w83781d_rt(struct i2c_client *client, int operation, int ctl_name, + int *nrels_mag, long *results) +{ + struct w83781d_data *data = i2c_get_clientdata(client); + int nr = 1 + ctl_name - W83781D_SYSCTL_RT1; + int i; + + if (operation == SENSORS_PROC_REAL_INFO) + *nrels_mag = 0; + else if (operation == SENSORS_PROC_REAL_READ) { + for (i = 0; i < 32; i++) { + results[i] = data->rt[nr - 1][i]; + } + *nrels_mag = 32; + } else if (operation == SENSORS_PROC_REAL_WRITE) { + if (*nrels_mag > 32) + *nrels_mag = 32; + for (i = 0; i < *nrels_mag; i++) { + /* fixme: no bounds checking 0-255 */ + data->rt[nr - 1][i] = results[i]; + w83781d_write_value(client, W83781D_REG_RT_IDX, i); + w83781d_write_value(client, W83781D_REG_RT_VAL, + data->rt[nr - 1][i]); + } + } +} +#endif + +static int __init sensors_w83781d_init(void) +{ + return i2c_add_driver(&w83781d_driver); +} + +static void __exit sensors_w83781d_exit(void) +{ + i2c_del_driver(&w83781d_driver); +} + +MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>, " + "Philip Edelbrock <phil@netroedge.com>, " + "and Mark Studebaker <mdsxyz123@yahoo.com>"); +MODULE_DESCRIPTION("W83781D driver"); +MODULE_LICENSE("GPL"); + +module_init(sensors_w83781d_init); +module_exit(sensors_w83781d_exit); [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 189 bytes --] ^ permalink raw reply [flat|nested] 89+ messages in thread
* w83781d i2c driver updated for 2.5.66 (without sysfs support) @ 2005-05-19 6:23 ` Martin Schlemmer 0 siblings, 0 replies; 89+ messages in thread From: Martin Schlemmer @ 2005-05-19 6:23 UTC (permalink / raw) To: Greg KH; +Cc: KML, Dominik Brodowski, sensors Skipped content of type multipart/mixed-------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part Url : http://lists.lm-sensors.org/pipermail/lm-sensors/attachments/20030326/6d1e64b3/attachment.bin ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: w83781d i2c driver updated for 2.5.66 (without sysfs support) 2005-05-19 6:23 ` Martin Schlemmer @ 2005-05-19 6:23 ` Jan Dittmer -1 siblings, 0 replies; 89+ messages in thread From: Jan Dittmer @ 2003-03-26 19:40 UTC (permalink / raw) To: azarah; +Cc: Greg KH, KML, Dominik Brodowski, sensors Martin Schlemmer wrote: > > I did look at the changes needed for sysfs, but this beast have > about 6 ctl_tables, and is hairy in general. I am not sure what > is the best way to do it for the different chips, so here is what > I have until I or somebody else can do the sysfs stuff. > I've just done this with the via686a driver. Saves about 100 lines of code. Comments? Jan --- c/drivers/i2c/chips/via686a.c 2003-03-26 10:35:04.000000000 +0100 +++ b/drivers/i2c/chips/via686a.c 2003-03-26 19:57:19.000000000 +0100 @@ -394,25 +394,185 @@ unsigned short flags, int kind); static int via686a_detach_client(struct i2c_client *client); -static int via686a_read_value(struct i2c_client *client, u8 register); -static void via686a_write_value(struct i2c_client *client, u8 register, - u8 value); +static inline int via686a_read_value(struct i2c_client *client, u8 reg) +{ + return (inb_p(client->addr + reg)); +} + +static inline void via686a_write_value(struct i2c_client *client, u8 reg, + u8 value) +{ + outb_p(value, client->addr + reg); +} + static void via686a_update_client(struct i2c_client *client); static void via686a_init_client(struct i2c_client *client); +/* following are the sysfs callback functions */ +static ssize_t show_in(struct device *dev, char *buf, int nr) { + struct i2c_client *client = to_i2c_client(dev); + struct via686a_data *data = i2c_get_clientdata(client); + via686a_update_client(client); + + return sprintf(buf,"%ld %ld %ld\n", + IN_FROM_REG(data->in_min[nr], nr), + IN_FROM_REG(data->in_max[nr], nr), + IN_FROM_REG(data->in[nr], nr) ); +} + +static ssize_t store_in(struct device *dev, const char *buf, size_t count, int nr) { + struct i2c_client *client = to_i2c_client(dev); + struct via686a_data *data = i2c_get_clientdata(client); + int in_min, in_max, ret; + ret = sscanf(buf, "%d %d", &in_min, &in_max); + if (ret == -1) return -EINVAL; + if (ret >= 1) { + data->in_min[nr] = IN_TO_REG(in_min, nr); + via686a_write_value(client, VIA686A_REG_IN_MIN(nr), data->in_min[nr]); + } + if (ret >= 2) { + data->in_max[nr] = IN_TO_REG(in_max, nr); + via686a_write_value(client, VIA686A_REG_IN_MAX(nr), data->in_max[nr]); + } + return count; +} + +#define show_in_offset(offset) \ +static ssize_t \ +show_in_##offset (struct device *dev, char *buf) \ +{ \ + return show_in(dev, buf, 0x##offset); \ +} \ +static ssize_t store_in_##offset (struct device *dev, const char *buf, size_t count) \ +{ \ + return store_in(dev, buf, count, 0x##offset); \ +} \ +static DEVICE_ATTR(in##offset, S_IRUGO| S_IWUSR, show_in_##offset, store_in_##offset) + +show_in_offset(0); +show_in_offset(1); +show_in_offset(2); +show_in_offset(3); +show_in_offset(4); + +static ssize_t show_temp(struct device *dev, char *buf, int nr) { + struct i2c_client *client = to_i2c_client(dev); + struct via686a_data *data = i2c_get_clientdata(client); + via686a_update_client(client); + + return sprintf(buf,"%ld %ld %ld\n", + TEMP_FROM_REG(data->temp_over[nr]), + TEMP_FROM_REG(data->temp_hyst[nr]), + TEMP_FROM_REG10(data->temp[nr]) ); +} +static ssize_t store_temp(struct device *dev, const char *buf, size_t count, int nr) { + struct i2c_client *client = to_i2c_client(dev); + struct via686a_data *data = i2c_get_clientdata(client); + int temp_over, temp_hyst, ret; + printk(buf); + ret = sscanf(buf, "%d %d", &temp_over, &temp_hyst); + if (ret == -1) return -EINVAL; + if (ret >= 1) { + data->temp_over[nr] = TEMP_TO_REG(temp_over); + via686a_write_value(client, VIA686A_REG_TEMP_OVER(nr + 1), data->temp_over[nr]); + } + if (ret >= 2) { + data->temp_hyst[nr] = TEMP_TO_REG(temp_hyst); + via686a_write_value(client, VIA686A_REG_TEMP_HYST(nr + 1), data->temp_hyst[nr]); + } + return count; +} +#define show_temp_offset(offset) \ +static ssize_t \ +show_temp_##offset (struct device *dev, char *buf) \ +{ \ + return show_temp(dev, buf, 0x##offset); \ +} \ +static ssize_t store_temp_##offset (struct device *dev, const char *buf, size_t count) \ +{ \ + return store_temp(dev, buf, count, 0x##offset); \ +} \ +static DEVICE_ATTR(temp##offset, S_IRUGO | S_IWUSR, show_temp_##offset, store_temp_##offset) + +show_temp_offset(0); +show_temp_offset(1); +show_temp_offset(2); + +static ssize_t show_fan(struct device *dev, char *buf, int nr) { + struct i2c_client *client = to_i2c_client(dev); + struct via686a_data *data = i2c_get_clientdata(client); + via686a_update_client(client); + + return sprintf(buf,"%d %d\n", + FAN_FROM_REG(data->fan_min[nr - 1], DIV_FROM_REG(data->fan_div[nr - 1])), + FAN_FROM_REG(data->fan[nr - 1], DIV_FROM_REG(data->fan_div[nr - 1])) ); +} +static ssize_t store_fan(struct device *dev, const char *buf, size_t count, int nr) { + struct i2c_client *client = to_i2c_client(dev); + struct via686a_data *data = i2c_get_clientdata(client); + int fan_min, ret; + ret = sscanf(buf, "%d", &fan_min); + if (ret == -1) return -EINVAL; + if (ret >= 1) { + data->fan_min[nr] = FAN_TO_REG(fan_min, DIV_FROM_REG(data->fan_div[nr])); + via686a_write_value(client, VIA686A_REG_FAN_MIN(nr+1), data->fan_min[nr]); + } + return count; +} +#define show_fan_offset(offset) \ +static ssize_t \ +show_fan_##offset (struct device *dev, char *buf) \ +{ \ + return show_fan(dev, buf, 0x##offset); \ +} \ +static ssize_t store_fan_##offset (struct device *dev, const char *buf, size_t count) \ +{ \ + return store_fan(dev, buf, count, 0x##offset); \ +} \ +static DEVICE_ATTR(fan##offset, S_IRUGO | S_IWUSR, show_fan_##offset, store_fan_##offset) + +show_fan_offset(1); +show_fan_offset(2); + +static ssize_t show_alarm(struct device *dev, char *buf) { + struct i2c_client *client = to_i2c_client(dev); + struct via686a_data *data = i2c_get_clientdata(client); + via686a_update_client(client); + + return sprintf(buf,"%d\n", ALARMS_FROM_REG(data->alarms)); +} +static DEVICE_ATTR(alarm, S_IRUGO | S_IWUSR, show_alarm, NULL); + +static ssize_t show_fan_div(struct device *dev, char *buf) { + struct i2c_client *client = to_i2c_client(dev); + struct via686a_data *data = i2c_get_clientdata(client); + via686a_update_client(client); + + return sprintf(buf,"%d %d\n", + DIV_FROM_REG(data->fan_div[0]), + DIV_FROM_REG(data->fan_div[1]) ); +} +static ssize_t store_fan_div(struct device *dev, const char *buf, size_t count) { + struct i2c_client *client = to_i2c_client(dev); + struct via686a_data *data = i2c_get_clientdata(client); + int fan_div[2], ret, old; -static void via686a_in(struct i2c_client *client, int operation, - int ctl_name, int *nrels_mag, long *results); -static void via686a_fan(struct i2c_client *client, int operation, - int ctl_name, int *nrels_mag, long *results); -static void via686a_temp(struct i2c_client *client, int operation, - int ctl_name, int *nrels_mag, long *results); -static void via686a_alarms(struct i2c_client *client, int operation, - int ctl_name, int *nrels_mag, long *results); -static void via686a_fan_div(struct i2c_client *client, int operation, - int ctl_name, int *nrels_mag, long *results); + ret = sscanf(buf, "%d %d", &fan_div[0], &fan_div[1]); + if (ret == -1) return -EINVAL; + old = via686a_read_value(client, VIA686A_REG_FANDIV); + if (ret >= 2) { + data->fan_min[1] = DIV_TO_REG(fan_div[1]); + old = (old & 0x3f) | (data->fan_div[1] << 6); + } + if (ret >= 1) { + data->fan_min[0] = DIV_TO_REG(fan_div[0]); + old = (old & 0xcf) | (data->fan_div[0] << 4); + via686a_write_value(client, VIA686A_REG_FANDIV, old); + } + return count; +} +static DEVICE_ATTR(fan_div, S_IRUGO | S_IWUSR, show_fan_div, store_fan_div); -static int via686a_id = 0; /* The driver. I choose to use type i2c_driver, as at is identical to both smbus_driver and isa_driver, and clients could be of either kind */ @@ -426,95 +586,18 @@ }; - -/* The /proc/sys entries */ - -/* -- SENSORS SYSCTL START -- */ -#define VIA686A_SYSCTL_IN0 1000 -#define VIA686A_SYSCTL_IN1 1001 -#define VIA686A_SYSCTL_IN2 1002 -#define VIA686A_SYSCTL_IN3 1003 -#define VIA686A_SYSCTL_IN4 1004 -#define VIA686A_SYSCTL_FAN1 1101 -#define VIA686A_SYSCTL_FAN2 1102 -#define VIA686A_SYSCTL_TEMP 1200 -#define VIA686A_SYSCTL_TEMP2 1201 -#define VIA686A_SYSCTL_TEMP3 1202 -#define VIA686A_SYSCTL_FAN_DIV 2000 -#define VIA686A_SYSCTL_ALARMS 2001 - -#define VIA686A_ALARM_IN0 0x01 -#define VIA686A_ALARM_IN1 0x02 -#define VIA686A_ALARM_IN2 0x04 -#define VIA686A_ALARM_IN3 0x08 -#define VIA686A_ALARM_TEMP 0x10 -#define VIA686A_ALARM_FAN1 0x40 -#define VIA686A_ALARM_FAN2 0x80 -#define VIA686A_ALARM_IN4 0x100 -#define VIA686A_ALARM_TEMP2 0x800 -#define VIA686A_ALARM_CHAS 0x1000 -#define VIA686A_ALARM_TEMP3 0x8000 - -/* -- SENSORS SYSCTL END -- */ - -/* These files are created for each detected VIA686A. This is just a template; - though at first sight, you might think we could use a statically - allocated list, we need some way to get back to the parent - which - is done through one of the 'extra' fields which are initialized - when a new copy is allocated. */ -static ctl_table via686a_dir_table_template[] = { - {VIA686A_SYSCTL_IN0, "in0", NULL, 0, 0644, NULL, &i2c_proc_real, - &i2c_sysctl_real, NULL, &via686a_in}, - {VIA686A_SYSCTL_IN1, "in1", NULL, 0, 0644, NULL, &i2c_proc_real, - &i2c_sysctl_real, NULL, &via686a_in}, - {VIA686A_SYSCTL_IN2, "in2", NULL, 0, 0644, NULL, &i2c_proc_real, - &i2c_sysctl_real, NULL, &via686a_in}, - {VIA686A_SYSCTL_IN3, "in3", NULL, 0, 0644, NULL, &i2c_proc_real, - &i2c_sysctl_real, NULL, &via686a_in}, - {VIA686A_SYSCTL_IN4, "in4", NULL, 0, 0644, NULL, &i2c_proc_real, - &i2c_sysctl_real, NULL, &via686a_in}, - {VIA686A_SYSCTL_FAN1, "fan1", NULL, 0, 0644, NULL, &i2c_proc_real, - &i2c_sysctl_real, NULL, &via686a_fan}, - {VIA686A_SYSCTL_FAN2, "fan2", NULL, 0, 0644, NULL, &i2c_proc_real, - &i2c_sysctl_real, NULL, &via686a_fan}, - {VIA686A_SYSCTL_TEMP, "temp1", NULL, 0, 0644, NULL, &i2c_proc_real, - &i2c_sysctl_real, NULL, &via686a_temp}, - {VIA686A_SYSCTL_TEMP2, "temp2", NULL, 0, 0644, NULL, - &i2c_proc_real, &i2c_sysctl_real, NULL, &via686a_temp}, - {VIA686A_SYSCTL_TEMP3, "temp3", NULL, 0, 0644, NULL, - &i2c_proc_real, &i2c_sysctl_real, NULL, &via686a_temp}, - {VIA686A_SYSCTL_FAN_DIV, "fan_div", NULL, 0, 0644, NULL, - &i2c_proc_real, &i2c_sysctl_real, NULL, &via686a_fan_div}, - {VIA686A_SYSCTL_ALARMS, "alarms", NULL, 0, 0444, NULL, - &i2c_proc_real, &i2c_sysctl_real, NULL, &via686a_alarms}, - {0} -}; - -static inline int via686a_read_value(struct i2c_client *client, u8 reg) -{ - return (inb_p(client->addr + reg)); -} - -static inline void via686a_write_value(struct i2c_client *client, u8 reg, - u8 value) -{ - outb_p(value, client->addr + reg); -} - /* This is called when the module is loaded */ static int via686a_attach_adapter(struct i2c_adapter *adapter) { return i2c_detect(adapter, &addr_data, via686a_detect); } -int via686a_detect(struct i2c_adapter *adapter, int address, +static int via686a_detect(struct i2c_adapter *adapter, int address, unsigned short flags, int kind) { - int i; struct i2c_client *new_client; struct via686a_data *data; int err = 0; - const char *type_name = "via686a"; const char client_name[] = "via686a chip"; u16 val; @@ -573,28 +656,31 @@ /* Fill in the remaining client fields and put into the global list */ snprintf(new_client->dev.name, DEVICE_NAME_SIZE, client_name); - new_client->id = via686a_id++; data->valid = 0; init_MUTEX(&data->update_lock); /* Tell the I2C layer a new client has arrived */ if ((err = i2c_attach_client(new_client))) goto ERROR3; - - /* Register a new directory entry with module sensors */ - if ((i = i2c_register_entry((struct i2c_client *) new_client, - type_name, - via686a_dir_table_template)) < 0) { - err = i; - goto ERROR4; - } - data->sysctl_id = i; + + device_create_file(&new_client->dev, &dev_attr_in0); + device_create_file(&new_client->dev, &dev_attr_in1); + device_create_file(&new_client->dev, &dev_attr_in2); + device_create_file(&new_client->dev, &dev_attr_in3); + device_create_file(&new_client->dev, &dev_attr_in4); + device_create_file(&new_client->dev, &dev_attr_temp0); + device_create_file(&new_client->dev, &dev_attr_temp1); + device_create_file(&new_client->dev, &dev_attr_temp2); + device_create_file(&new_client->dev, &dev_attr_fan1); + device_create_file(&new_client->dev, &dev_attr_fan2); + device_create_file(&new_client->dev, &dev_attr_alarm); + device_create_file(&new_client->dev, &dev_attr_fan_div); /* Initialize the VIA686A chip */ via686a_init_client(new_client); return 0; - ERROR4: - i2c_detach_client(new_client); +// ERROR4: +// i2c_detach_client(new_client); ERROR3: release_region(address, VIA686A_EXTENT); kfree(new_client); @@ -605,8 +691,8 @@ static int via686a_detach_client(struct i2c_client *client) { int err; - struct via686a_data *data = i2c_get_clientdata(client); - i2c_deregister_entry(data->sysctl_id); +// struct via686a_data *data = i2c_get_clientdata(client); +// i2c_deregister_entry(data->sysctl_id); if ((err = i2c_detach_client(client))) { dev_err(&client->dev, @@ -739,157 +825,12 @@ up(&data->update_lock); } - -/* The next few functions are the call-back functions of the /proc/sys and - sysctl files. Which function is used is defined in the ctl_table in - the extra1 field. - Each function must return the magnitude (power of 10 to divide the date - with) if it is called with operation==SENSORS_PROC_REAL_INFO. It must - put a maximum of *nrels elements in results reflecting the data of this - file, and set *nrels to the number it actually put in it, if operation== - SENSORS_PROC_REAL_READ. Finally, it must get upto *nrels elements from - results and write them to the chip, if operations==SENSORS_PROC_REAL_WRITE. - Note that on SENSORS_PROC_REAL_READ, I do not check whether results is - large enough (by checking the incoming value of *nrels). This is not very - good practice, but as long as you put less than about 5 values in results, - you can assume it is large enough. */ -static void via686a_in(struct i2c_client *client, int operation, int ctl_name, - int *nrels_mag, long *results) -{ - struct via686a_data *data = i2c_get_clientdata(client); - int nr = ctl_name - VIA686A_SYSCTL_IN0; - - if (operation == SENSORS_PROC_REAL_INFO) - *nrels_mag = 2; - else if (operation == SENSORS_PROC_REAL_READ) { - via686a_update_client(client); - results[0] = IN_FROM_REG(data->in_min[nr], nr); - results[1] = IN_FROM_REG(data->in_max[nr], nr); - results[2] = IN_FROM_REG(data->in[nr], nr); - *nrels_mag = 3; - } else if (operation == SENSORS_PROC_REAL_WRITE) { - if (*nrels_mag >= 1) { - data->in_min[nr] = IN_TO_REG(results[0], nr); - via686a_write_value(client, VIA686A_REG_IN_MIN(nr), - data->in_min[nr]); - } - if (*nrels_mag >= 2) { - data->in_max[nr] = IN_TO_REG(results[1], nr); - via686a_write_value(client, VIA686A_REG_IN_MAX(nr), - data->in_max[nr]); - } - } -} - -void via686a_fan(struct i2c_client *client, int operation, int ctl_name, - int *nrels_mag, long *results) -{ - struct via686a_data *data = i2c_get_clientdata(client); - int nr = ctl_name - VIA686A_SYSCTL_FAN1 + 1; - - if (operation == SENSORS_PROC_REAL_INFO) - *nrels_mag = 0; - else if (operation == SENSORS_PROC_REAL_READ) { - via686a_update_client(client); - results[0] = FAN_FROM_REG(data->fan_min[nr - 1], - DIV_FROM_REG(data->fan_div - [nr - 1])); - results[1] = FAN_FROM_REG(data->fan[nr - 1], - DIV_FROM_REG(data->fan_div[nr - 1])); - *nrels_mag = 2; - } else if (operation == SENSORS_PROC_REAL_WRITE) { - if (*nrels_mag >= 1) { - data->fan_min[nr - 1] = FAN_TO_REG(results[0], - DIV_FROM_REG(data-> - fan_div[nr -1])); - via686a_write_value(client, - VIA686A_REG_FAN_MIN(nr), - data->fan_min[nr - 1]); - } - } -} - -void via686a_temp(struct i2c_client *client, int operation, int ctl_name, - int *nrels_mag, long *results) -{ - struct via686a_data *data = i2c_get_clientdata(client); - int nr = ctl_name - VIA686A_SYSCTL_TEMP; - - if (operation == SENSORS_PROC_REAL_INFO) - *nrels_mag = 1; - else if (operation == SENSORS_PROC_REAL_READ) { - via686a_update_client(client); - results[0] = TEMP_FROM_REG(data->temp_over[nr]); - results[1] = TEMP_FROM_REG(data->temp_hyst[nr]); - results[2] = TEMP_FROM_REG10(data->temp[nr]); - *nrels_mag = 3; - } else if (operation == SENSORS_PROC_REAL_WRITE) { - if (*nrels_mag >= 1) { - data->temp_over[nr] = TEMP_TO_REG(results[0]); - via686a_write_value(client, - VIA686A_REG_TEMP_OVER(nr + 1), - data->temp_over[nr]); - } - if (*nrels_mag >= 2) { - data->temp_hyst[nr] = TEMP_TO_REG(results[1]); - via686a_write_value(client, - VIA686A_REG_TEMP_HYST(nr + 1), - data->temp_hyst[nr]); - } - } -} - -void via686a_alarms(struct i2c_client *client, int operation, int ctl_name, - int *nrels_mag, long *results) -{ - struct via686a_data *data = i2c_get_clientdata(client); - if (operation == SENSORS_PROC_REAL_INFO) - *nrels_mag = 0; - else if (operation == SENSORS_PROC_REAL_READ) { - via686a_update_client(client); - results[0] = ALARMS_FROM_REG(data->alarms); - *nrels_mag = 1; - } -} - -void via686a_fan_div(struct i2c_client *client, int operation, - int ctl_name, int *nrels_mag, long *results) -{ - struct via686a_data *data = i2c_get_clientdata(client); - int old; - - if (operation == SENSORS_PROC_REAL_INFO) - *nrels_mag = 0; - else if (operation == SENSORS_PROC_REAL_READ) { - via686a_update_client(client); - results[0] = DIV_FROM_REG(data->fan_div[0]); - results[1] = DIV_FROM_REG(data->fan_div[1]); - *nrels_mag = 2; - } else if (operation == SENSORS_PROC_REAL_WRITE) { - old = via686a_read_value(client, VIA686A_REG_FANDIV); - if (*nrels_mag >= 2) { - data->fan_div[1] = DIV_TO_REG(results[1]); - old = (old & 0x3f) | (data->fan_div[1] << 6); - } - if (*nrels_mag >= 1) { - data->fan_div[0] = DIV_TO_REG(results[0]); - old = (old & 0xcf) | (data->fan_div[0] << 4); - via686a_write_value(client, VIA686A_REG_FANDIV, - old); - } - } -} - - static struct pci_device_id via686a_pci_ids[] __devinitdata = { { .vendor = PCI_VENDOR_ID_VIA, .device = PCI_DEVICE_ID_VIA_82C686_4, .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID, - .class = 0, - .class_mask = 0, - .driver_data = 0, }, { 0, } }; ^ permalink raw reply [flat|nested] 89+ messages in thread
* w83781d i2c driver updated for 2.5.66 (without sysfs support) @ 2005-05-19 6:23 ` Jan Dittmer 0 siblings, 0 replies; 89+ messages in thread From: Jan Dittmer @ 2005-05-19 6:23 UTC (permalink / raw) To: azarah; +Cc: Greg KH, KML, Dominik Brodowski, sensors Martin Schlemmer wrote: > > I did look at the changes needed for sysfs, but this beast have > about 6 ctl_tables, and is hairy in general. I am not sure what > is the best way to do it for the different chips, so here is what > I have until I or somebody else can do the sysfs stuff. > I've just done this with the via686a driver. Saves about 100 lines of code. Comments? Jan --- c/drivers/i2c/chips/via686a.c 2003-03-26 10:35:04.000000000 +0100 +++ b/drivers/i2c/chips/via686a.c 2003-03-26 19:57:19.000000000 +0100 @@ -394,25 +394,185 @@ unsigned short flags, int kind); static int via686a_detach_client(struct i2c_client *client); -static int via686a_read_value(struct i2c_client *client, u8 register); -static void via686a_write_value(struct i2c_client *client, u8 register, - u8 value); +static inline int via686a_read_value(struct i2c_client *client, u8 reg) +{ + return (inb_p(client->addr + reg)); +} + +static inline void via686a_write_value(struct i2c_client *client, u8 reg, + u8 value) +{ + outb_p(value, client->addr + reg); +} + static void via686a_update_client(struct i2c_client *client); static void via686a_init_client(struct i2c_client *client); +/* following are the sysfs callback functions */ +static ssize_t show_in(struct device *dev, char *buf, int nr) { + struct i2c_client *client = to_i2c_client(dev); + struct via686a_data *data = i2c_get_clientdata(client); + via686a_update_client(client); + + return sprintf(buf,"%ld %ld %ld\n", + IN_FROM_REG(data->in_min[nr], nr), + IN_FROM_REG(data->in_max[nr], nr), + IN_FROM_REG(data->in[nr], nr) ); +} + +static ssize_t store_in(struct device *dev, const char *buf, size_t count, int nr) { + struct i2c_client *client = to_i2c_client(dev); + struct via686a_data *data = i2c_get_clientdata(client); + int in_min, in_max, ret; + ret = sscanf(buf, "%d %d", &in_min, &in_max); + if (ret = -1) return -EINVAL; + if (ret >= 1) { + data->in_min[nr] = IN_TO_REG(in_min, nr); + via686a_write_value(client, VIA686A_REG_IN_MIN(nr), data->in_min[nr]); + } + if (ret >= 2) { + data->in_max[nr] = IN_TO_REG(in_max, nr); + via686a_write_value(client, VIA686A_REG_IN_MAX(nr), data->in_max[nr]); + } + return count; +} + +#define show_in_offset(offset) \ +static ssize_t \ +show_in_##offset (struct device *dev, char *buf) \ +{ \ + return show_in(dev, buf, 0x##offset); \ +} \ +static ssize_t store_in_##offset (struct device *dev, const char *buf, size_t count) \ +{ \ + return store_in(dev, buf, count, 0x##offset); \ +} \ +static DEVICE_ATTR(in##offset, S_IRUGO| S_IWUSR, show_in_##offset, store_in_##offset) + +show_in_offset(0); +show_in_offset(1); +show_in_offset(2); +show_in_offset(3); +show_in_offset(4); + +static ssize_t show_temp(struct device *dev, char *buf, int nr) { + struct i2c_client *client = to_i2c_client(dev); + struct via686a_data *data = i2c_get_clientdata(client); + via686a_update_client(client); + + return sprintf(buf,"%ld %ld %ld\n", + TEMP_FROM_REG(data->temp_over[nr]), + TEMP_FROM_REG(data->temp_hyst[nr]), + TEMP_FROM_REG10(data->temp[nr]) ); +} +static ssize_t store_temp(struct device *dev, const char *buf, size_t count, int nr) { + struct i2c_client *client = to_i2c_client(dev); + struct via686a_data *data = i2c_get_clientdata(client); + int temp_over, temp_hyst, ret; + printk(buf); + ret = sscanf(buf, "%d %d", &temp_over, &temp_hyst); + if (ret = -1) return -EINVAL; + if (ret >= 1) { + data->temp_over[nr] = TEMP_TO_REG(temp_over); + via686a_write_value(client, VIA686A_REG_TEMP_OVER(nr + 1), data->temp_over[nr]); + } + if (ret >= 2) { + data->temp_hyst[nr] = TEMP_TO_REG(temp_hyst); + via686a_write_value(client, VIA686A_REG_TEMP_HYST(nr + 1), data->temp_hyst[nr]); + } + return count; +} +#define show_temp_offset(offset) \ +static ssize_t \ +show_temp_##offset (struct device *dev, char *buf) \ +{ \ + return show_temp(dev, buf, 0x##offset); \ +} \ +static ssize_t store_temp_##offset (struct device *dev, const char *buf, size_t count) \ +{ \ + return store_temp(dev, buf, count, 0x##offset); \ +} \ +static DEVICE_ATTR(temp##offset, S_IRUGO | S_IWUSR, show_temp_##offset, store_temp_##offset) + +show_temp_offset(0); +show_temp_offset(1); +show_temp_offset(2); + +static ssize_t show_fan(struct device *dev, char *buf, int nr) { + struct i2c_client *client = to_i2c_client(dev); + struct via686a_data *data = i2c_get_clientdata(client); + via686a_update_client(client); + + return sprintf(buf,"%d %d\n", + FAN_FROM_REG(data->fan_min[nr - 1], DIV_FROM_REG(data->fan_div[nr - 1])), + FAN_FROM_REG(data->fan[nr - 1], DIV_FROM_REG(data->fan_div[nr - 1])) ); +} +static ssize_t store_fan(struct device *dev, const char *buf, size_t count, int nr) { + struct i2c_client *client = to_i2c_client(dev); + struct via686a_data *data = i2c_get_clientdata(client); + int fan_min, ret; + ret = sscanf(buf, "%d", &fan_min); + if (ret = -1) return -EINVAL; + if (ret >= 1) { + data->fan_min[nr] = FAN_TO_REG(fan_min, DIV_FROM_REG(data->fan_div[nr])); + via686a_write_value(client, VIA686A_REG_FAN_MIN(nr+1), data->fan_min[nr]); + } + return count; +} +#define show_fan_offset(offset) \ +static ssize_t \ +show_fan_##offset (struct device *dev, char *buf) \ +{ \ + return show_fan(dev, buf, 0x##offset); \ +} \ +static ssize_t store_fan_##offset (struct device *dev, const char *buf, size_t count) \ +{ \ + return store_fan(dev, buf, count, 0x##offset); \ +} \ +static DEVICE_ATTR(fan##offset, S_IRUGO | S_IWUSR, show_fan_##offset, store_fan_##offset) + +show_fan_offset(1); +show_fan_offset(2); + +static ssize_t show_alarm(struct device *dev, char *buf) { + struct i2c_client *client = to_i2c_client(dev); + struct via686a_data *data = i2c_get_clientdata(client); + via686a_update_client(client); + + return sprintf(buf,"%d\n", ALARMS_FROM_REG(data->alarms)); +} +static DEVICE_ATTR(alarm, S_IRUGO | S_IWUSR, show_alarm, NULL); + +static ssize_t show_fan_div(struct device *dev, char *buf) { + struct i2c_client *client = to_i2c_client(dev); + struct via686a_data *data = i2c_get_clientdata(client); + via686a_update_client(client); + + return sprintf(buf,"%d %d\n", + DIV_FROM_REG(data->fan_div[0]), + DIV_FROM_REG(data->fan_div[1]) ); +} +static ssize_t store_fan_div(struct device *dev, const char *buf, size_t count) { + struct i2c_client *client = to_i2c_client(dev); + struct via686a_data *data = i2c_get_clientdata(client); + int fan_div[2], ret, old; -static void via686a_in(struct i2c_client *client, int operation, - int ctl_name, int *nrels_mag, long *results); -static void via686a_fan(struct i2c_client *client, int operation, - int ctl_name, int *nrels_mag, long *results); -static void via686a_temp(struct i2c_client *client, int operation, - int ctl_name, int *nrels_mag, long *results); -static void via686a_alarms(struct i2c_client *client, int operation, - int ctl_name, int *nrels_mag, long *results); -static void via686a_fan_div(struct i2c_client *client, int operation, - int ctl_name, int *nrels_mag, long *results); + ret = sscanf(buf, "%d %d", &fan_div[0], &fan_div[1]); + if (ret = -1) return -EINVAL; + old = via686a_read_value(client, VIA686A_REG_FANDIV); + if (ret >= 2) { + data->fan_min[1] = DIV_TO_REG(fan_div[1]); + old = (old & 0x3f) | (data->fan_div[1] << 6); + } + if (ret >= 1) { + data->fan_min[0] = DIV_TO_REG(fan_div[0]); + old = (old & 0xcf) | (data->fan_div[0] << 4); + via686a_write_value(client, VIA686A_REG_FANDIV, old); + } + return count; +} +static DEVICE_ATTR(fan_div, S_IRUGO | S_IWUSR, show_fan_div, store_fan_div); -static int via686a_id = 0; /* The driver. I choose to use type i2c_driver, as at is identical to both smbus_driver and isa_driver, and clients could be of either kind */ @@ -426,95 +586,18 @@ }; - -/* The /proc/sys entries */ - -/* -- SENSORS SYSCTL START -- */ -#define VIA686A_SYSCTL_IN0 1000 -#define VIA686A_SYSCTL_IN1 1001 -#define VIA686A_SYSCTL_IN2 1002 -#define VIA686A_SYSCTL_IN3 1003 -#define VIA686A_SYSCTL_IN4 1004 -#define VIA686A_SYSCTL_FAN1 1101 -#define VIA686A_SYSCTL_FAN2 1102 -#define VIA686A_SYSCTL_TEMP 1200 -#define VIA686A_SYSCTL_TEMP2 1201 -#define VIA686A_SYSCTL_TEMP3 1202 -#define VIA686A_SYSCTL_FAN_DIV 2000 -#define VIA686A_SYSCTL_ALARMS 2001 - -#define VIA686A_ALARM_IN0 0x01 -#define VIA686A_ALARM_IN1 0x02 -#define VIA686A_ALARM_IN2 0x04 -#define VIA686A_ALARM_IN3 0x08 -#define VIA686A_ALARM_TEMP 0x10 -#define VIA686A_ALARM_FAN1 0x40 -#define VIA686A_ALARM_FAN2 0x80 -#define VIA686A_ALARM_IN4 0x100 -#define VIA686A_ALARM_TEMP2 0x800 -#define VIA686A_ALARM_CHAS 0x1000 -#define VIA686A_ALARM_TEMP3 0x8000 - -/* -- SENSORS SYSCTL END -- */ - -/* These files are created for each detected VIA686A. This is just a template; - though at first sight, you might think we could use a statically - allocated list, we need some way to get back to the parent - which - is done through one of the 'extra' fields which are initialized - when a new copy is allocated. */ -static ctl_table via686a_dir_table_template[] = { - {VIA686A_SYSCTL_IN0, "in0", NULL, 0, 0644, NULL, &i2c_proc_real, - &i2c_sysctl_real, NULL, &via686a_in}, - {VIA686A_SYSCTL_IN1, "in1", NULL, 0, 0644, NULL, &i2c_proc_real, - &i2c_sysctl_real, NULL, &via686a_in}, - {VIA686A_SYSCTL_IN2, "in2", NULL, 0, 0644, NULL, &i2c_proc_real, - &i2c_sysctl_real, NULL, &via686a_in}, - {VIA686A_SYSCTL_IN3, "in3", NULL, 0, 0644, NULL, &i2c_proc_real, - &i2c_sysctl_real, NULL, &via686a_in}, - {VIA686A_SYSCTL_IN4, "in4", NULL, 0, 0644, NULL, &i2c_proc_real, - &i2c_sysctl_real, NULL, &via686a_in}, - {VIA686A_SYSCTL_FAN1, "fan1", NULL, 0, 0644, NULL, &i2c_proc_real, - &i2c_sysctl_real, NULL, &via686a_fan}, - {VIA686A_SYSCTL_FAN2, "fan2", NULL, 0, 0644, NULL, &i2c_proc_real, - &i2c_sysctl_real, NULL, &via686a_fan}, - {VIA686A_SYSCTL_TEMP, "temp1", NULL, 0, 0644, NULL, &i2c_proc_real, - &i2c_sysctl_real, NULL, &via686a_temp}, - {VIA686A_SYSCTL_TEMP2, "temp2", NULL, 0, 0644, NULL, - &i2c_proc_real, &i2c_sysctl_real, NULL, &via686a_temp}, - {VIA686A_SYSCTL_TEMP3, "temp3", NULL, 0, 0644, NULL, - &i2c_proc_real, &i2c_sysctl_real, NULL, &via686a_temp}, - {VIA686A_SYSCTL_FAN_DIV, "fan_div", NULL, 0, 0644, NULL, - &i2c_proc_real, &i2c_sysctl_real, NULL, &via686a_fan_div}, - {VIA686A_SYSCTL_ALARMS, "alarms", NULL, 0, 0444, NULL, - &i2c_proc_real, &i2c_sysctl_real, NULL, &via686a_alarms}, - {0} -}; - -static inline int via686a_read_value(struct i2c_client *client, u8 reg) -{ - return (inb_p(client->addr + reg)); -} - -static inline void via686a_write_value(struct i2c_client *client, u8 reg, - u8 value) -{ - outb_p(value, client->addr + reg); -} - /* This is called when the module is loaded */ static int via686a_attach_adapter(struct i2c_adapter *adapter) { return i2c_detect(adapter, &addr_data, via686a_detect); } -int via686a_detect(struct i2c_adapter *adapter, int address, +static int via686a_detect(struct i2c_adapter *adapter, int address, unsigned short flags, int kind) { - int i; struct i2c_client *new_client; struct via686a_data *data; int err = 0; - const char *type_name = "via686a"; const char client_name[] = "via686a chip"; u16 val; @@ -573,28 +656,31 @@ /* Fill in the remaining client fields and put into the global list */ snprintf(new_client->dev.name, DEVICE_NAME_SIZE, client_name); - new_client->id = via686a_id++; data->valid = 0; init_MUTEX(&data->update_lock); /* Tell the I2C layer a new client has arrived */ if ((err = i2c_attach_client(new_client))) goto ERROR3; - - /* Register a new directory entry with module sensors */ - if ((i = i2c_register_entry((struct i2c_client *) new_client, - type_name, - via686a_dir_table_template)) < 0) { - err = i; - goto ERROR4; - } - data->sysctl_id = i; + + device_create_file(&new_client->dev, &dev_attr_in0); + device_create_file(&new_client->dev, &dev_attr_in1); + device_create_file(&new_client->dev, &dev_attr_in2); + device_create_file(&new_client->dev, &dev_attr_in3); + device_create_file(&new_client->dev, &dev_attr_in4); + device_create_file(&new_client->dev, &dev_attr_temp0); + device_create_file(&new_client->dev, &dev_attr_temp1); + device_create_file(&new_client->dev, &dev_attr_temp2); + device_create_file(&new_client->dev, &dev_attr_fan1); + device_create_file(&new_client->dev, &dev_attr_fan2); + device_create_file(&new_client->dev, &dev_attr_alarm); + device_create_file(&new_client->dev, &dev_attr_fan_div); /* Initialize the VIA686A chip */ via686a_init_client(new_client); return 0; - ERROR4: - i2c_detach_client(new_client); +// ERROR4: +// i2c_detach_client(new_client); ERROR3: release_region(address, VIA686A_EXTENT); kfree(new_client); @@ -605,8 +691,8 @@ static int via686a_detach_client(struct i2c_client *client) { int err; - struct via686a_data *data = i2c_get_clientdata(client); - i2c_deregister_entry(data->sysctl_id); +// struct via686a_data *data = i2c_get_clientdata(client); +// i2c_deregister_entry(data->sysctl_id); if ((err = i2c_detach_client(client))) { dev_err(&client->dev, @@ -739,157 +825,12 @@ up(&data->update_lock); } - -/* The next few functions are the call-back functions of the /proc/sys and - sysctl files. Which function is used is defined in the ctl_table in - the extra1 field. - Each function must return the magnitude (power of 10 to divide the date - with) if it is called with operation=SENSORS_PROC_REAL_INFO. It must - put a maximum of *nrels elements in results reflecting the data of this - file, and set *nrels to the number it actually put in it, if operation= - SENSORS_PROC_REAL_READ. Finally, it must get upto *nrels elements from - results and write them to the chip, if operations=SENSORS_PROC_REAL_WRITE. - Note that on SENSORS_PROC_REAL_READ, I do not check whether results is - large enough (by checking the incoming value of *nrels). This is not very - good practice, but as long as you put less than about 5 values in results, - you can assume it is large enough. */ -static void via686a_in(struct i2c_client *client, int operation, int ctl_name, - int *nrels_mag, long *results) -{ - struct via686a_data *data = i2c_get_clientdata(client); - int nr = ctl_name - VIA686A_SYSCTL_IN0; - - if (operation = SENSORS_PROC_REAL_INFO) - *nrels_mag = 2; - else if (operation = SENSORS_PROC_REAL_READ) { - via686a_update_client(client); - results[0] = IN_FROM_REG(data->in_min[nr], nr); - results[1] = IN_FROM_REG(data->in_max[nr], nr); - results[2] = IN_FROM_REG(data->in[nr], nr); - *nrels_mag = 3; - } else if (operation = SENSORS_PROC_REAL_WRITE) { - if (*nrels_mag >= 1) { - data->in_min[nr] = IN_TO_REG(results[0], nr); - via686a_write_value(client, VIA686A_REG_IN_MIN(nr), - data->in_min[nr]); - } - if (*nrels_mag >= 2) { - data->in_max[nr] = IN_TO_REG(results[1], nr); - via686a_write_value(client, VIA686A_REG_IN_MAX(nr), - data->in_max[nr]); - } - } -} - -void via686a_fan(struct i2c_client *client, int operation, int ctl_name, - int *nrels_mag, long *results) -{ - struct via686a_data *data = i2c_get_clientdata(client); - int nr = ctl_name - VIA686A_SYSCTL_FAN1 + 1; - - if (operation = SENSORS_PROC_REAL_INFO) - *nrels_mag = 0; - else if (operation = SENSORS_PROC_REAL_READ) { - via686a_update_client(client); - results[0] = FAN_FROM_REG(data->fan_min[nr - 1], - DIV_FROM_REG(data->fan_div - [nr - 1])); - results[1] = FAN_FROM_REG(data->fan[nr - 1], - DIV_FROM_REG(data->fan_div[nr - 1])); - *nrels_mag = 2; - } else if (operation = SENSORS_PROC_REAL_WRITE) { - if (*nrels_mag >= 1) { - data->fan_min[nr - 1] = FAN_TO_REG(results[0], - DIV_FROM_REG(data-> - fan_div[nr -1])); - via686a_write_value(client, - VIA686A_REG_FAN_MIN(nr), - data->fan_min[nr - 1]); - } - } -} - -void via686a_temp(struct i2c_client *client, int operation, int ctl_name, - int *nrels_mag, long *results) -{ - struct via686a_data *data = i2c_get_clientdata(client); - int nr = ctl_name - VIA686A_SYSCTL_TEMP; - - if (operation = SENSORS_PROC_REAL_INFO) - *nrels_mag = 1; - else if (operation = SENSORS_PROC_REAL_READ) { - via686a_update_client(client); - results[0] = TEMP_FROM_REG(data->temp_over[nr]); - results[1] = TEMP_FROM_REG(data->temp_hyst[nr]); - results[2] = TEMP_FROM_REG10(data->temp[nr]); - *nrels_mag = 3; - } else if (operation = SENSORS_PROC_REAL_WRITE) { - if (*nrels_mag >= 1) { - data->temp_over[nr] = TEMP_TO_REG(results[0]); - via686a_write_value(client, - VIA686A_REG_TEMP_OVER(nr + 1), - data->temp_over[nr]); - } - if (*nrels_mag >= 2) { - data->temp_hyst[nr] = TEMP_TO_REG(results[1]); - via686a_write_value(client, - VIA686A_REG_TEMP_HYST(nr + 1), - data->temp_hyst[nr]); - } - } -} - -void via686a_alarms(struct i2c_client *client, int operation, int ctl_name, - int *nrels_mag, long *results) -{ - struct via686a_data *data = i2c_get_clientdata(client); - if (operation = SENSORS_PROC_REAL_INFO) - *nrels_mag = 0; - else if (operation = SENSORS_PROC_REAL_READ) { - via686a_update_client(client); - results[0] = ALARMS_FROM_REG(data->alarms); - *nrels_mag = 1; - } -} - -void via686a_fan_div(struct i2c_client *client, int operation, - int ctl_name, int *nrels_mag, long *results) -{ - struct via686a_data *data = i2c_get_clientdata(client); - int old; - - if (operation = SENSORS_PROC_REAL_INFO) - *nrels_mag = 0; - else if (operation = SENSORS_PROC_REAL_READ) { - via686a_update_client(client); - results[0] = DIV_FROM_REG(data->fan_div[0]); - results[1] = DIV_FROM_REG(data->fan_div[1]); - *nrels_mag = 2; - } else if (operation = SENSORS_PROC_REAL_WRITE) { - old = via686a_read_value(client, VIA686A_REG_FANDIV); - if (*nrels_mag >= 2) { - data->fan_div[1] = DIV_TO_REG(results[1]); - old = (old & 0x3f) | (data->fan_div[1] << 6); - } - if (*nrels_mag >= 1) { - data->fan_div[0] = DIV_TO_REG(results[0]); - old = (old & 0xcf) | (data->fan_div[0] << 4); - via686a_write_value(client, VIA686A_REG_FANDIV, - old); - } - } -} - - static struct pci_device_id via686a_pci_ids[] __devinitdata = { { .vendor = PCI_VENDOR_ID_VIA, .device = PCI_DEVICE_ID_VIA_82C686_4, .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID, - .class = 0, - .class_mask = 0, - .driver_data = 0, }, { 0, } }; ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: w83781d i2c driver updated for 2.5.66 (without sysfs support) 2005-05-19 6:23 ` Jan Dittmer @ 2005-05-19 6:23 ` Martin Schlemmer -1 siblings, 0 replies; 89+ messages in thread From: Martin Schlemmer @ 2003-03-26 19:54 UTC (permalink / raw) To: Jan Dittmer; +Cc: Greg KH, KML, Dominik Brodowski, sensors [-- Attachment #1: Type: text/plain, Size: 710 bytes --] On Wed, 2003-03-26 at 21:40, Jan Dittmer wrote: > Martin Schlemmer wrote: > > > > I did look at the changes needed for sysfs, but this beast have > > about 6 ctl_tables, and is hairy in general. I am not sure what > > is the best way to do it for the different chips, so here is what > > I have until I or somebody else can do the sysfs stuff. > > > I've just done this with the via686a driver. Saves about 100 lines of code. > > Comments? > Nice example, thanks =) The w83781d does things in similar fashion, except that it support 6 different 'models', that have more or less the same readouts except for here and there a few more or less. Regards, -- Martin Schlemmer [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 189 bytes --] ^ permalink raw reply [flat|nested] 89+ messages in thread
* w83781d i2c driver updated for 2.5.66 (without sysfs support) @ 2005-05-19 6:23 ` Martin Schlemmer 0 siblings, 0 replies; 89+ messages in thread From: Martin Schlemmer @ 2005-05-19 6:23 UTC (permalink / raw) To: Jan Dittmer; +Cc: Greg KH, KML, Dominik Brodowski, sensors On Wed, 2003-03-26 at 21:40, Jan Dittmer wrote: > Martin Schlemmer wrote: > > > > I did look at the changes needed for sysfs, but this beast have > > about 6 ctl_tables, and is hairy in general. I am not sure what > > is the best way to do it for the different chips, so here is what > > I have until I or somebody else can do the sysfs stuff. > > > I've just done this with the via686a driver. Saves about 100 lines of code. > > Comments? > Nice example, thanks =) The w83781d does things in similar fashion, except that it support 6 different 'models', that have more or less the same readouts except for here and there a few more or less. Regards, -- Martin Schlemmer -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part Url : http://lists.lm-sensors.org/pipermail/lm-sensors/attachments/20030326/dcf89801/attachment.bin ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: w83781d i2c driver updated for 2.5.66 (without sysfs support) 2005-05-19 6:23 ` Jan Dittmer @ 2005-05-19 6:23 ` Greg KH -1 siblings, 0 replies; 89+ messages in thread From: Greg KH @ 2003-03-26 20:26 UTC (permalink / raw) To: Jan Dittmer; +Cc: azarah, KML, Dominik Brodowski, sensors On Wed, Mar 26, 2003 at 08:40:58PM +0100, Jan Dittmer wrote: > Martin Schlemmer wrote: > > > >I did look at the changes needed for sysfs, but this beast have > >about 6 ctl_tables, and is hairy in general. I am not sure what > >is the best way to do it for the different chips, so here is what > >I have until I or somebody else can do the sysfs stuff. > > > I've just done this with the via686a driver. Saves about 100 lines of code. > > Comments? <snip> > +/* following are the sysfs callback functions */ > +static ssize_t show_in(struct device *dev, char *buf, int nr) { > + struct i2c_client *client = to_i2c_client(dev); > + struct via686a_data *data = i2c_get_clientdata(client); > + via686a_update_client(client); > + > + return sprintf(buf,"%ld %ld %ld\n", > + IN_FROM_REG(data->in_min[nr], nr), > + IN_FROM_REG(data->in_max[nr], nr), > + IN_FROM_REG(data->in[nr], nr) ); > +} We should really split these multivalue files up into individual files, as sysfs is for single value files. Makes parsing easier too. Here's a patch for the lm75.c driver that does this. As we are going to need a "generic" read and write for the "real" values that the i2c drivers use, I added these files to the i2c-proc.c file. Yes, i2c_read_real() doesn't really work just yet :) Anyway, I think this is the direction we should be moving to. And what is "temp_os" and "temp_hyst"? Should these files be named something a bit more descriptive? thanks, greg k-h diff -Nru a/drivers/i2c/chips/lm75.c b/drivers/i2c/chips/lm75.c --- a/drivers/i2c/chips/lm75.c Wed Mar 26 12:28:45 2003 +++ b/drivers/i2c/chips/lm75.c Wed Mar 26 12:28:45 2003 @@ -102,6 +102,49 @@ static int lm75_id = 0; +#define show(value) \ +static ssize_t show_##value(struct device *dev, char *buf) \ +{ \ + struct i2c_client *client = to_i2c_client(dev); \ + struct lm75_data *data = i2c_get_clientdata(client); \ + int temp; \ + \ + lm75_update_client(client); \ + temp = TEMP_FROM_REG(data->value); \ + return i2c_write_real(buf, temp, 1); \ +} +show(temp); +show(temp_os); +show(temp_hyst); + +static ssize_t set_temp_os(struct device *dev, const char *buf, size_t count) +{ + struct i2c_client *client = to_i2c_client(dev); + struct lm75_data *data = i2c_get_clientdata(client); + int temp; + + i2c_read_real(buf, &temp, 1); + data->temp_os = TEMP_TO_REG(temp); + lm75_write_value(client, LM75_REG_TEMP_OS, data->temp_os); + return count; +} + +static ssize_t set_temp_hyst(struct device *dev, const char *buf, size_t count) +{ + struct i2c_client *client = to_i2c_client(dev); + struct lm75_data *data = i2c_get_clientdata(client); + int temp; + + i2c_read_real(buf, &temp, 1); + data->temp_hyst = TEMP_TO_REG(temp); + lm75_write_value(client, LM75_REG_TEMP_HYST, data->temp_hyst); + return count; +} + +static DEVICE_ATTR(temp, S_IRUGO, show_temp, NULL); +static DEVICE_ATTR(temp_os, 0644, show_temp_os, set_temp_os); +static DEVICE_ATTR(temp_hyst, 0644, show_temp_hyst, set_temp_hyst); + static int lm75_attach_adapter(struct i2c_adapter *adapter) { return i2c_detect(adapter, &addr_data, lm75_detect); @@ -192,6 +235,10 @@ if ((err = i2c_attach_client(new_client))) goto error3; + device_create_file(&new_client->dev, &dev_attr_temp); + device_create_file(&new_client->dev, &dev_attr_temp_os); + device_create_file(&new_client->dev, &dev_attr_temp_hyst); + /* Register a new directory entry with module sensors */ i = i2c_register_entry(new_client, type_name, lm75_dir_table_template); if (i < 0) { diff -Nru a/drivers/i2c/i2c-proc.c b/drivers/i2c/i2c-proc.c --- a/drivers/i2c/i2c-proc.c Wed Mar 26 12:28:45 2003 +++ b/drivers/i2c/i2c-proc.c Wed Mar 26 12:28:45 2003 @@ -381,6 +381,14 @@ return ret; } +int i2c_read_real(const char *buf, int *real, int magnitude) +{ + char *temp; + + *real = simple_strtoul(buf, &temp, 10); + + return 0; +} /* nrels contains initially the maximum number of elements which can be put in results, and finally the number of elements actually put there. @@ -499,6 +507,29 @@ return 0; } +int i2c_write_real(char *buf, int real, int magnitude) +{ + char printfstr[12]; + int mag; + int times; + int field_location; + + mag = magnitude; + for (times = 1; mag-- > 0; times *= 10) + ; + + if (real < 0) { + strcpy(printfstr, "-%ld.%0Xld"); + field_location = 7; + } else { + strcpy(printfstr, "%ld.%0Xld"); + field_location = 6; + } + printfstr[field_location] = magnitude + '0'; + real = abs(real); + return sprintf(buf, printfstr, real / times, real % times); +} + static int i2c_write_reals(int nrels, void *buffer, size_t *bufsize, long *results, int magnitude) { @@ -724,6 +755,8 @@ EXPORT_SYMBOL(i2c_proc_real); EXPORT_SYMBOL(i2c_sysctl_real); EXPORT_SYMBOL(i2c_detect); +EXPORT_SYMBOL(i2c_write_real); +EXPORT_SYMBOL(i2c_read_real); MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>"); MODULE_DESCRIPTION("i2c-proc driver"); diff -Nru a/include/linux/i2c-proc.h b/include/linux/i2c-proc.h --- a/include/linux/i2c-proc.h Wed Mar 26 12:28:45 2003 +++ b/include/linux/i2c-proc.h Wed Mar 26 12:28:45 2003 @@ -410,5 +410,8 @@ char name[SENSORS_PREFIX_MAX + 13]; }; +extern int i2c_write_real(char *buf, int real, int magnitude); +extern int i2c_read_real(const char *buf, int *real, int magnitude); + #endif /* def _LINUX_I2C_PROC_H */ ^ permalink raw reply [flat|nested] 89+ messages in thread
* w83781d i2c driver updated for 2.5.66 (without sysfs support) @ 2005-05-19 6:23 ` Greg KH 0 siblings, 0 replies; 89+ messages in thread From: Greg KH @ 2005-05-19 6:23 UTC (permalink / raw) To: Jan Dittmer; +Cc: azarah, KML, Dominik Brodowski, sensors On Wed, Mar 26, 2003 at 08:40:58PM +0100, Jan Dittmer wrote: > Martin Schlemmer wrote: > > > >I did look at the changes needed for sysfs, but this beast have > >about 6 ctl_tables, and is hairy in general. I am not sure what > >is the best way to do it for the different chips, so here is what > >I have until I or somebody else can do the sysfs stuff. > > > I've just done this with the via686a driver. Saves about 100 lines of code. > > Comments? <snip> > +/* following are the sysfs callback functions */ > +static ssize_t show_in(struct device *dev, char *buf, int nr) { > + struct i2c_client *client = to_i2c_client(dev); > + struct via686a_data *data = i2c_get_clientdata(client); > + via686a_update_client(client); > + > + return sprintf(buf,"%ld %ld %ld\n", > + IN_FROM_REG(data->in_min[nr], nr), > + IN_FROM_REG(data->in_max[nr], nr), > + IN_FROM_REG(data->in[nr], nr) ); > +} We should really split these multivalue files up into individual files, as sysfs is for single value files. Makes parsing easier too. Here's a patch for the lm75.c driver that does this. As we are going to need a "generic" read and write for the "real" values that the i2c drivers use, I added these files to the i2c-proc.c file. Yes, i2c_read_real() doesn't really work just yet :) Anyway, I think this is the direction we should be moving to. And what is "temp_os" and "temp_hyst"? Should these files be named something a bit more descriptive? thanks, greg k-h diff -Nru a/drivers/i2c/chips/lm75.c b/drivers/i2c/chips/lm75.c --- a/drivers/i2c/chips/lm75.c Wed Mar 26 12:28:45 2003 +++ b/drivers/i2c/chips/lm75.c Wed Mar 26 12:28:45 2003 @@ -102,6 +102,49 @@ static int lm75_id = 0; +#define show(value) \ +static ssize_t show_##value(struct device *dev, char *buf) \ +{ \ + struct i2c_client *client = to_i2c_client(dev); \ + struct lm75_data *data = i2c_get_clientdata(client); \ + int temp; \ + \ + lm75_update_client(client); \ + temp = TEMP_FROM_REG(data->value); \ + return i2c_write_real(buf, temp, 1); \ +} +show(temp); +show(temp_os); +show(temp_hyst); + +static ssize_t set_temp_os(struct device *dev, const char *buf, size_t count) +{ + struct i2c_client *client = to_i2c_client(dev); + struct lm75_data *data = i2c_get_clientdata(client); + int temp; + + i2c_read_real(buf, &temp, 1); + data->temp_os = TEMP_TO_REG(temp); + lm75_write_value(client, LM75_REG_TEMP_OS, data->temp_os); + return count; +} + +static ssize_t set_temp_hyst(struct device *dev, const char *buf, size_t count) +{ + struct i2c_client *client = to_i2c_client(dev); + struct lm75_data *data = i2c_get_clientdata(client); + int temp; + + i2c_read_real(buf, &temp, 1); + data->temp_hyst = TEMP_TO_REG(temp); + lm75_write_value(client, LM75_REG_TEMP_HYST, data->temp_hyst); + return count; +} + +static DEVICE_ATTR(temp, S_IRUGO, show_temp, NULL); +static DEVICE_ATTR(temp_os, 0644, show_temp_os, set_temp_os); +static DEVICE_ATTR(temp_hyst, 0644, show_temp_hyst, set_temp_hyst); + static int lm75_attach_adapter(struct i2c_adapter *adapter) { return i2c_detect(adapter, &addr_data, lm75_detect); @@ -192,6 +235,10 @@ if ((err = i2c_attach_client(new_client))) goto error3; + device_create_file(&new_client->dev, &dev_attr_temp); + device_create_file(&new_client->dev, &dev_attr_temp_os); + device_create_file(&new_client->dev, &dev_attr_temp_hyst); + /* Register a new directory entry with module sensors */ i = i2c_register_entry(new_client, type_name, lm75_dir_table_template); if (i < 0) { diff -Nru a/drivers/i2c/i2c-proc.c b/drivers/i2c/i2c-proc.c --- a/drivers/i2c/i2c-proc.c Wed Mar 26 12:28:45 2003 +++ b/drivers/i2c/i2c-proc.c Wed Mar 26 12:28:45 2003 @@ -381,6 +381,14 @@ return ret; } +int i2c_read_real(const char *buf, int *real, int magnitude) +{ + char *temp; + + *real = simple_strtoul(buf, &temp, 10); + + return 0; +} /* nrels contains initially the maximum number of elements which can be put in results, and finally the number of elements actually put there. @@ -499,6 +507,29 @@ return 0; } +int i2c_write_real(char *buf, int real, int magnitude) +{ + char printfstr[12]; + int mag; + int times; + int field_location; + + mag = magnitude; + for (times = 1; mag-- > 0; times *= 10) + ; + + if (real < 0) { + strcpy(printfstr, "-%ld.%0Xld"); + field_location = 7; + } else { + strcpy(printfstr, "%ld.%0Xld"); + field_location = 6; + } + printfstr[field_location] = magnitude + '0'; + real = abs(real); + return sprintf(buf, printfstr, real / times, real % times); +} + static int i2c_write_reals(int nrels, void *buffer, size_t *bufsize, long *results, int magnitude) { @@ -724,6 +755,8 @@ EXPORT_SYMBOL(i2c_proc_real); EXPORT_SYMBOL(i2c_sysctl_real); EXPORT_SYMBOL(i2c_detect); +EXPORT_SYMBOL(i2c_write_real); +EXPORT_SYMBOL(i2c_read_real); MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>"); MODULE_DESCRIPTION("i2c-proc driver"); diff -Nru a/include/linux/i2c-proc.h b/include/linux/i2c-proc.h --- a/include/linux/i2c-proc.h Wed Mar 26 12:28:45 2003 +++ b/include/linux/i2c-proc.h Wed Mar 26 12:28:45 2003 @@ -410,5 +410,8 @@ char name[SENSORS_PREFIX_MAX + 13]; }; +extern int i2c_write_real(char *buf, int real, int magnitude); +extern int i2c_read_real(const char *buf, int *real, int magnitude); + #endif /* def _LINUX_I2C_PROC_H */ ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: w83781d i2c driver updated for 2.5.66 (without sysfs support) 2005-05-19 6:23 ` Greg KH @ 2005-05-19 6:23 ` Christoph Hellwig -1 siblings, 0 replies; 89+ messages in thread From: Christoph Hellwig @ 2003-03-26 20:43 UTC (permalink / raw) To: Greg KH; +Cc: Jan Dittmer, azarah, KML, Dominik Brodowski, sensors On Wed, Mar 26, 2003 at 12:26:23PM -0800, Greg KH wrote: > We should really split these multivalue files up into individual files, > as sysfs is for single value files. Makes parsing easier too. > > Here's a patch for the lm75.c driver that does this. As we are going to > need a "generic" read and write for the "real" values that the i2c > drivers use, I added these files to the i2c-proc.c file. i2c-proc.c is the wrong place. Please add a i2c-sensor.c file with helper code for hardware sensors driver (i2c_detect should move over to there from i2c-proc.c aswell) ^ permalink raw reply [flat|nested] 89+ messages in thread
* w83781d i2c driver updated for 2.5.66 (without sysfs support) @ 2005-05-19 6:23 ` Christoph Hellwig 0 siblings, 0 replies; 89+ messages in thread From: Christoph Hellwig @ 2005-05-19 6:23 UTC (permalink / raw) To: Greg KH; +Cc: Jan Dittmer, azarah, KML, Dominik Brodowski, sensors On Wed, Mar 26, 2003 at 12:26:23PM -0800, Greg KH wrote: > We should really split these multivalue files up into individual files, > as sysfs is for single value files. Makes parsing easier too. > > Here's a patch for the lm75.c driver that does this. As we are going to > need a "generic" read and write for the "real" values that the i2c > drivers use, I added these files to the i2c-proc.c file. i2c-proc.c is the wrong place. Please add a i2c-sensor.c file with helper code for hardware sensors driver (i2c_detect should move over to there from i2c-proc.c aswell) ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: w83781d i2c driver updated for 2.5.66 (without sysfs support) 2005-05-19 6:23 ` Christoph Hellwig @ 2005-05-19 6:23 ` Greg KH -1 siblings, 0 replies; 89+ messages in thread From: Greg KH @ 2003-03-26 21:23 UTC (permalink / raw) To: Christoph Hellwig, Jan Dittmer, azarah, KML, Dominik Brodowski, sensors On Wed, Mar 26, 2003 at 08:43:43PM +0000, Christoph Hellwig wrote: > On Wed, Mar 26, 2003 at 12:26:23PM -0800, Greg KH wrote: > > We should really split these multivalue files up into individual files, > > as sysfs is for single value files. Makes parsing easier too. > > > > Here's a patch for the lm75.c driver that does this. As we are going to > > need a "generic" read and write for the "real" values that the i2c > > drivers use, I added these files to the i2c-proc.c file. > > i2c-proc.c is the wrong place. Please add a i2c-sensor.c file with > helper code for hardware sensors driver (i2c_detect should move over to > there from i2c-proc.c aswell) Oh, I agree. I just threw it there as I was matching up with other functions already in that file. Eventually i2c-proc.c should be deleted, as all of the proc stuff will be gone. I like the idea of i2c-sensor.c for the remaining i2c_detect() function. thanks, greg k-h ^ permalink raw reply [flat|nested] 89+ messages in thread
* w83781d i2c driver updated for 2.5.66 (without sysfs support) @ 2005-05-19 6:23 ` Greg KH 0 siblings, 0 replies; 89+ messages in thread From: Greg KH @ 2005-05-19 6:23 UTC (permalink / raw) To: Christoph Hellwig, Jan Dittmer, azarah, KML, Dominik Brodowski, sensors On Wed, Mar 26, 2003 at 08:43:43PM +0000, Christoph Hellwig wrote: > On Wed, Mar 26, 2003 at 12:26:23PM -0800, Greg KH wrote: > > We should really split these multivalue files up into individual files, > > as sysfs is for single value files. Makes parsing easier too. > > > > Here's a patch for the lm75.c driver that does this. As we are going to > > need a "generic" read and write for the "real" values that the i2c > > drivers use, I added these files to the i2c-proc.c file. > > i2c-proc.c is the wrong place. Please add a i2c-sensor.c file with > helper code for hardware sensors driver (i2c_detect should move over to > there from i2c-proc.c aswell) Oh, I agree. I just threw it there as I was matching up with other functions already in that file. Eventually i2c-proc.c should be deleted, as all of the proc stuff will be gone. I like the idea of i2c-sensor.c for the remaining i2c_detect() function. thanks, greg k-h ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: w83781d i2c driver updated for 2.5.66 (without sysfs support) 2005-05-19 6:23 ` Greg KH @ 2005-05-19 6:23 ` Mark Studebaker -1 siblings, 0 replies; 89+ messages in thread From: Mark Studebaker @ 2003-03-26 22:26 UTC (permalink / raw) To: Greg KH; +Cc: Jan Dittmer, azarah, KML, Dominik Brodowski, sensors If you rename the files and/or split multivalue files into separate single value files, or change the format of the contents, and continue these changes across the 30 or so "chip" drivers of ours, you will completely blow up our libsensors library, and userspace programs. If all the patches do is move all the files unchanged from /proc/sys/dev/sensors/... to /sysfs/... then that change is much much easier to incorporate in our programs. While not all drivers conform perfectly to the our standard (link below) (lm75 temp_os and temp_hyst don't), this is the naming and data format standard we attempt to follow. This has evolved over the years. If the chip drivers in the kernel diverge from this, or even worse diverge from each other haphazardly, we're going to end up with a mess and no usable userspace tools for a long long time. Please consider keeping the file names and contents unchanged. thanks mds ------------ lm_sensors /proc naming standars for sensors chip drivers: http://www2.lm-sensors.nu/~lm78/cvs/lm_sensors2/doc/developers/proc Greg KH wrote: > > On Wed, Mar 26, 2003 at 08:40:58PM +0100, Jan Dittmer wrote: > > Martin Schlemmer wrote: > > > > > >I did look at the changes needed for sysfs, but this beast have > > >about 6 ctl_tables, and is hairy in general. I am not sure what > > >is the best way to do it for the different chips, so here is what > > >I have until I or somebody else can do the sysfs stuff. > > > > > I've just done this with the via686a driver. Saves about 100 lines of code. > > > > Comments? > > <snip> > > > +/* following are the sysfs callback functions */ > > +static ssize_t show_in(struct device *dev, char *buf, int nr) { > > + struct i2c_client *client = to_i2c_client(dev); > > + struct via686a_data *data = i2c_get_clientdata(client); > > + via686a_update_client(client); > > + > > + return sprintf(buf,"%ld %ld %ld\n", > > + IN_FROM_REG(data->in_min[nr], nr), > > + IN_FROM_REG(data->in_max[nr], nr), > > + IN_FROM_REG(data->in[nr], nr) ); > > +} > > We should really split these multivalue files up into individual files, > as sysfs is for single value files. Makes parsing easier too. > > Here's a patch for the lm75.c driver that does this. ^ permalink raw reply [flat|nested] 89+ messages in thread
* w83781d i2c driver updated for 2.5.66 (without sysfs support) @ 2005-05-19 6:23 ` Mark Studebaker 0 siblings, 0 replies; 89+ messages in thread From: Mark Studebaker @ 2005-05-19 6:23 UTC (permalink / raw) To: Greg KH; +Cc: Jan Dittmer, azarah, KML, Dominik Brodowski, sensors If you rename the files and/or split multivalue files into separate single value files, or change the format of the contents, and continue these changes across the 30 or so "chip" drivers of ours, you will completely blow up our libsensors library, and userspace programs. If all the patches do is move all the files unchanged from /proc/sys/dev/sensors/... to /sysfs/... then that change is much much easier to incorporate in our programs. While not all drivers conform perfectly to the our standard (link below) (lm75 temp_os and temp_hyst don't), this is the naming and data format standard we attempt to follow. This has evolved over the years. If the chip drivers in the kernel diverge from this, or even worse diverge from each other haphazardly, we're going to end up with a mess and no usable userspace tools for a long long time. Please consider keeping the file names and contents unchanged. thanks mds ------------ lm_sensors /proc naming standars for sensors chip drivers: http://www2.lm-sensors.nu/~lm78/cvs/lm_sensors2/doc/developers/proc Greg KH wrote: > > On Wed, Mar 26, 2003 at 08:40:58PM +0100, Jan Dittmer wrote: > > Martin Schlemmer wrote: > > > > > >I did look at the changes needed for sysfs, but this beast have > > >about 6 ctl_tables, and is hairy in general. I am not sure what > > >is the best way to do it for the different chips, so here is what > > >I have until I or somebody else can do the sysfs stuff. > > > > > I've just done this with the via686a driver. Saves about 100 lines of code. > > > > Comments? > > <snip> > > > +/* following are the sysfs callback functions */ > > +static ssize_t show_in(struct device *dev, char *buf, int nr) { > > + struct i2c_client *client = to_i2c_client(dev); > > + struct via686a_data *data = i2c_get_clientdata(client); > > + via686a_update_client(client); > > + > > + return sprintf(buf,"%ld %ld %ld\n", > > + IN_FROM_REG(data->in_min[nr], nr), > > + IN_FROM_REG(data->in_max[nr], nr), > > + IN_FROM_REG(data->in[nr], nr) ); > > +} > > We should really split these multivalue files up into individual files, > as sysfs is for single value files. Makes parsing easier too. > > Here's a patch for the lm75.c driver that does this. ^ permalink raw reply [flat|nested] 89+ messages in thread
* lm sensors sysfs file structure 2005-05-19 6:23 ` Mark Studebaker @ 2005-05-19 6:23 ` Greg KH -1 siblings, 0 replies; 89+ messages in thread From: Greg KH @ 2003-03-26 22:52 UTC (permalink / raw) To: Mark Studebaker; +Cc: Jan Dittmer, azarah, KML, Dominik Brodowski, sensors Subject changed to reflect change in topic, and to call attention to others who might be interested. On Wed, Mar 26, 2003 at 05:26:54PM -0500, Mark Studebaker wrote: > If you rename the files and/or split multivalue files into separate > single value files, or change the format of the contents, > and continue these changes across the 30 or so "chip" drivers of ours, > you will completely blow up our libsensors library, and userspace programs. Well ideally libsensors can change and then userspace programs will never know the difference :) I need to start digging into the libsensors code to be able to back this up, but at first glance I think it's feasible. > If all the patches do is move all the files unchanged from > /proc/sys/dev/sensors/... to /sysfs/... then that change is much much easier > to incorporate in our programs. True, but multi-valued files are not allowed in sysfs. It's especially obnoxious that you have 3 value files when you read them, but only expect 2 values for writing. The way I split up the values in the lm75.c driver shows a user exactly which values are writable, and enforces this on the file system level. I don't want to detract from all of the work you, and the lm_sensors group has done in the past, it's quite nice. I'm just trying to fit the drivers into current kernel policies in the best way possible. Remember, I want this to work, and for everyone to come to an understanding. > lm_sensors /proc naming standars for sensors chip drivers: > > http://www2.lm-sensors.nu/~lm78/cvs/lm_sensors2/doc/developers/proc Thanks for the link. I don't really think this is a problem. As an example, the temp files, which are currently defined as a proc file with this description: Entry Values Function ----- ------ -------- temp, temp[1-3] 3 Temperature max, min or hysteresis, and input value. Floating point values XXX.X or XXX.XX in degrees Celcius. 'temp' is used if there is only one temperature sensor on the chip; for multiple temps. start with 'temp1'. Temp1 is generally the sensor inside the chip itself, generally reported as "motherboard temperature". Temp2 and temp3 are generally sensors external to the chip itself, for example the thermal diode inside the CPU or a termistor nearby. The second value is preferably a hysteresis value, reported as a absolute temperature, NOT a delta from the max value. First two values are read/write and third is read only. Could be rewritten to say: Entry Function ----- -------- temp_max[1-3] Temperature max value. Fixed point value in form XXXXX and should be divided by 100 to get degrees Celsius. Read/Write value. temp_min[1-3] Temperature min or hysteresis value. Fixed point value in form XXXXX and should be divided by 100 to get degrees Celsius. This is preferably a hysteresis value, reported as a absolute temperature, NOT a delta from the max value. Read/Write value. temp_input[1-3] Temperature input value. Read only value. If there are multiple temperature sensors, temp_*1 is generally the sensor inside the chip itself, generally reported as "motherboard temperature". temp_*2 and temp_*3 are generally sensors external to the chip itself, for example the thermal diode inside the CPU or a thermistor nearby. That would give us one value per file, use no floating point in the kernel (fake or not) and generally make things a whole lot more orderly. Also, if a sensor does not have a max value (for example, I don't really know if this is true), instead of having to fake a value, it can just not create the file. Then userspace can easily detect this is not supported, and is not a placeholder value. Does that sound reasonable? thanks, greg k-h ^ permalink raw reply [flat|nested] 89+ messages in thread
* lm sensors sysfs file structure @ 2005-05-19 6:23 ` Greg KH 0 siblings, 0 replies; 89+ messages in thread From: Greg KH @ 2005-05-19 6:23 UTC (permalink / raw) To: Mark Studebaker; +Cc: Jan Dittmer, azarah, KML, Dominik Brodowski, sensors Subject changed to reflect change in topic, and to call attention to others who might be interested. On Wed, Mar 26, 2003 at 05:26:54PM -0500, Mark Studebaker wrote: > If you rename the files and/or split multivalue files into separate > single value files, or change the format of the contents, > and continue these changes across the 30 or so "chip" drivers of ours, > you will completely blow up our libsensors library, and userspace programs. Well ideally libsensors can change and then userspace programs will never know the difference :) I need to start digging into the libsensors code to be able to back this up, but at first glance I think it's feasible. > If all the patches do is move all the files unchanged from > /proc/sys/dev/sensors/... to /sysfs/... then that change is much much easier > to incorporate in our programs. True, but multi-valued files are not allowed in sysfs. It's especially obnoxious that you have 3 value files when you read them, but only expect 2 values for writing. The way I split up the values in the lm75.c driver shows a user exactly which values are writable, and enforces this on the file system level. I don't want to detract from all of the work you, and the lm_sensors group has done in the past, it's quite nice. I'm just trying to fit the drivers into current kernel policies in the best way possible. Remember, I want this to work, and for everyone to come to an understanding. > lm_sensors /proc naming standars for sensors chip drivers: > > http://www2.lm-sensors.nu/~lm78/cvs/lm_sensors2/doc/developers/proc Thanks for the link. I don't really think this is a problem. As an example, the temp files, which are currently defined as a proc file with this description: Entry Values Function ----- ------ -------- temp, temp[1-3] 3 Temperature max, min or hysteresis, and input value. Floating point values XXX.X or XXX.XX in degrees Celcius. 'temp' is used if there is only one temperature sensor on the chip; for multiple temps. start with 'temp1'. Temp1 is generally the sensor inside the chip itself, generally reported as "motherboard temperature". Temp2 and temp3 are generally sensors external to the chip itself, for example the thermal diode inside the CPU or a termistor nearby. The second value is preferably a hysteresis value, reported as a absolute temperature, NOT a delta from the max value. First two values are read/write and third is read only. Could be rewritten to say: Entry Function ----- -------- temp_max[1-3] Temperature max value. Fixed point value in form XXXXX and should be divided by 100 to get degrees Celsius. Read/Write value. temp_min[1-3] Temperature min or hysteresis value. Fixed point value in form XXXXX and should be divided by 100 to get degrees Celsius. This is preferably a hysteresis value, reported as a absolute temperature, NOT a delta from the max value. Read/Write value. temp_input[1-3] Temperature input value. Read only value. If there are multiple temperature sensors, temp_*1 is generally the sensor inside the chip itself, generally reported as "motherboard temperature". temp_*2 and temp_*3 are generally sensors external to the chip itself, for example the thermal diode inside the CPU or a thermistor nearby. That would give us one value per file, use no floating point in the kernel (fake or not) and generally make things a whole lot more orderly. Also, if a sensor does not have a max value (for example, I don't really know if this is true), instead of having to fake a value, it can just not create the file. Then userspace can easily detect this is not supported, and is not a placeholder value. Does that sound reasonable? thanks, greg k-h ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: lm sensors sysfs file structure 2005-05-19 6:23 ` Greg KH @ 2005-05-19 6:23 ` Jan Dittmer -1 siblings, 0 replies; 89+ messages in thread From: Jan Dittmer @ 2003-03-27 10:46 UTC (permalink / raw) To: Greg KH; +Cc: Mark Studebaker, azarah, KML, Dominik Brodowski, sensors Greg KH wrote: > True, but multi-valued files are not allowed in sysfs. It's especially > obnoxious that you have 3 value files when you read them, but only > expect 2 values for writing. The way I split up the values in the > lm75.c driver shows a user exactly which values are writable, and > enforces this on the file system level. Agreed, I never knew which of the three values had which functionality. For via686a this would be inX, inX_min, inX_max, tempX, tempX_overshoot (over = overshoot = os ?), tempX_hyst, and so on. > Entry Values Function > ----- ------ -------- > temp, > temp[1-3] 3 Temperature max, min or hysteresis, and input value. > Floating point values XXX.X or XXX.XX in degrees Celcius. If we're restructuring it, I think we should also agree on _one_ common denominator for all values ie. mVolt and milli-Degree Celsius, so that no userspace program ever again has know how to convert them to user-readable values and every user can just cat the values and doesn't have to wonder if it's centi-Volt, milli-Volt, centi-Degree, dezi-Degree or whatever. Thanks, Jan ^ permalink raw reply [flat|nested] 89+ messages in thread
* lm sensors sysfs file structure @ 2005-05-19 6:23 ` Jan Dittmer 0 siblings, 0 replies; 89+ messages in thread From: Jan Dittmer @ 2005-05-19 6:23 UTC (permalink / raw) To: Greg KH; +Cc: Mark Studebaker, azarah, KML, Dominik Brodowski, sensors Greg KH wrote: > True, but multi-valued files are not allowed in sysfs. It's especially > obnoxious that you have 3 value files when you read them, but only > expect 2 values for writing. The way I split up the values in the > lm75.c driver shows a user exactly which values are writable, and > enforces this on the file system level. Agreed, I never knew which of the three values had which functionality. For via686a this would be inX, inX_min, inX_max, tempX, tempX_overshoot (over = overshoot = os ?), tempX_hyst, and so on. > Entry Values Function > ----- ------ -------- > temp, > temp[1-3] 3 Temperature max, min or hysteresis, and input value. > Floating point values XXX.X or XXX.XX in degrees Celcius. If we're restructuring it, I think we should also agree on _one_ common denominator for all values ie. mVolt and milli-Degree Celsius, so that no userspace program ever again has know how to convert them to user-readable values and every user can just cat the values and doesn't have to wonder if it's centi-Volt, milli-Volt, centi-Degree, dezi-Degree or whatever. Thanks, Jan ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: lm sensors sysfs file structure 2005-05-19 6:23 ` Jan Dittmer @ 2005-05-19 6:23 ` Martin Schlemmer -1 siblings, 0 replies; 89+ messages in thread From: Martin Schlemmer @ 2003-03-27 10:50 UTC (permalink / raw) To: Jan Dittmer; +Cc: Greg KH, Mark Studebaker, KML, Dominik Brodowski, sensors On Thu, 2003-03-27 at 12:46, Jan Dittmer wrote: > Greg KH wrote: > > True, but multi-valued files are not allowed in sysfs. It's especially > > obnoxious that you have 3 value files when you read them, but only > > expect 2 values for writing. The way I split up the values in the > > lm75.c driver shows a user exactly which values are writable, and > > enforces this on the file system level. > > Agreed, I never knew which of the three values had which functionality. > For via686a this would be inX, inX_min, inX_max, tempX, tempX_overshoot > (over = overshoot = os ?), tempX_hyst, and so on. > > > Entry Values Function > > ----- ------ -------- > > temp, > > temp[1-3] 3 Temperature max, min or hysteresis, and input value. > > Floating point values XXX.X or XXX.XX in degrees Celcius. > > If we're restructuring it, I think we should also agree on _one_ common > denominator for all values ie. mVolt and milli-Degree Celsius, so that > no userspace program ever again has know how to convert them to > user-readable values and every user can just cat the values and doesn't > have to wonder if it's centi-Volt, milli-Volt, centi-Degree, dezi-Degree > or whatever. > Right, can we just get this finalised soon ? Not much fun in redoing something 2 times already ;) Regards, -- Martin Schlemmer ^ permalink raw reply [flat|nested] 89+ messages in thread
* lm sensors sysfs file structure @ 2005-05-19 6:23 ` Martin Schlemmer 0 siblings, 0 replies; 89+ messages in thread From: Martin Schlemmer @ 2005-05-19 6:23 UTC (permalink / raw) To: Jan Dittmer; +Cc: Greg KH, Mark Studebaker, KML, Dominik Brodowski, sensors On Thu, 2003-03-27 at 12:46, Jan Dittmer wrote: > Greg KH wrote: > > True, but multi-valued files are not allowed in sysfs. It's especially > > obnoxious that you have 3 value files when you read them, but only > > expect 2 values for writing. The way I split up the values in the > > lm75.c driver shows a user exactly which values are writable, and > > enforces this on the file system level. > > Agreed, I never knew which of the three values had which functionality. > For via686a this would be inX, inX_min, inX_max, tempX, tempX_overshoot > (over = overshoot = os ?), tempX_hyst, and so on. > > > Entry Values Function > > ----- ------ -------- > > temp, > > temp[1-3] 3 Temperature max, min or hysteresis, and input value. > > Floating point values XXX.X or XXX.XX in degrees Celcius. > > If we're restructuring it, I think we should also agree on _one_ common > denominator for all values ie. mVolt and milli-Degree Celsius, so that > no userspace program ever again has know how to convert them to > user-readable values and every user can just cat the values and doesn't > have to wonder if it's centi-Volt, milli-Volt, centi-Degree, dezi-Degree > or whatever. > Right, can we just get this finalised soon ? Not much fun in redoing something 2 times already ;) Regards, -- Martin Schlemmer ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: lm sensors sysfs file structure 2005-05-19 6:23 ` Martin Schlemmer @ 2005-05-19 6:23 ` Jan Dittmer -1 siblings, 0 replies; 89+ messages in thread From: Jan Dittmer @ 2003-03-27 12:27 UTC (permalink / raw) To: Martin Schlemmer Cc: Greg KH, Mark Studebaker, KML, Dominik Brodowski, sensors Martin Schlemmer wrote: > On Thu, 2003-03-27 at 12:46, Jan Dittmer wrote: > >>Greg KH wrote: >> >>>True, but multi-valued files are not allowed in sysfs. It's especially >>>obnoxious that you have 3 value files when you read them, but only >>>expect 2 values for writing. The way I split up the values in the >>>lm75.c driver shows a user exactly which values are writable, and >>>enforces this on the file system level. >> > > Right, can we just get this finalised soon ? Not much fun in redoing > something 2 times already ;) > Btw., why is temperature conversion done twice? First time in kernel space and then with the help of sensors.conf again in user space? Wouldn't it be much nicer to move this to the drivers? So there would be no need anymore to do this in userspace and one could rely on the values found in sysfs?! Thanks, Jan ^ permalink raw reply [flat|nested] 89+ messages in thread
* lm sensors sysfs file structure @ 2005-05-19 6:23 ` Jan Dittmer 0 siblings, 0 replies; 89+ messages in thread From: Jan Dittmer @ 2005-05-19 6:23 UTC (permalink / raw) To: Martin Schlemmer Cc: Greg KH, Mark Studebaker, KML, Dominik Brodowski, sensors Martin Schlemmer wrote: > On Thu, 2003-03-27 at 12:46, Jan Dittmer wrote: > >>Greg KH wrote: >> >>>True, but multi-valued files are not allowed in sysfs. It's especially >>>obnoxious that you have 3 value files when you read them, but only >>>expect 2 values for writing. The way I split up the values in the >>>lm75.c driver shows a user exactly which values are writable, and >>>enforces this on the file system level. >> > > Right, can we just get this finalised soon ? Not much fun in redoing > something 2 times already ;) > Btw., why is temperature conversion done twice? First time in kernel space and then with the help of sensors.conf again in user space? Wouldn't it be much nicer to move this to the drivers? So there would be no need anymore to do this in userspace and one could rely on the values found in sysfs?! Thanks, Jan ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: lm sensors sysfs file structure 2005-05-19 6:23 ` Jan Dittmer @ 2005-05-19 6:23 ` Martin Schlemmer -1 siblings, 0 replies; 89+ messages in thread From: Martin Schlemmer @ 2003-03-27 12:33 UTC (permalink / raw) To: Jan Dittmer; +Cc: Greg KH, Mark Studebaker, KML, Dominik Brodowski, sensors On Thu, 2003-03-27 at 14:27, Jan Dittmer wrote: > Btw., why is temperature conversion done twice? First time in kernel > space and then with the help of sensors.conf again in user space? > Wouldn't it be much nicer to move this to the drivers? So there would be > no need anymore to do this in userspace and one could rely on the values > found in sysfs?! > I guess for stuff like fan_div, etc at least, is that not all the chips are on spec, the sensors are located on different places, and the why the manufacturer of the board did things could all influence things. Thus you need to be able to tweak fan_dev, etc for each board individually to get the most precise reading. For instance, what my bios say, and what the raw reading from /proc is, is two different things. I also had to slightly adjust things between some models of Asus boards I had. Regards, -- Martin Schlemmer ^ permalink raw reply [flat|nested] 89+ messages in thread
* lm sensors sysfs file structure @ 2005-05-19 6:23 ` Martin Schlemmer 0 siblings, 0 replies; 89+ messages in thread From: Martin Schlemmer @ 2005-05-19 6:23 UTC (permalink / raw) To: Jan Dittmer; +Cc: Greg KH, Mark Studebaker, KML, Dominik Brodowski, sensors On Thu, 2003-03-27 at 14:27, Jan Dittmer wrote: > Btw., why is temperature conversion done twice? First time in kernel > space and then with the help of sensors.conf again in user space? > Wouldn't it be much nicer to move this to the drivers? So there would be > no need anymore to do this in userspace and one could rely on the values > found in sysfs?! > I guess for stuff like fan_div, etc at least, is that not all the chips are on spec, the sensors are located on different places, and the why the manufacturer of the board did things could all influence things. Thus you need to be able to tweak fan_dev, etc for each board individually to get the most precise reading. For instance, what my bios say, and what the raw reading from /proc is, is two different things. I also had to slightly adjust things between some models of Asus boards I had. Regards, -- Martin Schlemmer ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: lm sensors sysfs file structure 2005-05-19 6:23 ` Martin Schlemmer @ 2005-05-19 6:23 ` Jan Dittmer -1 siblings, 0 replies; 89+ messages in thread From: Jan Dittmer @ 2003-03-27 13:05 UTC (permalink / raw) To: Martin Schlemmer Cc: Greg KH, Mark Studebaker, KML, Dominik Brodowski, sensors Martin Schlemmer wrote: > For instance, what my bios say, and what the raw reading from > /proc is, is two different things. I also had to slightly adjust > things between some models of Asus boards I had. > But why not return always the raw data then and don't do any conversion at all? I mean, if we already try to guess the real value in the driver, we should try to get it right. Ah, and I don't want to do small corrections like 1 or 2 percent up or down, but things like this for lm80: compute in0 (24/14.7 + 1) * @ , @ / (24/14.7 + 1) compute in2 (22.1/30 + 1) * @ , @ / (22.1/30 + 1) compute in3 (2.8/1.9) * @, @ * 1.9/2.8 compute in4 (160/30.1 + 1) * @, @ / (160/30.1 + 1) These differ a lot. And as stated in the sensors.conf seem to be from the datasheet of the lm80 and not mainboard specific. So that the sysfs values at least are near reality. Thanks, Jan ^ permalink raw reply [flat|nested] 89+ messages in thread
* lm sensors sysfs file structure @ 2005-05-19 6:23 ` Jan Dittmer 0 siblings, 0 replies; 89+ messages in thread From: Jan Dittmer @ 2005-05-19 6:23 UTC (permalink / raw) To: Martin Schlemmer Cc: Greg KH, Mark Studebaker, KML, Dominik Brodowski, sensors Martin Schlemmer wrote: > For instance, what my bios say, and what the raw reading from > /proc is, is two different things. I also had to slightly adjust > things between some models of Asus boards I had. > But why not return always the raw data then and don't do any conversion at all? I mean, if we already try to guess the real value in the driver, we should try to get it right. Ah, and I don't want to do small corrections like 1 or 2 percent up or down, but things like this for lm80: compute in0 (24/14.7 + 1) * @ , @ / (24/14.7 + 1) compute in2 (22.1/30 + 1) * @ , @ / (22.1/30 + 1) compute in3 (2.8/1.9) * @, @ * 1.9/2.8 compute in4 (160/30.1 + 1) * @, @ / (160/30.1 + 1) These differ a lot. And as stated in the sensors.conf seem to be from the datasheet of the lm80 and not mainboard specific. So that the sysfs values at least are near reality. Thanks, Jan ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: lm sensors sysfs file structure 2005-05-19 6:23 ` Jan Dittmer @ 2005-05-19 6:23 ` Jean Delvare -1 siblings, 0 replies; 89+ messages in thread From: Jean Delvare @ 2003-03-27 13:31 UTC (permalink / raw) To: Jan Dittmer; +Cc: azarah, greg, mds, linux-kernel, linux, sensors > Ah, and I don't want to do small corrections like 1 or 2 percent up or > or down, but things like this for lm80: > compute in0 (24/14.7 + 1) * @ , @ / (24/14.7 + 1) > compute in2 (22.1/30 + 1) * @ , @ / (22.1/30 + 1) > compute in3 (2.8/1.9) * @, @ * 1.9/2.8 > compute in4 (160/30.1 + 1) * @, @ / (160/30.1 + 1) > > These differ a lot. And as stated in the sensors.conf seem to be from > the datasheet of the lm80 and not mainboard specific. They may be mainboard specific. The formulae rely on *suggested* resistor values, which the integrators may or may not follow. There definitely is a need for userspace conversion. Libsensors needs to be tunable by the user. I don't know about the kernel conversion Jan is talking about (never coded a sensor driver myself), so I can't talk about this half, but I'm pretty sure you shouldn't even think of moving all conversions into kernel space. Mark, Phil, maybe you could explain the reasons better than I would? -- Jean Delvare http://www.ensicaen.ismra.fr/~delvare/ ^ permalink raw reply [flat|nested] 89+ messages in thread
* lm sensors sysfs file structure @ 2005-05-19 6:23 ` Jean Delvare 0 siblings, 0 replies; 89+ messages in thread From: Jean Delvare @ 2005-05-19 6:23 UTC (permalink / raw) To: Jan Dittmer; +Cc: azarah, greg, mds, linux-kernel, linux, sensors > Ah, and I don't want to do small corrections like 1 or 2 percent up or > or down, but things like this for lm80: > compute in0 (24/14.7 + 1) * @ , @ / (24/14.7 + 1) > compute in2 (22.1/30 + 1) * @ , @ / (22.1/30 + 1) > compute in3 (2.8/1.9) * @, @ * 1.9/2.8 > compute in4 (160/30.1 + 1) * @, @ / (160/30.1 + 1) > > These differ a lot. And as stated in the sensors.conf seem to be from > the datasheet of the lm80 and not mainboard specific. They may be mainboard specific. The formulae rely on *suggested* resistor values, which the integrators may or may not follow. There definitely is a need for userspace conversion. Libsensors needs to be tunable by the user. I don't know about the kernel conversion Jan is talking about (never coded a sensor driver myself), so I can't talk about this half, but I'm pretty sure you shouldn't even think of moving all conversions into kernel space. Mark, Phil, maybe you could explain the reasons better than I would? -- Jean Delvare http://www.ensicaen.ismra.fr/~delvare/ ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: lm sensors sysfs file structure 2005-05-19 6:23 ` Jean Delvare @ 2005-05-19 6:23 ` Mark M. Hoffman -1 siblings, 0 replies; 89+ messages in thread From: Mark M. Hoffman @ 2003-03-27 17:16 UTC (permalink / raw) To: Jean Delvare; +Cc: Jan Dittmer, azarah, greg, mds, linux-kernel, linux, sensors * Jean Delvare <khali@linux-fr.org> [2003-03-27 14:31:40 +0100]: > > Ah, and I don't want to do small corrections like 1 or 2 percent up or > > or down, but things like this for lm80: > > compute in0 (24/14.7 + 1) * @ , @ / (24/14.7 + 1) > > compute in2 (22.1/30 + 1) * @ , @ / (22.1/30 + 1) > > compute in3 (2.8/1.9) * @, @ * 1.9/2.8 > > compute in4 (160/30.1 + 1) * @, @ / (160/30.1 + 1) > > > > These differ a lot. And as stated in the sensors.conf seem to be from > > the datasheet of the lm80 and not mainboard specific. > > They may be mainboard specific. The formulae rely on *suggested* > resistor values, which the integrators may or may not follow. There > definitely is a need for userspace conversion. Libsensors needs to be > tunable by the user. > > I don't know about the kernel conversion Jan is talking about (never > coded a sensor driver myself), so I can't talk about this half, but I'm > pretty sure you shouldn't even think of moving all conversions into > kernel space. > > Mark, Phil, maybe you could explain the reasons better than I would? I'm not the Mark to which Jean refers, but anyway... he is correct. The sensor chip cannot read temperatures directly, only voltage. The conversion from degress C to V is dependent on the mainboard for the reasons Jean mentions. But also, the chip driver cannot read voltage directly, only bits in a register. *That* conversion is *not* mainboard dependent; it is sensor chip specific. Even when the subject in question is voltage (e.g. power supply +12V), there is mainboard dependent nonsense between the "real value" and what is presented at the pin of the sensor chip. So there is a legitimate need for two conversions. IMHO, the mainboard dependent one *must* be done in userspace (as Jean says). But the conversion of raw register values to volts should happen in the kernel; fixed point maths are sufficient for that. (Yes I'm simplifying; external sensors can present data to sensors chips in other electrical formats, e.g. PWM. Same argument applies.) Regards, -- Mark M. Hoffman mhoffman@lightlink.com ^ permalink raw reply [flat|nested] 89+ messages in thread
* lm sensors sysfs file structure @ 2005-05-19 6:23 ` Mark M. Hoffman 0 siblings, 0 replies; 89+ messages in thread From: Mark M. Hoffman @ 2005-05-19 6:23 UTC (permalink / raw) To: Jean Delvare; +Cc: Jan Dittmer, azarah, greg, mds, linux-kernel, linux, sensors * Jean Delvare <khali@linux-fr.org> [2003-03-27 14:31:40 +0100]: > > Ah, and I don't want to do small corrections like 1 or 2 percent up or > > or down, but things like this for lm80: > > compute in0 (24/14.7 + 1) * @ , @ / (24/14.7 + 1) > > compute in2 (22.1/30 + 1) * @ , @ / (22.1/30 + 1) > > compute in3 (2.8/1.9) * @, @ * 1.9/2.8 > > compute in4 (160/30.1 + 1) * @, @ / (160/30.1 + 1) > > > > These differ a lot. And as stated in the sensors.conf seem to be from > > the datasheet of the lm80 and not mainboard specific. > > They may be mainboard specific. The formulae rely on *suggested* > resistor values, which the integrators may or may not follow. There > definitely is a need for userspace conversion. Libsensors needs to be > tunable by the user. > > I don't know about the kernel conversion Jan is talking about (never > coded a sensor driver myself), so I can't talk about this half, but I'm > pretty sure you shouldn't even think of moving all conversions into > kernel space. > > Mark, Phil, maybe you could explain the reasons better than I would? I'm not the Mark to which Jean refers, but anyway... he is correct. The sensor chip cannot read temperatures directly, only voltage. The conversion from degress C to V is dependent on the mainboard for the reasons Jean mentions. But also, the chip driver cannot read voltage directly, only bits in a register. *That* conversion is *not* mainboard dependent; it is sensor chip specific. Even when the subject in question is voltage (e.g. power supply +12V), there is mainboard dependent nonsense between the "real value" and what is presented at the pin of the sensor chip. So there is a legitimate need for two conversions. IMHO, the mainboard dependent one *must* be done in userspace (as Jean says). But the conversion of raw register values to volts should happen in the kernel; fixed point maths are sufficient for that. (Yes I'm simplifying; external sensors can present data to sensors chips in other electrical formats, e.g. PWM. Same argument applies.) Regards, -- Mark M. Hoffman mhoffman@lightlink.com ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: lm sensors sysfs file structure 2005-05-19 6:23 ` Jan Dittmer @ 2005-05-19 6:23 ` Greg KH -1 siblings, 0 replies; 89+ messages in thread From: Greg KH @ 2003-03-27 17:25 UTC (permalink / raw) To: Jan Dittmer; +Cc: Mark Studebaker, azarah, KML, Dominik Brodowski, sensors On Thu, Mar 27, 2003 at 11:46:16AM +0100, Jan Dittmer wrote: > >Entry Values Function > >----- ------ -------- > >temp, > >temp[1-3] 3 Temperature max, min or hysteresis, and input value. > > Floating point values XXX.X or XXX.XX in degrees Celcius. > > If we're restructuring it, I think we should also agree on _one_ common > denominator for all values ie. mVolt and milli-Degree Celsius, so that > no userspace program ever again has know how to convert them to > user-readable values and every user can just cat the values and doesn't > have to wonder if it's centi-Volt, milli-Volt, centi-Degree, dezi-Degree > or whatever. Um, that's what my proposal stated. Do you not agree with it? (You're quoting the existing document above, not my proposed changes.) thanks, greg k-h ^ permalink raw reply [flat|nested] 89+ messages in thread
* lm sensors sysfs file structure @ 2005-05-19 6:23 ` Greg KH 0 siblings, 0 replies; 89+ messages in thread From: Greg KH @ 2005-05-19 6:23 UTC (permalink / raw) To: Jan Dittmer; +Cc: Mark Studebaker, azarah, KML, Dominik Brodowski, sensors On Thu, Mar 27, 2003 at 11:46:16AM +0100, Jan Dittmer wrote: > >Entry Values Function > >----- ------ -------- > >temp, > >temp[1-3] 3 Temperature max, min or hysteresis, and input value. > > Floating point values XXX.X or XXX.XX in degrees Celcius. > > If we're restructuring it, I think we should also agree on _one_ common > denominator for all values ie. mVolt and milli-Degree Celsius, so that > no userspace program ever again has know how to convert them to > user-readable values and every user can just cat the values and doesn't > have to wonder if it's centi-Volt, milli-Volt, centi-Degree, dezi-Degree > or whatever. Um, that's what my proposal stated. Do you not agree with it? (You're quoting the existing document above, not my proposed changes.) thanks, greg k-h ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: lm sensors sysfs file structure 2005-05-19 6:23 ` Greg KH @ 2005-05-19 6:23 ` Jan Dittmer -1 siblings, 0 replies; 89+ messages in thread From: Jan Dittmer @ 2003-03-27 18:06 UTC (permalink / raw) To: Greg KH; +Cc: Mark Studebaker, azarah, KML, Dominik Brodowski, sensors Greg KH wrote: >>If we're restructuring it, I think we should also agree on _one_ common >>denominator for all values ie. mVolt and milli-Degree Celsius, so that >>no userspace program ever again has know how to convert them to >>user-readable values and every user can just cat the values and doesn't >>have to wonder if it's centi-Volt, milli-Volt, centi-Degree, dezi-Degree >>or whatever. > > > Um, that's what my proposal stated. Do you not agree with it? (You're > quoting the existing document above, not my proposed changes.) I just wanted to emphasis that _all_ units should be milli oder centi. Not mixing centiDegrees and milliVolts or one driver using milliVolt and another centiVolt. From your description it could well be, that one driver uses centi's and another milli's, both for voltage or one driver uses milliVolt but centi-degree. Thanks, Jan ^ permalink raw reply [flat|nested] 89+ messages in thread
* lm sensors sysfs file structure @ 2005-05-19 6:23 ` Jan Dittmer 0 siblings, 0 replies; 89+ messages in thread From: Jan Dittmer @ 2005-05-19 6:23 UTC (permalink / raw) To: Greg KH; +Cc: Mark Studebaker, azarah, KML, Dominik Brodowski, sensors Greg KH wrote: >>If we're restructuring it, I think we should also agree on _one_ common >>denominator for all values ie. mVolt and milli-Degree Celsius, so that >>no userspace program ever again has know how to convert them to >>user-readable values and every user can just cat the values and doesn't >>have to wonder if it's centi-Volt, milli-Volt, centi-Degree, dezi-Degree >>or whatever. > > > Um, that's what my proposal stated. Do you not agree with it? (You're > quoting the existing document above, not my proposed changes.) I just wanted to emphasis that _all_ units should be milli oder centi. Not mixing centiDegrees and milliVolts or one driver using milliVolt and another centiVolt. From your description it could well be, that one driver uses centi's and another milli's, both for voltage or one driver uses milliVolt but centi-degree. Thanks, Jan ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: lm sensors sysfs file structure 2005-05-19 6:23 ` Jan Dittmer @ 2005-05-19 6:23 ` Greg KH -1 siblings, 0 replies; 89+ messages in thread From: Greg KH @ 2003-03-27 18:13 UTC (permalink / raw) To: Jan Dittmer; +Cc: Mark Studebaker, azarah, KML, Dominik Brodowski, sensors On Thu, Mar 27, 2003 at 07:06:08PM +0100, Jan Dittmer wrote: > Greg KH wrote: > >>If we're restructuring it, I think we should also agree on _one_ common > >>denominator for all values ie. mVolt and milli-Degree Celsius, so that > >>no userspace program ever again has know how to convert them to > >>user-readable values and every user can just cat the values and doesn't > >>have to wonder if it's centi-Volt, milli-Volt, centi-Degree, dezi-Degree > >>or whatever. > > > >Um, that's what my proposal stated. Do you not agree with it? (You're > >quoting the existing document above, not my proposed changes.) > > I just wanted to emphasis that _all_ units should be milli oder centi. > Not mixing centiDegrees and milliVolts or one driver using milliVolt and > another centiVolt. I agree. > From your description it could well be, that one driver uses centi's > and another milli's, both for voltage or one driver uses milliVolt but > centi-degree. Huh? I said: temp_max[1-3] Temperature max value. Fixed point value in form XXXXX and should be divided by 100 to get degrees Celsius. Read/Write value. Where is the ability to use a different scale from different drivers in that? Anyway, it sounds like we are agreeing here, so I guess I'll go and write up the whole document in the new style and post it for comments. thanks, greg k-h ^ permalink raw reply [flat|nested] 89+ messages in thread
* lm sensors sysfs file structure @ 2005-05-19 6:23 ` Greg KH 0 siblings, 0 replies; 89+ messages in thread From: Greg KH @ 2005-05-19 6:23 UTC (permalink / raw) To: Jan Dittmer; +Cc: Mark Studebaker, azarah, KML, Dominik Brodowski, sensors On Thu, Mar 27, 2003 at 07:06:08PM +0100, Jan Dittmer wrote: > Greg KH wrote: > >>If we're restructuring it, I think we should also agree on _one_ common > >>denominator for all values ie. mVolt and milli-Degree Celsius, so that > >>no userspace program ever again has know how to convert them to > >>user-readable values and every user can just cat the values and doesn't > >>have to wonder if it's centi-Volt, milli-Volt, centi-Degree, dezi-Degree > >>or whatever. > > > >Um, that's what my proposal stated. Do you not agree with it? (You're > >quoting the existing document above, not my proposed changes.) > > I just wanted to emphasis that _all_ units should be milli oder centi. > Not mixing centiDegrees and milliVolts or one driver using milliVolt and > another centiVolt. I agree. > From your description it could well be, that one driver uses centi's > and another milli's, both for voltage or one driver uses milliVolt but > centi-degree. Huh? I said: temp_max[1-3] Temperature max value. Fixed point value in form XXXXX and should be divided by 100 to get degrees Celsius. Read/Write value. Where is the ability to use a different scale from different drivers in that? Anyway, it sounds like we are agreeing here, so I guess I'll go and write up the whole document in the new style and post it for comments. thanks, greg k-h ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: lm sensors sysfs file structure 2005-05-19 6:23 ` Greg KH @ 2005-05-19 6:23 ` Pavel Machek -1 siblings, 0 replies; 89+ messages in thread From: Pavel Machek @ 2003-03-30 19:23 UTC (permalink / raw) To: Greg KH Cc: Jan Dittmer, Mark Studebaker, azarah, KML, Dominik Brodowski, sensors Hi! > > > Floating point values XXX.X or XXX.XX in degrees Celcius. > > > > If we're restructuring it, I think we should also agree on _one_ common > > denominator for all values ie. mVolt and milli-Degree Celsius, so that > > no userspace program ever again has know how to convert them to > > user-readable values and every user can just cat the values and doesn't > > have to wonder if it's centi-Volt, milli-Volt, centi-Degree, dezi-Degree > > or whatever. > > Um, that's what my proposal stated. Do you not agree with it? (You're > quoting the existing document above, not my proposed changes.) Well, you had cV for PSU voltages and mV for cpu core voltage. I guess mV and mili-deg-C everywhere would be nicer. Pavel -- Pavel Written on sharp zaurus, because my Velo1 broke. If you have Velo you don't need... ^ permalink raw reply [flat|nested] 89+ messages in thread
* lm sensors sysfs file structure @ 2005-05-19 6:23 ` Pavel Machek 0 siblings, 0 replies; 89+ messages in thread From: Pavel Machek @ 2005-05-19 6:23 UTC (permalink / raw) To: Greg KH Cc: Jan Dittmer, Mark Studebaker, azarah, KML, Dominik Brodowski, sensors Hi! > > > Floating point values XXX.X or XXX.XX in degrees Celcius. > > > > If we're restructuring it, I think we should also agree on _one_ common > > denominator for all values ie. mVolt and milli-Degree Celsius, so that > > no userspace program ever again has know how to convert them to > > user-readable values and every user can just cat the values and doesn't > > have to wonder if it's centi-Volt, milli-Volt, centi-Degree, dezi-Degree > > or whatever. > > Um, that's what my proposal stated. Do you not agree with it? (You're > quoting the existing document above, not my proposed changes.) Well, you had cV for PSU voltages and mV for cpu core voltage. I guess mV and mili-deg-C everywhere would be nicer. Pavel -- Pavel Written on sharp zaurus, because my Velo1 broke. If you have Velo you don't need... ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: lm sensors sysfs file structure 2005-05-19 6:23 ` Pavel Machek @ 2005-05-19 6:23 ` Greg KH -1 siblings, 0 replies; 89+ messages in thread From: Greg KH @ 2003-04-01 6:44 UTC (permalink / raw) To: Pavel Machek Cc: Jan Dittmer, Mark Studebaker, azarah, KML, Dominik Brodowski, sensors On Sun, Mar 30, 2003 at 09:23:12PM +0200, Pavel Machek wrote: > Hi! > > > > > Floating point values XXX.X or XXX.XX in degrees Celcius. > > > > > > If we're restructuring it, I think we should also agree on _one_ common > > > denominator for all values ie. mVolt and milli-Degree Celsius, so that > > > no userspace program ever again has know how to convert them to > > > user-readable values and every user can just cat the values and doesn't > > > have to wonder if it's centi-Volt, milli-Volt, centi-Degree, dezi-Degree > > > or whatever. > > > > Um, that's what my proposal stated. Do you not agree with it? (You're > > quoting the existing document above, not my proposed changes.) > > Well, you had cV for PSU voltages and > mV for cpu core voltage. I guess mV > and mili-deg-C everywhere would be > nicer. I was trying to keep consistant with what the old /proc values were reported as. I'll go fix that up. As for why no floating point, it's a pain in the but to both output a fixed point number from the kernel into floating point, and to parse a floating point number from userspace within the kernel, turning it into a fixed point number. With the proposal I wrote up, none of that is needed, and all userspace has to do is divide by a factor of 10 to get the proper value. It's much simpler and easier to validate we got it right code. If you're still not convinced take a look at the code in drivers/i2c/i2c-proc.c::i2c_parse_reals() for an example of some hairy code... thanks, greg k-h ^ permalink raw reply [flat|nested] 89+ messages in thread
* lm sensors sysfs file structure @ 2005-05-19 6:23 ` Greg KH 0 siblings, 0 replies; 89+ messages in thread From: Greg KH @ 2005-05-19 6:23 UTC (permalink / raw) To: Pavel Machek Cc: Jan Dittmer, Mark Studebaker, azarah, KML, Dominik Brodowski, sensors On Sun, Mar 30, 2003 at 09:23:12PM +0200, Pavel Machek wrote: > Hi! > > > > > Floating point values XXX.X or XXX.XX in degrees Celcius. > > > > > > If we're restructuring it, I think we should also agree on _one_ common > > > denominator for all values ie. mVolt and milli-Degree Celsius, so that > > > no userspace program ever again has know how to convert them to > > > user-readable values and every user can just cat the values and doesn't > > > have to wonder if it's centi-Volt, milli-Volt, centi-Degree, dezi-Degree > > > or whatever. > > > > Um, that's what my proposal stated. Do you not agree with it? (You're > > quoting the existing document above, not my proposed changes.) > > Well, you had cV for PSU voltages and > mV for cpu core voltage. I guess mV > and mili-deg-C everywhere would be > nicer. I was trying to keep consistant with what the old /proc values were reported as. I'll go fix that up. As for why no floating point, it's a pain in the but to both output a fixed point number from the kernel into floating point, and to parse a floating point number from userspace within the kernel, turning it into a fixed point number. With the proposal I wrote up, none of that is needed, and all userspace has to do is divide by a factor of 10 to get the proper value. It's much simpler and easier to validate we got it right code. If you're still not convinced take a look at the code in drivers/i2c/i2c-proc.c::i2c_parse_reals() for an example of some hairy code... thanks, greg k-h ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: lm sensors sysfs file structure 2005-05-19 6:23 ` Greg KH @ 2005-05-19 6:23 ` Pavel Machek -1 siblings, 0 replies; 89+ messages in thread From: Pavel Machek @ 2003-04-01 20:22 UTC (permalink / raw) To: Greg KH Cc: Jan Dittmer, Mark Studebaker, azarah, KML, Dominik Brodowski, sensors Hi! > > > > > Floating point values XXX.X or XXX.XX in degrees Celcius. > > > > > > > > If we're restructuring it, I think we should also agree on _one_ common > > > > denominator for all values ie. mVolt and milli-Degree Celsius, so that > > > > no userspace program ever again has know how to convert them to > > > > user-readable values and every user can just cat the values and doesn't > > > > have to wonder if it's centi-Volt, milli-Volt, centi-Degree, dezi-Degree > > > > or whatever. > > > > > > Um, that's what my proposal stated. Do you not agree with it? (You're > > > quoting the existing document above, not my proposed changes.) > > > > Well, you had cV for PSU voltages and > > mV for cpu core voltage. I guess mV > > and mili-deg-C everywhere would be > > nicer. > > I was trying to keep consistant with what the old /proc values were > reported as. I'll go fix that up. > > As for why no floating point, it's a pain in the but to both output a > fixed point number from the kernel into floating point, and to parse a > floating point number from userspace within the kernel, turning it into > a fixed point number. With the proposal I wrote up, none of that is > needed, and all userspace has to do is divide by a factor of 10 to get > the proper value. Okay, I did not realize it is input, too. Outputing reals is really easy; but parsing them. Okay, I guess I'm convinced. You should still use mili-something, not centi-something... Pavel -- When do you have a heart between your knees? [Johanka's followup: and *two* hearts?] ^ permalink raw reply [flat|nested] 89+ messages in thread
* lm sensors sysfs file structure @ 2005-05-19 6:23 ` Pavel Machek 0 siblings, 0 replies; 89+ messages in thread From: Pavel Machek @ 2005-05-19 6:23 UTC (permalink / raw) To: Greg KH Cc: Jan Dittmer, Mark Studebaker, azarah, KML, Dominik Brodowski, sensors Hi! > > > > > Floating point values XXX.X or XXX.XX in degrees Celcius. > > > > > > > > If we're restructuring it, I think we should also agree on _one_ common > > > > denominator for all values ie. mVolt and milli-Degree Celsius, so that > > > > no userspace program ever again has know how to convert them to > > > > user-readable values and every user can just cat the values and doesn't > > > > have to wonder if it's centi-Volt, milli-Volt, centi-Degree, dezi-Degree > > > > or whatever. > > > > > > Um, that's what my proposal stated. Do you not agree with it? (You're > > > quoting the existing document above, not my proposed changes.) > > > > Well, you had cV for PSU voltages and > > mV for cpu core voltage. I guess mV > > and mili-deg-C everywhere would be > > nicer. > > I was trying to keep consistant with what the old /proc values were > reported as. I'll go fix that up. > > As for why no floating point, it's a pain in the but to both output a > fixed point number from the kernel into floating point, and to parse a > floating point number from userspace within the kernel, turning it into > a fixed point number. With the proposal I wrote up, none of that is > needed, and all userspace has to do is divide by a factor of 10 to get > the proper value. Okay, I did not realize it is input, too. Outputing reals is really easy; but parsing them. Okay, I guess I'm convinced. You should still use mili-something, not centi-something... Pavel -- When do you have a heart between your knees? [Johanka's followup: and *two* hearts?] ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: lm sensors sysfs file structure 2005-05-19 6:23 ` Greg KH @ 2005-05-19 6:23 ` Dave Jones -1 siblings, 0 replies; 89+ messages in thread From: Dave Jones @ 2003-04-01 23:27 UTC (permalink / raw) To: Greg KH Cc: Pavel Machek, Jan Dittmer, Mark Studebaker, azarah, KML, Dominik Brodowski, sensors On Mon, Mar 31, 2003 at 10:44:39PM -0800, Greg KH wrote: > > Well, you had cV for PSU voltages and mV for cpu core voltage. I guess mV > > and mili-deg-C everywhere would be nicer. > As for why no floating point, it's a pain in the but to both output a > fixed point number from the kernel into floating point, and to parse a > floating point number from userspace within the kernel, turning it into > a fixed point number. With the proposal I wrote up, none of that is > needed, and all userspace has to do is divide by a factor of 10 to get > the proper value. FWIW, I'm taking the same fixed-point millivolt approach with the sysfs overrides for cpufreq. Having similar things in sysfs exporting the same units seems to be a good idea. Dave ^ permalink raw reply [flat|nested] 89+ messages in thread
* lm sensors sysfs file structure @ 2005-05-19 6:23 ` Dave Jones 0 siblings, 0 replies; 89+ messages in thread From: Dave Jones @ 2005-05-19 6:23 UTC (permalink / raw) To: Greg KH Cc: Pavel Machek, Jan Dittmer, Mark Studebaker, azarah, KML, Dominik Brodowski, sensors On Mon, Mar 31, 2003 at 10:44:39PM -0800, Greg KH wrote: > > Well, you had cV for PSU voltages and mV for cpu core voltage. I guess mV > > and mili-deg-C everywhere would be nicer. > As for why no floating point, it's a pain in the but to both output a > fixed point number from the kernel into floating point, and to parse a > floating point number from userspace within the kernel, turning it into > a fixed point number. With the proposal I wrote up, none of that is > needed, and all userspace has to do is divide by a factor of 10 to get > the proper value. FWIW, I'm taking the same fixed-point millivolt approach with the sysfs overrides for cpufreq. Having similar things in sysfs exporting the same units seems to be a good idea. Dave ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: lm sensors sysfs file structure 2005-05-19 6:23 ` Dave Jones @ 2005-05-19 6:23 ` Greg KH -1 siblings, 0 replies; 89+ messages in thread From: Greg KH @ 2003-04-03 0:28 UTC (permalink / raw) To: Dave Jones, Pavel Machek, Jan Dittmer, Mark Studebaker, azarah, KML, Dominik Brodowski, sensors On Wed, Apr 02, 2003 at 12:27:47AM +0100, Dave Jones wrote: > On Mon, Mar 31, 2003 at 10:44:39PM -0800, Greg KH wrote: > > > Well, you had cV for PSU voltages and mV for cpu core voltage. I guess mV > > > and mili-deg-C everywhere would be nicer. > > As for why no floating point, it's a pain in the but to both output a > > fixed point number from the kernel into floating point, and to parse a > > floating point number from userspace within the kernel, turning it into > > a fixed point number. With the proposal I wrote up, none of that is > > needed, and all userspace has to do is divide by a factor of 10 to get > > the proper value. > > FWIW, I'm taking the same fixed-point millivolt approach with the > sysfs overrides for cpufreq. Having similar things in sysfs > exporting the same units seems to be a good idea. Hm, in looking around the kernel some more, it seems that there are a number of other places that export voltage and temperature values (ACPI being one of the most obvious.) It might be time to start thinking of a single userspace library to access all of these kinds of values in a system, instead of having to probe around different parts of the sysfs tree by hand... thanks, greg k-h ^ permalink raw reply [flat|nested] 89+ messages in thread
* lm sensors sysfs file structure @ 2005-05-19 6:23 ` Greg KH 0 siblings, 0 replies; 89+ messages in thread From: Greg KH @ 2005-05-19 6:23 UTC (permalink / raw) To: Dave Jones, Pavel Machek, Jan Dittmer, Mark Studebaker, azarah, KML, Dominik Brodowski, sensors On Wed, Apr 02, 2003 at 12:27:47AM +0100, Dave Jones wrote: > On Mon, Mar 31, 2003 at 10:44:39PM -0800, Greg KH wrote: > > > Well, you had cV for PSU voltages and mV for cpu core voltage. I guess mV > > > and mili-deg-C everywhere would be nicer. > > As for why no floating point, it's a pain in the but to both output a > > fixed point number from the kernel into floating point, and to parse a > > floating point number from userspace within the kernel, turning it into > > a fixed point number. With the proposal I wrote up, none of that is > > needed, and all userspace has to do is divide by a factor of 10 to get > > the proper value. > > FWIW, I'm taking the same fixed-point millivolt approach with the > sysfs overrides for cpufreq. Having similar things in sysfs > exporting the same units seems to be a good idea. Hm, in looking around the kernel some more, it seems that there are a number of other places that export voltage and temperature values (ACPI being one of the most obvious.) It might be time to start thinking of a single userspace library to access all of these kinds of values in a system, instead of having to probe around different parts of the sysfs tree by hand... thanks, greg k-h ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: lm sensors sysfs file structure 2005-05-19 6:23 ` Greg KH @ 2005-05-19 6:23 ` Dave Jones -1 siblings, 0 replies; 89+ messages in thread From: Dave Jones @ 2003-04-03 10:49 UTC (permalink / raw) To: Greg KH Cc: Pavel Machek, Jan Dittmer, Mark Studebaker, azarah, KML, Dominik Brodowski, sensors On Wed, Apr 02, 2003 at 04:28:22PM -0800, Greg KH wrote: > > FWIW, I'm taking the same fixed-point millivolt approach with the > > sysfs overrides for cpufreq. Having similar things in sysfs > > exporting the same units seems to be a good idea. > > Hm, in looking around the kernel some more, it seems that there are a > number of other places that export voltage and temperature values (ACPI > being one of the most obvious.) It might be time to start thinking of a > single userspace library to access all of these kinds of values in a > system, instead of having to probe around different parts of the sysfs > tree by hand... Had occured to me too. There was talk of a libpower or the likes mentioned on acpi-devel a year or so back, but afaik nothing really came of it. Dave ^ permalink raw reply [flat|nested] 89+ messages in thread
* lm sensors sysfs file structure @ 2005-05-19 6:23 ` Dave Jones 0 siblings, 0 replies; 89+ messages in thread From: Dave Jones @ 2005-05-19 6:23 UTC (permalink / raw) To: Greg KH Cc: Pavel Machek, Jan Dittmer, Mark Studebaker, azarah, KML, Dominik Brodowski, sensors On Wed, Apr 02, 2003 at 04:28:22PM -0800, Greg KH wrote: > > FWIW, I'm taking the same fixed-point millivolt approach with the > > sysfs overrides for cpufreq. Having similar things in sysfs > > exporting the same units seems to be a good idea. > > Hm, in looking around the kernel some more, it seems that there are a > number of other places that export voltage and temperature values (ACPI > being one of the most obvious.) It might be time to start thinking of a > single userspace library to access all of these kinds of values in a > system, instead of having to probe around different parts of the sysfs > tree by hand... Had occured to me too. There was talk of a libpower or the likes mentioned on acpi-devel a year or so back, but afaik nothing really came of it. Dave ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: lm sensors sysfs file structure 2005-05-19 6:23 ` Dave Jones @ 2005-05-19 6:23 ` Dominik Brodowski -1 siblings, 0 replies; 89+ messages in thread From: Dominik Brodowski @ 2003-04-03 18:43 UTC (permalink / raw) To: Dave Jones, Greg KH, Pavel Machek, Jan Dittmer, Mark Studebaker, azarah, KML, sensors, andrew.grover On Thu, Apr 03, 2003 at 11:49:44AM +0100, Dave Jones wrote: > On Wed, Apr 02, 2003 at 04:28:22PM -0800, Greg KH wrote: > > > > FWIW, I'm taking the same fixed-point millivolt approach with the > > > sysfs overrides for cpufreq. Having similar things in sysfs > > > exporting the same units seems to be a good idea. > > > > Hm, in looking around the kernel some more, it seems that there are a > > number of other places that export voltage and temperature values (ACPI > > being one of the most obvious.) It might be time to start thinking of a > > single userspace library to access all of these kinds of values in a > > system, instead of having to probe around different parts of the sysfs > > tree by hand... > > Had occured to me too. There was talk of a libpower or the likes > mentioned on acpi-devel a year or so back, but afaik nothing really > came of it. Actually, the "ospmd" tool (available at http://acpi.sourceforge.net ) already seems to manage APM and ACPI input. Well, and speaking of ACPI and sysfs in the same message: IMHO the /proc/acpi/ interface should be replaced by something in /sysfs/ as well.... Dominik ^ permalink raw reply [flat|nested] 89+ messages in thread
* lm sensors sysfs file structure @ 2005-05-19 6:23 ` Dominik Brodowski 0 siblings, 0 replies; 89+ messages in thread From: Dominik Brodowski @ 2005-05-19 6:23 UTC (permalink / raw) To: Dave Jones, Greg KH, Pavel Machek, Jan Dittmer, Mark Studebaker, azarah, KML, sensors, andrew.grover On Thu, Apr 03, 2003 at 11:49:44AM +0100, Dave Jones wrote: > On Wed, Apr 02, 2003 at 04:28:22PM -0800, Greg KH wrote: > > > > FWIW, I'm taking the same fixed-point millivolt approach with the > > > sysfs overrides for cpufreq. Having similar things in sysfs > > > exporting the same units seems to be a good idea. > > > > Hm, in looking around the kernel some more, it seems that there are a > > number of other places that export voltage and temperature values (ACPI > > being one of the most obvious.) It might be time to start thinking of a > > single userspace library to access all of these kinds of values in a > > system, instead of having to probe around different parts of the sysfs > > tree by hand... > > Had occured to me too. There was talk of a libpower or the likes > mentioned on acpi-devel a year or so back, but afaik nothing really > came of it. Actually, the "ospmd" tool (available at http://acpi.sourceforge.net ) already seems to manage APM and ACPI input. Well, and speaking of ACPI and sysfs in the same message: IMHO the /proc/acpi/ interface should be replaced by something in /sysfs/ as well.... Dominik ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: lm sensors sysfs file structure 2005-05-19 6:23 ` Greg KH @ 2005-05-19 6:23 ` Jan Dittmer -1 siblings, 0 replies; 89+ messages in thread From: Jan Dittmer @ 2003-03-27 18:40 UTC (permalink / raw) To: Greg KH; +Cc: Mark Studebaker, azarah, KML, Dominik Brodowski, sensors Greg KH wrote: > That would give us one value per file, use no floating point in the > kernel (fake or not) and generally make things a whole lot more orderly. > Also, if a sensor does not have a max value (for example, I don't really > know if this is true), instead of having to fake a value, it can just > not create the file. Then userspace can easily detect this is not > supported, and is not a placeholder value. > Is this the way you want to go? Just an example for the voltages. Btw, is it indended behaviour of sysfs, that after writing to a file, the size is zero? ds666:/sys/devices/legacy/i2c-0/i2c_dev_0# echo 100 > in4_min ds666:/sys/devices/legacy/i2c-0/i2c_dev_0# ls -l in4_min -rw-r--r-- 1 root root 0 Mar 27 19:18 in4_min -r--r--r-- 1 root root 4096 Mar 27 19:18 in0_input -rw-r--r-- 1 root root 4096 Mar 27 19:18 in0_max -rw-r--r-- 1 root root 4096 Mar 27 19:18 in0_min -r--r--r-- 1 root root 4096 Mar 27 19:18 in1_input -rw-r--r-- 1 root root 4096 Mar 27 19:18 in1_max -rw-r--r-- 1 root root 4096 Mar 27 19:18 in1_min -r--r--r-- 1 root root 4096 Mar 27 19:18 in2_input -rw-r--r-- 1 root root 4096 Mar 27 19:18 in2_max -rw-r--r-- 1 root root 4096 Mar 27 19:18 in2_min -r--r--r-- 1 root root 4096 Mar 27 19:18 in3_input -rw-r--r-- 1 root root 4096 Mar 27 19:18 in3_max -rw-r--r-- 1 root root 4096 Mar 27 19:18 in3_min -r--r--r-- 1 root root 4096 Mar 27 19:18 in4_input -rw-r--r-- 1 root root 4096 Mar 27 19:18 in4_max -rw-r--r-- 1 root root 4096 Mar 27 19:18 in4_min /* 7 voltage sensors */ static ssize_t show_in(struct device *dev, char *buf, int nr) { struct i2c_client *client = to_i2c_client(dev); struct via686a_data *data = i2c_get_clientdata(client); via686a_update_client(client); return sprintf(buf,"%ld\n", IN_FROM_REG(data->in[nr], nr) ); } static ssize_t show_in_min(struct device *dev, char *buf, int nr) { struct i2c_client *client = to_i2c_client(dev); struct via686a_data *data = i2c_get_clientdata(client); via686a_update_client(client); return sprintf(buf,"%ld\n", IN_FROM_REG(data->in_min[nr], nr) ); } static ssize_t show_in_max(struct device *dev, char *buf, int nr) { struct i2c_client *client = to_i2c_client(dev); struct via686a_data *data = i2c_get_clientdata(client); via686a_update_client(client); return sprintf(buf,"%ld\n", IN_FROM_REG(data->in_max[nr], nr) ); } static ssize_t set_in_min(struct device *dev, const char *buf, size_t count, int nr) { struct i2c_client *client = to_i2c_client(dev); struct via686a_data *data = i2c_get_clientdata(client); unsigned long val = simple_strtoul(buf, NULL, 10); data->in_min[nr] = IN_TO_REG(val,nr); via686a_write_value(client, VIA686A_REG_IN_MIN(nr), data->in_min[nr]); return count; } static ssize_t set_in_max(struct device *dev, const char *buf, size_t count, int nr) { struct i2c_client *client = to_i2c_client(dev); struct via686a_data *data = i2c_get_clientdata(client); unsigned long val = simple_strtoul(buf, NULL, 10); data->in_max[nr] = IN_TO_REG(val,nr); via686a_write_value(client, VIA686A_REG_IN_MAX(nr), data->in_max[nr]); return count; } #define show_in_offset(offset) \ static ssize_t \ show_in##offset (struct device *dev, char *buf) \ { \ return show_in(dev, buf, 0x##offset); \ } \ static ssize_t \ show_in##offset##_min (struct device *dev, char *buf) \ { \ return show_in_min(dev, buf, 0x##offset); \ } \ static ssize_t \ show_in##offset##_max (struct device *dev, char *buf) \ { \ return show_in_max(dev, buf, 0x##offset); \ } \ static ssize_t set_in##offset##_min (struct device *dev, \ const char *buf, size_t count) \ { \ return set_in_min(dev, buf, count, 0x##offset); \ } \ static ssize_t set_in##offset##_max (struct device *dev, \ const char *buf, size_t count) \ { \ return set_in_max(dev, buf, count, 0x##offset); \ } \ static DEVICE_ATTR(in##offset##_input, \ S_IRUGO, show_in##offset, NULL) \ static DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR, \ show_in##offset##_min, set_in##offset##_min) \ static DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR, \ show_in##offset##_max, set_in##offset##_max) show_in_offset(0); show_in_offset(1); show_in_offset(2); show_in_offset(3); show_in_offset(4); ^ permalink raw reply [flat|nested] 89+ messages in thread
* lm sensors sysfs file structure @ 2005-05-19 6:23 ` Jan Dittmer 0 siblings, 0 replies; 89+ messages in thread From: Jan Dittmer @ 2005-05-19 6:23 UTC (permalink / raw) To: Greg KH; +Cc: Mark Studebaker, azarah, KML, Dominik Brodowski, sensors Greg KH wrote: > That would give us one value per file, use no floating point in the > kernel (fake or not) and generally make things a whole lot more orderly. > Also, if a sensor does not have a max value (for example, I don't really > know if this is true), instead of having to fake a value, it can just > not create the file. Then userspace can easily detect this is not > supported, and is not a placeholder value. > Is this the way you want to go? Just an example for the voltages. Btw, is it indended behaviour of sysfs, that after writing to a file, the size is zero? ds666:/sys/devices/legacy/i2c-0/i2c_dev_0# echo 100 > in4_min ds666:/sys/devices/legacy/i2c-0/i2c_dev_0# ls -l in4_min -rw-r--r-- 1 root root 0 Mar 27 19:18 in4_min -r--r--r-- 1 root root 4096 Mar 27 19:18 in0_input -rw-r--r-- 1 root root 4096 Mar 27 19:18 in0_max -rw-r--r-- 1 root root 4096 Mar 27 19:18 in0_min -r--r--r-- 1 root root 4096 Mar 27 19:18 in1_input -rw-r--r-- 1 root root 4096 Mar 27 19:18 in1_max -rw-r--r-- 1 root root 4096 Mar 27 19:18 in1_min -r--r--r-- 1 root root 4096 Mar 27 19:18 in2_input -rw-r--r-- 1 root root 4096 Mar 27 19:18 in2_max -rw-r--r-- 1 root root 4096 Mar 27 19:18 in2_min -r--r--r-- 1 root root 4096 Mar 27 19:18 in3_input -rw-r--r-- 1 root root 4096 Mar 27 19:18 in3_max -rw-r--r-- 1 root root 4096 Mar 27 19:18 in3_min -r--r--r-- 1 root root 4096 Mar 27 19:18 in4_input -rw-r--r-- 1 root root 4096 Mar 27 19:18 in4_max -rw-r--r-- 1 root root 4096 Mar 27 19:18 in4_min /* 7 voltage sensors */ static ssize_t show_in(struct device *dev, char *buf, int nr) { struct i2c_client *client = to_i2c_client(dev); struct via686a_data *data = i2c_get_clientdata(client); via686a_update_client(client); return sprintf(buf,"%ld\n", IN_FROM_REG(data->in[nr], nr) ); } static ssize_t show_in_min(struct device *dev, char *buf, int nr) { struct i2c_client *client = to_i2c_client(dev); struct via686a_data *data = i2c_get_clientdata(client); via686a_update_client(client); return sprintf(buf,"%ld\n", IN_FROM_REG(data->in_min[nr], nr) ); } static ssize_t show_in_max(struct device *dev, char *buf, int nr) { struct i2c_client *client = to_i2c_client(dev); struct via686a_data *data = i2c_get_clientdata(client); via686a_update_client(client); return sprintf(buf,"%ld\n", IN_FROM_REG(data->in_max[nr], nr) ); } static ssize_t set_in_min(struct device *dev, const char *buf, size_t count, int nr) { struct i2c_client *client = to_i2c_client(dev); struct via686a_data *data = i2c_get_clientdata(client); unsigned long val = simple_strtoul(buf, NULL, 10); data->in_min[nr] = IN_TO_REG(val,nr); via686a_write_value(client, VIA686A_REG_IN_MIN(nr), data->in_min[nr]); return count; } static ssize_t set_in_max(struct device *dev, const char *buf, size_t count, int nr) { struct i2c_client *client = to_i2c_client(dev); struct via686a_data *data = i2c_get_clientdata(client); unsigned long val = simple_strtoul(buf, NULL, 10); data->in_max[nr] = IN_TO_REG(val,nr); via686a_write_value(client, VIA686A_REG_IN_MAX(nr), data->in_max[nr]); return count; } #define show_in_offset(offset) \ static ssize_t \ show_in##offset (struct device *dev, char *buf) \ { \ return show_in(dev, buf, 0x##offset); \ } \ static ssize_t \ show_in##offset##_min (struct device *dev, char *buf) \ { \ return show_in_min(dev, buf, 0x##offset); \ } \ static ssize_t \ show_in##offset##_max (struct device *dev, char *buf) \ { \ return show_in_max(dev, buf, 0x##offset); \ } \ static ssize_t set_in##offset##_min (struct device *dev, \ const char *buf, size_t count) \ { \ return set_in_min(dev, buf, count, 0x##offset); \ } \ static ssize_t set_in##offset##_max (struct device *dev, \ const char *buf, size_t count) \ { \ return set_in_max(dev, buf, count, 0x##offset); \ } \ static DEVICE_ATTR(in##offset##_input, \ S_IRUGO, show_in##offset, NULL) \ static DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR, \ show_in##offset##_min, set_in##offset##_min) \ static DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR, \ show_in##offset##_max, set_in##offset##_max) show_in_offset(0); show_in_offset(1); show_in_offset(2); show_in_offset(3); show_in_offset(4); ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: lm sensors sysfs file structure 2005-05-19 6:23 ` Jan Dittmer @ 2005-05-19 6:23 ` Greg KH -1 siblings, 0 replies; 89+ messages in thread From: Greg KH @ 2003-03-27 18:52 UTC (permalink / raw) To: Jan Dittmer; +Cc: Mark Studebaker, azarah, KML, Dominik Brodowski, sensors On Thu, Mar 27, 2003 at 07:40:26PM +0100, Jan Dittmer wrote: > Greg KH wrote: > >That would give us one value per file, use no floating point in the > >kernel (fake or not) and generally make things a whole lot more orderly. > >Also, if a sensor does not have a max value (for example, I don't really > >know if this is true), instead of having to fake a value, it can just > >not create the file. Then userspace can easily detect this is not > >supported, and is not a placeholder value. > > > > Is this the way you want to go? Just an example for the voltages. That looks very good to me, nice job. Sensors developers, does this look sane? > Btw, is it indended behaviour of sysfs, that after writing to a file, > the size is zero? Hm, don't know about that, I haven't seen that before. If you cat the file after writing it, does the file size change? thanks, greg k-h ^ permalink raw reply [flat|nested] 89+ messages in thread
* lm sensors sysfs file structure @ 2005-05-19 6:23 ` Greg KH 0 siblings, 0 replies; 89+ messages in thread From: Greg KH @ 2005-05-19 6:23 UTC (permalink / raw) To: Jan Dittmer; +Cc: Mark Studebaker, azarah, KML, Dominik Brodowski, sensors On Thu, Mar 27, 2003 at 07:40:26PM +0100, Jan Dittmer wrote: > Greg KH wrote: > >That would give us one value per file, use no floating point in the > >kernel (fake or not) and generally make things a whole lot more orderly. > >Also, if a sensor does not have a max value (for example, I don't really > >know if this is true), instead of having to fake a value, it can just > >not create the file. Then userspace can easily detect this is not > >supported, and is not a placeholder value. > > > > Is this the way you want to go? Just an example for the voltages. That looks very good to me, nice job. Sensors developers, does this look sane? > Btw, is it indended behaviour of sysfs, that after writing to a file, > the size is zero? Hm, don't know about that, I haven't seen that before. If you cat the file after writing it, does the file size change? thanks, greg k-h ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: lm sensors sysfs file structure 2005-05-19 6:23 ` Greg KH @ 2005-05-19 6:23 ` Patrick Mochel -1 siblings, 0 replies; 89+ messages in thread From: Patrick Mochel @ 2003-03-27 18:17 UTC (permalink / raw) To: Greg KH Cc: Jan Dittmer, Mark Studebaker, azarah, KML, Dominik Brodowski, sensors > > Btw, is it indended behaviour of sysfs, that after writing to a file, > > the size is zero? > > Hm, don't know about that, I haven't seen that before. If you cat the > file after writing it, does the file size change? It's a known problem that I haven't been able to track down. The file size is hardwired to PAGE_SIZE when it is created. For some reason, it's reset to 0 after it's opened. I haven't had a chance to track down why, or how to reset it.. -pat ^ permalink raw reply [flat|nested] 89+ messages in thread
* lm sensors sysfs file structure @ 2005-05-19 6:23 ` Patrick Mochel 0 siblings, 0 replies; 89+ messages in thread From: Patrick Mochel @ 2005-05-19 6:23 UTC (permalink / raw) To: Greg KH Cc: Jan Dittmer, Mark Studebaker, azarah, KML, Dominik Brodowski, sensors > > Btw, is it indended behaviour of sysfs, that after writing to a file, > > the size is zero? > > Hm, don't know about that, I haven't seen that before. If you cat the > file after writing it, does the file size change? It's a known problem that I haven't been able to track down. The file size is hardwired to PAGE_SIZE when it is created. For some reason, it's reset to 0 after it's opened. I haven't had a chance to track down why, or how to reset it.. -pat ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: lm sensors sysfs file structure 2005-05-19 6:23 ` Greg KH (?) (?) @ 2003-03-27 18:57 ` Jan Dittmer -1 siblings, 0 replies; 89+ messages in thread From: Jan Dittmer @ 2003-03-27 18:57 UTC (permalink / raw) To: Greg KH; +Cc: KML [ stripped some cc's ] Greg KH wrote: > On Thu, Mar 27, 2003 at 07:40:26PM +0100, Jan Dittmer wrote: > >>Btw, is it indended behaviour of sysfs, that after writing to a file, >>the size is zero? > > > Hm, don't know about that, I haven't seen that before. If you cat the > file after writing it, does the file size change? > No it stays 0. Happens also with other files in sysfs. Jan ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: lm sensors sysfs file structure 2005-05-19 6:23 ` Greg KH @ 2005-05-19 6:23 ` Martin Schlemmer -1 siblings, 0 replies; 89+ messages in thread From: Martin Schlemmer @ 2003-03-27 19:15 UTC (permalink / raw) To: Greg KH; +Cc: Jan Dittmer, Mark Studebaker, KML, Dominik Brodowski, sensors [-- Attachment #1: Type: text/plain, Size: 2519 bytes --] On Thu, 2003-03-27 at 20:52, Greg KH wrote: > > Is this the way you want to go? Just an example for the voltages. > > That looks very good to me, nice While we are at it, some form question. The w83781d have a magnitude of files in sysfs if you split them like this, so I went for the shorter (easier?) way. This ok, or should I split it up a bit more. Note that I have not done much for indentation yet. ------------------------------------------------------ #define show_in_reg(reg) \ static ssize_t show_##reg (struct device *dev, char *buf, int nr) \ { \ struct i2c_client *client = to_i2c_client(dev); \ struct w83781d_data *data = i2c_get_clientdata(client); \ w83781d_update_client(client); \ \ return sprintf(buf,"%ld\n", \ IN_FROM_REG(data->reg[nr])); \ } show_in_reg(in); show_in_reg(in_min); show_in_reg(in_max); #define store_in_reg(REG,reg) \ static ssize_t store_##reg (struct device *dev, const char *buf, size_t count, int nr) \ { \ struct i2c_client *client = to_i2c_client(dev); \ struct w83781d_data *data = i2c_get_clientdata(client); \ int reg, ret; \ \ ret = sscanf(buf, "%d", ®); \ if (ret == -1) return -EINVAL; \ if (ret >= 1) { \ data->reg[nr] = IN_TO_REG(reg); \ w83781d_write_value(client, W83781D_REG_IN_##REG(nr), data->reg[nr]); \ } \ return count; \ } store_in_reg(MIN, in_min); store_in_reg(MAX, in_max); #define show_in_offset(offset) \ static ssize_t \ show_in_##offset (struct device *dev, char *buf) \ { \ return show_in(dev, buf, 0x##offset); \ } \ static DEVICE_ATTR(in_input##offset, S_IRUGO | S_IWUSR, show_in_##offset, NULL) #define show_in_reg_offset(reg,offset) \ static ssize_t show_##reg##offset (struct device *dev, char *buf) \ { \ return show_##reg (dev, buf, 0x##offset); \ } \ static ssize_t store_##reg##offset (struct device *dev, const char *buf, size_t count) \ { \ return store_##reg (dev, buf, count, 0x##offset); \ } \ static DEVICE_ATTR(##reg##offset, S_IRUGO| S_IWUSR, show_##reg##offset, store_##reg##offset) #define show_in_offsets(offset) \ show_in_offset(offset); \ show_in_reg_offset(in_min, offset); \ show_in_reg_offset(in_max, offset); show_in_offsets(0); show_in_offsets(1); show_in_offsets(2); show_in_offsets(3); show_in_offsets(4); show_in_offsets(5); show_in_offsets(6); show_in_offsets(7); show_in_offsets(8); -- Martin Schlemmer [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 189 bytes --] ^ permalink raw reply [flat|nested] 89+ messages in thread
* lm sensors sysfs file structure @ 2005-05-19 6:23 ` Martin Schlemmer 0 siblings, 0 replies; 89+ messages in thread From: Martin Schlemmer @ 2005-05-19 6:23 UTC (permalink / raw) To: Greg KH; +Cc: Jan Dittmer, Mark Studebaker, KML, Dominik Brodowski, sensors On Thu, 2003-03-27 at 20:52, Greg KH wrote: > > Is this the way you want to go? Just an example for the voltages. > > That looks very good to me, nice While we are at it, some form question. The w83781d have a magnitude of files in sysfs if you split them like this, so I went for the shorter (easier?) way. This ok, or should I split it up a bit more. Note that I have not done much for indentation yet. ------------------------------------------------------ #define show_in_reg(reg) \ static ssize_t show_##reg (struct device *dev, char *buf, int nr) \ { \ struct i2c_client *client = to_i2c_client(dev); \ struct w83781d_data *data = i2c_get_clientdata(client); \ w83781d_update_client(client); \ \ return sprintf(buf,"%ld\n", \ IN_FROM_REG(data->reg[nr])); \ } show_in_reg(in); show_in_reg(in_min); show_in_reg(in_max); #define store_in_reg(REG,reg) \ static ssize_t store_##reg (struct device *dev, const char *buf, size_t count, int nr) \ { \ struct i2c_client *client = to_i2c_client(dev); \ struct w83781d_data *data = i2c_get_clientdata(client); \ int reg, ret; \ \ ret = sscanf(buf, "%d", ®); \ if (ret = -1) return -EINVAL; \ if (ret >= 1) { \ data->reg[nr] = IN_TO_REG(reg); \ w83781d_write_value(client, W83781D_REG_IN_##REG(nr), data->reg[nr]); \ } \ return count; \ } store_in_reg(MIN, in_min); store_in_reg(MAX, in_max); #define show_in_offset(offset) \ static ssize_t \ show_in_##offset (struct device *dev, char *buf) \ { \ return show_in(dev, buf, 0x##offset); \ } \ static DEVICE_ATTR(in_input##offset, S_IRUGO | S_IWUSR, show_in_##offset, NULL) #define show_in_reg_offset(reg,offset) \ static ssize_t show_##reg##offset (struct device *dev, char *buf) \ { \ return show_##reg (dev, buf, 0x##offset); \ } \ static ssize_t store_##reg##offset (struct device *dev, const char *buf, size_t count) \ { \ return store_##reg (dev, buf, count, 0x##offset); \ } \ static DEVICE_ATTR(##reg##offset, S_IRUGO| S_IWUSR, show_##reg##offset, store_##reg##offset) #define show_in_offsets(offset) \ show_in_offset(offset); \ show_in_reg_offset(in_min, offset); \ show_in_reg_offset(in_max, offset); show_in_offsets(0); show_in_offsets(1); show_in_offsets(2); show_in_offsets(3); show_in_offsets(4); show_in_offsets(5); show_in_offsets(6); show_in_offsets(7); show_in_offsets(8); -- Martin Schlemmer -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part Url : http://lists.lm-sensors.org/pipermail/lm-sensors/attachments/20030327/b7e1284f/attachment.bin ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: lm sensors sysfs file structure 2005-05-19 6:23 ` Martin Schlemmer @ 2005-05-19 6:23 ` Greg KH -1 siblings, 0 replies; 89+ messages in thread From: Greg KH @ 2003-03-27 19:25 UTC (permalink / raw) To: Martin Schlemmer Cc: Jan Dittmer, Mark Studebaker, KML, Dominik Brodowski, sensors On Thu, Mar 27, 2003 at 09:15:23PM +0200, Martin Schlemmer wrote: > On Thu, 2003-03-27 at 20:52, Greg KH wrote: > > > > Is this the way you want to go? Just an example for the voltages. > > > > That looks very good to me, nice > > While we are at it, some form question. The w83781d have a > magnitude of files in sysfs if you split them like this, so > I went for the shorter (easier?) way. > > This ok, or should I split it up a bit more. Note that I > have not done much for indentation yet. This is fine with me, whatever works for you. Either way, we are abusing macros a bunch :) thanks, greg k-h ^ permalink raw reply [flat|nested] 89+ messages in thread
* lm sensors sysfs file structure @ 2005-05-19 6:23 ` Greg KH 0 siblings, 0 replies; 89+ messages in thread From: Greg KH @ 2005-05-19 6:23 UTC (permalink / raw) To: Martin Schlemmer Cc: Jan Dittmer, Mark Studebaker, KML, Dominik Brodowski, sensors On Thu, Mar 27, 2003 at 09:15:23PM +0200, Martin Schlemmer wrote: > On Thu, 2003-03-27 at 20:52, Greg KH wrote: > > > > Is this the way you want to go? Just an example for the voltages. > > > > That looks very good to me, nice > > While we are at it, some form question. The w83781d have a > magnitude of files in sysfs if you split them like this, so > I went for the shorter (easier?) way. > > This ok, or should I split it up a bit more. Note that I > have not done much for indentation yet. This is fine with me, whatever works for you. Either way, we are abusing macros a bunch :) thanks, greg k-h ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: lm sensors sysfs file structure 2005-05-19 6:23 ` Greg KH @ 2005-05-19 6:23 ` Greg KH -1 siblings, 0 replies; 89+ messages in thread From: Greg KH @ 2003-03-27 19:42 UTC (permalink / raw) To: linux-kernel, sensors [-- Attachment #1: Type: text/plain, Size: 160 bytes --] Ok, I've modified the /proc file document to reflect the proposed sysfs file changes and included it below. Any comments? Any objections? thanks, greg k-h [-- Attachment #2: sensors-sysfs --] [-- Type: text/plain, Size: 5796 bytes --] Naming and data format standards for sysfs files ------------------------------------------------ The libsensors library offers an interface to the raw sensors data through the sysfs interface. See libsensors documentation and source for more further information. An alternative method that some programs use is to access the sysfs files directly. This document briefly describes the standards that the drivers follow, so that an application program can scan for entries and access this data in a simple and consistent way. If you are developing a userspace application please send us feedback on this standard. Note that motherboards vary widely in the connections to sensor chips. There is no standard that ensures, for example, that the second temperature sensor is connected to the CPU, or that the second fan is on the CPU. Therefore, programs must provide a facility for the user to label or bind /proc entries for display. Sensor chips often have unused inputs that should be ignored by user programs. Each chip gets its own directory in the sysfs /sys/devices tree. To find all sensor chips, it is easier to follow the symlinks from /sys/i2c/devices/ All sysfs values are fixed point numbers. To get the true value of some of the values, you should divide by the specified value. There is only one value per file, unlike the older /proc specification. Alarms are direct indications read from the chips. The drivers do NOT make comparisons of readings to thresholds. This allows violations between readings to be caught and alarmed. The exact definition of an alarm (for example, whether a threshold must be met or must be exceeded to cause an alarm) is chip-dependent. ------------------------------------------------------------------------- sysfs entries are as follows: Entry Function ----- -------- alarms Alarm bitmask. Read only. Integer representation of one to four bytes. A '1' bit means an alarm. Chips should be programmed for 'comparator' mode so that the alarm will 'come back' after you read the register if it is still valid. Generally a direct representation of a chip's internal alarm registers; there is no standard for the position of individual bits. Bits are defined in kernel/include/sensors.h. beep_enable Beep/interrupt enable 0 to disable. 1 to enable. Read/Write beep_mask Bitmask for beep. Same format as 'alarms' with the same bit locations. Read only. curr_max[1-n] Current max value Fixed point XXXX, divide by 100 to get Amps. Read/Write. curr_min[1-n] Current min or hysteresis value. Preferably a hysteresis value, reported as a absolute current, NOT a delta from the max value. Fixed point XXXX, divide by 100 to get Amps. Read/Write. curr_input[1-n] Current input value Fixed point XXXX, divide by 100 to get Amps. Read only. fan_min[1-3] Fan minimum value Integer value indicating RPM Read/Write. fan_input[1-3] Fan input value. Integer value indicating RPM Read only. fan_div[1-3] Fan divisor. Integers in powers of two (1,2,4,8,16,32,64,128). Some chips only support values 1,2,4,8. See doc/fan-divisors for details. in_min[0-8] Voltage min value. Fixed point value in form XXX. Divide by 100 to get Volts. Read/Write in_max[0-8] Voltage max value. Fixed point value in form XXX. Divide by 100 to get Volts. Read/Write in_input[0-8] Voltage input value. Fixed point value in form XXX. Divide by 100 to get Volts. Read only Actual voltage depends on the scaling resistors on the motherboard, as recommended in the chip datasheet. This varies by chip and by motherboard. Because of this variation, values are generally NOT scaled by the chip driver, and must be done by the application. However, some drivers (notably lm87 and via686a) do scale, with various degrees of success. These drivers will output the actual voltage. First two values are read/write and third is read only. Typical usage: in_*0 CPU #1 voltage (not scaled) in_*1 CPU #1 voltage (not scaled) in_*2 3.3V nominal (not scaled) in_*3 5.0V nominal (scaled) in_*4 12.0V nominal (scaled) in_*5 -12.0V nominal (scaled) in_*6 -5.0V nominal (scaled) in_*7 varies in_*8 varies pwn[1-3] Pulse width modulation fan control. Integer 0 - 255 Read/Write 255 is max or 100%. Corresponds to the fans 1-3. pwn_enable[1-3] pwn enable not always present even if pwn* is. 0 to turn off 1 to turn on Read/Write sensor[1-3] Sensor type selection. Integers 1,2,3, or thermistor Beta value (3435) Read/Write. temp_max[1-3] Temperature max value. Fixed point value in form XXXXX and should be divided by 100 to get degrees Celsius. Read/Write value. temp_min[1-3] Temperature min or hysteresis value. Fixed point value in form XXXXX and should be divided by 100 to get degrees Celsius. This is preferably a hysteresis value, reported as a absolute temperature, NOT a delta from the max value. Read/Write value. temp_input[1-3] Temperature input value. Read only value. If there are multiple temperature sensors, temp_*1 is generally the sensor inside the chip itself, generally reported as "motherboard temperature". temp_*2 and temp_*3 are generally sensors external to the chip itself, for example the thermal diode inside the CPU or a thermistor nearby. vid CPU core voltage. Read only. Fixed point value in form XXXX corresponding to CPU core voltage as told to the sensor chip. Divide by 1000 to get Volts. Not always correct. vrm Voltage Regulator Module version number. Read only. Two digit number (XX), first is major version, second is minor version. Affects the way the driver calculates the core voltage from the vid pins. See doc/vid for details. ^ permalink raw reply [flat|nested] 89+ messages in thread
* lm sensors sysfs file structure @ 2005-05-19 6:23 ` Greg KH 0 siblings, 0 replies; 89+ messages in thread From: Greg KH @ 2005-05-19 6:23 UTC (permalink / raw) To: linux-kernel, sensors Ok, I've modified the /proc file document to reflect the proposed sysfs file changes and included it below. Any comments? Any objections? thanks, greg k-h -------------- next part -------------- Naming and data format standards for sysfs files ------------------------------------------------ The libsensors library offers an interface to the raw sensors data through the sysfs interface. See libsensors documentation and source for more further information. An alternative method that some programs use is to access the sysfs files directly. This document briefly describes the standards that the drivers follow, so that an application program can scan for entries and access this data in a simple and consistent way. If you are developing a userspace application please send us feedback on this standard. Note that motherboards vary widely in the connections to sensor chips. There is no standard that ensures, for example, that the second temperature sensor is connected to the CPU, or that the second fan is on the CPU. Therefore, programs must provide a facility for the user to label or bind /proc entries for display. Sensor chips often have unused inputs that should be ignored by user programs. Each chip gets its own directory in the sysfs /sys/devices tree. To find all sensor chips, it is easier to follow the symlinks from /sys/i2c/devices/ All sysfs values are fixed point numbers. To get the true value of some of the values, you should divide by the specified value. There is only one value per file, unlike the older /proc specification. Alarms are direct indications read from the chips. The drivers do NOT make comparisons of readings to thresholds. This allows violations between readings to be caught and alarmed. The exact definition of an alarm (for example, whether a threshold must be met or must be exceeded to cause an alarm) is chip-dependent. ------------------------------------------------------------------------- sysfs entries are as follows: Entry Function ----- -------- alarms Alarm bitmask. Read only. Integer representation of one to four bytes. A '1' bit means an alarm. Chips should be programmed for 'comparator' mode so that the alarm will 'come back' after you read the register if it is still valid. Generally a direct representation of a chip's internal alarm registers; there is no standard for the position of individual bits. Bits are defined in kernel/include/sensors.h. beep_enable Beep/interrupt enable 0 to disable. 1 to enable. Read/Write beep_mask Bitmask for beep. Same format as 'alarms' with the same bit locations. Read only. curr_max[1-n] Current max value Fixed point XXXX, divide by 100 to get Amps. Read/Write. curr_min[1-n] Current min or hysteresis value. Preferably a hysteresis value, reported as a absolute current, NOT a delta from the max value. Fixed point XXXX, divide by 100 to get Amps. Read/Write. curr_input[1-n] Current input value Fixed point XXXX, divide by 100 to get Amps. Read only. fan_min[1-3] Fan minimum value Integer value indicating RPM Read/Write. fan_input[1-3] Fan input value. Integer value indicating RPM Read only. fan_div[1-3] Fan divisor. Integers in powers of two (1,2,4,8,16,32,64,128). Some chips only support values 1,2,4,8. See doc/fan-divisors for details. in_min[0-8] Voltage min value. Fixed point value in form XXX. Divide by 100 to get Volts. Read/Write in_max[0-8] Voltage max value. Fixed point value in form XXX. Divide by 100 to get Volts. Read/Write in_input[0-8] Voltage input value. Fixed point value in form XXX. Divide by 100 to get Volts. Read only Actual voltage depends on the scaling resistors on the motherboard, as recommended in the chip datasheet. This varies by chip and by motherboard. Because of this variation, values are generally NOT scaled by the chip driver, and must be done by the application. However, some drivers (notably lm87 and via686a) do scale, with various degrees of success. These drivers will output the actual voltage. First two values are read/write and third is read only. Typical usage: in_*0 CPU #1 voltage (not scaled) in_*1 CPU #1 voltage (not scaled) in_*2 3.3V nominal (not scaled) in_*3 5.0V nominal (scaled) in_*4 12.0V nominal (scaled) in_*5 -12.0V nominal (scaled) in_*6 -5.0V nominal (scaled) in_*7 varies in_*8 varies pwn[1-3] Pulse width modulation fan control. Integer 0 - 255 Read/Write 255 is max or 100%. Corresponds to the fans 1-3. pwn_enable[1-3] pwn enable not always present even if pwn* is. 0 to turn off 1 to turn on Read/Write sensor[1-3] Sensor type selection. Integers 1,2,3, or thermistor Beta value (3435) Read/Write. temp_max[1-3] Temperature max value. Fixed point value in form XXXXX and should be divided by 100 to get degrees Celsius. Read/Write value. temp_min[1-3] Temperature min or hysteresis value. Fixed point value in form XXXXX and should be divided by 100 to get degrees Celsius. This is preferably a hysteresis value, reported as a absolute temperature, NOT a delta from the max value. Read/Write value. temp_input[1-3] Temperature input value. Read only value. If there are multiple temperature sensors, temp_*1 is generally the sensor inside the chip itself, generally reported as "motherboard temperature". temp_*2 and temp_*3 are generally sensors external to the chip itself, for example the thermal diode inside the CPU or a thermistor nearby. vid CPU core voltage. Read only. Fixed point value in form XXXX corresponding to CPU core voltage as told to the sensor chip. Divide by 1000 to get Volts. Not always correct. vrm Voltage Regulator Module version number. Read only. Two digit number (XX), first is major version, second is minor version. Affects the way the driver calculates the core voltage from the vid pins. See doc/vid for details. ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: lm sensors sysfs file structure 2005-05-19 6:23 ` Greg KH @ 2005-05-19 6:23 ` Jan Dittmer -1 siblings, 0 replies; 89+ messages in thread From: Jan Dittmer @ 2003-03-27 20:32 UTC (permalink / raw) To: Greg KH; +Cc: linux-kernel, sensors Greg KH wrote: > fan_min[1-3] Fan minimum value > in_min[0-8] Voltage min value. > pwn[1-3] Pulse width modulation fan control. > temp_input[1-3] Temperature input value. Why not start all these counts from 0? Is there any reason to start from 1? Historical reasons or does the datasheet start the counting from 1? Jan ^ permalink raw reply [flat|nested] 89+ messages in thread
* lm sensors sysfs file structure @ 2005-05-19 6:23 ` Jan Dittmer 0 siblings, 0 replies; 89+ messages in thread From: Jan Dittmer @ 2005-05-19 6:23 UTC (permalink / raw) To: Greg KH; +Cc: linux-kernel, sensors Greg KH wrote: > fan_min[1-3] Fan minimum value > in_min[0-8] Voltage min value. > pwn[1-3] Pulse width modulation fan control. > temp_input[1-3] Temperature input value. Why not start all these counts from 0? Is there any reason to start from 1? Historical reasons or does the datasheet start the counting from 1? Jan ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: lm sensors sysfs file structure 2005-05-19 6:23 ` Jan Dittmer @ 2005-05-19 6:23 ` Greg KH -1 siblings, 0 replies; 89+ messages in thread From: Greg KH @ 2003-03-27 21:53 UTC (permalink / raw) To: Jan Dittmer; +Cc: linux-kernel, sensors On Thu, Mar 27, 2003 at 09:32:46PM +0100, Jan Dittmer wrote: > Greg KH wrote: > > >fan_min[1-3] Fan minimum value > >in_min[0-8] Voltage min value. > >pwn[1-3] Pulse width modulation fan control. > >temp_input[1-3] Temperature input value. > Why not start all these counts from 0? Is there any reason to start from > 1? Historical reasons or does the datasheet start the counting from 1? Hm, good point. It looks like most of the values started at 1, with the one exception being the voltage files "in". I don't know why it's this way, history? Perhaps someone from the sensors project can tell us. thanks, greg k-h ^ permalink raw reply [flat|nested] 89+ messages in thread
* lm sensors sysfs file structure @ 2005-05-19 6:23 ` Greg KH 0 siblings, 0 replies; 89+ messages in thread From: Greg KH @ 2005-05-19 6:23 UTC (permalink / raw) To: Jan Dittmer; +Cc: linux-kernel, sensors On Thu, Mar 27, 2003 at 09:32:46PM +0100, Jan Dittmer wrote: > Greg KH wrote: > > >fan_min[1-3] Fan minimum value > >in_min[0-8] Voltage min value. > >pwn[1-3] Pulse width modulation fan control. > >temp_input[1-3] Temperature input value. > Why not start all these counts from 0? Is there any reason to start from > 1? Historical reasons or does the datasheet start the counting from 1? Hm, good point. It looks like most of the values started at 1, with the one exception being the voltage files "in". I don't know why it's this way, history? Perhaps someone from the sensors project can tell us. thanks, greg k-h ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: lm sensors sysfs file structure 2005-05-19 6:23 ` Greg KH @ 2005-05-19 6:23 ` Mark M. Hoffman -1 siblings, 0 replies; 89+ messages in thread From: Mark M. Hoffman @ 2003-03-27 22:23 UTC (permalink / raw) To: Greg KH; +Cc: Jan Dittmer, linux-kernel, sensors * Greg KH <greg@kroah.com> [2003-03-27 13:53:44 -0800]: > On Thu, Mar 27, 2003 at 09:32:46PM +0100, Jan Dittmer wrote: > > Greg KH wrote: > > > > >fan_min[1-3] Fan minimum value > > >in_min[0-8] Voltage min value. > > >pwn[1-3] Pulse width modulation fan control. > > >temp_input[1-3] Temperature input value. > > Why not start all these counts from 0? Is there any reason to start from > > 1? Historical reasons or does the datasheet start the counting from 1? > > Hm, good point. It looks like most of the values started at 1, with the > one exception being the voltage files "in". > > I don't know why it's this way, history? Perhaps someone from the > sensors project can tell us. Hardware designers tend to count devices starting with "1". Silly them. :) Regards, -- Mark M. Hoffman mhoffman@lightlink.com ^ permalink raw reply [flat|nested] 89+ messages in thread
* lm sensors sysfs file structure @ 2005-05-19 6:23 ` Mark M. Hoffman 0 siblings, 0 replies; 89+ messages in thread From: Mark M. Hoffman @ 2005-05-19 6:23 UTC (permalink / raw) To: Greg KH; +Cc: Jan Dittmer, linux-kernel, sensors * Greg KH <greg@kroah.com> [2003-03-27 13:53:44 -0800]: > On Thu, Mar 27, 2003 at 09:32:46PM +0100, Jan Dittmer wrote: > > Greg KH wrote: > > > > >fan_min[1-3] Fan minimum value > > >in_min[0-8] Voltage min value. > > >pwn[1-3] Pulse width modulation fan control. > > >temp_input[1-3] Temperature input value. > > Why not start all these counts from 0? Is there any reason to start from > > 1? Historical reasons or does the datasheet start the counting from 1? > > Hm, good point. It looks like most of the values started at 1, with the > one exception being the voltage files "in". > > I don't know why it's this way, history? Perhaps someone from the > sensors project can tell us. Hardware designers tend to count devices starting with "1". Silly them. :) Regards, -- Mark M. Hoffman mhoffman@lightlink.com ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: lm sensors sysfs file structure 2005-05-19 6:23 ` Greg KH @ 2005-05-19 6:23 ` Martin Schlemmer -1 siblings, 0 replies; 89+ messages in thread From: Martin Schlemmer @ 2003-03-28 6:05 UTC (permalink / raw) To: Greg KH; +Cc: Jan Dittmer, KML, sensors On Thu, 2003-03-27 at 23:53, Greg KH wrote: > On Thu, Mar 27, 2003 at 09:32:46PM +0100, Jan Dittmer wrote: > > Greg KH wrote: > > > > >fan_min[1-3] Fan minimum value > > >in_min[0-8] Voltage min value. > > >pwn[1-3] Pulse width modulation fan control. > > >temp_input[1-3] Temperature input value. > > Why not start all these counts from 0? Is there any reason to start from > > 1? Historical reasons or does the datasheet start the counting from 1? > > Hm, good point. It looks like most of the values started at 1, with the > one exception being the voltage files "in". > > I don't know why it's this way, history? Perhaps someone from the > sensors project can tell us. > Might be because you usually have marked on the boards fan1, fan2, etc. Thus it should be less confusing for the user, as it is a more 1-1 mapping to the real locations. As the voltage inputs just have to be mapped correctly, it should not bother him ? Regards, -- Martin Schlemmer ^ permalink raw reply [flat|nested] 89+ messages in thread
* lm sensors sysfs file structure @ 2005-05-19 6:23 ` Martin Schlemmer 0 siblings, 0 replies; 89+ messages in thread From: Martin Schlemmer @ 2005-05-19 6:23 UTC (permalink / raw) To: Greg KH; +Cc: Jan Dittmer, KML, sensors On Thu, 2003-03-27 at 23:53, Greg KH wrote: > On Thu, Mar 27, 2003 at 09:32:46PM +0100, Jan Dittmer wrote: > > Greg KH wrote: > > > > >fan_min[1-3] Fan minimum value > > >in_min[0-8] Voltage min value. > > >pwn[1-3] Pulse width modulation fan control. > > >temp_input[1-3] Temperature input value. > > Why not start all these counts from 0? Is there any reason to start from > > 1? Historical reasons or does the datasheet start the counting from 1? > > Hm, good point. It looks like most of the values started at 1, with the > one exception being the voltage files "in". > > I don't know why it's this way, history? Perhaps someone from the > sensors project can tell us. > Might be because you usually have marked on the boards fan1, fan2, etc. Thus it should be less confusing for the user, as it is a more 1-1 mapping to the real locations. As the voltage inputs just have to be mapped correctly, it should not bother him ? Regards, -- Martin Schlemmer ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: lm sensors sysfs file structure 2005-05-19 6:23 ` Greg KH @ 2005-05-19 6:23 ` Pavel Machek -1 siblings, 0 replies; 89+ messages in thread From: Pavel Machek @ 2003-03-28 18:34 UTC (permalink / raw) To: Greg KH Cc: Mark Studebaker, Jan Dittmer, azarah, KML, Dominik Brodowski, sensors Hi! > temp_min[1-3] Temperature min or hysteresis value. > Fixed point value in form XXXXX and should be divided by > 100 to get degrees Celsius. This is preferably a I believe floating point is nicer... It is improbable to have miliKelvins around, still I don'n see why fixedpoint... Pavel -- Pavel Written on sharp zaurus, because my Velo1 broke. If you have Velo you don't need... ^ permalink raw reply [flat|nested] 89+ messages in thread
* lm sensors sysfs file structure @ 2005-05-19 6:23 ` Pavel Machek 0 siblings, 0 replies; 89+ messages in thread From: Pavel Machek @ 2005-05-19 6:23 UTC (permalink / raw) To: Greg KH Cc: Mark Studebaker, Jan Dittmer, azarah, KML, Dominik Brodowski, sensors Hi! > temp_min[1-3] Temperature min or hysteresis value. > Fixed point value in form XXXXX and should be divided by > 100 to get degrees Celsius. This is preferably a I believe floating point is nicer... It is improbable to have miliKelvins around, still I don'n see why fixedpoint... Pavel -- Pavel Written on sharp zaurus, because my Velo1 broke. If you have Velo you don't need... ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: w83781d i2c driver updated for 2.5.66 (without sysfs support) 2005-05-19 6:23 ` Martin Schlemmer @ 2005-05-19 6:23 ` Greg KH -1 siblings, 0 replies; 89+ messages in thread From: Greg KH @ 2003-03-26 20:29 UTC (permalink / raw) To: Martin Schlemmer; +Cc: KML, Dominik Brodowski, sensors On Wed, Mar 26, 2003 at 09:04:33PM +0200, Martin Schlemmer wrote: > Hi > > Ok, this is the w83781d driver updated for 2.5.66bk2. It works > over here. Looks nice, thanks. Some of the nasty casts should be fixed up though. Stuff like: > + ERROR7: > + if (!is_isa) > + i2c_detach_client(& > + (((struct w83781d_data > + *) (i2c_get_clientdata(new_client)))-> > + lm75[1])); > + ERROR6: > + if (!is_isa) > + i2c_detach_client(& > + (((struct w83781d_data > + *) (i2c_get_clientdata(new_client)))-> > + lm75[0])); > + ERROR5: > + if (!is_isa) > + kfree(((struct w83781d_data *) (i2c_get_clientdata(new_client)))-> > + lm75); Is just obnoxious :) I'll hold off sending this driver to Linus until it gets cleaned up with sysfs entries, as I'd rather not pollute /proc and sysctls anymore. thanks, greg k-h ^ permalink raw reply [flat|nested] 89+ messages in thread
* w83781d i2c driver updated for 2.5.66 (without sysfs support) @ 2005-05-19 6:23 ` Greg KH 0 siblings, 0 replies; 89+ messages in thread From: Greg KH @ 2005-05-19 6:23 UTC (permalink / raw) To: Martin Schlemmer; +Cc: KML, Dominik Brodowski, sensors On Wed, Mar 26, 2003 at 09:04:33PM +0200, Martin Schlemmer wrote: > Hi > > Ok, this is the w83781d driver updated for 2.5.66bk2. It works > over here. Looks nice, thanks. Some of the nasty casts should be fixed up though. Stuff like: > + ERROR7: > + if (!is_isa) > + i2c_detach_client(& > + (((struct w83781d_data > + *) (i2c_get_clientdata(new_client)))-> > + lm75[1])); > + ERROR6: > + if (!is_isa) > + i2c_detach_client(& > + (((struct w83781d_data > + *) (i2c_get_clientdata(new_client)))-> > + lm75[0])); > + ERROR5: > + if (!is_isa) > + kfree(((struct w83781d_data *) (i2c_get_clientdata(new_client)))-> > + lm75); Is just obnoxious :) I'll hold off sending this driver to Linus until it gets cleaned up with sysfs entries, as I'd rather not pollute /proc and sysctls anymore. thanks, greg k-h ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: w83781d i2c driver updated for 2.5.66 (without sysfs support) 2005-05-19 6:23 ` Greg KH @ 2005-05-19 6:23 ` Martin Schlemmer -1 siblings, 0 replies; 89+ messages in thread From: Martin Schlemmer @ 2003-03-26 23:34 UTC (permalink / raw) To: Greg KH; +Cc: KML, Dominik Brodowski, sensors [-- Attachment #1: Type: text/plain, Size: 857 bytes --] On Wed, 2003-03-26 at 22:29, Greg KH wrote: > Some of the nasty casts should be fixed up though. Stuff like: > > > + ERROR7: > > + if (!is_isa) > > + i2c_detach_client(& > > + (((struct w83781d_data > > + *) (i2c_get_clientdata(new_client)))-> > > + lm75[1])); > > + ERROR6: > > + if (!is_isa) > > + i2c_detach_client(& > > + (((struct w83781d_data > > + *) (i2c_get_clientdata(new_client)))-> > > + lm75[0])); > > + ERROR5: > > + if (!is_isa) > > + kfree(((struct w83781d_data *) (i2c_get_clientdata(new_client)))-> > > + lm75); > > Is just obnoxious :) > Quick question .... With sysfs, is it not needed to call i2c_detach_client ? I am asking this as it seems from patches that you remove all these calls ... Regards, -- Martin Schlemmer [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 189 bytes --] ^ permalink raw reply [flat|nested] 89+ messages in thread
* w83781d i2c driver updated for 2.5.66 (without sysfs support) @ 2005-05-19 6:23 ` Martin Schlemmer 0 siblings, 0 replies; 89+ messages in thread From: Martin Schlemmer @ 2005-05-19 6:23 UTC (permalink / raw) To: Greg KH; +Cc: KML, Dominik Brodowski, sensors On Wed, 2003-03-26 at 22:29, Greg KH wrote: > Some of the nasty casts should be fixed up though. Stuff like: > > > + ERROR7: > > + if (!is_isa) > > + i2c_detach_client(& > > + (((struct w83781d_data > > + *) (i2c_get_clientdata(new_client)))-> > > + lm75[1])); > > + ERROR6: > > + if (!is_isa) > > + i2c_detach_client(& > > + (((struct w83781d_data > > + *) (i2c_get_clientdata(new_client)))-> > > + lm75[0])); > > + ERROR5: > > + if (!is_isa) > > + kfree(((struct w83781d_data *) (i2c_get_clientdata(new_client)))-> > > + lm75); > > Is just obnoxious :) > Quick question .... With sysfs, is it not needed to call i2c_detach_client ? I am asking this as it seems from patches that you remove all these calls ... Regards, -- Martin Schlemmer -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part Url : http://lists.lm-sensors.org/pipermail/lm-sensors/attachments/20030327/e8b15229/attachment.bin ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: w83781d i2c driver updated for 2.5.66 (without sysfs support) 2005-05-19 6:23 ` Martin Schlemmer @ 2005-05-19 6:23 ` Greg KH -1 siblings, 0 replies; 89+ messages in thread From: Greg KH @ 2003-03-26 23:46 UTC (permalink / raw) To: Martin Schlemmer; +Cc: KML, Dominik Brodowski, sensors On Thu, Mar 27, 2003 at 01:34:32AM +0200, Martin Schlemmer wrote: > > Quick question .... With sysfs, is it not needed to call > i2c_detach_client ? I am asking this as it seems from patches > that you remove all these calls ... No, that's still required. I didn't delete that in my lm75.c patch, did I? You just don't have to call i2c_deregister_entry, as we don't call i2c_register_entry anymore. thanks, greg k-h ^ permalink raw reply [flat|nested] 89+ messages in thread
* w83781d i2c driver updated for 2.5.66 (without sysfs support) @ 2005-05-19 6:23 ` Greg KH 0 siblings, 0 replies; 89+ messages in thread From: Greg KH @ 2005-05-19 6:23 UTC (permalink / raw) To: Martin Schlemmer; +Cc: KML, Dominik Brodowski, sensors On Thu, Mar 27, 2003 at 01:34:32AM +0200, Martin Schlemmer wrote: > > Quick question .... With sysfs, is it not needed to call > i2c_detach_client ? I am asking this as it seems from patches > that you remove all these calls ... No, that's still required. I didn't delete that in my lm75.c patch, did I? You just don't have to call i2c_deregister_entry, as we don't call i2c_register_entry anymore. thanks, greg k-h ^ permalink raw reply [flat|nested] 89+ messages in thread
* [PATCH-2.5] w83781d i2c driver updated for 2.5.66-bk4 (with sysfs support, empty tree) 2005-05-19 6:23 ` Greg KH @ 2005-05-19 6:23 ` Martin Schlemmer -1 siblings, 0 replies; 89+ messages in thread From: Martin Schlemmer @ 2003-03-30 12:47 UTC (permalink / raw) To: Greg KH; +Cc: KML, Dominik Brodowski, sensors [-- Attachment #1.1: Type: text/plain, Size: 527 bytes --] Hi This should have a working w83781d driver updated for 2.5.66-bk4. Currently sysfs support is working, and are according to the spec (sensors-sysfs) in the 'lm sensors sysfs file structure' thread. Thus I used 'temp_input[1-3]', as there was not final decision on having them temp_input[0-2] as well, for example. This patch is against a 'vanilla' 2.5.66-bk4 (do not have w83781d.c from lm_sensors2 cvs present). Retry, as previous did not go through due to size. Regards, -- Martin Schlemmer [-- Attachment #1.2: i2c-chip-w83781d-2.5.66bk4.patch --] [-- Type: text/x-patch, Size: 67456 bytes --] diff -urPp ../linux-2.5.66bk4/drivers/i2c/chips/Kconfig linux.w83781d/drivers/i2c/chips/Kconfig --- ../linux-2.5.66bk4/drivers/i2c/chips/Kconfig 2003-03-25 00:00:45.000000000 +0200 +++ linux.w83781d/drivers/i2c/chips/Kconfig 2003-03-25 18:54:07.000000000 +0200 @@ -36,5 +36,19 @@ config SENSORS_LM75 You will also need the latest user-space utilties: you can find them in the lm_sensors package, which you can download at http://www.lm-sensors.nu + +config SENSORS_W83781D + tristate " Winbond W83781D, W83782D, W83783S, W83627HF, Asus AS99127F" + depends on I2C && I2C_PROC + help + If you say yes here you get support for the Winbond W8378x series + of sensor chips: the W83781D, W83782D, W83783S and W83682HF, + and the similar Asus AS99127F. This + can also be built as a module which can be inserted and removed + while the kernel is running. + + You will also need the latest user-space utilties: you can find them + in the lm_sensors package, which you can download at + http://www.lm-sensors.nu endmenu diff -urPp ../linux-2.5.66bk4/drivers/i2c/chips/Makefile linux.w83781d/drivers/i2c/chips/Makefile --- ../linux-2.5.66bk4/drivers/i2c/chips/Makefile 2003-03-24 23:59:53.000000000 +0200 +++ linux.w83781d/drivers/i2c/chips/Makefile 2003-03-25 18:54:11.000000000 +0200 @@ -4,3 +4,4 @@ obj-$(CONFIG_SENSORS_ADM1021) += adm1021.o obj-$(CONFIG_SENSORS_LM75) += lm75.o +obj-$(CONFIG_SENSORS_W83781D) += w83781d.o diff -urPp ../linux-2.5.66bk4/drivers/i2c/chips/w83781d.c linux.w83781d/drivers/i2c/chips/w83781d.c --- ../linux-2.5.66bk4/drivers/i2c/chips/w83781d.c 1970-01-01 02:00:00.000000000 +0200 +++ linux.w83781d/drivers/i2c/chips/w83781d.c 2003-03-30 08:28:43.000000000 +0200 @@ -0,0 +1,1884 @@ +/* + w83781d.c - Part of lm_sensors, Linux kernel modules for hardware + monitoring + Copyright (c) 1998 - 2001 Frodo Looijaard <frodol@dds.nl>, + Philip Edelbrock <phil@netroedge.com>, + and Mark Studebaker <mdsxyz123@yahoo.com> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +/* + Supports following chips: + + Chip #vin #fanin #pwm #temp wchipid vendid i2c ISA + as99127f 7 3 1? 3 0x30 0x12c3 yes no + asb100 "bach" (type_name = as99127f) 0x30 0x0694 yes no + w83781d 7 3 0 3 0x10 0x5ca3 yes yes + w83627hf 9 3 2 3 0x20 0x5ca3 yes yes(LPC) + w83782d 9 3 2-4 3 0x30 0x5ca3 yes yes + w83783s 5-6 3 2 1-2 0x40 0x5ca3 yes no + w83697hf 8 2 2 2 0x60 0x5ca3 no yes(LPC) + +*/ + +#include <linux/module.h> +#include <linux/init.h> +#include <linux/slab.h> +#include <linux/i2c.h> +#include <linux/i2c-proc.h> +#include <linux/i2c-vid.h> +#include <asm/io.h> + +/* RT Table support #defined so we can take it out if it gets bothersome */ +#define W83781D_RT 1 + +/* Addresses to scan */ +static unsigned short normal_i2c[] = { SENSORS_I2C_END }; +static unsigned short normal_i2c_range[] = { 0x20, 0x2f, SENSORS_I2C_END }; +static unsigned int normal_isa[] = { 0x0290, SENSORS_ISA_END }; +static unsigned int normal_isa_range[] = { SENSORS_ISA_END }; + +/* Insmod parameters */ +SENSORS_INSMOD_6(w83781d, w83782d, w83783s, w83627hf, as99127f, w83697hf); +SENSORS_MODULE_PARM(force_subclients, "List of subclient addresses: " + "{bus, clientaddr, subclientaddr1, subclientaddr2}"); + +static int init = 1; +MODULE_PARM(init, "i"); +MODULE_PARM_DESC(init, "Set to zero to bypass chip initialization"); + +/* Constants specified below */ + +/* Length of ISA address segment */ +#define W83781D_EXTENT 8 + +/* Where are the ISA address/data registers relative to the base address */ +#define W83781D_ADDR_REG_OFFSET 5 +#define W83781D_DATA_REG_OFFSET 6 + +/* The W83781D registers */ +/* The W83782D registers for nr=7,8 are in bank 5 */ +#define W83781D_REG_IN_MAX(nr) ((nr < 7) ? (0x2b + (nr) * 2) : \ + (0x554 + (((nr) - 7) * 2))) +#define W83781D_REG_IN_MIN(nr) ((nr < 7) ? (0x2c + (nr) * 2) : \ + (0x555 + (((nr) - 7) * 2))) +#define W83781D_REG_IN(nr) ((nr < 7) ? (0x20 + (nr)) : \ + (0x550 + (nr) - 7)) + +#define W83781D_REG_FAN_MIN(nr) (0x3a + (nr)) +#define W83781D_REG_FAN(nr) (0x27 + (nr)) + +#define W83781D_REG_BANK 0x4E +#define W83781D_REG_TEMP2_CONFIG 0x152 +#define W83781D_REG_TEMP3_CONFIG 0x252 +#define W83781D_REG_TEMP(nr) ((nr == 3) ? (0x0250) : \ + ((nr == 2) ? (0x0150) : \ + (0x27))) +#define W83781D_REG_TEMP_HYST(nr) ((nr == 3) ? (0x253) : \ + ((nr == 2) ? (0x153) : \ + (0x3A))) +#define W83781D_REG_TEMP_OVER(nr) ((nr == 3) ? (0x255) : \ + ((nr == 2) ? (0x155) : \ + (0x39))) + +#define W83781D_REG_CONFIG 0x40 +#define W83781D_REG_ALARM1 0x41 +#define W83781D_REG_ALARM2 0x42 +#define W83781D_REG_ALARM3 0x450 /* not on W83781D */ + +#define W83781D_REG_IRQ 0x4C +#define W83781D_REG_BEEP_CONFIG 0x4D +#define W83781D_REG_BEEP_INTS1 0x56 +#define W83781D_REG_BEEP_INTS2 0x57 +#define W83781D_REG_BEEP_INTS3 0x453 /* not on W83781D */ + +#define W83781D_REG_VID_FANDIV 0x47 + +#define W83781D_REG_CHIPID 0x49 +#define W83781D_REG_WCHIPID 0x58 +#define W83781D_REG_CHIPMAN 0x4F +#define W83781D_REG_PIN 0x4B + +/* 782D/783S only */ +#define W83781D_REG_VBAT 0x5D + +/* PWM 782D (1-4) and 783S (1-2) only */ +#define W83781D_REG_PWM1 0x5B /* 782d and 783s/627hf datasheets disagree */ + /* on which is which; */ +#define W83781D_REG_PWM2 0x5A /* We follow the 782d convention here, */ + /* However 782d is probably wrong. */ +#define W83781D_REG_PWM3 0x5E +#define W83781D_REG_PWM4 0x5F +#define W83781D_REG_PWMCLK12 0x5C +#define W83781D_REG_PWMCLK34 0x45C +static const u8 regpwm[] = { W83781D_REG_PWM1, W83781D_REG_PWM2, + W83781D_REG_PWM3, W83781D_REG_PWM4 +}; + +#define W83781D_REG_PWM(nr) (regpwm[(nr) - 1]) + +#define W83781D_REG_I2C_ADDR 0x48 +#define W83781D_REG_I2C_SUBADDR 0x4A + +/* The following are undocumented in the data sheets however we + received the information in an email from Winbond tech support */ +/* Sensor selection - not on 781d */ +#define W83781D_REG_SCFG1 0x5D +static const u8 BIT_SCFG1[] = { 0x02, 0x04, 0x08 }; + +#define W83781D_REG_SCFG2 0x59 +static const u8 BIT_SCFG2[] = { 0x10, 0x20, 0x40 }; + +#define W83781D_DEFAULT_BETA 3435 + +/* RT Table registers */ +#define W83781D_REG_RT_IDX 0x50 +#define W83781D_REG_RT_VAL 0x51 + +/* Conversions. Rounding and limit checking is only done on the TO_REG + variants. Note that you should be a bit careful with which arguments + these macros are called: arguments may be evaluated more than once. + Fixing this is just not worth it. */ +#define IN_TO_REG(val) (SENSORS_LIMIT((((val) * 10 + 8)/16),0,255)) +#define IN_FROM_REG(val) (((val) * 16) / 10) + +static inline u8 +FAN_TO_REG(long rpm, int div) +{ + if (rpm == 0) + return 255; + rpm = SENSORS_LIMIT(rpm, 1, 1000000); + return SENSORS_LIMIT((1350000 + rpm * div / 2) / (rpm * div), 1, 254); +} + +#define FAN_FROM_REG(val,div) ((val) == 0 ? -1 : \ + ((val) == 255 ? 0 : \ + 1350000 / ((val) * (div)))) + +#define TEMP_TO_REG(val) (SENSORS_LIMIT(((val / 10) < 0 ? (((val / 10) - 5) / 10) : \ + ((val / 10) + 5) / 10), 0, 255)) +#define TEMP_FROM_REG(val) ((((val ) > 0x80 ? (val) - 0x100 : (val)) * 10) * 10) + +#define TEMP_ADD_TO_REG(val) (SENSORS_LIMIT(((((val / 10) + 2) / 5) << 7),\ + 0, 0xffff)) +#define TEMP_ADD_FROM_REG(val) ((((val) >> 7) * 5) * 10) + +#define AS99127_TEMP_ADD_TO_REG(val) (SENSORS_LIMIT((((((val / 10) + 2)*4)/10) \ + << 7), 0, 0xffff)) +#define AS99127_TEMP_ADD_FROM_REG(val) (((((val) >> 7) * 10) / 4) * 10) + +#define ALARMS_FROM_REG(val) (val) +#define PWM_FROM_REG(val) (val) +#define PWM_TO_REG(val) (SENSORS_LIMIT((val),0,255)) +#define BEEP_MASK_FROM_REG(val) (val) +#define BEEP_MASK_TO_REG(val) ((val) & 0xffffff) + +#define BEEP_ENABLE_TO_REG(val) ((val) ? 1 : 0) +#define BEEP_ENABLE_FROM_REG(val) ((val) ? 1 : 0) + +#define DIV_FROM_REG(val) (1 << (val)) + +static inline u8 +DIV_TO_REG(long val, enum chips type) +{ + int i; + val = SENSORS_LIMIT(val, 1, + ((type == w83781d + || type == as99127f) ? 8 : 128)) >> 1; + for (i = 0; i < 6; i++) { + if (val == 0) + break; + val >>= 1; + } + return ((u8) i); +} + +/* Initial limits */ +#define W83781D_INIT_IN_0 (vid == 3500 ? 280 : vid / 10) +#define W83781D_INIT_IN_1 (vid == 3500 ? 280 : vid / 10) +#define W83781D_INIT_IN_2 330 +#define W83781D_INIT_IN_3 (((500) * 100) / 168) +#define W83781D_INIT_IN_4 (((1200) * 10) / 38) +#define W83781D_INIT_IN_5 (((-1200) * -604) / 2100) +#define W83781D_INIT_IN_6 (((-500) * -604) / 909) +#define W83781D_INIT_IN_7 (((500) * 100) / 168) +#define W83781D_INIT_IN_8 300 +/* Initial limits for 782d/783s negative voltages */ +/* Note level shift. Change min/max below if you change these. */ +#define W83782D_INIT_IN_5 ((((-1200) + 1491) * 100)/514) +#define W83782D_INIT_IN_6 ((( (-500) + 771) * 100)/314) + +#define W83781D_INIT_IN_PERCENTAGE 10 +#define W83781D_INIT_IN_MIN(val) (val - val * W83781D_INIT_IN_PERCENTAGE / 100) +#define W83781D_INIT_IN_MAX(val) (val + val * W83781D_INIT_IN_PERCENTAGE / 100) + +#define W83781D_INIT_IN_MIN_0 W83781D_INIT_IN_MIN(W83781D_INIT_IN_0) +#define W83781D_INIT_IN_MAX_0 W83781D_INIT_IN_MAX(W83781D_INIT_IN_0) +#define W83781D_INIT_IN_MIN_1 W83781D_INIT_IN_MIN(W83781D_INIT_IN_1) +#define W83781D_INIT_IN_MAX_1 W83781D_INIT_IN_MAX(W83781D_INIT_IN_1) +#define W83781D_INIT_IN_MIN_2 W83781D_INIT_IN_MIN(W83781D_INIT_IN_2) +#define W83781D_INIT_IN_MAX_2 W83781D_INIT_IN_MAX(W83781D_INIT_IN_2) +#define W83781D_INIT_IN_MIN_3 W83781D_INIT_IN_MIN(W83781D_INIT_IN_3) +#define W83781D_INIT_IN_MAX_3 W83781D_INIT_IN_MAX(W83781D_INIT_IN_3) +#define W83781D_INIT_IN_MIN_4 W83781D_INIT_IN_MIN(W83781D_INIT_IN_4) +#define W83781D_INIT_IN_MAX_4 W83781D_INIT_IN_MAX(W83781D_INIT_IN_4) +#define W83781D_INIT_IN_MIN_5 W83781D_INIT_IN_MIN(W83781D_INIT_IN_5) +#define W83781D_INIT_IN_MAX_5 W83781D_INIT_IN_MAX(W83781D_INIT_IN_5) +#define W83781D_INIT_IN_MIN_6 W83781D_INIT_IN_MIN(W83781D_INIT_IN_6) +#define W83781D_INIT_IN_MAX_6 W83781D_INIT_IN_MAX(W83781D_INIT_IN_6) +#define W83781D_INIT_IN_MIN_7 W83781D_INIT_IN_MIN(W83781D_INIT_IN_7) +#define W83781D_INIT_IN_MAX_7 W83781D_INIT_IN_MAX(W83781D_INIT_IN_7) +#define W83781D_INIT_IN_MIN_8 W83781D_INIT_IN_MIN(W83781D_INIT_IN_8) +#define W83781D_INIT_IN_MAX_8 W83781D_INIT_IN_MAX(W83781D_INIT_IN_8) + +/* Initial limits for 782d/783s negative voltages */ +/* These aren't direct multiples because of level shift */ +/* Beware going negative - check */ +#define W83782D_INIT_IN_MIN_5_TMP \ + (((-1200 * (100 + W83781D_INIT_IN_PERCENTAGE)) + (1491 * 100))/514) +#define W83782D_INIT_IN_MIN_5 \ + ((W83782D_INIT_IN_MIN_5_TMP > 0) ? W83782D_INIT_IN_MIN_5_TMP : 0) +#define W83782D_INIT_IN_MAX_5 \ + (((-1200 * (100 - W83781D_INIT_IN_PERCENTAGE)) + (1491 * 100))/514) +#define W83782D_INIT_IN_MIN_6_TMP \ + ((( -500 * (100 + W83781D_INIT_IN_PERCENTAGE)) + (771 * 100))/314) +#define W83782D_INIT_IN_MIN_6 \ + ((W83782D_INIT_IN_MIN_6_TMP > 0) ? W83782D_INIT_IN_MIN_6_TMP : 0) +#define W83782D_INIT_IN_MAX_6 \ + ((( -500 * (100 - W83781D_INIT_IN_PERCENTAGE)) + (771 * 100))/314) + +#define W83781D_INIT_FAN_MIN_1 3000 +#define W83781D_INIT_FAN_MIN_2 3000 +#define W83781D_INIT_FAN_MIN_3 3000 + +/* temp = value / 100 */ +#define W83781D_INIT_TEMP_OVER 6000 +#define W83781D_INIT_TEMP_HYST 12700 /* must be 127 for ALARM to work */ +#define W83781D_INIT_TEMP2_OVER 6000 +#define W83781D_INIT_TEMP2_HYST 5000 +#define W83781D_INIT_TEMP3_OVER 6000 +#define W83781D_INIT_TEMP3_HYST 5000 + +/* There are some complications in a module like this. First off, W83781D chips + may be both present on the SMBus and the ISA bus, and we have to handle + those cases separately at some places. Second, there might be several + W83781D chips available (well, actually, that is probably never done; but + it is a clean illustration of how to handle a case like that). Finally, + a specific chip may be attached to *both* ISA and SMBus, and we would + not like to detect it double. Fortunately, in the case of the W83781D at + least, a register tells us what SMBus address we are on, so that helps + a bit - except if there could be more than one SMBus. Groan. No solution + for this yet. */ + +/* This module may seem overly long and complicated. In fact, it is not so + bad. Quite a lot of bookkeeping is done. A real driver can often cut + some corners. */ + +/* For each registered W83781D, we need to keep some data in memory. That + data is pointed to by w83781d_list[NR]->data. The structure itself is + dynamically allocated, at the same time when a new w83781d client is + allocated. */ +struct w83781d_data { + struct semaphore lock; + enum chips type; + + struct semaphore update_lock; + char valid; /* !=0 if following fields are valid */ + unsigned long last_updated; /* In jiffies */ + + struct i2c_client *lm75; /* for secondary I2C addresses */ + /* pointer to array of 2 subclients */ + + u8 in[9]; /* Register value - 8 & 9 for 782D only */ + u8 in_max[9]; /* Register value - 8 & 9 for 782D only */ + u8 in_min[9]; /* Register value - 8 & 9 for 782D only */ + u8 fan[3]; /* Register value */ + u8 fan_min[3]; /* Register value */ + u8 temp; + u8 temp_min; /* Register value */ + u8 temp_max; /* Register value */ + u16 temp_add[2]; /* Register value */ + u16 temp_max_add[2]; /* Register value */ + u16 temp_min_add[2]; /* Register value */ + u8 fan_div[3]; /* Register encoding, shifted right */ + u8 vid; /* Register encoding, combined */ + u32 alarms; /* Register encoding, combined */ + u32 beep_mask; /* Register encoding, combined */ + u8 beep_enable; /* Boolean */ + u8 pwm[4]; /* Register value */ + u8 pwmenable[4]; /* Boolean */ + u16 sens[3]; /* 782D/783S only. + 1 = pentium diode; 2 = 3904 diode; + 3000-5000 = thermistor beta. + Default = 3435. + Other Betas unimplemented */ +#ifdef W83781D_RT + u8 rt[3][32]; /* Register value */ +#endif + u8 vrm; +}; + +static int w83781d_attach_adapter(struct i2c_adapter *adapter); +static int w83781d_detect(struct i2c_adapter *adapter, int address, + unsigned short flags, int kind); +static int w83781d_detach_client(struct i2c_client *client); + +static int w83781d_read_value(struct i2c_client *client, u16 register); +static int w83781d_write_value(struct i2c_client *client, u16 register, + u16 value); +static void w83781d_update_client(struct i2c_client *client); +static void w83781d_init_client(struct i2c_client *client); + +static inline u16 swap_bytes(u16 val) +{ + return (val >> 8) | (val << 8); +} + +static struct i2c_driver w83781d_driver = { + .owner = THIS_MODULE, + .name = "w83781d", + .id = I2C_DRIVERID_W83781D, + .flags = I2C_DF_NOTIFY, + .attach_adapter = w83781d_attach_adapter, + .detach_client = w83781d_detach_client, +}; + +/* following are the sysfs callback functions */ +#define show_in_reg(reg) \ +static ssize_t show_##reg (struct device *dev, char *buf, int nr) \ +{ \ + struct i2c_client *client = to_i2c_client(dev); \ + struct w83781d_data *data = i2c_get_clientdata(client); \ + \ + w83781d_update_client(client); \ + \ + return sprintf(buf,"%ld\n", (long)IN_FROM_REG(data->reg[nr])); \ +} +show_in_reg(in); +show_in_reg(in_min); +show_in_reg(in_max); + +#define store_in_reg(REG, reg) \ +static ssize_t store_in_##reg (struct device *dev, const char *buf, size_t count, int nr) \ +{ \ + struct i2c_client *client = to_i2c_client(dev); \ + struct w83781d_data *data = i2c_get_clientdata(client); \ + u32 val; \ + \ + val = simple_strtoul(buf, NULL, 10); \ + data->in_##reg[nr] = IN_TO_REG(val); \ + w83781d_write_value(client, W83781D_REG_IN_##REG(nr), data->in_##reg[nr]); \ + \ + return count; \ +} +store_in_reg(MIN, min); +store_in_reg(MAX, max); + +#define sysfs_in_offset(offset) \ +static ssize_t \ +show_regs_in_##offset (struct device *dev, char *buf) \ +{ \ + return show_in(dev, buf, 0x##offset); \ +} \ +static DEVICE_ATTR(in_input##offset, S_IRUGO, show_regs_in_##offset, NULL) + +#define sysfs_in_reg_offset(reg, offset) \ +static ssize_t show_regs_in_##reg##offset (struct device *dev, char *buf) \ +{ \ + return show_in_##reg (dev, buf, 0x##offset); \ +} \ +static ssize_t store_regs_in_##reg##offset (struct device *dev, const char *buf, size_t count) \ +{ \ + return store_in_##reg (dev, buf, count, 0x##offset); \ +} \ +static DEVICE_ATTR(in_##reg##offset, S_IRUGO| S_IWUSR, show_regs_in_##reg##offset, store_regs_in_##reg##offset) + +#define sysfs_in_offsets(offset) \ +sysfs_in_offset(offset); \ +sysfs_in_reg_offset(min, offset); \ +sysfs_in_reg_offset(max, offset); + +sysfs_in_offsets(0); +sysfs_in_offsets(1); +sysfs_in_offsets(2); +sysfs_in_offsets(3); +sysfs_in_offsets(4); +sysfs_in_offsets(5); +sysfs_in_offsets(6); +sysfs_in_offsets(7); +sysfs_in_offsets(8); + +#define device_create_file_in(client, offset) \ +device_create_file(&client->dev, &dev_attr_in_input##offset); \ +device_create_file(&client->dev, &dev_attr_in_min##offset); \ +device_create_file(&client->dev, &dev_attr_in_max##offset); + +#define show_fan_reg(reg) \ +static ssize_t show_##reg (struct device *dev, char *buf, int nr) \ +{ \ + struct i2c_client *client = to_i2c_client(dev); \ + struct w83781d_data *data = i2c_get_clientdata(client); \ + \ + w83781d_update_client(client); \ + \ + return sprintf(buf,"%ld\n", \ + FAN_FROM_REG(data->reg[nr-1], (long)DIV_FROM_REG(data->fan_div[nr-1]))); \ +} +show_fan_reg(fan); +show_fan_reg(fan_min); + +static ssize_t +store_fan_min(struct device *dev, const char *buf, size_t count, int nr) +{ + struct i2c_client *client = to_i2c_client(dev); + struct w83781d_data *data = i2c_get_clientdata(client); + u32 val; + + val = simple_strtoul(buf, NULL, 10); + data->fan_min[nr - 1] = + FAN_TO_REG(val, DIV_FROM_REG(data->fan_div[nr - 1])); + w83781d_write_value(client, W83781D_REG_FAN_MIN(nr), + data->fan_min[nr - 1]); + + return count; +} + +#define sysfs_fan_offset(offset) \ +static ssize_t show_regs_fan_##offset (struct device *dev, char *buf) \ +{ \ + return show_fan(dev, buf, 0x##offset); \ +} \ +static DEVICE_ATTR(fan_input##offset, S_IRUGO, show_regs_fan_##offset, NULL) + +#define sysfs_fan_min_offset(offset) \ +static ssize_t show_regs_fan_min##offset (struct device *dev, char *buf) \ +{ \ + return show_fan_min(dev, buf, 0x##offset); \ +} \ +static ssize_t store_regs_fan_min##offset (struct device *dev, const char *buf, size_t count) \ +{ \ + return store_fan_min(dev, buf, count, 0x##offset); \ +} \ +static DEVICE_ATTR(fan_min##offset, S_IRUGO | S_IWUSR, show_regs_fan_min##offset, store_regs_fan_min##offset) + +sysfs_fan_offset(1); +sysfs_fan_min_offset(1); +sysfs_fan_offset(2); +sysfs_fan_min_offset(2); +sysfs_fan_offset(3); +sysfs_fan_min_offset(3); + +#define device_create_file_fan(client, offset) \ +device_create_file(&client->dev, &dev_attr_fan_input##offset); \ +device_create_file(&client->dev, &dev_attr_fan_min##offset); \ + +#define show_temp_reg(reg) \ +static ssize_t show_##reg (struct device *dev, char *buf, int nr) \ +{ \ + struct i2c_client *client = to_i2c_client(dev); \ + struct w83781d_data *data = i2c_get_clientdata(client); \ + \ + w83781d_update_client(client); \ + \ + if (nr >= 2) { /* TEMP2 and TEMP3 */ \ + if (data->type == as99127f) { \ + return sprintf(buf,"%ld\n", \ + (long)AS99127_TEMP_ADD_FROM_REG(data->reg##_add[nr-2])); \ + } else { \ + return sprintf(buf,"%ld\n", \ + (long)TEMP_ADD_FROM_REG(data->reg##_add[nr-2])); \ + } \ + } else { /* TEMP1 */ \ + return sprintf(buf,"%ld\n", (long)TEMP_FROM_REG(data->reg)); \ + } \ +} +show_temp_reg(temp); +show_temp_reg(temp_min); +show_temp_reg(temp_max); + +#define store_temp_reg(REG, reg) \ +static ssize_t store_temp_##reg (struct device *dev, const char *buf, size_t count, int nr) \ +{ \ + struct i2c_client *client = to_i2c_client(dev); \ + struct w83781d_data *data = i2c_get_clientdata(client); \ + u32 val; \ + \ + val = simple_strtoul(buf, NULL, 10); \ + \ + if (nr >= 2) { /* TEMP2 and TEMP3 */ \ + if (data->type == as99127f) \ + data->temp_##reg##_add[nr-2] = AS99127_TEMP_ADD_TO_REG(val); \ + else \ + data->temp_##reg##_add[nr-2] = TEMP_ADD_TO_REG(val); \ + \ + w83781d_write_value(client, W83781D_REG_TEMP_##REG(nr), \ + data->temp_##reg##_add[nr-2]); \ + } else { /* TEMP1 */ \ + data->temp_##reg = TEMP_TO_REG(val); \ + w83781d_write_value(client, W83781D_REG_TEMP_##REG(nr), \ + data->temp_##reg); \ + } \ + \ + return count; \ +} +store_temp_reg(OVER, min); +store_temp_reg(HYST, max); + +#define sysfs_temp_offset(offset) \ +static ssize_t \ +show_regs_temp_##offset (struct device *dev, char *buf) \ +{ \ + return show_temp(dev, buf, 0x##offset); \ +} \ +static DEVICE_ATTR(temp_input##offset, S_IRUGO, show_regs_temp_##offset, NULL) + +#define sysfs_temp_reg_offset(reg, offset) \ +static ssize_t show_regs_temp_##reg##offset (struct device *dev, char *buf) \ +{ \ + return show_temp_##reg (dev, buf, 0x##offset); \ +} \ +static ssize_t store_regs_temp_##reg##offset (struct device *dev, const char *buf, size_t count) \ +{ \ + return store_temp_##reg (dev, buf, count, 0x##offset); \ +} \ +static DEVICE_ATTR(temp_##reg##offset, S_IRUGO| S_IWUSR, show_regs_temp_##reg##offset, store_regs_temp_##reg##offset) + +#define sysfs_temp_offsets(offset) \ +sysfs_temp_offset(offset); \ +sysfs_temp_reg_offset(min, offset); \ +sysfs_temp_reg_offset(max, offset); + +sysfs_temp_offsets(1); +sysfs_temp_offsets(2); +sysfs_temp_offsets(3); + +#define device_create_file_temp(client, offset) \ +device_create_file(&client->dev, &dev_attr_temp_input##offset); \ +device_create_file(&client->dev, &dev_attr_temp_max##offset); \ +device_create_file(&client->dev, &dev_attr_temp_min##offset); + +static ssize_t +show_vid_reg(struct device *dev, char *buf) +{ + struct i2c_client *client = to_i2c_client(dev); + struct w83781d_data *data = i2c_get_clientdata(client); + + w83781d_update_client(client); + + return sprintf(buf, "%ld\n", (long) vid_from_reg(data->vid, data->vrm)); +} + +static +DEVICE_ATTR(vid, S_IRUGO, show_vid_reg, NULL) +#define device_create_file_vid(client) \ +device_create_file(&client->dev, &dev_attr_vid); +static ssize_t +show_vrm_reg(struct device *dev, char *buf) +{ + struct i2c_client *client = to_i2c_client(dev); + struct w83781d_data *data = i2c_get_clientdata(client); + + w83781d_update_client(client); + + return sprintf(buf, "%ld\n", (long) data->vrm); +} + +static ssize_t +store_vrm_reg(struct device *dev, const char *buf, size_t count) +{ + struct i2c_client *client = to_i2c_client(dev); + struct w83781d_data *data = i2c_get_clientdata(client); + u32 val; + + val = simple_strtoul(buf, NULL, 10); + data->vrm = val; + + return count; +} + +static +DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm_reg, store_vrm_reg) +#define device_create_file_vrm(client) \ +device_create_file(&client->dev, &dev_attr_vrm); +static ssize_t +show_alarms_reg(struct device *dev, char *buf) +{ + struct i2c_client *client = to_i2c_client(dev); + struct w83781d_data *data = i2c_get_clientdata(client); + + w83781d_update_client(client); + + return sprintf(buf, "%ld\n", (long) ALARMS_FROM_REG(data->alarms)); +} + +static +DEVICE_ATTR(alarms, S_IRUGO, show_alarms_reg, NULL) +#define device_create_file_alarms(client) \ +device_create_file(&client->dev, &dev_attr_alarms); +#define show_beep_reg(REG, reg) \ +static ssize_t show_beep_##reg (struct device *dev, char *buf) \ +{ \ + struct i2c_client *client = to_i2c_client(dev); \ + struct w83781d_data *data = i2c_get_clientdata(client); \ + \ + w83781d_update_client(client); \ + \ + return sprintf(buf,"%ld\n", (long)BEEP_##REG##_FROM_REG(data->beep_##reg)); \ +} +show_beep_reg(ENABLE, enable); +show_beep_reg(MASK, mask); + +#define BEEP_ENABLE 0 /* Store beep_enable */ +#define BEEP_MASK 1 /* Store beep_mask */ + +static ssize_t +store_beep_reg(struct device *dev, const char *buf, size_t count, + int update_mask) +{ + struct i2c_client *client = to_i2c_client(dev); + struct w83781d_data *data = i2c_get_clientdata(client); + u32 val, val2; + + val = simple_strtoul(buf, NULL, 10); + + if (update_mask == BEEP_MASK) { /* We are storing beep_mask */ + data->beep_mask = BEEP_MASK_TO_REG(val); + w83781d_write_value(client, W83781D_REG_BEEP_INTS1, + data->beep_mask & 0xff); + + if ((data->type != w83781d) && (data->type != as99127f)) { + w83781d_write_value(client, W83781D_REG_BEEP_INTS3, + ((data->beep_mask) >> 16) & 0xff); + } + + val2 = (data->beep_mask >> 8) & 0x7f; + } else { /* We are storing beep_enable */ + val2 = w83781d_read_value(client, W83781D_REG_BEEP_INTS2) & 0x7f; + data->beep_enable = BEEP_ENABLE_TO_REG(val); + } + + w83781d_write_value(client, W83781D_REG_BEEP_INTS2, + val2 | data->beep_enable << 7); + + return count; +} + +#define sysfs_beep(REG, reg) \ +static ssize_t show_regs_beep_##reg (struct device *dev, char *buf) \ +{ \ + return show_beep_##reg(dev, buf); \ +} \ +static ssize_t store_regs_beep_##reg (struct device *dev, const char *buf, size_t count) \ +{ \ + return store_beep_reg(dev, buf, count, BEEP_##REG); \ +} \ +static DEVICE_ATTR(beep_##reg, S_IRUGO | S_IWUSR, show_regs_beep_##reg, store_regs_beep_##reg) + +sysfs_beep(ENABLE, enable); +sysfs_beep(MASK, mask); + +#define device_create_file_beep(client) \ +device_create_file(&client->dev, &dev_attr_beep_enable); \ +device_create_file(&client->dev, &dev_attr_beep_mask); + +/* w83697hf only has two fans */ +static ssize_t +show_fan_div_reg(struct device *dev, char *buf, int nr) +{ + struct i2c_client *client = to_i2c_client(dev); + struct w83781d_data *data = i2c_get_clientdata(client); + + w83781d_update_client(client); + + return sprintf(buf, "%ld\n", + (long) DIV_FROM_REG(data->fan_div[nr - 1])); +} + +/* w83697hf only has two fans */ +static ssize_t +store_fan_div_reg(struct device *dev, const char *buf, size_t count, int nr) +{ + struct i2c_client *client = to_i2c_client(dev); + struct w83781d_data *data = i2c_get_clientdata(client); + u32 val, old, old2, old3; + + val = simple_strtoul(buf, NULL, 10); + old = w83781d_read_value(client, W83781D_REG_VID_FANDIV); + + data->fan_div[nr - 1] = DIV_TO_REG(val, data->type); + + /* w83781d and as99127f don't have extended divisor bits */ + if ((data->type != w83781d) && data->type != as99127f) { + old3 = w83781d_read_value(client, W83781D_REG_VBAT); + } + if (nr >= 3 && data->type != w83697hf) { + old2 = w83781d_read_value(client, W83781D_REG_PIN); + old2 = (old2 & 0x3f) | ((data->fan_div[2] & 0x03) << 6); + w83781d_write_value(client, W83781D_REG_PIN, old2); + + if ((data->type != w83781d) && (data->type != as99127f)) { + old3 = (old3 & 0x7f) | ((data->fan_div[2] & 0x04) << 5); + } + } + if (nr >= 2) { + old = (old & 0x3f) | ((data->fan_div[1] & 0x03) << 6); + + if ((data->type != w83781d) && (data->type != as99127f)) { + old3 = (old3 & 0xbf) | ((data->fan_div[1] & 0x04) << 4); + } + } + if (nr >= 1) { + old = (old & 0xcf) | ((data->fan_div[0] & 0x03) << 4); + w83781d_write_value(client, W83781D_REG_VID_FANDIV, old); + + if ((data->type != w83781d) && (data->type != as99127f)) { + old3 = (old3 & 0xdf) | ((data->fan_div[0] & 0x04) << 3); + w83781d_write_value(client, W83781D_REG_VBAT, old3); + } + } + + return count; +} + +#define sysfs_fan_div(offset) \ +static ssize_t show_regs_fan_div_##offset (struct device *dev, char *buf) \ +{ \ + return show_fan_div_reg(dev, buf, offset); \ +} \ +static ssize_t store_regs_fan_div_##offset (struct device *dev, const char *buf, size_t count) \ +{ \ + return store_fan_div_reg(dev, buf, count, offset); \ +} \ +static DEVICE_ATTR(fan_div##offset, S_IRUGO | S_IWUSR, show_regs_fan_div_##offset, store_regs_fan_div_##offset) + +sysfs_fan_div(1); +sysfs_fan_div(2); +sysfs_fan_div(3); + +#define device_create_file_fan_div(client, offset) \ +device_create_file(&client->dev, &dev_attr_fan_div##offset); \ + +/* w83697hf only has two fans */ +static ssize_t +show_pwm_reg(struct device *dev, char *buf, int nr) +{ + struct i2c_client *client = to_i2c_client(dev); + struct w83781d_data *data = i2c_get_clientdata(client); + + w83781d_update_client(client); + + return sprintf(buf, "%ld\n", (long) PWM_FROM_REG(data->pwm[nr - 1])); +} + +/* w83697hf only has two fans */ +static ssize_t +show_pwmenable_reg(struct device *dev, char *buf, int nr) +{ + struct i2c_client *client = to_i2c_client(dev); + struct w83781d_data *data = i2c_get_clientdata(client); + + w83781d_update_client(client); + + return sprintf(buf, "%ld\n", (long) data->pwmenable[nr - 1]); +} + +static ssize_t +store_pwm_reg(struct device *dev, const char *buf, size_t count, int nr) +{ + struct i2c_client *client = to_i2c_client(dev); + struct w83781d_data *data = i2c_get_clientdata(client); + u32 val; + + val = simple_strtoul(buf, NULL, 10); + + data->pwm[nr - 1] = PWM_TO_REG(val); + w83781d_write_value(client, W83781D_REG_PWM(nr), data->pwm[nr - 1]); + + return count; +} + +static ssize_t +store_pwmenable_reg(struct device *dev, const char *buf, size_t count, int nr) +{ + struct i2c_client *client = to_i2c_client(dev); + struct w83781d_data *data = i2c_get_clientdata(client); + u32 val, j, k; + + val = simple_strtoul(buf, NULL, 10); + + /* only PWM2 can be enabled/disabled */ + if (nr == 2) { + j = w83781d_read_value(client, W83781D_REG_PWMCLK12); + k = w83781d_read_value(client, W83781D_REG_BEEP_CONFIG); + + if (val > 0) { + if (!(j & 0x08)) + w83781d_write_value(client, + W83781D_REG_PWMCLK12, + j | 0x08); + if (k & 0x10) + w83781d_write_value(client, + W83781D_REG_BEEP_CONFIG, + k & 0xef); + + data->pwmenable[1] = 1; + } else { + if (j & 0x08) + w83781d_write_value(client, + W83781D_REG_PWMCLK12, + j & 0xf7); + if (!(k & 0x10)) + w83781d_write_value(client, + W83781D_REG_BEEP_CONFIG, + j | 0x10); + + data->pwmenable[1] = 0; + } + } + + return count; +} + +#define sysfs_pwm(offset) \ +static ssize_t show_regs_pwm_##offset (struct device *dev, char *buf) \ +{ \ + return show_pwm_reg(dev, buf, offset); \ +} \ +static ssize_t store_regs_pwm_##offset (struct device *dev, const char *buf, size_t count) \ +{ \ + return store_pwm_reg(dev, buf, count, offset); \ +} \ +static DEVICE_ATTR(pwm##offset, S_IRUGO | S_IWUSR, show_regs_pwm_##offset, store_regs_pwm_##offset) + +#define sysfs_pwmenable(offset) \ +static ssize_t show_regs_pwmenable_##offset (struct device *dev, char *buf) \ +{ \ + return show_pwmenable_reg(dev, buf, offset); \ +} \ +static ssize_t store_regs_pwmenable_##offset (struct device *dev, const char *buf, size_t count) \ +{ \ + return store_pwmenable_reg(dev, buf, count, offset); \ +} \ +static DEVICE_ATTR(pwm_enable##offset, S_IRUGO | S_IWUSR, show_regs_pwmenable_##offset, store_regs_pwmenable_##offset) + +sysfs_pwm(1); +sysfs_pwm(2); +sysfs_pwmenable(2); /* only PWM2 can be enabled/disabled */ +sysfs_pwm(3); +sysfs_pwm(4); + +#define device_create_file_pwm(client, offset) \ +device_create_file(&client->dev, &dev_attr_pwm##offset); \ + +#define device_create_file_pwmenable(client, offset) \ +device_create_file(&client->dev, &dev_attr_pwm_enable##offset); \ + +static ssize_t +show_sensor_reg(struct device *dev, char *buf, int nr) +{ + struct i2c_client *client = to_i2c_client(dev); + struct w83781d_data *data = i2c_get_clientdata(client); + + w83781d_update_client(client); + + return sprintf(buf, "%ld\n", (long) data->sens[nr - 1]); +} + +static ssize_t +store_sensor_reg(struct device *dev, const char *buf, size_t count, int nr) +{ + struct i2c_client *client = to_i2c_client(dev); + struct w83781d_data *data = i2c_get_clientdata(client); + u32 val, tmp; + + val = simple_strtoul(buf, NULL, 10); + + switch (val) { + case 1: /* PII/Celeron diode */ + tmp = w83781d_read_value(client, W83781D_REG_SCFG1); + w83781d_write_value(client, W83781D_REG_SCFG1, + tmp | BIT_SCFG1[nr - 1]); + tmp = w83781d_read_value(client, W83781D_REG_SCFG2); + w83781d_write_value(client, W83781D_REG_SCFG2, + tmp | BIT_SCFG2[nr - 1]); + data->sens[nr - 1] = val; + break; + case 2: /* 3904 */ + tmp = w83781d_read_value(client, W83781D_REG_SCFG1); + w83781d_write_value(client, W83781D_REG_SCFG1, + tmp | BIT_SCFG1[nr - 1]); + tmp = w83781d_read_value(client, W83781D_REG_SCFG2); + w83781d_write_value(client, W83781D_REG_SCFG2, + tmp & ~BIT_SCFG2[nr - 1]); + data->sens[nr - 1] = val; + break; + case W83781D_DEFAULT_BETA: /* thermistor */ + tmp = w83781d_read_value(client, W83781D_REG_SCFG1); + w83781d_write_value(client, W83781D_REG_SCFG1, + tmp & ~BIT_SCFG1[nr - 1]); + data->sens[nr - 1] = val; + break; + default: + dev_err(&client->dev, + "Invalid sensor type %ld; must be 1, 2, or %d\n", + (long) val, W83781D_DEFAULT_BETA); + break; + } + + return count; +} + +#define sysfs_sensor(offset) \ +static ssize_t show_regs_sensor_##offset (struct device *dev, char *buf) \ +{ \ + return show_sensor_reg(dev, buf, offset); \ +} \ +static ssize_t store_regs_sensor_##offset (struct device *dev, const char *buf, size_t count) \ +{ \ + return store_sensor_reg(dev, buf, count, offset); \ +} \ +static DEVICE_ATTR(sensor##offset, S_IRUGO | S_IWUSR, show_regs_sensor_##offset, store_regs_sensor_##offset) + +sysfs_sensor(1); +sysfs_sensor(2); +sysfs_sensor(3); + +#define device_create_file_sensor(client, offset) \ +device_create_file(&client->dev, &dev_attr_sensor##offset); \ + +#ifdef W83781D_RT +static ssize_t +show_rt_reg(struct device *dev, char *buf, int nr) +{ + struct i2c_client *client = to_i2c_client(dev); + struct w83781d_data *data = i2c_get_clientdata(client); + int i, j = 0; + + w83781d_update_client(client); + + for (i = 0; i < 32; i++) { + if (i > 0) + j += sprintf(buf, " %ld", (long) data->rt[nr - 1][i]); + else + j += sprintf(buf, "%ld", (long) data->rt[nr - 1][i]); + } + j += sprintf(buf, "\n"); + + return j; +} + +static ssize_t +store_rt_reg(struct device *dev, const char *buf, size_t count, int nr) +{ + struct i2c_client *client = to_i2c_client(dev); + struct w83781d_data *data = i2c_get_clientdata(client); + u32 val, i; + + for (i = 0; i < count; i++) { + val = simple_strtoul(buf + count, NULL, 10); + + /* fixme: no bounds checking 0-255 */ + data->rt[nr - 1][i] = val & 0xff; + w83781d_write_value(client, W83781D_REG_RT_IDX, i); + w83781d_write_value(client, W83781D_REG_RT_VAL, + data->rt[nr - 1][i]); + } + + return count; +} + +#define sysfs_rt(offset) \ +static ssize_t show_regs_rt_##offset (struct device *dev, char *buf) \ +{ \ + return show_rt_reg(dev, buf, offset); \ +} \ +static ssize_t store_regs_rt_##offset (struct device *dev, const char *buf, size_t count) \ +{ \ + return store_rt_reg(dev, buf, count, offset); \ +} \ +static DEVICE_ATTR(rt##offset, S_IRUGO | S_IWUSR, show_regs_rt_##offset, store_regs_rt_##offset) + +sysfs_rt(1); +sysfs_rt(2); +sysfs_rt(3); + +#define device_create_file_rt(client, offset) \ +device_create_file(&client->dev, &dev_attr_rt##offset); \ + +#endif /* ifdef W83781D_RT */ + +/* This function is called when: + * w83781d_driver is inserted (when this module is loaded), for each + available adapter + * when a new adapter is inserted (and w83781d_driver is still present) */ +static int +w83781d_attach_adapter(struct i2c_adapter *adapter) +{ + return i2c_detect(adapter, &addr_data, w83781d_detect); +} + +static int +w83781d_detect(struct i2c_adapter *adapter, int address, + unsigned short flags, int kind) +{ + int i = 0, val1 = 0, val2, id; + struct i2c_client *new_client; + struct w83781d_data *data; + int err = 0; + const char *type_name = ""; + const char *client_name = ""; + int is_isa = i2c_is_isa_adapter(adapter); + enum vendor { winbond, asus } vendid; + + if (!is_isa + && !i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) + goto ERROR0; + + if (is_isa) { + if (!request_region(address, W83781D_EXTENT, "w83781d")) + goto ERROR0; + release_region(address, W83781D_EXTENT); + } + + /* Probe whether there is anything available on this address. Already + done for SMBus clients */ + if (kind < 0) { + if (is_isa) { + +#define REALLY_SLOW_IO + /* We need the timeouts for at least some LM78-like chips. But only + if we read 'undefined' registers. */ + i = inb_p(address + 1); + if (inb_p(address + 2) != i) + goto ERROR0; + if (inb_p(address + 3) != i) + goto ERROR0; + if (inb_p(address + 7) != i) + goto ERROR0; +#undef REALLY_SLOW_IO + + /* Let's just hope nothing breaks here */ + i = inb_p(address + 5) & 0x7f; + outb_p(~i & 0x7f, address + 5); + if ((inb_p(address + 5) & 0x7f) != (~i & 0x7f)) { + outb_p(i, address + 5); + return 0; + } + } + } + + /* OK. For now, we presume we have a valid client. We now create the + client structure, even though we cannot fill it completely yet. + But it allows us to access w83781d_{read,write}_value. */ + + if (!(new_client = kmalloc(sizeof (struct i2c_client) + + sizeof (struct w83781d_data), GFP_KERNEL))) { + err = -ENOMEM; + goto ERROR0; + } + + memset(new_client, 0x00, sizeof (struct i2c_client) + + sizeof (struct w83781d_data)); + + data = (struct w83781d_data *) (new_client + 1); + i2c_set_clientdata(new_client, data); + new_client->addr = address; + init_MUTEX(&data->lock); + new_client->adapter = adapter; + new_client->driver = &w83781d_driver; + new_client->flags = 0; + + /* Now, we do the remaining detection. */ + + /* The w8378?d may be stuck in some other bank than bank 0. This may + make reading other information impossible. Specify a force=... or + force_*=... parameter, and the Winbond will be reset to the right + bank. */ + if (kind < 0) { + if (w83781d_read_value(new_client, W83781D_REG_CONFIG) & 0x80) + goto ERROR1; + val1 = w83781d_read_value(new_client, W83781D_REG_BANK); + val2 = w83781d_read_value(new_client, W83781D_REG_CHIPMAN); + /* Check for Winbond or Asus ID if in bank 0 */ + if ((!(val1 & 0x07)) && + (((!(val1 & 0x80)) && (val2 != 0xa3) && (val2 != 0xc3) + && (val2 != 0x94)) + || ((val1 & 0x80) && (val2 != 0x5c) && (val2 != 0x12) + && (val2 != 0x06)))) + goto ERROR1; + /* If Winbond SMBus, check address at 0x48. Asus doesn't support */ + if ((!is_isa) && (((!(val1 & 0x80)) && (val2 == 0xa3)) || + ((val1 & 0x80) && (val2 == 0x5c)))) { + if (w83781d_read_value + (new_client, W83781D_REG_I2C_ADDR) != address) + goto ERROR1; + } + } + + /* We have either had a force parameter, or we have already detected the + Winbond. Put it now into bank 0 and Vendor ID High Byte */ + w83781d_write_value(new_client, W83781D_REG_BANK, + (w83781d_read_value(new_client, + W83781D_REG_BANK) & 0x78) | + 0x80); + + /* Determine the chip type. */ + if (kind <= 0) { + /* get vendor ID */ + val2 = w83781d_read_value(new_client, W83781D_REG_CHIPMAN); + if (val2 == 0x5c) + vendid = winbond; + else if ((val2 == 0x12) || (val2 == 0x06)) + vendid = asus; + else + goto ERROR1; + /* mask off lower bit, not reliable */ + val1 = + w83781d_read_value(new_client, W83781D_REG_WCHIPID) & 0xfe; + if (val1 == 0x10 && vendid == winbond) + kind = w83781d; + else if (val1 == 0x30 && vendid == winbond) + kind = w83782d; + else if (val1 == 0x40 && vendid == winbond && !is_isa) + kind = w83783s; + else if (val1 == 0x20 && vendid == winbond) + kind = w83627hf; + else if (val1 == 0x30 && vendid == asus && !is_isa) + kind = as99127f; + else if (val1 == 0x60 && vendid == winbond && is_isa) + kind = w83697hf; + else { + if (kind == 0) + dev_warn(&new_client->dev, + "Ignoring 'force' parameter for unknown chip at" + "adapter %d, address 0x%02x\n", + i2c_adapter_id(adapter), address); + goto ERROR1; + } + } + + if (kind == w83781d) { + type_name = "w83781d"; + client_name = "W83781D chip"; + } else if (kind == w83782d) { + type_name = "w83782d"; + client_name = "W83782D chip"; + } else if (kind == w83783s) { + type_name = "w83783s"; + client_name = "W83783S chip"; + } else if (kind == w83627hf) { + type_name = "w83627hf"; + client_name = "W83627HF chip"; + } else if (kind == as99127f) { + type_name = "as99127f"; + client_name = "AS99127F chip"; + } else if (kind == w83697hf) { + type_name = "w83697hf"; + client_name = "W83697HF chip"; + } else { + dev_err(&new_client->dev, "Internal error: unknown kind (%d)?!?", kind); + goto ERROR1; + } + + /* Reserve the ISA region */ + if (is_isa) + request_region(address, W83781D_EXTENT, type_name); + + /* Fill in the remaining client fields and put it into the global list */ + strncpy(new_client->dev.name, client_name, DEVICE_NAME_SIZE); + data->type = kind; + + data->valid = 0; + init_MUTEX(&data->update_lock); + + /* Tell the I2C layer a new client has arrived */ + if ((err = i2c_attach_client(new_client))) + goto ERROR3; + + /* attach secondary i2c lm75-like clients */ + if (!is_isa) { + if (!(data->lm75 = kmalloc(2 * sizeof (struct i2c_client), + GFP_KERNEL))) { + err = -ENOMEM; + goto ERROR4; + } + + memset(data->lm75, 0x00, 2 * sizeof (struct i2c_client)); + + id = i2c_adapter_id(adapter); + if (force_subclients[0] == id && force_subclients[1] == address) { + for (i = 2; i <= 3; i++) { + if (force_subclients[i] < 0x48 || + force_subclients[i] > 0x4f) { + dev_err(&new_client->dev, + "Invalid subclient address %d; must be 0x48-0x4f\n", + force_subclients[i]); + goto ERROR5; + } + } + w83781d_write_value(new_client, + W83781D_REG_I2C_SUBADDR, + (force_subclients[2] & 0x07) | + ((force_subclients[3] & 0x07) << + 4)); + data->lm75[0].addr = force_subclients[2]; + } else { + val1 = w83781d_read_value(new_client, + W83781D_REG_I2C_SUBADDR); + data->lm75[0].addr = 0x48 + (val1 & 0x07); + } + if (kind != w83783s) { + if (force_subclients[0] == id && + force_subclients[1] == address) { + data->lm75[1].addr = force_subclients[3]; + } else { + data->lm75[1].addr = + 0x48 + ((val1 >> 4) & 0x07); + } + if (data->lm75[0].addr == data->lm75[1].addr) { + dev_err(&new_client->dev, + "Duplicate addresses 0x%x for subclients.\n", + data->lm75[0].addr); + goto ERROR5; + } + } + if (kind == w83781d) + client_name = "W83781D subclient"; + else if (kind == w83782d) + client_name = "W83782D subclient"; + else if (kind == w83783s) + client_name = "W83783S subclient"; + else if (kind == w83627hf) + client_name = "W83627HF subclient"; + else if (kind == as99127f) + client_name = "AS99127F subclient"; + + for (i = 0; i <= 1; i++) { + i2c_set_clientdata(&data->lm75[i], NULL); /* store all data in w83781d */ + data->lm75[i].adapter = adapter; + data->lm75[i].driver = &w83781d_driver; + data->lm75[i].flags = 0; + strncpy(data->lm75[i].dev.name, client_name, + DEVICE_NAME_SIZE); + if (kind == w83783s) + break; + } + } else { + data->lm75 = NULL; + } + + device_create_file_in(new_client, 0); + if (kind != w83783s && kind != w83697hf) + device_create_file_in(new_client, 1); + device_create_file_in(new_client, 2); + device_create_file_in(new_client, 3); + device_create_file_in(new_client, 4); + device_create_file_in(new_client, 5); + device_create_file_in(new_client, 6); + if (kind != as99127f && kind != w83781d && kind != w83783s) { + device_create_file_in(new_client, 7); + device_create_file_in(new_client, 8); + } + + device_create_file_fan(new_client, 1); + device_create_file_fan(new_client, 2); + if (kind != w83697hf) + device_create_file_fan(new_client, 3); + + device_create_file_temp(new_client, 1); + device_create_file_temp(new_client, 2); + if (kind != w83783s && kind != w83697hf) + device_create_file_temp(new_client, 3); + + if (kind != w83697hf) + device_create_file_vid(new_client); + + if (kind != w83697hf) + device_create_file_vrm(new_client); + + device_create_file_fan_div(new_client, 1); + device_create_file_fan_div(new_client, 2); + if (kind != w83697hf) + device_create_file_fan_div(new_client, 3); + + device_create_file_alarms(new_client); + + device_create_file_beep(new_client); + + if (kind != w83781d) { + device_create_file_pwm(new_client, 1); + device_create_file_pwm(new_client, 2); + device_create_file_pwmenable(new_client, 2); + } + if (kind == w83782d && !is_isa) { + device_create_file_pwm(new_client, 3); + device_create_file_pwm(new_client, 4); + } + + if (kind != as99127f && kind != w83781d) { + device_create_file_sensor(new_client, 1); + device_create_file_sensor(new_client, 2); + if (kind != w83783s && kind != w83697hf) + device_create_file_sensor(new_client, 3); + } +#ifdef W83781D_RT + if (kind == w83781d) { + device_create_file_rt(new_client, 1); + device_create_file_rt(new_client, 2); + device_create_file_rt(new_client, 3); + } +#endif + + /* Initialize the chip */ + w83781d_init_client(new_client); + return 0; + +/* OK, this is not exactly good programming practice, usually. But it is + very code-efficient in this case. */ + + ERROR5: + if (!is_isa) { + i2c_detach_client(&data->lm75[0]); + if (data->type != w83783s) + i2c_detach_client(&data->lm75[1]); + kfree(data->lm75); + } + ERROR4: + i2c_detach_client(new_client); + ERROR3: + if (is_isa) + release_region(address, W83781D_EXTENT); + ERROR1: + kfree(new_client); + ERROR0: + return err; +} + +static int +w83781d_detach_client(struct i2c_client *client) +{ + struct w83781d_data *data = i2c_get_clientdata(client); + int err; + + if ((err = i2c_detach_client(client))) { + dev_err(&client->dev, + "Client deregistration failed, client not detached.\n"); + return err; + } + + if (i2c_is_isa_client(client)) { + release_region(client->addr, W83781D_EXTENT); + } else { + i2c_detach_client(&data->lm75[0]); + if (data->type != w83783s) + i2c_detach_client(&data->lm75[1]); + kfree(data->lm75); + } + kfree(client); + + return 0; +} + +/* The SMBus locks itself, usually, but nothing may access the Winbond between + bank switches. ISA access must always be locked explicitly! + We ignore the W83781D BUSY flag at this moment - it could lead to deadlocks, + would slow down the W83781D access and should not be necessary. + There are some ugly typecasts here, but the good news is - they should + nowhere else be necessary! */ +static int +w83781d_read_value(struct i2c_client *client, u16 reg) +{ + struct w83781d_data *data = i2c_get_clientdata(client); + int res, word_sized, bank; + struct i2c_client *cl; + + down(&data->lock); + if (i2c_is_isa_client(client)) { + word_sized = (((reg & 0xff00) == 0x100) + || ((reg & 0xff00) == 0x200)) + && (((reg & 0x00ff) == 0x50) + || ((reg & 0x00ff) == 0x53) + || ((reg & 0x00ff) == 0x55)); + if (reg & 0xff00) { + outb_p(W83781D_REG_BANK, + client->addr + W83781D_ADDR_REG_OFFSET); + outb_p(reg >> 8, + client->addr + W83781D_DATA_REG_OFFSET); + } + outb_p(reg & 0xff, client->addr + W83781D_ADDR_REG_OFFSET); + res = inb_p(client->addr + W83781D_DATA_REG_OFFSET); + if (word_sized) { + outb_p((reg & 0xff) + 1, + client->addr + W83781D_ADDR_REG_OFFSET); + res = + (res << 8) + inb_p(client->addr + + W83781D_DATA_REG_OFFSET); + } + if (reg & 0xff00) { + outb_p(W83781D_REG_BANK, + client->addr + W83781D_ADDR_REG_OFFSET); + outb_p(0, client->addr + W83781D_DATA_REG_OFFSET); + } + } else { + bank = (reg >> 8) & 0x0f; + if (bank > 2) + /* switch banks */ + i2c_smbus_write_byte_data(client, W83781D_REG_BANK, + bank); + if (bank == 0 || bank > 2) { + res = i2c_smbus_read_byte_data(client, reg & 0xff); + } else { + /* switch to subclient */ + cl = &data->lm75[bank - 1]; + /* convert from ISA to LM75 I2C addresses */ + switch (reg & 0xff) { + case 0x50: /* TEMP */ + res = + swap_bytes(i2c_smbus_read_word_data(cl, 0)); + break; + case 0x52: /* CONFIG */ + res = i2c_smbus_read_byte_data(cl, 1); + break; + case 0x53: /* HYST */ + res = + swap_bytes(i2c_smbus_read_word_data(cl, 2)); + break; + case 0x55: /* OVER */ + default: + res = + swap_bytes(i2c_smbus_read_word_data(cl, 3)); + break; + } + } + if (bank > 2) + i2c_smbus_write_byte_data(client, W83781D_REG_BANK, 0); + } + up(&data->lock); + return res; +} + +static int +w83781d_write_value(struct i2c_client *client, u16 reg, u16 value) +{ + struct w83781d_data *data = i2c_get_clientdata(client); + int word_sized, bank; + struct i2c_client *cl; + + down(&data->lock); + if (i2c_is_isa_client(client)) { + word_sized = (((reg & 0xff00) == 0x100) + || ((reg & 0xff00) == 0x200)) + && (((reg & 0x00ff) == 0x53) + || ((reg & 0x00ff) == 0x55)); + if (reg & 0xff00) { + outb_p(W83781D_REG_BANK, + client->addr + W83781D_ADDR_REG_OFFSET); + outb_p(reg >> 8, + client->addr + W83781D_DATA_REG_OFFSET); + } + outb_p(reg & 0xff, client->addr + W83781D_ADDR_REG_OFFSET); + if (word_sized) { + outb_p(value >> 8, + client->addr + W83781D_DATA_REG_OFFSET); + outb_p((reg & 0xff) + 1, + client->addr + W83781D_ADDR_REG_OFFSET); + } + outb_p(value & 0xff, client->addr + W83781D_DATA_REG_OFFSET); + if (reg & 0xff00) { + outb_p(W83781D_REG_BANK, + client->addr + W83781D_ADDR_REG_OFFSET); + outb_p(0, client->addr + W83781D_DATA_REG_OFFSET); + } + } else { + bank = (reg >> 8) & 0x0f; + if (bank > 2) + /* switch banks */ + i2c_smbus_write_byte_data(client, W83781D_REG_BANK, + bank); + if (bank == 0 || bank > 2) { + i2c_smbus_write_byte_data(client, reg & 0xff, + value & 0xff); + } else { + /* switch to subclient */ + cl = &data->lm75[bank - 1]; + /* convert from ISA to LM75 I2C addresses */ + switch (reg & 0xff) { + case 0x52: /* CONFIG */ + i2c_smbus_write_byte_data(cl, 1, value & 0xff); + break; + case 0x53: /* HYST */ + i2c_smbus_write_word_data(cl, 2, + swap_bytes(value)); + break; + case 0x55: /* OVER */ + i2c_smbus_write_word_data(cl, 3, + swap_bytes(value)); + break; + } + } + if (bank > 2) + i2c_smbus_write_byte_data(client, W83781D_REG_BANK, 0); + } + up(&data->lock); + return 0; +} + +/* Called when we have found a new W83781D. It should set limits, etc. */ +static void +w83781d_init_client(struct i2c_client *client) +{ + struct w83781d_data *data = i2c_get_clientdata(client); + int vid = 0, i, p; + int type = data->type; + u8 tmp; + + if (init && type != as99127f) { /* this resets registers we don't have + documentation for on the as99127f */ + /* save these registers */ + i = w83781d_read_value(client, W83781D_REG_BEEP_CONFIG); + p = w83781d_read_value(client, W83781D_REG_PWMCLK12); + /* Reset all except Watchdog values and last conversion values + This sets fan-divs to 2, among others */ + w83781d_write_value(client, W83781D_REG_CONFIG, 0x80); + /* Restore the registers and disable power-on abnormal beep. + This saves FAN 1/2/3 input/output values set by BIOS. */ + w83781d_write_value(client, W83781D_REG_BEEP_CONFIG, i | 0x80); + w83781d_write_value(client, W83781D_REG_PWMCLK12, p); + /* Disable master beep-enable (reset turns it on). + Individual beep_mask should be reset to off but for some reason + disabling this bit helps some people not get beeped */ + w83781d_write_value(client, W83781D_REG_BEEP_INTS2, 0); + } + + if (type != w83697hf) { + vid = w83781d_read_value(client, W83781D_REG_VID_FANDIV) & 0x0f; + vid |= + (w83781d_read_value(client, W83781D_REG_CHIPID) & 0x01) << + 4; + data->vrm = DEFAULT_VRM; + vid = vid_from_reg(vid, data->vrm); + } + + if ((type != w83781d) && (type != as99127f)) { + tmp = w83781d_read_value(client, W83781D_REG_SCFG1); + for (i = 1; i <= 3; i++) { + if (!(tmp & BIT_SCFG1[i - 1])) { + data->sens[i - 1] = W83781D_DEFAULT_BETA; + } else { + if (w83781d_read_value + (client, + W83781D_REG_SCFG2) & BIT_SCFG2[i - 1]) + data->sens[i - 1] = 1; + else + data->sens[i - 1] = 2; + } + if ((type == w83783s || type == w83697hf) && (i == 2)) + break; + } + } +#ifdef W83781D_RT +/* + Fill up the RT Tables. + We assume that they are 32 bytes long, in order for temp 1-3. + Data sheet documentation is sparse. + We also assume that it is only for the 781D although I suspect + that the others support it as well.... +*/ + + if (init && type == w83781d) { + u16 k = 0; +/* + Auto-indexing doesn't seem to work... + w83781d_write_value(client,W83781D_REG_RT_IDX,0); +*/ + for (i = 0; i < 3; i++) { + int j; + for (j = 0; j < 32; j++) { + w83781d_write_value(client, + W83781D_REG_RT_IDX, k++); + data->rt[i][j] = + w83781d_read_value(client, + W83781D_REG_RT_VAL); + } + } + } +#endif /* W83781D_RT */ + + if (init) { + w83781d_write_value(client, W83781D_REG_IN_MIN(0), + IN_TO_REG(W83781D_INIT_IN_MIN_0)); + w83781d_write_value(client, W83781D_REG_IN_MAX(0), + IN_TO_REG(W83781D_INIT_IN_MAX_0)); + if (type != w83783s && type != w83697hf) { + w83781d_write_value(client, W83781D_REG_IN_MIN(1), + IN_TO_REG(W83781D_INIT_IN_MIN_1)); + w83781d_write_value(client, W83781D_REG_IN_MAX(1), + IN_TO_REG(W83781D_INIT_IN_MAX_1)); + } + + w83781d_write_value(client, W83781D_REG_IN_MIN(2), + IN_TO_REG(W83781D_INIT_IN_MIN_2)); + w83781d_write_value(client, W83781D_REG_IN_MAX(2), + IN_TO_REG(W83781D_INIT_IN_MAX_2)); + w83781d_write_value(client, W83781D_REG_IN_MIN(3), + IN_TO_REG(W83781D_INIT_IN_MIN_3)); + w83781d_write_value(client, W83781D_REG_IN_MAX(3), + IN_TO_REG(W83781D_INIT_IN_MAX_3)); + w83781d_write_value(client, W83781D_REG_IN_MIN(4), + IN_TO_REG(W83781D_INIT_IN_MIN_4)); + w83781d_write_value(client, W83781D_REG_IN_MAX(4), + IN_TO_REG(W83781D_INIT_IN_MAX_4)); + if (type == w83781d || type == as99127f) { + w83781d_write_value(client, W83781D_REG_IN_MIN(5), + IN_TO_REG(W83781D_INIT_IN_MIN_5)); + w83781d_write_value(client, W83781D_REG_IN_MAX(5), + IN_TO_REG(W83781D_INIT_IN_MAX_5)); + } else { + w83781d_write_value(client, W83781D_REG_IN_MIN(5), + IN_TO_REG(W83782D_INIT_IN_MIN_5)); + w83781d_write_value(client, W83781D_REG_IN_MAX(5), + IN_TO_REG(W83782D_INIT_IN_MAX_5)); + } + if (type == w83781d || type == as99127f) { + w83781d_write_value(client, W83781D_REG_IN_MIN(6), + IN_TO_REG(W83781D_INIT_IN_MIN_6)); + w83781d_write_value(client, W83781D_REG_IN_MAX(6), + IN_TO_REG(W83781D_INIT_IN_MAX_6)); + } else { + w83781d_write_value(client, W83781D_REG_IN_MIN(6), + IN_TO_REG(W83782D_INIT_IN_MIN_6)); + w83781d_write_value(client, W83781D_REG_IN_MAX(6), + IN_TO_REG(W83782D_INIT_IN_MAX_6)); + } + if ((type == w83782d) || (type == w83627hf) || + (type == w83697hf)) { + w83781d_write_value(client, W83781D_REG_IN_MIN(7), + IN_TO_REG(W83781D_INIT_IN_MIN_7)); + w83781d_write_value(client, W83781D_REG_IN_MAX(7), + IN_TO_REG(W83781D_INIT_IN_MAX_7)); + w83781d_write_value(client, W83781D_REG_IN_MIN(8), + IN_TO_REG(W83781D_INIT_IN_MIN_8)); + w83781d_write_value(client, W83781D_REG_IN_MAX(8), + IN_TO_REG(W83781D_INIT_IN_MAX_8)); + w83781d_write_value(client, W83781D_REG_VBAT, + (w83781d_read_value + (client, + W83781D_REG_VBAT) | 0x01)); + } + w83781d_write_value(client, W83781D_REG_FAN_MIN(1), + FAN_TO_REG(W83781D_INIT_FAN_MIN_1, 2)); + w83781d_write_value(client, W83781D_REG_FAN_MIN(2), + FAN_TO_REG(W83781D_INIT_FAN_MIN_2, 2)); + if (type != w83697hf) { + w83781d_write_value(client, W83781D_REG_FAN_MIN(3), + FAN_TO_REG(W83781D_INIT_FAN_MIN_3, + 2)); + } + + w83781d_write_value(client, W83781D_REG_TEMP_OVER(1), + TEMP_TO_REG(W83781D_INIT_TEMP_OVER)); + w83781d_write_value(client, W83781D_REG_TEMP_HYST(1), + TEMP_TO_REG(W83781D_INIT_TEMP_HYST)); + + if (type == as99127f) { + w83781d_write_value(client, W83781D_REG_TEMP_OVER(2), + AS99127_TEMP_ADD_TO_REG + (W83781D_INIT_TEMP2_OVER)); + w83781d_write_value(client, W83781D_REG_TEMP_HYST(2), + AS99127_TEMP_ADD_TO_REG + (W83781D_INIT_TEMP2_HYST)); + } else { + w83781d_write_value(client, W83781D_REG_TEMP_OVER(2), + TEMP_ADD_TO_REG + (W83781D_INIT_TEMP2_OVER)); + w83781d_write_value(client, W83781D_REG_TEMP_HYST(2), + TEMP_ADD_TO_REG + (W83781D_INIT_TEMP2_HYST)); + } + w83781d_write_value(client, W83781D_REG_TEMP2_CONFIG, 0x00); + + if (type == as99127f) { + w83781d_write_value(client, W83781D_REG_TEMP_OVER(3), + AS99127_TEMP_ADD_TO_REG + (W83781D_INIT_TEMP3_OVER)); + w83781d_write_value(client, W83781D_REG_TEMP_HYST(3), + AS99127_TEMP_ADD_TO_REG + (W83781D_INIT_TEMP3_HYST)); + } else if (type != w83783s && type != w83697hf) { + w83781d_write_value(client, W83781D_REG_TEMP_OVER(3), + TEMP_ADD_TO_REG + (W83781D_INIT_TEMP3_OVER)); + w83781d_write_value(client, W83781D_REG_TEMP_HYST(3), + TEMP_ADD_TO_REG + (W83781D_INIT_TEMP3_HYST)); + } + if (type != w83783s && type != w83697hf) { + w83781d_write_value(client, W83781D_REG_TEMP3_CONFIG, + 0x00); + } + if (type != w83781d) { + /* enable comparator mode for temp2 and temp3 so + alarm indication will work correctly */ + w83781d_write_value(client, W83781D_REG_IRQ, 0x41); + for (i = 0; i < 3; i++) + data->pwmenable[i] = 1; + } + } + + /* Start monitoring */ + w83781d_write_value(client, W83781D_REG_CONFIG, + (w83781d_read_value(client, + W83781D_REG_CONFIG) & 0xf7) + | 0x01); +} + +static void +w83781d_update_client(struct i2c_client *client) +{ + struct w83781d_data *data = i2c_get_clientdata(client); + int i; + + down(&data->update_lock); + + if (time_after + (jiffies - data->last_updated, (unsigned long) (HZ + HZ / 2)) + || time_before(jiffies, data->last_updated) || !data->valid) { + pr_debug(KERN_DEBUG "Starting device update\n"); + + for (i = 0; i <= 8; i++) { + if ((data->type == w83783s || data->type == w83697hf) + && (i == 1)) + continue; /* 783S has no in1 */ + data->in[i] = + w83781d_read_value(client, W83781D_REG_IN(i)); + data->in_min[i] = + w83781d_read_value(client, W83781D_REG_IN_MIN(i)); + data->in_max[i] = + w83781d_read_value(client, W83781D_REG_IN_MAX(i)); + if ((data->type != w83782d) && (data->type != w83697hf) + && (data->type != w83627hf) && (i == 6)) + break; + } + for (i = 1; i <= 3; i++) { + data->fan[i - 1] = + w83781d_read_value(client, W83781D_REG_FAN(i)); + data->fan_min[i - 1] = + w83781d_read_value(client, W83781D_REG_FAN_MIN(i)); + } + if (data->type != w83781d) { + for (i = 1; i <= 4; i++) { + data->pwm[i - 1] = + w83781d_read_value(client, + W83781D_REG_PWM(i)); + if (((data->type == w83783s) + || (data->type == w83627hf) + || (data->type == as99127f) + || (data->type == w83697hf) + || ((data->type == w83782d) + && i2c_is_isa_client(client))) + && i == 2) + break; + } + } + + data->temp = w83781d_read_value(client, W83781D_REG_TEMP(1)); + data->temp_min = + w83781d_read_value(client, W83781D_REG_TEMP_OVER(1)); + data->temp_max = + w83781d_read_value(client, W83781D_REG_TEMP_HYST(1)); + data->temp_add[0] = + w83781d_read_value(client, W83781D_REG_TEMP(2)); + data->temp_max_add[0] = + w83781d_read_value(client, W83781D_REG_TEMP_OVER(2)); + data->temp_min_add[0] = + w83781d_read_value(client, W83781D_REG_TEMP_HYST(2)); + if (data->type != w83783s && data->type != w83697hf) { + data->temp_add[1] = + w83781d_read_value(client, W83781D_REG_TEMP(3)); + data->temp_max_add[1] = + w83781d_read_value(client, + W83781D_REG_TEMP_OVER(3)); + data->temp_min_add[1] = + w83781d_read_value(client, + W83781D_REG_TEMP_HYST(3)); + } + i = w83781d_read_value(client, W83781D_REG_VID_FANDIV); + if (data->type != w83697hf) { + data->vid = i & 0x0f; + data->vid |= + (w83781d_read_value(client, W83781D_REG_CHIPID) & + 0x01) + << 4; + } + data->fan_div[0] = (i >> 4) & 0x03; + data->fan_div[1] = (i >> 6) & 0x03; + if (data->type != w83697hf) { + data->fan_div[2] = (w83781d_read_value(client, + W83781D_REG_PIN) + >> 6) & 0x03; + } + if ((data->type != w83781d) && (data->type != as99127f)) { + i = w83781d_read_value(client, W83781D_REG_VBAT); + data->fan_div[0] |= (i >> 3) & 0x04; + data->fan_div[1] |= (i >> 4) & 0x04; + if (data->type != w83697hf) + data->fan_div[2] |= (i >> 5) & 0x04; + } + data->alarms = + w83781d_read_value(client, + W83781D_REG_ALARM1) + + (w83781d_read_value(client, W83781D_REG_ALARM2) << 8); + if ((data->type == w83782d) || (data->type == w83627hf)) { + data->alarms |= + w83781d_read_value(client, + W83781D_REG_ALARM3) << 16; + } + i = w83781d_read_value(client, W83781D_REG_BEEP_INTS2); + data->beep_enable = i >> 7; + data->beep_mask = ((i & 0x7f) << 8) + + w83781d_read_value(client, W83781D_REG_BEEP_INTS1); + if ((data->type != w83781d) && (data->type != as99127f)) { + data->beep_mask |= + w83781d_read_value(client, + W83781D_REG_BEEP_INTS3) << 16; + } + data->last_updated = jiffies; + data->valid = 1; + } + + up(&data->update_lock); +} + +static int __init +sensors_w83781d_init(void) +{ + return i2c_add_driver(&w83781d_driver); +} + +static void __exit +sensors_w83781d_exit(void) +{ + i2c_del_driver(&w83781d_driver); +} + +MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>, " + "Philip Edelbrock <phil@netroedge.com>, " + "and Mark Studebaker <mdsxyz123@yahoo.com>"); +MODULE_DESCRIPTION("W83781D driver"); +MODULE_LICENSE("GPL"); + +module_init(sensors_w83781d_init); +module_exit(sensors_w83781d_exit); diff -urPp ../linux-2.5.66bk4/include/linux/i2c-vid.h linux.w83781d/include/linux/i2c-vid.h --- ../linux-2.5.66bk4/include/linux/i2c-vid.h 1970-01-01 02:00:00.000000000 +0200 +++ linux.w83781d/include/linux/i2c-vid.h 2003-03-30 06:28:53.000000000 +0200 @@ -0,0 +1,62 @@ +/* + vrm.c - Part of lm_sensors, Linux kernel modules for hardware + monitoring + Copyright (c) 2002 Mark D. Studebaker <mdsxyz123@yahoo.com> + With assistance from Trent Piepho <xyzzy@speakeasy.org> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +/* + This file contains common code for decoding VID pins. + This file is #included in various chip drivers in this directory. + As the user is unlikely to load more than one driver which + includes this code we don't worry about the wasted space. + Reference: VRM x.y DC-DC Converter Design Guidelines, + available at http://developer.intel.com +*/ + +/* + Legal val values 00 - 1F. + vrm is the Intel VRM document version. + Note: vrm version is scaled by 10 and the return value is scaled by 1000 + to avoid floating point in the kernel. +*/ + +#define DEFAULT_VRM 82 + +static inline int vid_from_reg(int val, int vrm) +{ + switch(vrm) { + + case 91: /* VRM 9.1 */ + case 90: /* VRM 9.0 */ + return(val == 0x1f ? 0 : + 1850 - val * 25); + + case 85: /* VRM 8.5 */ + return((val & 0x10 ? 25 : 0) + + ((val & 0x0f) > 0x04 ? 2050 : 1250) - + ((val & 0x0f) * 50)); + + case 84: /* VRM 8.4 */ + val &= 0x0f; + /* fall through */ + default: /* VRM 8.2 */ + return(val == 0x1f ? 0 : + val & 0x10 ? 5100 - (val) * 100 : + 2050 - (val) * 50); + } +} [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 189 bytes --] ^ permalink raw reply [flat|nested] 89+ messages in thread
* [PATCH-2.5] w83781d i2c driver updated for 2.5.66-bk4 (with sysfs @ 2005-05-19 6:23 ` Martin Schlemmer 0 siblings, 0 replies; 89+ messages in thread From: Martin Schlemmer @ 2005-05-19 6:23 UTC (permalink / raw) To: Greg KH; +Cc: KML, Dominik Brodowski, sensors Skipped content of type multipart/mixed-------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part Url : http://lists.lm-sensors.org/pipermail/lm-sensors/attachments/20030330/c873c3a9/attachment.bin ^ permalink raw reply [flat|nested] 89+ messages in thread
* Re: [PATCH-2.5] w83781d i2c driver updated for 2.5.66-bk4 (with sysfs support, empty tree) 2005-05-19 6:23 ` [PATCH-2.5] w83781d i2c driver updated for 2.5.66-bk4 (with sysfs Martin Schlemmer @ 2005-05-19 6:23 ` Greg KH -1 siblings, 0 replies; 89+ messages in thread From: Greg KH @ 2003-04-02 22:22 UTC (permalink / raw) To: Martin Schlemmer; +Cc: KML, Dominik Brodowski, sensors On Sun, Mar 30, 2003 at 02:47:24PM +0200, Martin Schlemmer wrote: > Hi > > This should have a working w83781d driver updated for 2.5.66-bk4. > Currently sysfs support is working, and are according to the spec > (sensors-sysfs) in the 'lm sensors sysfs file structure' thread. > Thus I used 'temp_input[1-3]', as there was not final decision > on having them temp_input[0-2] as well, for example. > > This patch is against a 'vanilla' 2.5.66-bk4 (do not have w83781d.c > from lm_sensors2 cvs present). Retry, as previous did not go through > due to size. Thanks, I've applied this to my trees and will send it off to Linus in a short bit. greg k-h ^ permalink raw reply [flat|nested] 89+ messages in thread
* [PATCH-2.5] w83781d i2c driver updated for 2.5.66-bk4 (with sysfs support, empty tree) @ 2005-05-19 6:23 ` Greg KH 0 siblings, 0 replies; 89+ messages in thread From: Greg KH @ 2005-05-19 6:23 UTC (permalink / raw) To: Martin Schlemmer; +Cc: KML, Dominik Brodowski, sensors On Sun, Mar 30, 2003 at 02:47:24PM +0200, Martin Schlemmer wrote: > Hi > > This should have a working w83781d driver updated for 2.5.66-bk4. > Currently sysfs support is working, and are according to the spec > (sensors-sysfs) in the 'lm sensors sysfs file structure' thread. > Thus I used 'temp_input[1-3]', as there was not final decision > on having them temp_input[0-2] as well, for example. > > This patch is against a 'vanilla' 2.5.66-bk4 (do not have w83781d.c > from lm_sensors2 cvs present). Retry, as previous did not go through > due to size. Thanks, I've applied this to my trees and will send it off to Linus in a short bit. greg k-h ^ permalink raw reply [flat|nested] 89+ messages in thread
* RE: lm sensors sysfs file structure
2005-05-19 6:23 ` Greg KH
@ 2005-05-19 6:23 ` Grover, Andrew
-1 siblings, 0 replies; 89+ messages in thread
From: Grover, Andrew @ 2003-04-03 21:19 UTC (permalink / raw)
To: Dominik Brodowski, Dave Jones, Greg KH, Pavel Machek, Jan Dittmer,
Mark Studebaker, azarah, KML, sensors
> From: Dominik Brodowski [mailto:linux@brodo.de]
> > Had occured to me too. There was talk of a libpower or the likes
> > mentioned on acpi-devel a year or so back, but afaik nothing really
> > came of it.
>
> Actually, the "ospmd" tool (available at
> http://acpi.sourceforge.net ) already seems to > manage APM and
> ACPI input. Well, and speaking of ACPI and
> sysfs in the same message: IMHO the /proc/acpi/ interface
> should be replaced by something in /sysfs/ as well....
Agree w.r.t. ACPI /proc switching to sysfs. Just a matter of someone
sitting down and making the changes.
It is still not clear to me if libpower should subsume libsensors, or
vice versa, or keep them separate. There are areas of overlap, as well
as significant areas of non-overlap.
Regards -- Andy
^ permalink raw reply [flat|nested] 89+ messages in thread* lm sensors sysfs file structure @ 2005-05-19 6:23 ` Grover, Andrew 0 siblings, 0 replies; 89+ messages in thread From: Grover, Andrew @ 2005-05-19 6:23 UTC (permalink / raw) To: Dominik Brodowski, Dave Jones, Greg KH, Pavel Machek, Jan Dittmer, Mark Studebaker, azarah, KML, sensors > From: Dominik Brodowski [mailto:linux@brodo.de] > > Had occured to me too. There was talk of a libpower or the likes > > mentioned on acpi-devel a year or so back, but afaik nothing really > > came of it. > > Actually, the "ospmd" tool (available at > http://acpi.sourceforge.net ) already seems to > manage APM and > ACPI input. Well, and speaking of ACPI and > sysfs in the same message: IMHO the /proc/acpi/ interface > should be replaced by something in /sysfs/ as well.... Agree w.r.t. ACPI /proc switching to sysfs. Just a matter of someone sitting down and making the changes. It is still not clear to me if libpower should subsume libsensors, or vice versa, or keep them separate. There are areas of overlap, as well as significant areas of non-overlap. Regards -- Andy ^ permalink raw reply [flat|nested] 89+ messages in thread
* RE: lm sensors sysfs file structure 2005-05-19 6:23 ` Greg KH @ 2005-05-19 6:23 ` Patrick Mochel -1 siblings, 0 replies; 89+ messages in thread From: Patrick Mochel @ 2003-04-14 15:16 UTC (permalink / raw) To: Grover, Andrew Cc: Dominik Brodowski, Dave Jones, Greg KH, Pavel Machek, Jan Dittmer, Mark Studebaker, azarah, KML, sensors > It is still not clear to me if libpower should subsume libsensors, or > vice versa, or keep them separate. There are areas of overlap, as well > as significant areas of non-overlap. IMHO, neither should subsume the other; there should be a 'libdevice', or similar that has both a sensor and a power component to it. -pat ^ permalink raw reply [flat|nested] 89+ messages in thread
* lm sensors sysfs file structure @ 2005-05-19 6:23 ` Patrick Mochel 0 siblings, 0 replies; 89+ messages in thread From: Patrick Mochel @ 2005-05-19 6:23 UTC (permalink / raw) To: Grover, Andrew Cc: Dominik Brodowski, Dave Jones, Greg KH, Pavel Machek, Jan Dittmer, Mark Studebaker, azarah, KML, sensors > It is still not clear to me if libpower should subsume libsensors, or > vice versa, or keep them separate. There are areas of overlap, as well > as significant areas of non-overlap. IMHO, neither should subsume the other; there should be a 'libdevice', or similar that has both a sensor and a power component to it. -pat ^ permalink raw reply [flat|nested] 89+ messages in thread
end of thread, other threads:[~2005-05-19 6:23 UTC | newest] Thread overview: 89+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2003-03-25 8:53 i2c driver changes for 2.5.66; adding w83781d support Martin Schlemmer 2003-03-25 17:56 ` Greg KH 2003-03-26 19:04 ` w83781d i2c driver updated for 2.5.66 (without sysfs support) Martin Schlemmer 2005-05-19 6:23 ` Martin Schlemmer 2003-03-26 19:40 ` Jan Dittmer 2005-05-19 6:23 ` Jan Dittmer 2003-03-26 19:54 ` Martin Schlemmer 2005-05-19 6:23 ` Martin Schlemmer 2003-03-26 20:26 ` Greg KH 2005-05-19 6:23 ` Greg KH 2003-03-26 20:43 ` Christoph Hellwig 2005-05-19 6:23 ` Christoph Hellwig 2003-03-26 21:23 ` Greg KH 2005-05-19 6:23 ` Greg KH 2003-03-26 22:26 ` Mark Studebaker 2005-05-19 6:23 ` Mark Studebaker 2003-03-26 22:52 ` lm sensors sysfs file structure Greg KH 2005-05-19 6:23 ` Greg KH 2003-03-27 10:46 ` Jan Dittmer 2005-05-19 6:23 ` Jan Dittmer 2003-03-27 10:50 ` Martin Schlemmer 2005-05-19 6:23 ` Martin Schlemmer 2003-03-27 12:27 ` Jan Dittmer 2005-05-19 6:23 ` Jan Dittmer 2003-03-27 12:33 ` Martin Schlemmer 2005-05-19 6:23 ` Martin Schlemmer 2003-03-27 13:05 ` Jan Dittmer 2005-05-19 6:23 ` Jan Dittmer 2003-03-27 13:31 ` Jean Delvare 2005-05-19 6:23 ` Jean Delvare 2003-03-27 17:16 ` Mark M. Hoffman 2005-05-19 6:23 ` Mark M. Hoffman 2003-03-27 17:25 ` Greg KH 2005-05-19 6:23 ` Greg KH 2003-03-27 18:06 ` Jan Dittmer 2005-05-19 6:23 ` Jan Dittmer 2003-03-27 18:13 ` Greg KH 2005-05-19 6:23 ` Greg KH 2003-03-30 19:23 ` Pavel Machek 2005-05-19 6:23 ` Pavel Machek 2003-04-01 6:44 ` Greg KH 2005-05-19 6:23 ` Greg KH 2003-04-01 20:22 ` Pavel Machek 2005-05-19 6:23 ` Pavel Machek 2003-04-01 23:27 ` Dave Jones 2005-05-19 6:23 ` Dave Jones 2003-04-03 0:28 ` Greg KH 2005-05-19 6:23 ` Greg KH 2003-04-03 10:49 ` Dave Jones 2005-05-19 6:23 ` Dave Jones 2003-04-03 18:43 ` Dominik Brodowski 2005-05-19 6:23 ` Dominik Brodowski 2003-03-27 18:40 ` Jan Dittmer 2005-05-19 6:23 ` Jan Dittmer 2003-03-27 18:52 ` Greg KH 2005-05-19 6:23 ` Greg KH 2003-03-27 18:17 ` Patrick Mochel 2005-05-19 6:23 ` Patrick Mochel 2003-03-27 18:57 ` Jan Dittmer 2003-03-27 19:15 ` Martin Schlemmer 2005-05-19 6:23 ` Martin Schlemmer 2003-03-27 19:25 ` Greg KH 2005-05-19 6:23 ` Greg KH 2003-03-27 19:42 ` Greg KH 2005-05-19 6:23 ` Greg KH 2003-03-27 20:32 ` Jan Dittmer 2005-05-19 6:23 ` Jan Dittmer 2003-03-27 21:53 ` Greg KH 2005-05-19 6:23 ` Greg KH 2003-03-27 22:23 ` Mark M. Hoffman 2005-05-19 6:23 ` Mark M. Hoffman 2003-03-28 6:05 ` Martin Schlemmer 2005-05-19 6:23 ` Martin Schlemmer 2003-03-28 18:34 ` Pavel Machek 2005-05-19 6:23 ` Pavel Machek 2003-03-26 20:29 ` w83781d i2c driver updated for 2.5.66 (without sysfs support) Greg KH 2005-05-19 6:23 ` Greg KH 2003-03-26 23:34 ` Martin Schlemmer 2005-05-19 6:23 ` Martin Schlemmer 2003-03-26 23:46 ` Greg KH 2005-05-19 6:23 ` Greg KH 2003-03-30 12:47 ` [PATCH-2.5] w83781d i2c driver updated for 2.5.66-bk4 (with sysfs support, empty tree) Martin Schlemmer 2005-05-19 6:23 ` [PATCH-2.5] w83781d i2c driver updated for 2.5.66-bk4 (with sysfs Martin Schlemmer 2003-04-02 22:22 ` [PATCH-2.5] w83781d i2c driver updated for 2.5.66-bk4 (with sysfs support, empty tree) Greg KH 2005-05-19 6:23 ` Greg KH -- strict thread matches above, loose matches on Subject: below -- 2003-04-03 21:19 lm sensors sysfs file structure Grover, Andrew 2005-05-19 6:23 ` Grover, Andrew 2003-04-14 15:16 ` Patrick Mochel 2005-05-19 6:23 ` Patrick Mochel
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.