* Re: [lm-sensors] [PATCH] Add f75375s driver
2007-06-28 23:07 [lm-sensors] [PATCH] Add f75375s driver Riku Voipio
@ 2007-07-02 11:23 ` Riku Voipio
2007-07-05 15:54 ` Christian Emmerich
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Riku Voipio @ 2007-07-02 11:23 UTC (permalink / raw)
To: lm-sensors
Hi,
Just to clarify, this the updated and resent patch as requested in the
"kernel TODO" post.
It is against latest 2.6.22-rc6 + Linuses git up till 29.6. I'd really
appreciate if you would
manage to review it before 2.6.23 window...
Riku Voipio wrote:
> Incorporates unit fixes for voltage and fan speed. fan_max ->fan_full
> rename as requested by Jean, and pwm_enable 0 set now fan to full
> speed.
>
> Signed-off-by: Riku Voipio <riku.voipio@movial.fi>
> ---
> drivers/hwmon/Kconfig | 10 +
> drivers/hwmon/Makefile | 1 +
> drivers/hwmon/f75375s.c | 691 +++++++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 702 insertions(+), 0 deletions(-)
> create mode 100644 drivers/hwmon/f75375s.c
>
> diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
> index 13eea47..9138604 100644
> --- a/drivers/hwmon/Kconfig
> +++ b/drivers/hwmon/Kconfig
> @@ -199,6 +199,16 @@ config SENSORS_F71805F
> This driver can also be built as a module. If so, the module
> will be called f71805f.
>
> +config SENSORS_F75375S
> + tristate "Fintek F75375S/SP and F75373";
> + depends on I2C && EXPERIMENTAL
> + help
> + If you say yes here you get support for hardware monitoring
> + features of the Fintek F75375S/SP and F75373
> +
> + This driver can also be built as a module. If so, the module
> + will be called f75375s.
> +
> config SENSORS_FSCHER
> tristate "FSC Hermes"
> depends on I2C
> diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
> index cfaf338..689131a 100644
> --- a/drivers/hwmon/Makefile
> +++ b/drivers/hwmon/Makefile
> @@ -27,6 +27,7 @@ obj-$(CONFIG_SENSORS_ATXP1) += atxp1.o
> obj-$(CONFIG_SENSORS_CORETEMP) += coretemp.o
> obj-$(CONFIG_SENSORS_DS1621) += ds1621.o
> obj-$(CONFIG_SENSORS_F71805F) += f71805f.o
> +obj-$(CONFIG_SENSORS_F75375S) += f75375s.o
> obj-$(CONFIG_SENSORS_FSCHER) += fscher.o
> obj-$(CONFIG_SENSORS_FSCPOS) += fscpos.o
> obj-$(CONFIG_SENSORS_GL518SM) += gl518sm.o
> diff --git a/drivers/hwmon/f75375s.c b/drivers/hwmon/f75375s.c
> new file mode 100644
> index 0000000..b99b4f8
> --- /dev/null
> +++ b/drivers/hwmon/f75375s.c
> @@ -0,0 +1,691 @@
> +/*
> + * f75375.c - driver for the Fintek F75375/SP and F75373
> + * hardware monitoring features
> + * Copyright (C) 2006-2007 Riku Voipio <riku.voipio@movial.fi>
> + *
> + * 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.
> + *
> + */
> +
> +#include <linux/module.h>
> +#include <linux/jiffies.h>
> +#include <linux/hwmon.h>
> +#include <linux/hwmon-sysfs.h>
> +#include <linux/i2c.h>
> +#include <linux/err.h>
> +#include <linux/mutex.h>
> +
> +/* Addresses to scan */
> +static unsigned short normal_i2c[] = { 0x2d, 0x2e, I2C_CLIENT_END };
> +
> +/* Insmod parameters */
> +I2C_CLIENT_INSMOD_1(f75375);
> +
> +/* Fintek F75375 registers */
> +#define F75375_REG_CONFIG0 0x0
> +#define F75375_REG_CONFIG1 0x1
> +#define F75375_REG_CONFIG2 0x2
> +#define F75375_REG_CONFIG3 0x3
> +#define F75375_REG_ADDR 0x4
> +#define F75375_REG_INTR 0x31
> +#define F75375_CHIP_ID 0x5A
> +#define F75375_REG_VERSION 0x5C
> +#define F75375_REG_VENDOR 0x5D
> +#define F75375_REG_FAN_TIMER 0x60
> +
> +#define F75375_REG_VOLT(nr) (0x10 + (nr))
> +#define F75375_REG_VOLT_HIGH(nr) (0x20 + (nr) * 2 )
> +#define F75375_REG_VOLT_LOW(nr) (0x21 + (nr) * 2 )
> +
> +#define F75375_REG_TEMP(nr) (0x14 + (nr))
> +#define F75375_REG_TEMP_HIGH(nr) (0x28 + (nr) * 2 )
> +#define F75375_REG_TEMP_HYST(nr) (0x29 + (nr) * 2 )
> +
> +#define F75375_REG_FAN(nr) (0x16 + (nr) * 2 )
> +#define F75375_REG_FAN_MIN(nr) (0x2C + (nr) * 2 )
> +#define F75375_REG_FAN_FULL(nr) (0x70 + (nr) * 0x10 )
> +#define F75375_REG_FAN_PWM_DUTY(nr) (0x76 + (nr) * 0x10 )
> +#define F75375_REG_FAN_PWM_CLOCK(nr) (0x7D + (nr) * 0x10 )
> +
> +#define F75375_REG_FAN_EXP(nr) (0x74 + (nr) * 0x10 )
> +#define F75375_REG_FAN_B_TEMP(nr, step) ((0xA0 + (nr) * 0x10) + (step))
> +#define F75375_REG_FAN_B_SPEED(nr, step) \
> + ((0xA5 + (nr) * 0x10) + (step) * 2 )
> +
> +#define F75375_REG_PWM1_RAISE_DUTY 0x69
> +#define F75375_REG_PWM2_RAISE_DUTY 0x6A
> +#define F75375_REG_PWM1_DROP_DUTY 0x6B
> +#define F75375_REG_PWM2_DROP_DUTY 0x6C
> +
> +#define FAN_CTRL_LINEAR(nr) (4+nr)
> +#define FAN_CTRL_MODE(nr) (5+(nr*2))
> +
> +enum kinds {F75375, F75373};
> +
> +/*
> + * Data structures and manipulation thereof
> + */
> +
> +struct f75375_data {
> + unsigned short addr;
> + struct i2c_client client;
> + struct class_device *class_dev;
> +
> + const char *name;
> + enum kinds kind;
> + struct mutex update_lock; /* protect register access */
> + char valid;
> + unsigned long last_updated; /* In jiffies */
> + unsigned long last_limits; /* In jiffies */
> +
> + /* Register values */
> + u8 in[4];
> + u8 in_max[4];
> + u8 in_min[4];
> + u16 fan[2];
> + u16 fan_min[2];
> + u16 fan_full[2];
> + u16 fan_exp[2];
> + u8 fan_timer;
> + u8 pwm[2];
> + u8 pwm_mode[2];
> + u8 pwm_enable[2];
> + u8 temp[2];
> + s8 temp_high[2];
> + s8 temp_max_hyst[2];
> +};
> +
> +static int f75375_attach_adapter(struct i2c_adapter *adapter);
> +static int f75375_detect(struct i2c_adapter *adapter, int address, int kind);
> +static int f75375_detach_client(struct i2c_client *client);
> +
> +static struct i2c_driver f75375_driver = {
> + .driver = {
> + .name = "f75375",
> + },
> + .attach_adapter = f75375_attach_adapter,
> + .detach_client = f75375_detach_client,
> +};
> +
> +static inline int f75375_read8(struct i2c_client *client, u8 reg)
> +{
> + return i2c_smbus_read_byte_data(client, reg);
> +}
> +static inline u16 f75375_read16(struct i2c_client *client, u8 reg)
> +{
> + return ((i2c_smbus_read_byte_data(client, reg) << 8)
> + | i2c_smbus_read_byte_data(client, reg + 1));
> +}
> +
> +static inline int f75375_write8(struct i2c_client *client, u8 reg,
> + u8 value)
> +{
> + return i2c_smbus_write_byte_data(client, reg, value);
> +}
> +static inline int f75375_write16(struct i2c_client *client, u8 reg,
> + u16 value)
> +{
> + int err = i2c_smbus_write_byte_data(client, reg, (value << 8));
> + if (err)
> + return err;
> + return i2c_smbus_write_byte_data(client, reg + 1, (value & 0xFF));
> +}
> +static struct f75375_data *f75375_update_device(struct device *dev)
> +{
> + struct i2c_client *client = to_i2c_client(dev);
> + struct f75375_data *data = i2c_get_clientdata(client);
> + int nr;
> +
> + mutex_lock(&data->update_lock);
> +
> + /* Limit registers cache is refreshed after 60 seconds */
> + if (time_after(jiffies, data->last_updated + 60 * HZ)
> + || !data->valid) {
> + for (nr = 0; nr < 2; nr++) {
> + data->temp_high[nr] > + f75375_read8(client, F75375_REG_TEMP_HIGH(nr));
> + data->temp_max_hyst[nr] > + f75375_read8(client, F75375_REG_TEMP_HYST(nr));
> + data->fan_full[nr] > + f75375_read16(client, F75375_REG_FAN_FULL(nr));
> + data->fan_min[nr] > + f75375_read16(client, F75375_REG_FAN_MIN(nr));
> + data->fan_exp[nr] > + f75375_read16(client, F75375_REG_FAN_EXP(nr));
> + data->pwm[nr] = f75375_read8(client,
> + F75375_REG_FAN_PWM_DUTY(nr));
> +
> + }
> + for (nr = 0; nr < 4; nr++) {
> + data->in_max[nr] > + f75375_read8(client, F75375_REG_VOLT_HIGH(nr));
> + data->in_min[nr] > + f75375_read8(client, F75375_REG_VOLT_LOW(nr));
> + }
> + data->fan_timer = f75375_read8(client, F75375_REG_FAN_TIMER);
> + data->last_limits = jiffies;
> + }
> +
> + /* Measurement registers cache is refreshed after 2 second */
> + if (time_after(jiffies, data->last_updated + 2 * HZ)
> + || !data->valid) {
> + for (nr = 0; nr < 2; nr++) {
> + data->temp[nr] > + f75375_read8(client, F75375_REG_TEMP(nr));
> + data->fan[nr] > + f75375_read16(client, F75375_REG_FAN(nr));
> + }
> + for (nr = 0; nr < 4; nr++) {
> + data->in[nr] > + f75375_read8(client, F75375_REG_VOLT(nr));
> + }
> + data->last_updated = jiffies;
> + data->valid = 1;
> + }
> +
> + mutex_unlock(&data->update_lock);
> + return data;
> +}
> +
> +
> +#define RPM_FROM_REG(val) (val = 65535 ? 0 : 1500000/(val))
> +#define RPM_TO_REG(val) (1500000/(val))
> +
> +static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr,
> + const char *buf, size_t count)
> +{
> + struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
> + int nr = sensor_attr->index;
> +
> + struct i2c_client *client = to_i2c_client(dev);
> + struct f75375_data *data = i2c_get_clientdata(client);
> + int val = simple_strtol(buf, NULL, 10);
> +
> + mutex_lock(&data->update_lock);
> + data->fan_min[nr] = RPM_TO_REG(val);
> + f75375_write16(client, F75375_REG_FAN_MIN(nr), data->fan_min[nr]);
> + mutex_unlock(&data->update_lock);
> + return count;
> +}
> +
> +static ssize_t set_fan_exp(struct device *dev, struct device_attribute *attr,
> + const char *buf, size_t count)
> +{
> + struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
> + int nr = sensor_attr->index;
> +
> + struct i2c_client *client = to_i2c_client(dev);
> + struct f75375_data *data = i2c_get_clientdata(client);
> + int val = simple_strtol(buf, NULL, 10);
> +
> + mutex_lock(&data->update_lock);
> + data->fan_exp[nr] = RPM_TO_REG(val);
> + f75375_write16(client, F75375_REG_FAN_MIN(nr), data->fan_exp[nr]);
> + mutex_unlock(&data->update_lock);
> + return count;
> +}
> +
> +static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
> + const char *buf, size_t count)
> +{
> + struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
> + int nr = sensor_attr->index;
> +
> + struct i2c_client *client = to_i2c_client(dev);
> + struct f75375_data *data = i2c_get_clientdata(client);
> + int val = simple_strtol(buf, NULL, 10);
> +
> + mutex_lock(&data->update_lock);
> + data->pwm[nr] = val;
> + f75375_write8(client, F75375_REG_FAN_PWM_DUTY(nr), data->pwm[nr]);
> + mutex_unlock(&data->update_lock);
> + return count;
> +}
> +
> +static ssize_t show_pwm_enable(struct device *dev, struct device_attribute
> + *attr, char *buf)
> +{
> + struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
> + int nr = sensor_attr->index;
> + struct f75375_data *data = f75375_update_device(dev);
> + return sprintf(buf, "%d\n", data->pwm_enable[nr]);
> +}
> +
> +static ssize_t set_pwm_enable(struct device *dev, struct device_attribute *attr,
> + const char *buf, size_t count)
> +{
> + struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
> + int nr = sensor_attr->index;
> +
> + struct i2c_client *client = to_i2c_client(dev);
> + struct f75375_data *data = i2c_get_clientdata(client);
> + int val = simple_strtol(buf, NULL, 10);
> + u8 fanmode;
> +
> + if (val < 0 || val > 4)
> + return -EINVAL;
> +
> + mutex_lock(&data->update_lock);
> + fanmode = f75375_read8(client, F75375_REG_FAN_TIMER);
> + fanmode = ~(3 << FAN_CTRL_MODE(nr) );
> +
> + switch (val) {
> + case 0: /* Full speed */
> + fanmode |= (3 << FAN_CTRL_MODE(nr) );
> + data->pwm[nr] = 255;
> + f75375_write8( client, F75375_REG_FAN_PWM_DUTY(nr),
> + data->pwm[nr]);
> + break;
> + case 1: /* PWM */
> + fanmode |= (3 << FAN_CTRL_MODE(nr) );
> + break;
> + case 2: /* AUTOMATIC*/
> + fanmode |= (2 << FAN_CTRL_MODE(nr) );
> + break;
> + case 3: /* fan speed */
> + break;
> + }
> + f75375_write8(client, F75375_REG_FAN_TIMER, fanmode);
> + data->pwm_enable[nr] = val;
> + mutex_unlock(&data->update_lock);
> + return count;
> +}
> +
> +static ssize_t set_pwm_mode(struct device *dev, struct device_attribute *attr,
> + const char *buf, size_t count)
> +{
> + struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
> + int nr = sensor_attr->index;
> +
> + struct i2c_client *client = to_i2c_client(dev);
> + struct f75375_data *data = i2c_get_clientdata(client);
> + int kind = data->kind;
> + int val = simple_strtol(buf, NULL, 10);
> + u8 conf = 0;
> +
> + if (val != 0 || val != 1 || kind = F75373 )
> + return -EINVAL;
> +
> + mutex_lock(&data->update_lock);
> + conf = f75375_read8(client, F75375_REG_CONFIG1);
> + conf = ~(1 << FAN_CTRL_LINEAR(nr) );
> +
> + if (val = 0)
> + conf |= (1 << FAN_CTRL_LINEAR(nr) ) ;
> +
> + f75375_write8(client, F75375_REG_CONFIG1, conf);
> + data->pwm_mode[nr] = val;
> + mutex_unlock(&data->update_lock);
> + return count;
> +}
> +
> +static ssize_t show_pwm(struct device *dev, struct device_attribute
> + *attr, char *buf)
> +{
> + struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
> + int nr = sensor_attr->index;
> + struct f75375_data *data = f75375_update_device(dev);
> + return sprintf(buf, "%d\n", data->pwm[nr]);
> +}
> +static ssize_t show_pwm_mode(struct device *dev, struct device_attribute
> + *attr, char *buf)
> +{
> + struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
> + int nr = sensor_attr->index;
> + struct f75375_data *data = f75375_update_device(dev);
> + return sprintf(buf, "%d\n", data->pwm_mode[nr]);
> +}
> +
> +#define VOLT_FROM_REG(val) ((val)*8)
> +#define VOLT_TO_REG(val) ((val)/8)
> +
> +static ssize_t show_in(struct device *dev, struct device_attribute *attr,
> + char *buf)
> +{
> + struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
> + int nr = sensor_attr->index;
> + struct f75375_data *data = f75375_update_device(dev);
> + return sprintf(buf, "%d\n", VOLT_FROM_REG(data->in[nr]));
> +}
> +
> +static ssize_t show_in_max(struct device *dev, struct device_attribute *attr,
> + char *buf)
> +{
> + struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
> + int nr = sensor_attr->index;
> + struct f75375_data *data = f75375_update_device(dev);
> + return sprintf(buf, "%d\n", VOLT_FROM_REG(data->in_max[nr]));
> +}
> +
> +static ssize_t show_in_min(struct device *dev, struct device_attribute *attr,
> + char *buf)
> +{
> + struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
> + int nr = sensor_attr->index;
> + struct f75375_data *data = f75375_update_device(dev);
> + return sprintf(buf, "%d\n", VOLT_FROM_REG(data->in_max[nr]));
> +}
> +
> +static ssize_t set_in_max(struct device *dev, struct device_attribute *attr,
> + const char *buf, size_t count)
> +{
> + struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
> + int nr = sensor_attr->index;
> + struct i2c_client *client = to_i2c_client(dev);
> + struct f75375_data *data = i2c_get_clientdata(client);
> + int val = simple_strtol(buf, NULL, 10);
> + mutex_lock(&data->update_lock);
> + data->in_max[nr] = VOLT_TO_REG(val);
> + f75375_write8(client, F75375_REG_VOLT_HIGH(nr), data->in_max[nr]);
> + mutex_unlock(&data->update_lock);
> + return count;
> +}
> +
> +static ssize_t set_in_min(struct device *dev, struct device_attribute *attr,
> + const char *buf, size_t count)
> +{
> + struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
> + int nr = sensor_attr->index;
> + struct i2c_client *client = to_i2c_client(dev);
> + struct f75375_data *data = i2c_get_clientdata(client);
> + int val = simple_strtol(buf, NULL, 10);
> + mutex_lock(&data->update_lock);
> + data->in_min[nr] = VOLT_TO_REG(val);
> + f75375_write8(client, F75375_REG_VOLT_LOW(nr), data->in_min[nr]);
> + mutex_unlock(&data->update_lock);
> + return count;
> +}
> +#define TEMP_FROM_REG(val) ((val)*1000)
> +#define TEMP_TO_REG(val) ((val)/1000)
> +
> +static ssize_t show_temp(struct device *dev, struct device_attribute *attr,
> + char *buf)
> +{
> + struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
> + int nr = sensor_attr->index;
> + struct f75375_data *data = f75375_update_device(dev);
> + return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[nr]));
> +}
> +
> +static ssize_t show_temp_max(struct device *dev, struct device_attribute *attr,
> + char *buf)
> +{
> + struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
> + int nr = sensor_attr->index;
> + struct f75375_data *data = f75375_update_device(dev);
> + return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_high[nr]));
> +}
> +
> +static ssize_t show_temp_max_hyst(struct device *dev,
> + struct device_attribute *attr, char *buf)
> +{
> + struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
> + int nr = sensor_attr->index;
> + struct f75375_data *data = f75375_update_device(dev);
> + return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_max_hyst[nr]));
> +}
> +
> +static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,
> + const char *buf, size_t count)
> +{
> + struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
> + int nr = sensor_attr->index;
> +
> + struct i2c_client *client = to_i2c_client(dev);
> + struct f75375_data *data = i2c_get_clientdata(client);
> + int val = simple_strtol(buf, NULL, 10);
> +
> + mutex_lock(&data->update_lock);
> + data->temp_high[nr] = TEMP_TO_REG(val);
> + f75375_write8(client, F75375_REG_TEMP_HIGH(nr), data->temp_high[nr]);
> + mutex_unlock(&data->update_lock);
> + return count;
> +}
> +
> +static ssize_t set_temp_max_hyst(struct device *dev,
> + struct device_attribute *attr, const char *buf, size_t count)
> +{
> + struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
> + int nr = sensor_attr->index;
> +
> + struct i2c_client *client = to_i2c_client(dev);
> + struct f75375_data *data = i2c_get_clientdata(client);
> + int val = simple_strtol(buf, NULL, 10);
> +
> + mutex_lock(&data->update_lock);
> + data->temp_max_hyst[nr] = TEMP_TO_REG(val);
> + f75375_write8(client, F75375_REG_TEMP_HYST(nr),
> + data->temp_max_hyst[nr]);
> + mutex_unlock(&data->update_lock);
> + return count;
> +}
> +
> +#define show_fan(thing) \
> +static ssize_t show_##thing(struct device *dev, struct device_attribute *attr, \
> + char *buf)\
> +{\
> + struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);\
> + int nr = sensor_attr->index;\
> + struct f75375_data *data = f75375_update_device(dev); \
> + return sprintf(buf, "%d\n", RPM_FROM_REG(data->thing[nr])); \
> +}
> +
> +show_fan(fan);
> +show_fan(fan_min);
> +show_fan(fan_full);
> +show_fan(fan_exp);
> +
> +static SENSOR_DEVICE_ATTR(in0_input, S_IRUGO, show_in, NULL, 0);
> +static SENSOR_DEVICE_ATTR(in0_max, S_IRUGO|S_IWUSR,
> + show_in_max, set_in_max, 0);
> +static SENSOR_DEVICE_ATTR(in0_min, S_IRUGO|S_IWUSR,
> + show_in_min, set_in_min, 0);
> +static SENSOR_DEVICE_ATTR(in1_input, S_IRUGO, show_in, NULL, 1);
> +static SENSOR_DEVICE_ATTR(in1_max, S_IRUGO|S_IWUSR,
> + show_in_max, set_in_max, 1);
> +static SENSOR_DEVICE_ATTR(in1_min, S_IRUGO|S_IWUSR,
> + show_in_min, set_in_min, 1);
> +static SENSOR_DEVICE_ATTR(in2_input, S_IRUGO, show_in, NULL, 2);
> +static SENSOR_DEVICE_ATTR(in2_max, S_IRUGO|S_IWUSR,
> + show_in_max, set_in_max, 2);
> +static SENSOR_DEVICE_ATTR(in2_min, S_IRUGO|S_IWUSR,
> + show_in_min, set_in_min, 2);
> +static SENSOR_DEVICE_ATTR(in3_input, S_IRUGO, show_in, NULL, 3);
> +static SENSOR_DEVICE_ATTR(in3_max, S_IRUGO|S_IWUSR,
> + show_in_max, set_in_max, 3);
> +static SENSOR_DEVICE_ATTR(in3_min, S_IRUGO|S_IWUSR,
> + show_in_min, set_in_min, 3);
> +static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL, 0);
> +static SENSOR_DEVICE_ATTR(temp1_max_hyst, S_IRUGO | S_IWUSR,
> + show_temp_max_hyst, set_temp_max_hyst, 0);
> +static SENSOR_DEVICE_ATTR(temp1_max, S_IRUGO|S_IWUSR,
> + show_temp_max, set_temp_max, 0);
> +static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, show_temp, NULL, 1);
> +static SENSOR_DEVICE_ATTR(temp2_max_hyst, S_IRUGO | S_IWUSR,
> + show_temp_max_hyst, set_temp_max_hyst, 1);
> +static SENSOR_DEVICE_ATTR(temp2_max, S_IRUGO|S_IWUSR,
> + show_temp_max, set_temp_max, 1);
> +static SENSOR_DEVICE_ATTR(fan1_input, S_IRUGO, show_fan, NULL, 0);
> +static SENSOR_DEVICE_ATTR(fan1_full, S_IRUGO, show_fan_full, NULL, 0);
> +static SENSOR_DEVICE_ATTR(fan1_min, S_IRUGO|S_IWUSR,
> + show_fan_min, set_fan_min, 0);
> +static SENSOR_DEVICE_ATTR(fan1_exp, S_IRUGO|S_IWUSR,
> + show_fan_exp, set_fan_exp, 0);
> +static SENSOR_DEVICE_ATTR(fan2_input, S_IRUGO, show_fan, NULL, 1);
> +static SENSOR_DEVICE_ATTR(fan2_full, S_IRUGO, show_fan_full, NULL, 1);
> +static SENSOR_DEVICE_ATTR(fan2_min, S_IRUGO|S_IWUSR,
> + show_fan_min, set_fan_min, 1);
> +static SENSOR_DEVICE_ATTR(fan2_exp, S_IRUGO|S_IWUSR,
> + show_fan_exp, set_fan_exp, 1);
> +static SENSOR_DEVICE_ATTR(pwm1, S_IRUGO|S_IWUSR,
> + show_pwm, set_pwm, 0);
> +static SENSOR_DEVICE_ATTR(pwm1_enable, S_IRUGO|S_IWUSR,
> + show_pwm_enable, set_pwm_enable, 0);
> +static SENSOR_DEVICE_ATTR(pwm1_mode, S_IRUGO|S_IWUSR,
> + show_pwm_mode, set_pwm_mode, 0);
> +static SENSOR_DEVICE_ATTR(pwm2, S_IRUGO | S_IWUSR,
> + show_pwm, set_pwm, 1);
> +static SENSOR_DEVICE_ATTR(pwm2_enable, S_IRUGO|S_IWUSR,
> + show_pwm_enable, set_pwm_enable, 1);
> +static SENSOR_DEVICE_ATTR(pwm2_mode, S_IRUGO|S_IWUSR,
> + show_pwm_mode, set_pwm_mode, 1);
> +
> +static struct attribute *f75375_attributes[] = {
> + &sensor_dev_attr_temp1_input.dev_attr.attr,
> + &sensor_dev_attr_temp1_max.dev_attr.attr,
> + &sensor_dev_attr_temp1_max_hyst.dev_attr.attr,
> + &sensor_dev_attr_temp2_input.dev_attr.attr,
> + &sensor_dev_attr_temp2_max.dev_attr.attr,
> + &sensor_dev_attr_temp2_max_hyst.dev_attr.attr,
> + &sensor_dev_attr_fan1_input.dev_attr.attr,
> + &sensor_dev_attr_fan1_full.dev_attr.attr,
> + &sensor_dev_attr_fan1_min.dev_attr.attr,
> + &sensor_dev_attr_fan1_exp.dev_attr.attr,
> + &sensor_dev_attr_fan2_input.dev_attr.attr,
> + &sensor_dev_attr_fan2_full.dev_attr.attr,
> + &sensor_dev_attr_fan2_min.dev_attr.attr,
> + &sensor_dev_attr_fan2_exp.dev_attr.attr,
> + &sensor_dev_attr_pwm1.dev_attr.attr,
> + &sensor_dev_attr_pwm1_enable.dev_attr.attr,
> + &sensor_dev_attr_pwm1_mode.dev_attr.attr,
> + &sensor_dev_attr_pwm2.dev_attr.attr,
> + &sensor_dev_attr_pwm2_enable.dev_attr.attr,
> + &sensor_dev_attr_pwm2_mode.dev_attr.attr,
> + &sensor_dev_attr_in0_input.dev_attr.attr,
> + &sensor_dev_attr_in0_max.dev_attr.attr,
> + &sensor_dev_attr_in0_min.dev_attr.attr,
> + &sensor_dev_attr_in1_input.dev_attr.attr,
> + &sensor_dev_attr_in1_max.dev_attr.attr,
> + &sensor_dev_attr_in1_min.dev_attr.attr,
> + &sensor_dev_attr_in2_input.dev_attr.attr,
> + &sensor_dev_attr_in2_max.dev_attr.attr,
> + &sensor_dev_attr_in2_min.dev_attr.attr,
> + &sensor_dev_attr_in3_input.dev_attr.attr,
> + &sensor_dev_attr_in3_max.dev_attr.attr,
> + &sensor_dev_attr_in3_min.dev_attr.attr,
> + NULL
> +};
> +
> +static const struct attribute_group f75375_group > +{
> + .attrs = f75375_attributes,
> +};
> +
> +static int f75375_detach_client(struct i2c_client *client)
> +{
> + struct f75375_data *data = i2c_get_clientdata(client);
> + int err;
> +
> + sysfs_remove_group(&client->dev.kobj, &f75375_group);
> + hwmon_device_unregister(data->class_dev);
> +
> + err = i2c_detach_client(client);
> + if (err) {
> + dev_err(&client->dev,
> + "Client deregistration failed, "
> + "client not detached.\n");
> + return err;
> + }
> + kfree(data);
> + return 0;
> +}
> +
> +static int f75375_attach_adapter(struct i2c_adapter *adapter)
> +{
> + return i2c_probe(adapter, &addr_data, f75375_detect);
> +}
> +
> +
> +/* This function is called by i2c_probe */
> +static int f75375_detect(struct i2c_adapter *adapter, int address, int kind)
> +{
> + struct i2c_client *client;
> + struct f75375_data *data;
> + u8 version = 0;
> + int err = 0;
> + char *name = "";
> +
> + if (!(data = kzalloc(sizeof(struct f75375_data), GFP_KERNEL))) {
> + err = -ENOMEM;
> + goto exit;
> + }
> + client = &data->client;
> + i2c_set_clientdata(client, data);
> + client->addr = address;
> + client->adapter = adapter;
> + client->driver = &f75375_driver;
> + client->flags = 0;
> +
> + if (kind < 0) {
> + u16 vendid = f75375_read16(client, F75375_REG_VENDOR);
> + u16 chipid = f75375_read16(client, F75375_CHIP_ID);
> + version = f75375_read8(client, F75375_REG_VERSION);
> + if (chipid = 0x0306 && vendid = 0x1934) {
> + name = "f75375";
> + data->kind = F75375;
> + } else if (chipid = 0x0204 && vendid = 0x1934) {
> + name = "f75373";
> + data->kind = F75373;
> + } else {
> + dev_err(&adapter->dev,
> + "failed,%02X,%02X,%02X\n",
> + chipid, version, vendid);
> + goto exit_free;
> + }
> + }
> + dev_info(&adapter->dev, "found %s version: %02X\n", name, version);
> + strlcpy(client->name, name, I2C_NAME_SIZE);
> + data->valid = 0;
> + mutex_init(&data->update_lock);
> + if ((err = i2c_attach_client(client)))
> + goto exit_free;
> +
> + if ((err = sysfs_create_group(&client->dev.kobj, &f75375_group)))
> + goto exit_detach;
> +
> + data->class_dev = hwmon_device_register(&client->dev);
> + if (IS_ERR(data->class_dev)) {
> + err = PTR_ERR(data->class_dev);
> + goto exit_remove;
> + }
> +
> + return 0;
> +
> +exit_remove:
> + sysfs_remove_group(&client->dev.kobj, &f75375_group);
> +exit_detach:
> + i2c_detach_client(client);
> +exit_free:
> + kfree(data);
> +exit:
> + return err;
> +}
> +
> +static int __init sensors_f75375_init(void)
> +{
> + return i2c_add_driver(&f75375_driver);
> +}
> +
> +static void __exit sensors_f75375_exit(void)
> +{
> + i2c_del_driver(&f75375_driver);
> +}
> +
> +MODULE_AUTHOR("Riku Voipio <riku.voipio@movial.fi> ");
> +MODULE_LICENSE("GPL");
> +MODULE_DESCRIPTION("F75373/F75375 hardware monitoring driver");
> +
> +module_init(sensors_f75375_init);
> +module_exit(sensors_f75375_exit);
>
_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [lm-sensors] [PATCH] Add f75375s driver
2007-06-28 23:07 [lm-sensors] [PATCH] Add f75375s driver Riku Voipio
2007-07-02 11:23 ` Riku Voipio
@ 2007-07-05 15:54 ` Christian Emmerich
2007-07-06 19:14 ` Voipio Riku
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Christian Emmerich @ 2007-07-05 15:54 UTC (permalink / raw)
To: lm-sensors
[-- Attachment #1.1: Type: text/plain, Size: 1116 bytes --]
Hi,
> Just to clarify, this the updated and resent patch as requested in the
> "kernel TODO" post.
> It is against latest 2.6.22-rc6 + Linuses git up till 29.6. I'd really
> appreciate if you would
> manage to review it before 2.6.23 window...
I tested the new version of the driver. Maybe i found one small bug. Should it be in function 'show_in_min':
"return sprintf(buf, "%d\n", VOLT_FROM_REG(data->in_min[nr]));"
instead of
"return sprintf(buf, "%d\n", VOLT_FROM_REG(data->in_max[nr]));"? After changing it, i can set a min value in sensors.conf using sensors -s.
Another problem is still the value of tempX_max_hyst, the value is always zero. If i read sysfs direct i get following output:
root@pc:/sys/devices/pci0000:00/0000:00:01.1/i2c-2/2-002d# cat temp1_max_hyst
0
root@pc:/sys/devices/pci0000:00/0000:00:01.1/i2c-2/2-002d# cat temp2_max_hyst
0
I'm using kernel version 2.6.17-10, is that a problem? I use the driver for the f75373 chip.
best regards
christian.
---------------------------------
Die besten Tipps und Tricks fürs Grillen. BE A BETTER GRILLMEISTER!
[-- Attachment #1.2: Type: text/html, Size: 1999 bytes --]
[-- Attachment #2: Type: text/plain, Size: 153 bytes --]
_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [lm-sensors] [PATCH] Add f75375s driver
2007-06-28 23:07 [lm-sensors] [PATCH] Add f75375s driver Riku Voipio
2007-07-02 11:23 ` Riku Voipio
2007-07-05 15:54 ` Christian Emmerich
@ 2007-07-06 19:14 ` Voipio Riku
2007-07-07 17:26 ` Christian Emmerich
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Voipio Riku @ 2007-07-06 19:14 UTC (permalink / raw)
To: lm-sensors
[-- Attachment #1: Type: text/plain, Size: 1511 bytes --]
Hi Christian,
Thanks for your time reviewing and testing the driver.
> I tested the new version of the driver. Maybe i found one small bug.
> Should it be in function 'show_in_min':
> "return sprintf(buf, "%d\n", VOLT_FROM_REG(data->in_min[nr]));"
> instead of
> "return sprintf(buf, "%d\n", VOLT_FROM_REG(data->in_max[nr]));"?
Thanks, fixed.
> Another problem is still the value of tempX_max_hyst, the value is always
> zero. If i read sysfs direct i get following output:
> root@pc:/sys/devices/pci0000:00/0000:00:01.1/i2c-2/2-002d# cat
> temp1_max_hyst
> 0
> root@pc:/sys/devices/pci0000:00/0000:00:01.1/i2c-2/2-002d# cat
> temp2_max_hyst
> 0
What value are you setting it to?
thecus-1:/sys/devices/platform/IOP3xx-I2C.0/i2c-0/0-002e# cat temp1_max_hyst
55000
thecus-1:/sys/devices/platform/IOP3xx-I2C.0/i2c-0/0-002e# echo 55 >
temp1_max_hyst
thecus-1:/sys/devices/platform/IOP3xx-I2C.0/i2c-0/0-002e# cat temp1_max_hyst
0
ALL6500:/sys/devices/platform/IOP3xx-I2C.0/i2c-0/0-002e# echo 61000 >
temp1_max_hyst
ALL6500:/sys/devices/platform/IOP3xx-I2C.0/i2c-0/0-002e# cat temp1_max_hyst
61000
So it appears to work as expected. According to sysfs-interface temp*
should report and accept millidegrees or millivolts. We are outputting
millidegrees.
> I'm using kernel version 2.6.17-10, is that a problem? I use the driver
> for the f75373 chip.
Older kernel should not be a problem. I only have a f75375, but the
datasheets for hysteris parts are identical.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Add-f75375s-driver.patch --]
[-- Type: text/x-diff; name="0001-Add-f75375s-driver.patch", Size: 24000 bytes --]
From 2dec61db31dbb6b9105b9092454063509487b30c Mon Sep 17 00:00:00 2001
From: Riku Voipio <nchip@watergate-2.(none)>
Date: Fri, 29 Jun 2007 01:21:03 +0300
Subject: [PATCH] Add f75375s driver
Signed-off-by: Riku Voipio <riku.voipio@movial.fi>
---
drivers/hwmon/Kconfig | 10 +
drivers/hwmon/Makefile | 1 +
drivers/hwmon/f75375s.c | 673 +++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 684 insertions(+), 0 deletions(-)
create mode 100644 drivers/hwmon/f75375s.c
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 13eea47..9138604 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -199,6 +199,16 @@ config SENSORS_F71805F
This driver can also be built as a module. If so, the module
will be called f71805f.
+config SENSORS_F75375S
+ tristate "Fintek F75375S/SP and F75373";
+ depends on I2C && EXPERIMENTAL
+ help
+ If you say yes here you get support for hardware monitoring
+ features of the Fintek F75375S/SP and F75373
+
+ This driver can also be built as a module. If so, the module
+ will be called f75375s.
+
config SENSORS_FSCHER
tristate "FSC Hermes"
depends on I2C
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index cfaf338..689131a 100644
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -27,6 +27,7 @@ obj-$(CONFIG_SENSORS_ATXP1) += atxp1.o
obj-$(CONFIG_SENSORS_CORETEMP) += coretemp.o
obj-$(CONFIG_SENSORS_DS1621) += ds1621.o
obj-$(CONFIG_SENSORS_F71805F) += f71805f.o
+obj-$(CONFIG_SENSORS_F75375S) += f75375s.o
obj-$(CONFIG_SENSORS_FSCHER) += fscher.o
obj-$(CONFIG_SENSORS_FSCPOS) += fscpos.o
obj-$(CONFIG_SENSORS_GL518SM) += gl518sm.o
diff --git a/drivers/hwmon/f75375s.c b/drivers/hwmon/f75375s.c
new file mode 100644
index 0000000..e77e7b2
--- /dev/null
+++ b/drivers/hwmon/f75375s.c
@@ -0,0 +1,673 @@
+/*
+ * f75375s.c - driver for the Fintek F75375/SP and F75373
+ * hardware monitoring features
+ * Copyright (C) 2006-2007 Riku Voipio <riku.voipio@movial.fi>
+ *
+ * Datasheets available at:
+ *
+ * f75375:
+ * http://www.fintek.com.tw/files/productfiles/2005111152950.pdf
+ *
+ * f75373:
+ * http://www.fintek.com.tw/files/productfiles/2005111153128.pdf
+ *
+ * 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.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/jiffies.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/i2c.h>
+#include <linux/err.h>
+#include <linux/mutex.h>
+
+/* Addresses to scan */
+static unsigned short normal_i2c[] = { 0x2d, 0x2e, I2C_CLIENT_END };
+
+/* Insmod parameters */
+I2C_CLIENT_INSMOD_1(f75375);
+
+/* Fintek F75375 registers */
+#define F75375_REG_CONFIG0 0x0
+#define F75375_REG_CONFIG1 0x1
+#define F75375_REG_CONFIG2 0x2
+#define F75375_REG_CONFIG3 0x3
+#define F75375_REG_ADDR 0x4
+#define F75375_REG_INTR 0x31
+#define F75375_CHIP_ID 0x5A
+#define F75375_REG_VERSION 0x5C
+#define F75375_REG_VENDOR 0x5D
+#define F75375_REG_FAN_TIMER 0x60
+
+#define F75375_REG_VOLT(nr) (0x10 + (nr))
+#define F75375_REG_VOLT_HIGH(nr) (0x20 + (nr) * 2 )
+#define F75375_REG_VOLT_LOW(nr) (0x21 + (nr) * 2 )
+
+#define F75375_REG_TEMP(nr) (0x14 + (nr))
+#define F75375_REG_TEMP_HIGH(nr) (0x28 + (nr) * 2 )
+#define F75375_REG_TEMP_HYST(nr) (0x29 + (nr) * 2 )
+
+#define F75375_REG_FAN(nr) (0x16 + (nr) * 2 )
+#define F75375_REG_FAN_MIN(nr) (0x2C + (nr) * 2 )
+#define F75375_REG_FAN_FULL(nr) (0x70 + (nr) * 0x10 )
+#define F75375_REG_FAN_PWM_DUTY(nr) (0x76 + (nr) * 0x10 )
+#define F75375_REG_FAN_PWM_CLOCK(nr) (0x7D + (nr) * 0x10 )
+
+#define F75375_REG_FAN_EXP(nr) (0x74 + (nr) * 0x10 )
+#define F75375_REG_FAN_B_TEMP(nr, step) ((0xA0 + (nr) * 0x10) + (step))
+#define F75375_REG_FAN_B_SPEED(nr, step) \
+ ((0xA5 + (nr) * 0x10) + (step) * 2 )
+
+#define F75375_REG_PWM1_RAISE_DUTY 0x69
+#define F75375_REG_PWM2_RAISE_DUTY 0x6A
+#define F75375_REG_PWM1_DROP_DUTY 0x6B
+#define F75375_REG_PWM2_DROP_DUTY 0x6C
+
+#define FAN_CTRL_LINEAR(nr) (4+nr)
+#define FAN_CTRL_MODE(nr) (5+(nr*2))
+
+enum kinds {F75375, F75373};
+
+/*
+ * Data structures and manipulation thereof
+ */
+
+struct f75375_data {
+ unsigned short addr;
+ struct i2c_client client;
+ struct class_device *class_dev;
+
+ const char *name;
+ enum kinds kind;
+ struct mutex update_lock; /* protect register access */
+ char valid;
+ unsigned long last_updated; /* In jiffies */
+ unsigned long last_limits; /* In jiffies */
+
+ /* Register values */
+ u8 in[4];
+ u8 in_max[4];
+ u8 in_min[4];
+ u16 fan[2];
+ u16 fan_min[2];
+ u16 fan_full[2];
+ u16 fan_exp[2];
+ u8 fan_timer;
+ u8 pwm[2];
+ u8 pwm_mode[2];
+ u8 pwm_enable[2];
+ u8 temp[2];
+ s8 temp_high[2];
+ s8 temp_max_hyst[2];
+};
+
+static int f75375_attach_adapter(struct i2c_adapter *adapter);
+static int f75375_detect(struct i2c_adapter *adapter, int address, int kind);
+static int f75375_detach_client(struct i2c_client *client);
+
+static struct i2c_driver f75375_driver = {
+ .driver = {
+ .name = "f75375",
+ },
+ .attach_adapter = f75375_attach_adapter,
+ .detach_client = f75375_detach_client,
+};
+
+static inline int f75375_read8(struct i2c_client *client, u8 reg)
+{
+ return i2c_smbus_read_byte_data(client, reg);
+}
+static inline u16 f75375_read16(struct i2c_client *client, u8 reg)
+{
+ return ((i2c_smbus_read_byte_data(client, reg) << 8)
+ | i2c_smbus_read_byte_data(client, reg + 1));
+}
+
+static inline int f75375_write8(struct i2c_client *client, u8 reg,
+ u8 value)
+{
+ return i2c_smbus_write_byte_data(client, reg, value);
+}
+static inline int f75375_write16(struct i2c_client *client, u8 reg,
+ u16 value)
+{
+ int err = i2c_smbus_write_byte_data(client, reg, (value << 8));
+ if (err)
+ return err;
+ return i2c_smbus_write_byte_data(client, reg + 1, (value & 0xFF));
+}
+static struct f75375_data *f75375_update_device(struct device *dev)
+{
+ struct i2c_client *client = to_i2c_client(dev);
+ struct f75375_data *data = i2c_get_clientdata(client);
+ int nr;
+
+ mutex_lock(&data->update_lock);
+
+ /* Limit registers cache is refreshed after 60 seconds */
+ if (time_after(jiffies, data->last_updated + 60 * HZ)
+ || !data->valid) {
+ for (nr = 0; nr < 2; nr++) {
+ data->temp_high[nr] =
+ f75375_read8(client, F75375_REG_TEMP_HIGH(nr));
+ data->temp_max_hyst[nr] =
+ f75375_read8(client, F75375_REG_TEMP_HYST(nr));
+ data->fan_full[nr] =
+ f75375_read16(client, F75375_REG_FAN_FULL(nr));
+ data->fan_min[nr] =
+ f75375_read16(client, F75375_REG_FAN_MIN(nr));
+ data->fan_exp[nr] =
+ f75375_read16(client, F75375_REG_FAN_EXP(nr));
+ data->pwm[nr] = f75375_read8(client,
+ F75375_REG_FAN_PWM_DUTY(nr));
+
+ }
+ for (nr = 0; nr < 4; nr++) {
+ data->in_max[nr] =
+ f75375_read8(client, F75375_REG_VOLT_HIGH(nr));
+ data->in_min[nr] =
+ f75375_read8(client, F75375_REG_VOLT_LOW(nr));
+ }
+ data->fan_timer = f75375_read8(client, F75375_REG_FAN_TIMER);
+ data->last_limits = jiffies;
+ }
+
+ /* Measurement registers cache is refreshed after 2 second */
+ if (time_after(jiffies, data->last_updated + 2 * HZ)
+ || !data->valid) {
+ for (nr = 0; nr < 2; nr++) {
+ data->temp[nr] =
+ f75375_read8(client, F75375_REG_TEMP(nr));
+ data->fan[nr] =
+ f75375_read16(client, F75375_REG_FAN(nr));
+ }
+ for (nr = 0; nr < 4; nr++) {
+ data->in[nr] =
+ f75375_read8(client, F75375_REG_VOLT(nr));
+ }
+ data->last_updated = jiffies;
+ data->valid = 1;
+ }
+
+ mutex_unlock(&data->update_lock);
+ return data;
+}
+
+
+#define RPM_FROM_REG(val) (val == 65535 ? 0 : 1500000/(val))
+#define RPM_TO_REG(val) (1500000/(val))
+
+static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct i2c_client *client = to_i2c_client(dev);
+ struct f75375_data *data = i2c_get_clientdata(client);
+ int val = simple_strtol(buf, NULL, 10);
+
+ mutex_lock(&data->update_lock);
+ data->fan_min[nr] = RPM_TO_REG(val);
+ f75375_write16(client, F75375_REG_FAN_MIN(nr), data->fan_min[nr]);
+ mutex_unlock(&data->update_lock);
+ return count;
+}
+
+static ssize_t set_fan_exp(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct i2c_client *client = to_i2c_client(dev);
+ struct f75375_data *data = i2c_get_clientdata(client);
+ int val = simple_strtol(buf, NULL, 10);
+
+ mutex_lock(&data->update_lock);
+ data->fan_exp[nr] = RPM_TO_REG(val);
+ f75375_write16(client, F75375_REG_FAN_MIN(nr), data->fan_exp[nr]);
+ mutex_unlock(&data->update_lock);
+ return count;
+}
+
+static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct i2c_client *client = to_i2c_client(dev);
+ struct f75375_data *data = i2c_get_clientdata(client);
+ int val = simple_strtol(buf, NULL, 10);
+
+ mutex_lock(&data->update_lock);
+ data->pwm[nr] = val;
+ f75375_write8(client, F75375_REG_FAN_PWM_DUTY(nr), data->pwm[nr]);
+ mutex_unlock(&data->update_lock);
+ return count;
+}
+
+static ssize_t show_pwm_enable(struct device *dev, struct device_attribute
+ *attr, char *buf)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct f75375_data *data = f75375_update_device(dev);
+ return sprintf(buf, "%d\n", data->pwm_enable[nr]);
+}
+
+static ssize_t set_pwm_enable(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct i2c_client *client = to_i2c_client(dev);
+ struct f75375_data *data = i2c_get_clientdata(client);
+ int val = simple_strtol(buf, NULL, 10);
+ u8 fanmode;
+
+ if (val < 0 || val > 4)
+ return -EINVAL;
+
+ mutex_lock(&data->update_lock);
+ fanmode = f75375_read8(client, F75375_REG_FAN_TIMER);
+ fanmode = ~(3 << FAN_CTRL_MODE(nr) );
+
+ switch (val) {
+ case 0: /* Full speed */
+ fanmode |= (3 << FAN_CTRL_MODE(nr) );
+ data->pwm[nr] = 255;
+ f75375_write8( client, F75375_REG_FAN_PWM_DUTY(nr),
+ data->pwm[nr]);
+ break;
+ case 1: /* PWM */
+ fanmode |= (3 << FAN_CTRL_MODE(nr) );
+ break;
+ case 2: /* AUTOMATIC*/
+ fanmode |= (2 << FAN_CTRL_MODE(nr) );
+ break;
+ case 3: /* fan speed */
+ break;
+ }
+ f75375_write8(client, F75375_REG_FAN_TIMER, fanmode);
+ data->pwm_enable[nr] = val;
+ mutex_unlock(&data->update_lock);
+ return count;
+}
+
+static ssize_t set_pwm_mode(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct i2c_client *client = to_i2c_client(dev);
+ struct f75375_data *data = i2c_get_clientdata(client);
+ int kind = data->kind;
+ int val = simple_strtol(buf, NULL, 10);
+ u8 conf = 0;
+
+ if (val != 0 || val != 1 || kind == F75373 )
+ return -EINVAL;
+
+ mutex_lock(&data->update_lock);
+ conf = f75375_read8(client, F75375_REG_CONFIG1);
+ conf = ~(1 << FAN_CTRL_LINEAR(nr) );
+
+ if (val == 0)
+ conf |= (1 << FAN_CTRL_LINEAR(nr) ) ;
+
+ f75375_write8(client, F75375_REG_CONFIG1, conf);
+ data->pwm_mode[nr] = val;
+ mutex_unlock(&data->update_lock);
+ return count;
+}
+
+static ssize_t show_pwm(struct device *dev, struct device_attribute
+ *attr, char *buf)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct f75375_data *data = f75375_update_device(dev);
+ return sprintf(buf, "%d\n", data->pwm[nr]);
+}
+static ssize_t show_pwm_mode(struct device *dev, struct device_attribute
+ *attr, char *buf)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct f75375_data *data = f75375_update_device(dev);
+ return sprintf(buf, "%d\n", data->pwm_mode[nr]);
+}
+
+#define VOLT_FROM_REG(val) ((val)*8)
+#define VOLT_TO_REG(val) ((val)/8)
+
+static ssize_t show_in(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct f75375_data *data = f75375_update_device(dev);
+ return sprintf(buf, "%d\n", VOLT_FROM_REG(data->in[nr]));
+}
+
+static ssize_t show_in_max(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct f75375_data *data = f75375_update_device(dev);
+ return sprintf(buf, "%d\n", VOLT_FROM_REG(data->in_max[nr]));
+}
+
+static ssize_t show_in_min(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct f75375_data *data = f75375_update_device(dev);
+ return sprintf(buf, "%d\n", VOLT_FROM_REG(data->in_min[nr]));
+}
+
+static ssize_t set_in_max(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct i2c_client *client = to_i2c_client(dev);
+ struct f75375_data *data = i2c_get_clientdata(client);
+ int val = simple_strtol(buf, NULL, 10);
+ mutex_lock(&data->update_lock);
+ data->in_max[nr] = VOLT_TO_REG(val);
+ f75375_write8(client, F75375_REG_VOLT_HIGH(nr), data->in_max[nr]);
+ mutex_unlock(&data->update_lock);
+ return count;
+}
+
+static ssize_t set_in_min(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct i2c_client *client = to_i2c_client(dev);
+ struct f75375_data *data = i2c_get_clientdata(client);
+ int val = simple_strtol(buf, NULL, 10);
+ mutex_lock(&data->update_lock);
+ data->in_min[nr] = VOLT_TO_REG(val);
+ f75375_write8(client, F75375_REG_VOLT_LOW(nr), data->in_min[nr]);
+ mutex_unlock(&data->update_lock);
+ return count;
+}
+#define TEMP_FROM_REG(val) ((val)*1000)
+#define TEMP_TO_REG(val) ((val)/1000)
+
+static ssize_t show_temp(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct f75375_data *data = f75375_update_device(dev);
+ return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[nr]));
+}
+
+static ssize_t show_temp_max(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct f75375_data *data = f75375_update_device(dev);
+ return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_high[nr]));
+}
+
+static ssize_t show_temp_max_hyst(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct f75375_data *data = f75375_update_device(dev);
+ return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_max_hyst[nr]));
+}
+
+static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct i2c_client *client = to_i2c_client(dev);
+ struct f75375_data *data = i2c_get_clientdata(client);
+ int val = simple_strtol(buf, NULL, 10);
+
+ mutex_lock(&data->update_lock);
+ data->temp_high[nr] = TEMP_TO_REG(val);
+ f75375_write8(client, F75375_REG_TEMP_HIGH(nr), data->temp_high[nr]);
+ mutex_unlock(&data->update_lock);
+ return count;
+}
+
+static ssize_t set_temp_max_hyst(struct device *dev,
+ struct device_attribute *attr, const char *buf, size_t count)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct i2c_client *client = to_i2c_client(dev);
+ struct f75375_data *data = i2c_get_clientdata(client);
+ int val = simple_strtol(buf, NULL, 10);
+
+ mutex_lock(&data->update_lock);
+ data->temp_max_hyst[nr] = TEMP_TO_REG(val);
+ f75375_write8(client, F75375_REG_TEMP_HYST(nr),
+ data->temp_max_hyst[nr]);
+ mutex_unlock(&data->update_lock);
+ return count;
+}
+
+#define show_fan(thing) \
+static ssize_t show_##thing(struct device *dev, struct device_attribute *attr, \
+ char *buf)\
+{\
+ int nr = to_sensor_dev_attr(attr)->index;\
+ struct f75375_data *data = f75375_update_device(dev); \
+ return sprintf(buf, "%d\n", RPM_FROM_REG(data->thing[nr])); \
+}
+
+show_fan(fan);
+show_fan(fan_min);
+show_fan(fan_full);
+show_fan(fan_exp);
+
+static SENSOR_DEVICE_ATTR(in0_input, S_IRUGO, show_in, NULL, 0);
+static SENSOR_DEVICE_ATTR(in0_max, S_IRUGO|S_IWUSR,
+ show_in_max, set_in_max, 0);
+static SENSOR_DEVICE_ATTR(in0_min, S_IRUGO|S_IWUSR,
+ show_in_min, set_in_min, 0);
+static SENSOR_DEVICE_ATTR(in1_input, S_IRUGO, show_in, NULL, 1);
+static SENSOR_DEVICE_ATTR(in1_max, S_IRUGO|S_IWUSR,
+ show_in_max, set_in_max, 1);
+static SENSOR_DEVICE_ATTR(in1_min, S_IRUGO|S_IWUSR,
+ show_in_min, set_in_min, 1);
+static SENSOR_DEVICE_ATTR(in2_input, S_IRUGO, show_in, NULL, 2);
+static SENSOR_DEVICE_ATTR(in2_max, S_IRUGO|S_IWUSR,
+ show_in_max, set_in_max, 2);
+static SENSOR_DEVICE_ATTR(in2_min, S_IRUGO|S_IWUSR,
+ show_in_min, set_in_min, 2);
+static SENSOR_DEVICE_ATTR(in3_input, S_IRUGO, show_in, NULL, 3);
+static SENSOR_DEVICE_ATTR(in3_max, S_IRUGO|S_IWUSR,
+ show_in_max, set_in_max, 3);
+static SENSOR_DEVICE_ATTR(in3_min, S_IRUGO|S_IWUSR,
+ show_in_min, set_in_min, 3);
+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp1_max_hyst, S_IRUGO|S_IWUSR,
+ show_temp_max_hyst, set_temp_max_hyst, 0);
+static SENSOR_DEVICE_ATTR(temp1_max, S_IRUGO|S_IWUSR,
+ show_temp_max, set_temp_max, 0);
+static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, show_temp, NULL, 1);
+static SENSOR_DEVICE_ATTR(temp2_max_hyst, S_IRUGO|S_IWUSR,
+ show_temp_max_hyst, set_temp_max_hyst, 1);
+static SENSOR_DEVICE_ATTR(temp2_max, S_IRUGO|S_IWUSR,
+ show_temp_max, set_temp_max, 1);
+static SENSOR_DEVICE_ATTR(fan1_input, S_IRUGO, show_fan, NULL, 0);
+static SENSOR_DEVICE_ATTR(fan1_full, S_IRUGO, show_fan_full, NULL, 0);
+static SENSOR_DEVICE_ATTR(fan1_min, S_IRUGO|S_IWUSR,
+ show_fan_min, set_fan_min, 0);
+static SENSOR_DEVICE_ATTR(fan1_exp, S_IRUGO|S_IWUSR,
+ show_fan_exp, set_fan_exp, 0);
+static SENSOR_DEVICE_ATTR(fan2_input, S_IRUGO, show_fan, NULL, 1);
+static SENSOR_DEVICE_ATTR(fan2_full, S_IRUGO, show_fan_full, NULL, 1);
+static SENSOR_DEVICE_ATTR(fan2_min, S_IRUGO|S_IWUSR,
+ show_fan_min, set_fan_min, 1);
+static SENSOR_DEVICE_ATTR(fan2_exp, S_IRUGO|S_IWUSR,
+ show_fan_exp, set_fan_exp, 1);
+static SENSOR_DEVICE_ATTR(pwm1, S_IRUGO|S_IWUSR,
+ show_pwm, set_pwm, 0);
+static SENSOR_DEVICE_ATTR(pwm1_enable, S_IRUGO|S_IWUSR,
+ show_pwm_enable, set_pwm_enable, 0);
+static SENSOR_DEVICE_ATTR(pwm1_mode, S_IRUGO|S_IWUSR,
+ show_pwm_mode, set_pwm_mode, 0);
+static SENSOR_DEVICE_ATTR(pwm2, S_IRUGO | S_IWUSR,
+ show_pwm, set_pwm, 1);
+static SENSOR_DEVICE_ATTR(pwm2_enable, S_IRUGO|S_IWUSR,
+ show_pwm_enable, set_pwm_enable, 1);
+static SENSOR_DEVICE_ATTR(pwm2_mode, S_IRUGO|S_IWUSR,
+ show_pwm_mode, set_pwm_mode, 1);
+
+static struct attribute *f75375_attributes[] = {
+ &sensor_dev_attr_temp1_input.dev_attr.attr,
+ &sensor_dev_attr_temp1_max.dev_attr.attr,
+ &sensor_dev_attr_temp1_max_hyst.dev_attr.attr,
+ &sensor_dev_attr_temp2_input.dev_attr.attr,
+ &sensor_dev_attr_temp2_max.dev_attr.attr,
+ &sensor_dev_attr_temp2_max_hyst.dev_attr.attr,
+ &sensor_dev_attr_fan1_input.dev_attr.attr,
+ &sensor_dev_attr_fan1_full.dev_attr.attr,
+ &sensor_dev_attr_fan1_min.dev_attr.attr,
+ &sensor_dev_attr_fan1_exp.dev_attr.attr,
+ &sensor_dev_attr_fan2_input.dev_attr.attr,
+ &sensor_dev_attr_fan2_full.dev_attr.attr,
+ &sensor_dev_attr_fan2_min.dev_attr.attr,
+ &sensor_dev_attr_fan2_exp.dev_attr.attr,
+ &sensor_dev_attr_pwm1.dev_attr.attr,
+ &sensor_dev_attr_pwm1_enable.dev_attr.attr,
+ &sensor_dev_attr_pwm1_mode.dev_attr.attr,
+ &sensor_dev_attr_pwm2.dev_attr.attr,
+ &sensor_dev_attr_pwm2_enable.dev_attr.attr,
+ &sensor_dev_attr_pwm2_mode.dev_attr.attr,
+ &sensor_dev_attr_in0_input.dev_attr.attr,
+ &sensor_dev_attr_in0_max.dev_attr.attr,
+ &sensor_dev_attr_in0_min.dev_attr.attr,
+ &sensor_dev_attr_in1_input.dev_attr.attr,
+ &sensor_dev_attr_in1_max.dev_attr.attr,
+ &sensor_dev_attr_in1_min.dev_attr.attr,
+ &sensor_dev_attr_in2_input.dev_attr.attr,
+ &sensor_dev_attr_in2_max.dev_attr.attr,
+ &sensor_dev_attr_in2_min.dev_attr.attr,
+ &sensor_dev_attr_in3_input.dev_attr.attr,
+ &sensor_dev_attr_in3_max.dev_attr.attr,
+ &sensor_dev_attr_in3_min.dev_attr.attr,
+ NULL
+};
+
+static const struct attribute_group f75375_group =
+{
+ .attrs = f75375_attributes,
+};
+
+static int f75375_detach_client(struct i2c_client *client)
+{
+ struct f75375_data *data = i2c_get_clientdata(client);
+ int err;
+
+ sysfs_remove_group(&client->dev.kobj, &f75375_group);
+ hwmon_device_unregister(data->class_dev);
+
+ err = i2c_detach_client(client);
+ if (err) {
+ dev_err(&client->dev,
+ "Client deregistration failed, "
+ "client not detached.\n");
+ return err;
+ }
+ kfree(data);
+ return 0;
+}
+
+static int f75375_attach_adapter(struct i2c_adapter *adapter)
+{
+ return i2c_probe(adapter, &addr_data, f75375_detect);
+}
+
+
+/* This function is called by i2c_probe */
+static int f75375_detect(struct i2c_adapter *adapter, int address, int kind)
+{
+ struct i2c_client *client;
+ struct f75375_data *data;
+ u8 version = 0;
+ int err = 0;
+ char *name = "";
+
+ if (!(data = kzalloc(sizeof(struct f75375_data), GFP_KERNEL))) {
+ err = -ENOMEM;
+ goto exit;
+ }
+ client = &data->client;
+ i2c_set_clientdata(client, data);
+ client->addr = address;
+ client->adapter = adapter;
+ client->driver = &f75375_driver;
+ client->flags = 0;
+
+ if (kind < 0) {
+ u16 vendid = f75375_read16(client, F75375_REG_VENDOR);
+ u16 chipid = f75375_read16(client, F75375_CHIP_ID);
+ version = f75375_read8(client, F75375_REG_VERSION);
+ if (chipid == 0x0306 && vendid == 0x1934) {
+ name = "f75375";
+ data->kind = F75375;
+ } else if (chipid == 0x0204 && vendid == 0x1934) {
+ name = "f75373";
+ data->kind = F75373;
+ } else {
+ dev_err(&adapter->dev,
+ "failed,%02X,%02X,%02X\n",
+ chipid, version, vendid);
+ goto exit_free;
+ }
+ }
+ dev_info(&adapter->dev, "found %s version: %02X\n", name, version);
+ strlcpy(client->name, name, I2C_NAME_SIZE);
+ data->valid = 0;
+ mutex_init(&data->update_lock);
+ if ((err = i2c_attach_client(client)))
+ goto exit_free;
+
+ if ((err = sysfs_create_group(&client->dev.kobj, &f75375_group)))
+ goto exit_detach;
+
+ data->class_dev = hwmon_device_register(&client->dev);
+ if (IS_ERR(data->class_dev)) {
+ err = PTR_ERR(data->class_dev);
+ goto exit_remove;
+ }
+
+ return 0;
+
+exit_remove:
+ sysfs_remove_group(&client->dev.kobj, &f75375_group);
+exit_detach:
+ i2c_detach_client(client);
+exit_free:
+ kfree(data);
+exit:
+ return err;
+}
+
+static int __init sensors_f75375_init(void)
+{
+ return i2c_add_driver(&f75375_driver);
+}
+
+static void __exit sensors_f75375_exit(void)
+{
+ i2c_del_driver(&f75375_driver);
+}
+
+MODULE_AUTHOR("Riku Voipio <riku.voipio@movial.fi> ");
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("F75373/F75375 hardware monitoring driver");
+
+module_init(sensors_f75375_init);
+module_exit(sensors_f75375_exit);
--
1.5.0.3
[-- Attachment #3: Type: text/plain, Size: 153 bytes --]
_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [lm-sensors] [PATCH] Add f75375s driver
2007-06-28 23:07 [lm-sensors] [PATCH] Add f75375s driver Riku Voipio
` (2 preceding siblings ...)
2007-07-06 19:14 ` Voipio Riku
@ 2007-07-07 17:26 ` Christian Emmerich
2007-07-10 10:01 ` Riku Voipio
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Christian Emmerich @ 2007-07-07 17:26 UTC (permalink / raw)
To: lm-sensors
[-- Attachment #1.1: Type: text/plain, Size: 6994 bytes --]
Hi Riku,
> Thanks for your time reviewing and testing the driver.
No problem. Without the driver i would't be able to manage the temperature/fan speed of my pc, so i have to thank you for your work.
> > Another problem is still the value of tempX_max_hyst, the value is always
> > zero. If i read sysfs direct i get following output:
> > root at pc:/sys/devices/pci0000:00/0000:00:01.1/i2c-2/2-002d# cat
> > temp1_max_hyst
> > 0
> > root at pc:/sys/devices/pci0000:00/0000:00:01.1/i2c-2/2-002d# cat
> > temp2_max_hyst
> > 0
> What value are you setting it to?
> thecus-1:/sys/devices/platform/IOP3xx-I2C.0/i2c-0/0-002e# cat temp1_max_hyst
> 55000
> thecus-1:/sys/devices/platform/IOP3xx-I2C.0/i2c-0/0-002e# echo 55 >
> temp1_max_hyst
> thecus-1:/sys/devices/platform/IOP3xx-I2C.0/i2c-0/0-002e# cat temp1_max_hyst
> 0
> ALL6500:/sys/devices/platform/IOP3xx-I2C.0/i2c-0/0-002e# echo 61000 >
> temp1_max_hyst
> ALL6500:/sys/devices/platform/IOP3xx-I2C.0/i2c-0/0-002e# cat temp1_max_hyst
> 61000
> So it appears to work as expected. According to sysfs-interface temp*
> should report and accept millidegrees or millivolts. We are outputting
> millidegrees.
OK, this was my fault if i set the value by hand i could also see the value using 'cat temp1_max_hyst' and sensors, i thought there would be an automatic entry i can read out.
What does this value exactly stand for, is it usefull for sensors or just a value i can read out using sensors?
Another problem i forget in my last mail. I don't know what's the reason, but if i do the following:
root@pc:/sys/devices/pci0000:00/0000:00:01.1/i2c-1/1-002d# cat fan1_min
i got following output:
<output>
root@pc:/sys/devices/pci0000:00/0000:00:01.1/i2c-1/1-002d# cat fan1_min
Segmentation fault
root@pc:/sys/devices/pci0000:00/0000:00:01.1/i2c-1/1-002d#
Message from syslogd@pc at Sat Jul 7 18:56:41 2007 ...
pc kernel: [17200023.168000] CPU: 0
Message from syslogd@pc at Sat Jul 7 18:56:41 2007 ...
pc kernel: [17200023.168000] CPU: 0
Message from syslogd@pc at Sat Jul 7 18:56:41 2007 ...
pc kernel: [17200023.168000] EIP is at show_fan_min+0x2c/0x50 [f75375s]
Message from syslogd@pc at Sat Jul 7 18:56:41 2007 ...
pc kernel: [17200023.168000] EIP is at show_fan_min+0x2c/0x50 [f75375s]
Message from syslogd@pc at Sat Jul 7 18:56:41 2007 ...
pc kernel: [17200023.168000] eax: 0016e360 ebx: 00000000 ecx: 00000000 edx: 00000000
Message from syslogd@pc at Sat Jul 7 18:56:41 2007 ...
pc kernel: [17200023.168000] eax: 0016e360 ebx: 00000000 ecx: 00000000 edx: 00000000
Message from syslogd@pc at Sat Jul 7 18:56:41 2007 ...
pc kernel: [17200023.168000] esi: db7b2000 edi: c0367514 ebp: dd948e80 esp: d82b9f38
Message from syslogd@pc at Sat Jul 7 18:56:41 2007 ...
pc kernel: [17200023.168000] esi: db7b2000 edi: c0367514 ebp: dd948e80 esp: d82b9f38
Message from syslogd@pc at Sat Jul 7 18:56:41 2007 ...
pc kernel: [17200023.168000] ds: 007b es: 007b ss: 0068
Message from syslogd@pc at Sat Jul 7 18:56:41 2007 ...
pc kernel: [17200023.168000] ds: 007b es: 007b ss: 0068
Message from syslogd@pc at Sat Jul 7 18:56:41 2007 ...
pc kernel: [17200023.168000] Process cat (pid: 11063, threadinfo=d82b8000 task=dba09ad0)
Message from syslogd@pc at Sat Jul 7 18:56:41 2007 ...
pc kernel: [17200023.168000] Process cat (pid: 11063, threadinfo=d82b8000 task=dba09ad0)
Message from syslogd@pc at Sat Jul 7 18:56:41 2007 ...
pc kernel: [17200023.168000] Stack: c136f640 0fa5bacc 080550d4 e1381360 dd948e80 c0228e7d ddab7668 d657f7e0
Message from syslogd@pc at Sat Jul 7 18:56:41 2007 ...
pc kernel: [17200023.168000] Stack: c136f640 0fa5bacc 080550d4 e1381360 dd948e80 c0228e7d ddab7668 d657f7e0
Message from syslogd@pc at Sat Jul 7 18:56:41 2007 ...
pc kernel: [17200023.168000] c0196410 00001000 08054000 d657f7f4 e13841a0 c3cc12c0 cc29eae0 08054000
Message from syslogd@pc at Sat Jul 7 18:56:41 2007 ...
pc kernel: [17200023.168000] c0196410 00001000 08054000 d657f7f4 e13841a0 c3cc12c0 cc29eae0 08054000
Message from syslogd@pc at Sat Jul 7 18:56:41 2007 ...
pc kernel: [17200023.168000] d82b9fa4 00001000 c0158c9c d82b9fa4 c01963a0 cc29eae0 fffffff7 08054000
Message from syslogd@pc at Sat Jul 7 18:56:41 2007 ...
pc kernel: [17200023.168000] d82b9fa4 00001000 c0158c9c d82b9fa4 c01963a0 cc29eae0 fffffff7 08054000
Message from syslogd@pc at Sat Jul 7 18:56:41 2007 ...
pc kernel: [17200023.168000] Call Trace:
Message from syslogd@pc at Sat Jul 7 18:56:41 2007 ...
pc kernel: [17200023.168000] Call Trace:
Message from syslogd@pc at Sat Jul 7 18:56:41 2007 ...
pc kernel: [17200023.168000] <e1381360> show_fan_min+0x0/0x50 [f75375s] <c0228e7d> dev_attr_show+0x1d/0x30
Message from syslogd@pc at Sat Jul 7 18:56:41 2007 ...
pc kernel: [17200023.168000] <e1381360> show_fan_min+0x0/0x50 [f75375s] <c0228e7d> dev_attr_show+0x1d/0x30
Message from syslogd@pc at Sat Jul 7 18:56:41 2007 ...
pc kernel: [17200023.168000] <c0196410> sysfs_read_file+0x70/0x154 <c0158c9c> vfs_read+0xbc/0x180
Message from syslogd@pc at Sat Jul 7 18:56:41 2007 ...
pc kernel: [17200023.168000] <c0196410> sysfs_read_file+0x70/0x154 <c0158c9c> vfs_read+0xbc/0x180
Message from syslogd@pc at Sat Jul 7 18:56:41 2007 ...
pc kernel: [17200023.168000] <c01963a0> sysfs_read_file+0x0/0x154 <c0159101> sys_read+0x41/0x70
Message from syslogd@pc at Sat Jul 7 18:56:41 2007 ...
pc kernel: [17200023.168000] <c01963a0> sysfs_read_file+0x0/0x154 <c0159101> sys_read+0x41/0x70
Message from syslogd@pc at Sat Jul 7 18:56:42 2007 ...
pc kernel: [17200023.168000] <c0102dbb> sysenter_past_esp+0x54/0x79
Message from syslogd@pc at Sat Jul 7 18:56:42 2007 ...
pc kernel: [17200023.168000] <c0102dbb> sysenter_past_esp+0x54/0x79
Message from syslogd@pc at Sat Jul 7 18:56:42 2007 ...
pc kernel: [17200023.168000] Code: 89 ce 53 83 ec 0c 8b 5a 14 e8 21 fd ff ff 31 c9 0f b7 84 58 bc 01 00 00 66 83 f8 ff 74 11 ba 60 e3 16 00 0f b7 c8 89 d0 c1 fa 1f <f7> f9 89 c1 89 34 24 89 4c 24 08 c7 44 24 04 15 1e 38 e1 e8 bc
Message from syslogd@pc at Sat Jul 7 18:56:42 2007 ...
pc kernel: [17200023.168000] Code: 89 ce 53 83 ec 0c 8b 5a 14 e8 21 fd ff ff 31 c9 0f b7 84 58 bc 01 00 00 66 83 f8 ff 74 11 ba 60 e3 16 00 0f b7 c8 89 d0 c1 fa 1f <f7> f9 89 c1 89 34 24 89 4c 24 08 c7 44 24 04 15 1e 38 e1 e8 bc
Message from syslogd@pc at Sat Jul 7 18:56:42 2007 ...
pc kernel: [17200023.168000] EIP: [pg0+552657804/1069069312] show_fan_min+0x2c/0x50 [f75375s] SS:ESP 0068:d82b9f38
Message from syslogd@pc at Sat Jul 7 18:56:42 2007 ...
pc kernel: [17200023.168000] EIP: [pg0+552657804/1069069312] show_fan_min+0x2c/0x50 [f75375s] SS:ESP 0068:d82b9f38
root@pc:/sys/devices/pci0000:00/0000:00:01.1/i2c-1/1-002d#
</output>
Maybe you can try to do the same on your machine, maybe the problem is related to my chip/pc?
best regards
christian.
---------------------------------
BE A BETTER WELTENBUMMLER: Jetzt Frage stellen und einen von 44 iPods gewinnen!
[-- Attachment #1.2: Type: text/html, Size: 17047 bytes --]
[-- Attachment #2: Type: text/plain, Size: 153 bytes --]
_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [lm-sensors] [PATCH] Add f75375s driver
2007-06-28 23:07 [lm-sensors] [PATCH] Add f75375s driver Riku Voipio
` (3 preceding siblings ...)
2007-07-07 17:26 ` Christian Emmerich
@ 2007-07-10 10:01 ` Riku Voipio
2007-07-10 19:08 ` Christian Emmerich
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Riku Voipio @ 2007-07-10 10:01 UTC (permalink / raw)
To: lm-sensors
[-- Attachment #1: Type: text/plain, Size: 1689 bytes --]
Christian Emmerich wrote:
> Hi Riku,
>
> > Thanks for your time reviewing and testing the driver.
> No problem. Without the driver i would't be able to manage the
> temperature/fan speed of my pc, so i have to thank you for your work.
>
>
> > temp1_max_hyst
> > ALL6500:/sys/devices/platform/IOP3xx-I2C.0/i2c-0/0-002e# cat
> temp1_max_hyst
> > 61000
>
> > So it appears to work as expected. According to sysfs-interface temp*
> > should report and accept millidegrees or millivolts. We are outputting
> > millidegrees.
>
> OK, this was my fault if i set the value by hand i could also see the
> value using 'cat temp1_max_hyst' and sensors, i thought there would be
> an automatic entry i can read out.
> What does this value exactly stand for, is it usefull for sensors or
> just a value i can read out using sensors?
>
It has a default value, 60 degrees, but your bios might overwrite it.
Which reminds me: if you don't mind, please verify that values reported
by sensors match the ones reported
by bios. Often bios's come with a screen that shows of hwmon
information. as I understand, hysteresis is a kind of "soft" limit, or
warning zone before the critical
temperature hits.
> Another problem i forget in my last mail. I don't know what's the
> reason, but if i do the following:
> root@pc:/sys/devices/pci0000:00/0000:00:01.1/i2c-1/1-002d# cat fan1_min
> i got following output:
> <output>
> root@pc:/sys/devices/pci0000:00/0000:00:01.1/i2c-1/1-002d# cat fan1_min
> Segmentation fault
> root@pc:/sys/devices/pci0000:00/0000:00:01.1/i2c-1/1-002d#
Oops. the new REG_TO_RPM code did not take in account if the rpm count
is zero.. should be fixed with the attached version..
[-- Attachment #2: 0001-Add-f75375s-driver.patch --]
[-- Type: text/x-patch, Size: 23516 bytes --]
From c809c6b59e9a18e2c97e67fd10a76abdd75f9c4a Mon Sep 17 00:00:00 2001
From: Riku Voipio <nchip@watergate-2.(none)>
Date: Fri, 29 Jun 2007 01:21:03 +0300
Subject: [PATCH] Add f75375s driver
Signed-off-by: Riku Voipio <riku.voipio@movial.fi>
---
drivers/hwmon/Kconfig | 10 +
drivers/hwmon/Makefile | 1 +
drivers/hwmon/f75375s.c | 683 +++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 694 insertions(+), 0 deletions(-)
create mode 100644 drivers/hwmon/f75375s.c
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 13eea47..9138604 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -199,6 +199,16 @@ config SENSORS_F71805F
This driver can also be built as a module. If so, the module
will be called f71805f.
+config SENSORS_F75375S
+ tristate "Fintek F75375S/SP and F75373";
+ depends on I2C && EXPERIMENTAL
+ help
+ If you say yes here you get support for hardware monitoring
+ features of the Fintek F75375S/SP and F75373
+
+ This driver can also be built as a module. If so, the module
+ will be called f75375s.
+
config SENSORS_FSCHER
tristate "FSC Hermes"
depends on I2C
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index cfaf338..689131a 100644
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -27,6 +27,7 @@ obj-$(CONFIG_SENSORS_ATXP1) += atxp1.o
obj-$(CONFIG_SENSORS_CORETEMP) += coretemp.o
obj-$(CONFIG_SENSORS_DS1621) += ds1621.o
obj-$(CONFIG_SENSORS_F71805F) += f71805f.o
+obj-$(CONFIG_SENSORS_F75375S) += f75375s.o
obj-$(CONFIG_SENSORS_FSCHER) += fscher.o
obj-$(CONFIG_SENSORS_FSCPOS) += fscpos.o
obj-$(CONFIG_SENSORS_GL518SM) += gl518sm.o
diff --git a/drivers/hwmon/f75375s.c b/drivers/hwmon/f75375s.c
new file mode 100644
index 0000000..9cc9fba
--- /dev/null
+++ b/drivers/hwmon/f75375s.c
@@ -0,0 +1,683 @@
+/*
+ * f75375s.c - driver for the Fintek F75375/SP and F75373
+ * hardware monitoring features
+ * Copyright (C) 2006-2007 Riku Voipio <riku.voipio@movial.fi>
+ *
+ * Datasheets available at:
+ *
+ * f75375:
+ * http://www.fintek.com.tw/files/productfiles/2005111152950.pdf
+ *
+ * f75373:
+ * http://www.fintek.com.tw/files/productfiles/2005111153128.pdf
+ *
+ * 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.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/jiffies.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/i2c.h>
+#include <linux/err.h>
+#include <linux/mutex.h>
+
+/* Addresses to scan */
+static unsigned short normal_i2c[] = { 0x2d, 0x2e, I2C_CLIENT_END };
+
+/* Insmod parameters */
+I2C_CLIENT_INSMOD_1(f75375);
+
+/* Fintek F75375 registers */
+#define F75375_REG_CONFIG0 0x0
+#define F75375_REG_CONFIG1 0x1
+#define F75375_REG_CONFIG2 0x2
+#define F75375_REG_CONFIG3 0x3
+#define F75375_REG_ADDR 0x4
+#define F75375_REG_INTR 0x31
+#define F75375_CHIP_ID 0x5A
+#define F75375_REG_VERSION 0x5C
+#define F75375_REG_VENDOR 0x5D
+#define F75375_REG_FAN_TIMER 0x60
+
+#define F75375_REG_VOLT(nr) (0x10 + (nr))
+#define F75375_REG_VOLT_HIGH(nr) (0x20 + (nr) * 2 )
+#define F75375_REG_VOLT_LOW(nr) (0x21 + (nr) * 2 )
+
+#define F75375_REG_TEMP(nr) (0x14 + (nr))
+#define F75375_REG_TEMP_HIGH(nr) (0x28 + (nr) * 2 )
+#define F75375_REG_TEMP_HYST(nr) (0x29 + (nr) * 2 )
+
+#define F75375_REG_FAN(nr) (0x16 + (nr) * 2 )
+#define F75375_REG_FAN_MIN(nr) (0x2C + (nr) * 2 )
+#define F75375_REG_FAN_FULL(nr) (0x70 + (nr) * 0x10 )
+#define F75375_REG_FAN_PWM_DUTY(nr) (0x76 + (nr) * 0x10 )
+#define F75375_REG_FAN_PWM_CLOCK(nr) (0x7D + (nr) * 0x10 )
+
+#define F75375_REG_FAN_EXP(nr) (0x74 + (nr) * 0x10 )
+#define F75375_REG_FAN_B_TEMP(nr, step) ((0xA0 + (nr) * 0x10) + (step))
+#define F75375_REG_FAN_B_SPEED(nr, step) \
+ ((0xA5 + (nr) * 0x10) + (step) * 2 )
+
+#define F75375_REG_PWM1_RAISE_DUTY 0x69
+#define F75375_REG_PWM2_RAISE_DUTY 0x6A
+#define F75375_REG_PWM1_DROP_DUTY 0x6B
+#define F75375_REG_PWM2_DROP_DUTY 0x6C
+
+#define FAN_CTRL_LINEAR(nr) (4+nr)
+#define FAN_CTRL_MODE(nr) (5+(nr*2))
+
+enum kinds {F75375, F75373};
+
+/*
+ * Data structures and manipulation thereof
+ */
+
+struct f75375_data {
+ unsigned short addr;
+ struct i2c_client client;
+ struct class_device *class_dev;
+
+ const char *name;
+ enum kinds kind;
+ struct mutex update_lock; /* protect register access */
+ char valid;
+ unsigned long last_updated; /* In jiffies */
+ unsigned long last_limits; /* In jiffies */
+
+ /* Register values */
+ u8 in[4];
+ u8 in_max[4];
+ u8 in_min[4];
+ u16 fan[2];
+ u16 fan_min[2];
+ u16 fan_full[2];
+ u16 fan_exp[2];
+ u8 fan_timer;
+ u8 pwm[2];
+ u8 pwm_mode[2];
+ u8 pwm_enable[2];
+ u8 temp[2];
+ s8 temp_high[2];
+ s8 temp_max_hyst[2];
+};
+
+static int f75375_attach_adapter(struct i2c_adapter *adapter);
+static int f75375_detect(struct i2c_adapter *adapter, int address, int kind);
+static int f75375_detach_client(struct i2c_client *client);
+
+static struct i2c_driver f75375_driver = {
+ .driver = {
+ .name = "f75375",
+ },
+ .attach_adapter = f75375_attach_adapter,
+ .detach_client = f75375_detach_client,
+};
+
+static inline int f75375_read8(struct i2c_client *client, u8 reg)
+{
+ return i2c_smbus_read_byte_data(client, reg);
+}
+static inline u16 f75375_read16(struct i2c_client *client, u8 reg)
+{
+ return ((i2c_smbus_read_byte_data(client, reg) << 8)
+ | i2c_smbus_read_byte_data(client, reg + 1));
+}
+
+static inline int f75375_write8(struct i2c_client *client, u8 reg,
+ u8 value)
+{
+ return i2c_smbus_write_byte_data(client, reg, value);
+}
+static inline int f75375_write16(struct i2c_client *client, u8 reg,
+ u16 value)
+{
+ int err = i2c_smbus_write_byte_data(client, reg, (value << 8));
+ if (err)
+ return err;
+ return i2c_smbus_write_byte_data(client, reg + 1, (value & 0xFF));
+}
+static struct f75375_data *f75375_update_device(struct device *dev)
+{
+ struct i2c_client *client = to_i2c_client(dev);
+ struct f75375_data *data = i2c_get_clientdata(client);
+ int nr;
+
+ mutex_lock(&data->update_lock);
+
+ /* Limit registers cache is refreshed after 60 seconds */
+ if (time_after(jiffies, data->last_updated + 60 * HZ)
+ || !data->valid) {
+ for (nr = 0; nr < 2; nr++) {
+ data->temp_high[nr] =
+ f75375_read8(client, F75375_REG_TEMP_HIGH(nr));
+ data->temp_max_hyst[nr] =
+ f75375_read8(client, F75375_REG_TEMP_HYST(nr));
+ data->fan_full[nr] =
+ f75375_read16(client, F75375_REG_FAN_FULL(nr));
+ data->fan_min[nr] =
+ f75375_read16(client, F75375_REG_FAN_MIN(nr));
+ data->fan_exp[nr] =
+ f75375_read16(client, F75375_REG_FAN_EXP(nr));
+ data->pwm[nr] = f75375_read8(client,
+ F75375_REG_FAN_PWM_DUTY(nr));
+
+ }
+ for (nr = 0; nr < 4; nr++) {
+ data->in_max[nr] =
+ f75375_read8(client, F75375_REG_VOLT_HIGH(nr));
+ data->in_min[nr] =
+ f75375_read8(client, F75375_REG_VOLT_LOW(nr));
+ }
+ data->fan_timer = f75375_read8(client, F75375_REG_FAN_TIMER);
+ data->last_limits = jiffies;
+ }
+
+ /* Measurement registers cache is refreshed after 2 second */
+ if (time_after(jiffies, data->last_updated + 2 * HZ)
+ || !data->valid) {
+ for (nr = 0; nr < 2; nr++) {
+ data->temp[nr] =
+ f75375_read8(client, F75375_REG_TEMP(nr));
+ data->fan[nr] =
+ f75375_read16(client, F75375_REG_FAN(nr));
+ }
+ for (nr = 0; nr < 4; nr++) {
+ data->in[nr] =
+ f75375_read8(client, F75375_REG_VOLT(nr));
+ }
+ data->last_updated = jiffies;
+ data->valid = 1;
+ }
+
+ mutex_unlock(&data->update_lock);
+ return data;
+}
+
+
+#define RPM_FROM_REG(val) ((val == 65535 || val == 0 ) ? 0 : 1500000/(val))
+#define RPM_TO_REG(val) (1500000/(val))
+
+static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct i2c_client *client = to_i2c_client(dev);
+ struct f75375_data *data = i2c_get_clientdata(client);
+ int val = simple_strtol(buf, NULL, 10);
+
+ mutex_lock(&data->update_lock);
+ data->fan_min[nr] = RPM_TO_REG(val);
+ f75375_write16(client, F75375_REG_FAN_MIN(nr), data->fan_min[nr]);
+ mutex_unlock(&data->update_lock);
+ return count;
+}
+
+static ssize_t set_fan_exp(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct i2c_client *client = to_i2c_client(dev);
+ struct f75375_data *data = i2c_get_clientdata(client);
+ int val = simple_strtol(buf, NULL, 10);
+
+ mutex_lock(&data->update_lock);
+ data->fan_exp[nr] = RPM_TO_REG(val);
+ f75375_write16(client, F75375_REG_FAN_MIN(nr), data->fan_exp[nr]);
+ mutex_unlock(&data->update_lock);
+ return count;
+}
+
+static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct i2c_client *client = to_i2c_client(dev);
+ struct f75375_data *data = i2c_get_clientdata(client);
+ int val = simple_strtol(buf, NULL, 10);
+
+ if (val > 255)
+ val = 255;
+
+ mutex_lock(&data->update_lock);
+ data->pwm[nr] = val;
+ f75375_write8(client, F75375_REG_FAN_PWM_DUTY(nr), data->pwm[nr]);
+ mutex_unlock(&data->update_lock);
+ return count;
+}
+
+static ssize_t show_pwm_enable(struct device *dev, struct device_attribute
+ *attr, char *buf)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct f75375_data *data = f75375_update_device(dev);
+ return sprintf(buf, "%d\n", data->pwm_enable[nr]);
+}
+
+static ssize_t set_pwm_enable(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct i2c_client *client = to_i2c_client(dev);
+ struct f75375_data *data = i2c_get_clientdata(client);
+ int val = simple_strtol(buf, NULL, 10);
+ u8 fanmode;
+
+ if (val < 0 || val > 4)
+ return -EINVAL;
+
+ mutex_lock(&data->update_lock);
+ fanmode = f75375_read8(client, F75375_REG_FAN_TIMER);
+ fanmode = ~(3 << FAN_CTRL_MODE(nr) );
+
+ switch (val) {
+ case 0: /* Full speed */
+ fanmode |= (3 << FAN_CTRL_MODE(nr) );
+ data->pwm[nr] = 255;
+ f75375_write8( client, F75375_REG_FAN_PWM_DUTY(nr),
+ data->pwm[nr]);
+ break;
+ case 1: /* PWM */
+ fanmode |= (3 << FAN_CTRL_MODE(nr) );
+ break;
+ case 2: /* AUTOMATIC*/
+ fanmode |= (2 << FAN_CTRL_MODE(nr) );
+ break;
+ case 3: /* fan speed */
+ break;
+ }
+ f75375_write8(client, F75375_REG_FAN_TIMER, fanmode);
+ data->pwm_enable[nr] = val;
+ mutex_unlock(&data->update_lock);
+ return count;
+}
+
+static ssize_t set_pwm_mode(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct i2c_client *client = to_i2c_client(dev);
+ struct f75375_data *data = i2c_get_clientdata(client);
+ int kind = data->kind;
+ int val = simple_strtol(buf, NULL, 10);
+ u8 conf = 0;
+
+ if (val != 0 || val != 1 || kind == F75373 )
+ return -EINVAL;
+
+ mutex_lock(&data->update_lock);
+ conf = f75375_read8(client, F75375_REG_CONFIG1);
+ conf = ~(1 << FAN_CTRL_LINEAR(nr) );
+
+ if (val == 0)
+ conf |= (1 << FAN_CTRL_LINEAR(nr) ) ;
+
+ f75375_write8(client, F75375_REG_CONFIG1, conf);
+ data->pwm_mode[nr] = val;
+ mutex_unlock(&data->update_lock);
+ return count;
+}
+
+static ssize_t show_pwm(struct device *dev, struct device_attribute
+ *attr, char *buf)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct f75375_data *data = f75375_update_device(dev);
+ return sprintf(buf, "%d\n", data->pwm[nr]);
+}
+static ssize_t show_pwm_mode(struct device *dev, struct device_attribute
+ *attr, char *buf)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct f75375_data *data = f75375_update_device(dev);
+ return sprintf(buf, "%d\n", data->pwm_mode[nr]);
+}
+
+#define VOLT_FROM_REG(val) ((val)*8)
+#define VOLT_TO_REG(val) ((val)/8)
+
+static ssize_t show_in(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct f75375_data *data = f75375_update_device(dev);
+ return sprintf(buf, "%d\n", VOLT_FROM_REG(data->in[nr]));
+}
+
+static ssize_t show_in_max(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct f75375_data *data = f75375_update_device(dev);
+ return sprintf(buf, "%d\n", VOLT_FROM_REG(data->in_max[nr]));
+}
+
+static ssize_t show_in_min(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct f75375_data *data = f75375_update_device(dev);
+ return sprintf(buf, "%d\n", VOLT_FROM_REG(data->in_min[nr]));
+}
+
+static ssize_t set_in_max(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct i2c_client *client = to_i2c_client(dev);
+ struct f75375_data *data = i2c_get_clientdata(client);
+ int val = simple_strtol(buf, NULL, 10);
+ if (VOLT_TO_REG(val) > 255)
+ return -EINVAL;
+ mutex_lock(&data->update_lock);
+ data->in_max[nr] = VOLT_TO_REG(val);
+ f75375_write8(client, F75375_REG_VOLT_HIGH(nr), data->in_max[nr]);
+ mutex_unlock(&data->update_lock);
+ return count;
+}
+
+static ssize_t set_in_min(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct i2c_client *client = to_i2c_client(dev);
+ struct f75375_data *data = i2c_get_clientdata(client);
+ int val = simple_strtol(buf, NULL, 10);
+ if (VOLT_TO_REG(val) > 255)
+ return -EINVAL;
+ mutex_lock(&data->update_lock);
+ data->in_min[nr] = VOLT_TO_REG(val);
+ f75375_write8(client, F75375_REG_VOLT_LOW(nr), data->in_min[nr]);
+ mutex_unlock(&data->update_lock);
+ return count;
+}
+#define TEMP_FROM_REG(val) ((val)*1000)
+#define TEMP_TO_REG(val) ((val)/1000)
+
+static ssize_t show_temp(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct f75375_data *data = f75375_update_device(dev);
+ return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[nr]));
+}
+
+static ssize_t show_temp_max(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct f75375_data *data = f75375_update_device(dev);
+ return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_high[nr]));
+}
+
+static ssize_t show_temp_max_hyst(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct f75375_data *data = f75375_update_device(dev);
+ return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_max_hyst[nr]));
+}
+
+static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct i2c_client *client = to_i2c_client(dev);
+ struct f75375_data *data = i2c_get_clientdata(client);
+ int val = simple_strtol(buf, NULL, 10);
+ if (TEMP_TO_REG(val) > 255)
+ return -EINVAL;
+ mutex_lock(&data->update_lock);
+ data->temp_high[nr] = TEMP_TO_REG(val);
+ f75375_write8(client, F75375_REG_TEMP_HIGH(nr), data->temp_high[nr]);
+ mutex_unlock(&data->update_lock);
+ return count;
+}
+
+static ssize_t set_temp_max_hyst(struct device *dev,
+ struct device_attribute *attr, const char *buf, size_t count)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct i2c_client *client = to_i2c_client(dev);
+ struct f75375_data *data = i2c_get_clientdata(client);
+ int val = simple_strtol(buf, NULL, 10);
+ if (TEMP_TO_REG(val) > 255)
+ return -EINVAL;
+
+ mutex_lock(&data->update_lock);
+ data->temp_max_hyst[nr] = TEMP_TO_REG(val);
+ f75375_write8(client, F75375_REG_TEMP_HYST(nr),
+ data->temp_max_hyst[nr]);
+ mutex_unlock(&data->update_lock);
+ return count;
+}
+
+#define show_fan(thing) \
+static ssize_t show_##thing(struct device *dev, struct device_attribute *attr, \
+ char *buf)\
+{\
+ int nr = to_sensor_dev_attr(attr)->index;\
+ struct f75375_data *data = f75375_update_device(dev); \
+ return sprintf(buf, "%d\n", RPM_FROM_REG(data->thing[nr])); \
+}
+
+show_fan(fan);
+show_fan(fan_min);
+show_fan(fan_full);
+show_fan(fan_exp);
+
+static SENSOR_DEVICE_ATTR(in0_input, S_IRUGO, show_in, NULL, 0);
+static SENSOR_DEVICE_ATTR(in0_max, S_IRUGO|S_IWUSR,
+ show_in_max, set_in_max, 0);
+static SENSOR_DEVICE_ATTR(in0_min, S_IRUGO|S_IWUSR,
+ show_in_min, set_in_min, 0);
+static SENSOR_DEVICE_ATTR(in1_input, S_IRUGO, show_in, NULL, 1);
+static SENSOR_DEVICE_ATTR(in1_max, S_IRUGO|S_IWUSR,
+ show_in_max, set_in_max, 1);
+static SENSOR_DEVICE_ATTR(in1_min, S_IRUGO|S_IWUSR,
+ show_in_min, set_in_min, 1);
+static SENSOR_DEVICE_ATTR(in2_input, S_IRUGO, show_in, NULL, 2);
+static SENSOR_DEVICE_ATTR(in2_max, S_IRUGO|S_IWUSR,
+ show_in_max, set_in_max, 2);
+static SENSOR_DEVICE_ATTR(in2_min, S_IRUGO|S_IWUSR,
+ show_in_min, set_in_min, 2);
+static SENSOR_DEVICE_ATTR(in3_input, S_IRUGO, show_in, NULL, 3);
+static SENSOR_DEVICE_ATTR(in3_max, S_IRUGO|S_IWUSR,
+ show_in_max, set_in_max, 3);
+static SENSOR_DEVICE_ATTR(in3_min, S_IRUGO|S_IWUSR,
+ show_in_min, set_in_min, 3);
+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp1_max_hyst, S_IRUGO|S_IWUSR,
+ show_temp_max_hyst, set_temp_max_hyst, 0);
+static SENSOR_DEVICE_ATTR(temp1_max, S_IRUGO|S_IWUSR,
+ show_temp_max, set_temp_max, 0);
+static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, show_temp, NULL, 1);
+static SENSOR_DEVICE_ATTR(temp2_max_hyst, S_IRUGO|S_IWUSR,
+ show_temp_max_hyst, set_temp_max_hyst, 1);
+static SENSOR_DEVICE_ATTR(temp2_max, S_IRUGO|S_IWUSR,
+ show_temp_max, set_temp_max, 1);
+static SENSOR_DEVICE_ATTR(fan1_input, S_IRUGO, show_fan, NULL, 0);
+static SENSOR_DEVICE_ATTR(fan1_full, S_IRUGO, show_fan_full, NULL, 0);
+static SENSOR_DEVICE_ATTR(fan1_min, S_IRUGO|S_IWUSR,
+ show_fan_min, set_fan_min, 0);
+static SENSOR_DEVICE_ATTR(fan1_exp, S_IRUGO|S_IWUSR,
+ show_fan_exp, set_fan_exp, 0);
+static SENSOR_DEVICE_ATTR(fan2_input, S_IRUGO, show_fan, NULL, 1);
+static SENSOR_DEVICE_ATTR(fan2_full, S_IRUGO, show_fan_full, NULL, 1);
+static SENSOR_DEVICE_ATTR(fan2_min, S_IRUGO|S_IWUSR,
+ show_fan_min, set_fan_min, 1);
+static SENSOR_DEVICE_ATTR(fan2_exp, S_IRUGO|S_IWUSR,
+ show_fan_exp, set_fan_exp, 1);
+static SENSOR_DEVICE_ATTR(pwm1, S_IRUGO|S_IWUSR,
+ show_pwm, set_pwm, 0);
+static SENSOR_DEVICE_ATTR(pwm1_enable, S_IRUGO|S_IWUSR,
+ show_pwm_enable, set_pwm_enable, 0);
+static SENSOR_DEVICE_ATTR(pwm1_mode, S_IRUGO|S_IWUSR,
+ show_pwm_mode, set_pwm_mode, 0);
+static SENSOR_DEVICE_ATTR(pwm2, S_IRUGO | S_IWUSR,
+ show_pwm, set_pwm, 1);
+static SENSOR_DEVICE_ATTR(pwm2_enable, S_IRUGO|S_IWUSR,
+ show_pwm_enable, set_pwm_enable, 1);
+static SENSOR_DEVICE_ATTR(pwm2_mode, S_IRUGO|S_IWUSR,
+ show_pwm_mode, set_pwm_mode, 1);
+
+static struct attribute *f75375_attributes[] = {
+ &sensor_dev_attr_temp1_input.dev_attr.attr,
+ &sensor_dev_attr_temp1_max.dev_attr.attr,
+ &sensor_dev_attr_temp1_max_hyst.dev_attr.attr,
+ &sensor_dev_attr_temp2_input.dev_attr.attr,
+ &sensor_dev_attr_temp2_max.dev_attr.attr,
+ &sensor_dev_attr_temp2_max_hyst.dev_attr.attr,
+ &sensor_dev_attr_fan1_input.dev_attr.attr,
+ &sensor_dev_attr_fan1_full.dev_attr.attr,
+ &sensor_dev_attr_fan1_min.dev_attr.attr,
+ &sensor_dev_attr_fan1_exp.dev_attr.attr,
+ &sensor_dev_attr_fan2_input.dev_attr.attr,
+ &sensor_dev_attr_fan2_full.dev_attr.attr,
+ &sensor_dev_attr_fan2_min.dev_attr.attr,
+ &sensor_dev_attr_fan2_exp.dev_attr.attr,
+ &sensor_dev_attr_pwm1.dev_attr.attr,
+ &sensor_dev_attr_pwm1_enable.dev_attr.attr,
+ &sensor_dev_attr_pwm1_mode.dev_attr.attr,
+ &sensor_dev_attr_pwm2.dev_attr.attr,
+ &sensor_dev_attr_pwm2_enable.dev_attr.attr,
+ &sensor_dev_attr_pwm2_mode.dev_attr.attr,
+ &sensor_dev_attr_in0_input.dev_attr.attr,
+ &sensor_dev_attr_in0_max.dev_attr.attr,
+ &sensor_dev_attr_in0_min.dev_attr.attr,
+ &sensor_dev_attr_in1_input.dev_attr.attr,
+ &sensor_dev_attr_in1_max.dev_attr.attr,
+ &sensor_dev_attr_in1_min.dev_attr.attr,
+ &sensor_dev_attr_in2_input.dev_attr.attr,
+ &sensor_dev_attr_in2_max.dev_attr.attr,
+ &sensor_dev_attr_in2_min.dev_attr.attr,
+ &sensor_dev_attr_in3_input.dev_attr.attr,
+ &sensor_dev_attr_in3_max.dev_attr.attr,
+ &sensor_dev_attr_in3_min.dev_attr.attr,
+ NULL
+};
+
+static const struct attribute_group f75375_group =
+{
+ .attrs = f75375_attributes,
+};
+
+static int f75375_detach_client(struct i2c_client *client)
+{
+ struct f75375_data *data = i2c_get_clientdata(client);
+ int err;
+
+ sysfs_remove_group(&client->dev.kobj, &f75375_group);
+ hwmon_device_unregister(data->class_dev);
+
+ err = i2c_detach_client(client);
+ if (err) {
+ dev_err(&client->dev,
+ "Client deregistration failed, "
+ "client not detached.\n");
+ return err;
+ }
+ kfree(data);
+ return 0;
+}
+
+static int f75375_attach_adapter(struct i2c_adapter *adapter)
+{
+ return i2c_probe(adapter, &addr_data, f75375_detect);
+}
+
+
+/* This function is called by i2c_probe */
+static int f75375_detect(struct i2c_adapter *adapter, int address, int kind)
+{
+ struct i2c_client *client;
+ struct f75375_data *data;
+ u8 version = 0;
+ int err = 0;
+ char *name = "";
+
+ if (!(data = kzalloc(sizeof(struct f75375_data), GFP_KERNEL))) {
+ err = -ENOMEM;
+ goto exit;
+ }
+ client = &data->client;
+ i2c_set_clientdata(client, data);
+ client->addr = address;
+ client->adapter = adapter;
+ client->driver = &f75375_driver;
+ client->flags = 0;
+
+ if (kind < 0) {
+ u16 vendid = f75375_read16(client, F75375_REG_VENDOR);
+ u16 chipid = f75375_read16(client, F75375_CHIP_ID);
+ version = f75375_read8(client, F75375_REG_VERSION);
+ if (chipid == 0x0306 && vendid == 0x1934) {
+ name = "f75375";
+ data->kind = F75375;
+ } else if (chipid == 0x0204 && vendid == 0x1934) {
+ name = "f75373";
+ data->kind = F75373;
+ } else {
+ dev_err(&adapter->dev,
+ "failed,%02X,%02X,%02X\n",
+ chipid, version, vendid);
+ goto exit_free;
+ }
+ }
+ dev_info(&adapter->dev, "found %s version: %02X\n", name, version);
+ strlcpy(client->name, name, I2C_NAME_SIZE);
+ data->valid = 0;
+ mutex_init(&data->update_lock);
+ if ((err = i2c_attach_client(client)))
+ goto exit_free;
+
+ if ((err = sysfs_create_group(&client->dev.kobj, &f75375_group)))
+ goto exit_detach;
+
+ data->class_dev = hwmon_device_register(&client->dev);
+ if (IS_ERR(data->class_dev)) {
+ err = PTR_ERR(data->class_dev);
+ goto exit_remove;
+ }
+
+ return 0;
+
+exit_remove:
+ sysfs_remove_group(&client->dev.kobj, &f75375_group);
+exit_detach:
+ i2c_detach_client(client);
+exit_free:
+ kfree(data);
+exit:
+ return err;
+}
+
+static int __init sensors_f75375_init(void)
+{
+ return i2c_add_driver(&f75375_driver);
+}
+
+static void __exit sensors_f75375_exit(void)
+{
+ i2c_del_driver(&f75375_driver);
+}
+
+MODULE_AUTHOR("Riku Voipio <riku.voipio@movial.fi> ");
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("F75373/F75375 hardware monitoring driver");
+
+module_init(sensors_f75375_init);
+module_exit(sensors_f75375_exit);
--
1.5.0.3
[-- Attachment #3: Type: text/plain, Size: 153 bytes --]
_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [lm-sensors] [PATCH] Add f75375s driver
2007-06-28 23:07 [lm-sensors] [PATCH] Add f75375s driver Riku Voipio
` (4 preceding siblings ...)
2007-07-10 10:01 ` Riku Voipio
@ 2007-07-10 19:08 ` Christian Emmerich
2007-08-24 10:03 ` Riku Voipio
2007-08-26 18:50 ` Mark M. Hoffman
7 siblings, 0 replies; 9+ messages in thread
From: Christian Emmerich @ 2007-07-10 19:08 UTC (permalink / raw)
To: lm-sensors
[-- Attachment #1.1: Type: text/plain, Size: 5014 bytes --]
Hi Riku,
Thanks for your reply & the new version of the driver.
> > OK, this was my fault if i set the value by hand i could also see the
> > value using 'cat temp1_max_hyst' and sensors, i thought there would be
> > an automatic entry i can read out.
> > What does this value exactly stand for, is it usefull for sensors or
> > just a value i can read out using sensors?
>
> It has a default value, 60 degrees, but your bios might overwrite it.
It seems that the bios overwrites it, the value is always zero until i change it. If i set it by hand, i can see a value using cat and also using sensors.
> Which reminds me: if you don't mind, please verify that values reported
> by sensors match the ones reported
> by bios. Often bios's come with a screen that shows of hwmon
> information.
I can see following values:
bios-hwmon sensors
CPU Temp: 51°C +50°C
SYS Temp: 43°C +44°C
CPU Fan 1800 1777
SYS Fan not connected in my pc
VCC: n.a. +1.72 V
V1: n.a. +1.34 V
V2: n.a. +1.01 V
V3: n.a. +0.81 V
Values i can also see in my bios seems to be ok. The voltage values of the fintek chip are not shown in the bios. I have a second chip ( w83627hf ), the voltage values of this chip are displayed in the bios.
> > Another problem i forget in my last mail. I don't know what's the
> > reason, but if i do the following:
> > root at pc:/sys/devices/pci0000:00/0000:00:01.1/i2c-1/1-002d# cat fan1_min
> > i got following output:
> > <output>
> > root at pc:/sys/devices/pci0000:00/0000:00:01.1/i2c-1/1-002d# cat fan1_min
> > Segmentation fault
> > root at pc:/sys/devices/pci0000:00/0000:00:01.1/i2c-1/1-002d#
> Oops. the new REG_TO_RPM code did not take in account if the rpm count
> is zero.. should be fixed with the attached version..
OK, now i can make a cat fan1_min. The value is zero until i set it by hand. But if i set it to zero it leads to an segmentation fault again.
<output>
root@pc:/sys/devices/pci0000:00/0000:00:01.1/i2c-1/1-002d# echo 0 > fan1_min
Segmentation fault
mythtv@pc:~$
Message from syslogd@pc at Tue Jul 10 20:44:47 2007 ...
pc kernel: [17190005.040000] divide error: 0000 [#1]
Message from syslogd@pc at Tue Jul 10 20:44:47 2007 ...
pc kernel: [17190005.040000] CPU: 0
Message from syslogd@pc at Tue Jul 10 20:44:47 2007 ...
pc kernel: [17190005.040000] EIP is at set_fan_min+0x4b/0xa0 [f75375s]
Message from syslogd@pc at Tue Jul 10 20:44:47 2007 ...
pc kernel: [17190005.040000] eax: 0016e360 ebx: 00000000 ecx: 00000000 edx: 00000000
Message from syslogd@pc at Tue Jul 10 20:44:47 2007 ...
pc kernel: [17190005.040000] esi: dd9d2e00 edi: 00000000 ebp: dd9d2e04 esp: d927df34
Message from syslogd@pc at Tue Jul 10 20:44:47 2007 ...
pc kernel: [17190005.040000] ds: 007b es: 007b ss: 0068
Message from syslogd@pc at Tue Jul 10 20:44:47 2007 ...
pc kernel: [17190005.040000] Process bash (pid: 18265, threadinfo=d927c000 task=dba575c0)
Message from syslogd@pc at Tue Jul 10 20:44:47 2007 ...
pc kernel: [17190005.040000] Stack: dd9d2f94 000280d0 e0b777e0 e0b7a1c0 dd9d2e80 00000002 c0228ebd 00000002
Message from syslogd@pc at Tue Jul 10 20:44:47 2007 ...
pc kernel: [17190005.040000] deead0d4 c0367514 d66401a0 c0195e87 00000002 d09356e0 d66401b4 d09356e0
Message from syslogd@pc at Tue Jul 10 20:44:47 2007 ...
pc kernel: [17190005.040000] 080fc808 d927dfa4 00000002 c0158b0e d927dfa4 c0195e00 d09356e0 fffffff7
Message from syslogd@pc at Tue Jul 10 20:44:47 2007 ...
pc kernel: [17190005.040000] Call Trace:
Message from syslogd@pc at Tue Jul 10 20:44:47 2007 ...
pc kernel: [17190005.040000] <e0b777e0> set_fan_min+0x0/0xa0 [f75375s] <c0228ebd> dev_attr_store+0x2d/0x40
Message from syslogd@pc at Tue Jul 10 20:44:47 2007 ...
pc kernel: [17190005.040000] <c0195e87> sysfs_write_file+0x87/0xf0 <c0158b0e> vfs_write+0xbe/0x190
Message from syslogd@pc at Tue Jul 10 20:44:47 2007 ...
pc kernel: [17190005.040000] <c0195e00> sysfs_write_file+0x0/0xf0 <c0159171> sys_write+0x41/0x70
Message from syslogd@pc at Tue Jul 10 20:44:47 2007 ...
pc kernel: [17190005.040000] <c0102dbb> sysenter_past_esp+0x54/0x79
Message from syslogd@pc at Tue Jul 10 20:44:47 2007 ...
pc kernel: [17190005.040000] Code: 7a 14 31 d2 8b b5 f8 00 00 00 e8 01 40 65 df 89 c3 8d 86 94 01 00 00 89 04 24 e8 01 ea 74 df ba 60 e3 16 00 31 c9 89 d0 c1 fa 1f <f7> fb 8d 5c 3f 2c 0f b6 d3 66 89 44 24 06 66 89 84 7e bc 01 00
Message from syslogd@pc at Tue Jul 10 20:44:47 2007 ...
pc kernel: [17190005.040000] EIP: [pg0+544229419/1069069312] set_fan_min+0x4b/0xa0 [f75375s] SS:ESP 0068:d927df34
</output>
best regards
christian.
---------------------------------
Die etwas anderen Infos rund um das Thema Reisen. BE A BETTER WELTENBUMMLER!
[-- Attachment #1.2: Type: text/html, Size: 13049 bytes --]
[-- Attachment #2: Type: text/plain, Size: 153 bytes --]
_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
^ permalink raw reply [flat|nested] 9+ messages in thread* [lm-sensors] [PATCH] Add f75375s driver
2007-06-28 23:07 [lm-sensors] [PATCH] Add f75375s driver Riku Voipio
` (5 preceding siblings ...)
2007-07-10 19:08 ` Christian Emmerich
@ 2007-08-24 10:03 ` Riku Voipio
2007-08-26 18:50 ` Mark M. Hoffman
7 siblings, 0 replies; 9+ messages in thread
From: Riku Voipio @ 2007-08-24 10:03 UTC (permalink / raw)
To: lm-sensors
[-- Attachment #1.1.1: Type: text/plain, Size: 404 bytes --]
Hi,
After diving deeper into mutexes, I eventually figured that the
driver is already doing the correct thing. f75375_read16 is only
called from f75375_update_device() while holding update mutex and
from f75375_detect when we are reading static values. So just
document that. The rest of the issues Mark noticed have also
been fixed.
--
"rm -rf" only sounds scary if you don't have backups
[-- Attachment #1.1.2: 0001-Add-f75375s-driver.patch --]
[-- Type: text/plain, Size: 24417 bytes --]
From 7dcb7e2d5a685f438ef3ad3cd0f92f256629189d Mon Sep 17 00:00:00 2001
From: Riku Voipio <riku.voipio@movial.fi>
Date: Fri, 24 Aug 2007 10:46:18 +0300
Subject: [PATCH] Add f75375s driver
Signed-off-by: Riku Voipio <riku.voipio@movial.fi>
---
drivers/hwmon/Kconfig | 10 +
drivers/hwmon/Makefile | 1 +
drivers/hwmon/f75375s.c | 691 +++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 702 insertions(+), 0 deletions(-)
create mode 100644 drivers/hwmon/f75375s.c
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 192953b..17aa5d7 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -216,6 +216,16 @@ config SENSORS_F71805F
This driver can also be built as a module. If so, the module
will be called f71805f.
+config SENSORS_F75375S
+ tristate "Fintek F75375S/SP and F75373";
+ depends on I2C && EXPERIMENTAL
+ help
+ If you say yes here you get support for hardware monitoring
+ features of the Fintek F75375S/SP and F75373
+
+ This driver can also be built as a module. If so, the module
+ will be called f75375s.
+
config SENSORS_FSCHER
tristate "FSC Hermes"
depends on I2C
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index d04f900..54efadd 100644
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -29,6 +29,7 @@ obj-$(CONFIG_SENSORS_CORETEMP) += coretemp.o
obj-$(CONFIG_SENSORS_DME1737) += dme1737.o
obj-$(CONFIG_SENSORS_DS1621) += ds1621.o
obj-$(CONFIG_SENSORS_F71805F) += f71805f.o
+obj-$(CONFIG_SENSORS_F75375S) += f75375s.o
obj-$(CONFIG_SENSORS_FSCHER) += fscher.o
obj-$(CONFIG_SENSORS_FSCPOS) += fscpos.o
obj-$(CONFIG_SENSORS_GL518SM) += gl518sm.o
diff --git a/drivers/hwmon/f75375s.c b/drivers/hwmon/f75375s.c
new file mode 100644
index 0000000..6425184
--- /dev/null
+++ b/drivers/hwmon/f75375s.c
@@ -0,0 +1,691 @@
+/*
+ * f75375s.c - driver for the Fintek F75375/SP and F75373
+ * hardware monitoring features
+ * Copyright (C) 2006-2007 Riku Voipio <riku.voipio@movial.fi>
+ *
+ * Datasheets available at:
+ *
+ * f75375:
+ * http://www.fintek.com.tw/files/productfiles/2005111152950.pdf
+ *
+ * f75373:
+ * http://www.fintek.com.tw/files/productfiles/2005111153128.pdf
+ *
+ * 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.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/jiffies.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/i2c.h>
+#include <linux/err.h>
+#include <linux/mutex.h>
+
+/* Addresses to scan */
+static unsigned short normal_i2c[] = { 0x2d, 0x2e, I2C_CLIENT_END };
+
+/* Insmod parameters */
+I2C_CLIENT_INSMOD_2(f75373, f75375);
+
+/* Fintek F75375 registers */
+#define F75375_REG_CONFIG0 0x0
+#define F75375_REG_CONFIG1 0x1
+#define F75375_REG_CONFIG2 0x2
+#define F75375_REG_CONFIG3 0x3
+#define F75375_REG_ADDR 0x4
+#define F75375_REG_INTR 0x31
+#define F75375_CHIP_ID 0x5A
+#define F75375_REG_VERSION 0x5C
+#define F75375_REG_VENDOR 0x5D
+#define F75375_REG_FAN_TIMER 0x60
+
+#define F75375_REG_VOLT(nr) (0x10 + (nr))
+#define F75375_REG_VOLT_HIGH(nr) (0x20 + (nr) * 2)
+#define F75375_REG_VOLT_LOW(nr) (0x21 + (nr) * 2)
+
+#define F75375_REG_TEMP(nr) (0x14 + (nr))
+#define F75375_REG_TEMP_HIGH(nr) (0x28 + (nr) * 2)
+#define F75375_REG_TEMP_HYST(nr) (0x29 + (nr) * 2)
+
+#define F75375_REG_FAN(nr) (0x16 + (nr) * 2)
+#define F75375_REG_FAN_MIN(nr) (0x2C + (nr) * 2)
+#define F75375_REG_FAN_FULL(nr) (0x70 + (nr) * 0x10)
+#define F75375_REG_FAN_PWM_DUTY(nr) (0x76 + (nr) * 0x10)
+#define F75375_REG_FAN_PWM_CLOCK(nr) (0x7D + (nr) * 0x10)
+
+#define F75375_REG_FAN_EXP(nr) (0x74 + (nr) * 0x10)
+#define F75375_REG_FAN_B_TEMP(nr, step) ((0xA0 + (nr) * 0x10) + (step))
+#define F75375_REG_FAN_B_SPEED(nr, step) \
+ ((0xA5 + (nr) * 0x10) + (step) * 2)
+
+#define F75375_REG_PWM1_RAISE_DUTY 0x69
+#define F75375_REG_PWM2_RAISE_DUTY 0x6A
+#define F75375_REG_PWM1_DROP_DUTY 0x6B
+#define F75375_REG_PWM2_DROP_DUTY 0x6C
+
+#define FAN_CTRL_LINEAR(nr) (4 + nr)
+#define FAN_CTRL_MODE(nr) (5 + ((nr) * 2))
+
+/*
+ * Data structures and manipulation thereof
+ */
+
+struct f75375_data {
+ unsigned short addr;
+ struct i2c_client client;
+ struct class_device *class_dev;
+
+ const char *name;
+ int kind;
+ struct mutex update_lock; /* protect register access */
+ char valid;
+ unsigned long last_updated; /* In jiffies */
+ unsigned long last_limits; /* In jiffies */
+
+ /* Register values */
+ u8 in[4];
+ u8 in_max[4];
+ u8 in_min[4];
+ u16 fan[2];
+ u16 fan_min[2];
+ u16 fan_full[2];
+ u16 fan_exp[2];
+ u8 fan_timer;
+ u8 pwm[2];
+ u8 pwm_mode[2];
+ u8 pwm_enable[2];
+ s8 temp[2];
+ s8 temp_high[2];
+ s8 temp_max_hyst[2];
+};
+
+static int f75375_attach_adapter(struct i2c_adapter *adapter);
+static int f75375_detect(struct i2c_adapter *adapter, int address, int kind);
+static int f75375_detach_client(struct i2c_client *client);
+
+static struct i2c_driver f75375_driver = {
+ .driver = {
+ .name = "f75375",
+ },
+ .attach_adapter = f75375_attach_adapter,
+ .detach_client = f75375_detach_client,
+};
+
+static inline int f75375_read8(struct i2c_client *client, u8 reg)
+{
+ return i2c_smbus_read_byte_data(client, reg);
+}
+
+/* in most cases, should be called while holding update_lock */
+static inline u16 f75375_read16(struct i2c_client *client, u8 reg)
+{
+ return ((i2c_smbus_read_byte_data(client, reg) << 8)
+ | i2c_smbus_read_byte_data(client, reg + 1));
+}
+
+static inline void f75375_write8(struct i2c_client *client, u8 reg,
+ u8 value)
+{
+ i2c_smbus_write_byte_data(client, reg, value);
+}
+
+static inline void f75375_write16(struct i2c_client *client, u8 reg,
+ u16 value)
+{
+ int err = i2c_smbus_write_byte_data(client, reg, (value << 8));
+ if (err)
+ return;
+ i2c_smbus_write_byte_data(client, reg + 1, (value & 0xFF));
+}
+
+static struct f75375_data *f75375_update_device(struct device *dev)
+{
+ struct i2c_client *client = to_i2c_client(dev);
+ struct f75375_data *data = i2c_get_clientdata(client);
+ int nr;
+
+ mutex_lock(&data->update_lock);
+
+ /* Limit registers cache is refreshed after 60 seconds */
+ if (time_after(jiffies, data->last_limits + 60 * HZ)
+ || !data->valid) {
+ for (nr = 0; nr < 2; nr++) {
+ data->temp_high[nr] =
+ f75375_read8(client, F75375_REG_TEMP_HIGH(nr));
+ data->temp_max_hyst[nr] =
+ f75375_read8(client, F75375_REG_TEMP_HYST(nr));
+ data->fan_full[nr] =
+ f75375_read16(client, F75375_REG_FAN_FULL(nr));
+ data->fan_min[nr] =
+ f75375_read16(client, F75375_REG_FAN_MIN(nr));
+ data->fan_exp[nr] =
+ f75375_read16(client, F75375_REG_FAN_EXP(nr));
+ data->pwm[nr] = f75375_read8(client,
+ F75375_REG_FAN_PWM_DUTY(nr));
+
+ }
+ for (nr = 0; nr < 4; nr++) {
+ data->in_max[nr] =
+ f75375_read8(client, F75375_REG_VOLT_HIGH(nr));
+ data->in_min[nr] =
+ f75375_read8(client, F75375_REG_VOLT_LOW(nr));
+ }
+ data->fan_timer = f75375_read8(client, F75375_REG_FAN_TIMER);
+ data->last_limits = jiffies;
+ }
+
+ /* Measurement registers cache is refreshed after 2 second */
+ if (time_after(jiffies, data->last_updated + 2 * HZ)
+ || !data->valid) {
+ for (nr = 0; nr < 2; nr++) {
+ data->temp[nr] =
+ f75375_read8(client, F75375_REG_TEMP(nr));
+ data->fan[nr] =
+ f75375_read16(client, F75375_REG_FAN(nr));
+ }
+ for (nr = 0; nr < 4; nr++)
+ data->in[nr] =
+ f75375_read8(client, F75375_REG_VOLT(nr));
+
+ data->last_updated = jiffies;
+ data->valid = 1;
+ }
+
+ mutex_unlock(&data->update_lock);
+ return data;
+}
+
+static inline u16 rpm_from_reg(u16 reg)
+{
+ if (reg == 0 || reg == 0xffff)
+ return 0;
+ return (1500000 / reg);
+}
+
+static inline u16 rpm_to_reg(int rpm)
+{
+ if (rpm < 367 || rpm > 0xffff)
+ return 0xffff;
+ return (1500000 / rpm);
+}
+
+static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct i2c_client *client = to_i2c_client(dev);
+ struct f75375_data *data = i2c_get_clientdata(client);
+ int val = simple_strtoul(buf, NULL, 10);
+
+ mutex_lock(&data->update_lock);
+ data->fan_min[nr] = rpm_to_reg(val);
+ f75375_write16(client, F75375_REG_FAN_MIN(nr), data->fan_min[nr]);
+ mutex_unlock(&data->update_lock);
+ return count;
+}
+
+static ssize_t set_fan_exp(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct i2c_client *client = to_i2c_client(dev);
+ struct f75375_data *data = i2c_get_clientdata(client);
+ int val = simple_strtoul(buf, NULL, 10);
+
+ mutex_lock(&data->update_lock);
+ data->fan_exp[nr] = rpm_to_reg(val);
+ f75375_write16(client, F75375_REG_FAN_EXP(nr), data->fan_exp[nr]);
+ mutex_unlock(&data->update_lock);
+ return count;
+}
+
+static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct i2c_client *client = to_i2c_client(dev);
+ struct f75375_data *data = i2c_get_clientdata(client);
+ int val = simple_strtoul(buf, NULL, 10);
+
+ mutex_lock(&data->update_lock);
+ data->pwm[nr] = SENSORS_LIMIT(val, 0, 255);
+ f75375_write8(client, F75375_REG_FAN_PWM_DUTY(nr), data->pwm[nr]);
+ mutex_unlock(&data->update_lock);
+ return count;
+}
+
+static ssize_t show_pwm_enable(struct device *dev, struct device_attribute
+ *attr, char *buf)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct f75375_data *data = f75375_update_device(dev);
+ return sprintf(buf, "%d\n", data->pwm_enable[nr]);
+}
+
+static ssize_t set_pwm_enable(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct i2c_client *client = to_i2c_client(dev);
+ struct f75375_data *data = i2c_get_clientdata(client);
+ int val = simple_strtoul(buf, NULL, 10);
+ u8 fanmode;
+
+ if (val < 0 || val > 4)
+ return -EINVAL;
+
+ mutex_lock(&data->update_lock);
+ fanmode = f75375_read8(client, F75375_REG_FAN_TIMER);
+ fanmode = ~(3 << FAN_CTRL_MODE(nr));
+
+ switch (val) {
+ case 0: /* Full speed */
+ fanmode |= (3 << FAN_CTRL_MODE(nr));
+ data->pwm[nr] = 255;
+ f75375_write8(client, F75375_REG_FAN_PWM_DUTY(nr),
+ data->pwm[nr]);
+ break;
+ case 1: /* PWM */
+ fanmode |= (3 << FAN_CTRL_MODE(nr));
+ break;
+ case 2: /* AUTOMATIC*/
+ fanmode |= (2 << FAN_CTRL_MODE(nr));
+ break;
+ case 3: /* fan speed */
+ break;
+ }
+ f75375_write8(client, F75375_REG_FAN_TIMER, fanmode);
+ data->pwm_enable[nr] = val;
+ mutex_unlock(&data->update_lock);
+ return count;
+}
+
+static ssize_t set_pwm_mode(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct i2c_client *client = to_i2c_client(dev);
+ struct f75375_data *data = i2c_get_clientdata(client);
+ int val = simple_strtoul(buf, NULL, 10);
+ u8 conf = 0;
+
+ if (val != 0 || val != 1 || data->kind == f75373)
+ return -EINVAL;
+
+ mutex_lock(&data->update_lock);
+ conf = f75375_read8(client, F75375_REG_CONFIG1);
+ conf = ~(1 << FAN_CTRL_LINEAR(nr));
+
+ if (val == 0)
+ conf |= (1 << FAN_CTRL_LINEAR(nr)) ;
+
+ f75375_write8(client, F75375_REG_CONFIG1, conf);
+ data->pwm_mode[nr] = val;
+ mutex_unlock(&data->update_lock);
+ return count;
+}
+
+static ssize_t show_pwm(struct device *dev, struct device_attribute
+ *attr, char *buf)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct f75375_data *data = f75375_update_device(dev);
+ return sprintf(buf, "%d\n", data->pwm[nr]);
+}
+
+static ssize_t show_pwm_mode(struct device *dev, struct device_attribute
+ *attr, char *buf)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct f75375_data *data = f75375_update_device(dev);
+ return sprintf(buf, "%d\n", data->pwm_mode[nr]);
+}
+
+#define VOLT_FROM_REG(val) ((val) * 8)
+#define VOLT_TO_REG(val) ((val) / 8)
+
+static ssize_t show_in(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct f75375_data *data = f75375_update_device(dev);
+ return sprintf(buf, "%d\n", VOLT_FROM_REG(data->in[nr]));
+}
+
+static ssize_t show_in_max(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct f75375_data *data = f75375_update_device(dev);
+ return sprintf(buf, "%d\n", VOLT_FROM_REG(data->in_max[nr]));
+}
+
+static ssize_t show_in_min(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct f75375_data *data = f75375_update_device(dev);
+ return sprintf(buf, "%d\n", VOLT_FROM_REG(data->in_min[nr]));
+}
+
+static ssize_t set_in_max(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct i2c_client *client = to_i2c_client(dev);
+ struct f75375_data *data = i2c_get_clientdata(client);
+ int val = simple_strtoul(buf, NULL, 10);
+ val = SENSORS_LIMIT(VOLT_TO_REG(val), 0, 0xff);
+ mutex_lock(&data->update_lock);
+ data->in_max[nr] = val;
+ f75375_write8(client, F75375_REG_VOLT_HIGH(nr), data->in_max[nr]);
+ mutex_unlock(&data->update_lock);
+ return count;
+}
+
+static ssize_t set_in_min(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct i2c_client *client = to_i2c_client(dev);
+ struct f75375_data *data = i2c_get_clientdata(client);
+ int val = simple_strtoul(buf, NULL, 10);
+ val = SENSORS_LIMIT(VOLT_TO_REG(val), 0, 0xff);
+ mutex_lock(&data->update_lock);
+ data->in_min[nr] = val;
+ f75375_write8(client, F75375_REG_VOLT_LOW(nr), data->in_min[nr]);
+ mutex_unlock(&data->update_lock);
+ return count;
+}
+#define TEMP_FROM_REG(val) ((val) * 1000)
+#define TEMP_TO_REG(val) ((val) / 1000)
+
+static ssize_t show_temp(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct f75375_data *data = f75375_update_device(dev);
+ return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[nr]));
+}
+
+static ssize_t show_temp_max(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct f75375_data *data = f75375_update_device(dev);
+ return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_high[nr]));
+}
+
+static ssize_t show_temp_max_hyst(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct f75375_data *data = f75375_update_device(dev);
+ return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_max_hyst[nr]));
+}
+
+static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct i2c_client *client = to_i2c_client(dev);
+ struct f75375_data *data = i2c_get_clientdata(client);
+ int val = simple_strtol(buf, NULL, 10);
+ val = SENSORS_LIMIT(TEMP_TO_REG(val), 0, 127);
+ mutex_lock(&data->update_lock);
+ data->temp_high[nr] = val;
+ f75375_write8(client, F75375_REG_TEMP_HIGH(nr), data->temp_high[nr]);
+ mutex_unlock(&data->update_lock);
+ return count;
+}
+
+static ssize_t set_temp_max_hyst(struct device *dev,
+ struct device_attribute *attr, const char *buf, size_t count)
+{
+ int nr = to_sensor_dev_attr(attr)->index;
+ struct i2c_client *client = to_i2c_client(dev);
+ struct f75375_data *data = i2c_get_clientdata(client);
+ int val = simple_strtol(buf, NULL, 10);
+ val = SENSORS_LIMIT(TEMP_TO_REG(val), 0, 127);
+ mutex_lock(&data->update_lock);
+ data->temp_max_hyst[nr] = val;
+ f75375_write8(client, F75375_REG_TEMP_HYST(nr),
+ data->temp_max_hyst[nr]);
+ mutex_unlock(&data->update_lock);
+ return count;
+}
+
+#define show_fan(thing) \
+static ssize_t show_##thing(struct device *dev, struct device_attribute *attr, \
+ char *buf)\
+{\
+ int nr = to_sensor_dev_attr(attr)->index;\
+ struct f75375_data *data = f75375_update_device(dev); \
+ return sprintf(buf, "%d\n", rpm_from_reg(data->thing[nr])); \
+}
+
+show_fan(fan);
+show_fan(fan_min);
+show_fan(fan_full);
+show_fan(fan_exp);
+
+static SENSOR_DEVICE_ATTR(in0_input, S_IRUGO, show_in, NULL, 0);
+static SENSOR_DEVICE_ATTR(in0_max, S_IRUGO|S_IWUSR,
+ show_in_max, set_in_max, 0);
+static SENSOR_DEVICE_ATTR(in0_min, S_IRUGO|S_IWUSR,
+ show_in_min, set_in_min, 0);
+static SENSOR_DEVICE_ATTR(in1_input, S_IRUGO, show_in, NULL, 1);
+static SENSOR_DEVICE_ATTR(in1_max, S_IRUGO|S_IWUSR,
+ show_in_max, set_in_max, 1);
+static SENSOR_DEVICE_ATTR(in1_min, S_IRUGO|S_IWUSR,
+ show_in_min, set_in_min, 1);
+static SENSOR_DEVICE_ATTR(in2_input, S_IRUGO, show_in, NULL, 2);
+static SENSOR_DEVICE_ATTR(in2_max, S_IRUGO|S_IWUSR,
+ show_in_max, set_in_max, 2);
+static SENSOR_DEVICE_ATTR(in2_min, S_IRUGO|S_IWUSR,
+ show_in_min, set_in_min, 2);
+static SENSOR_DEVICE_ATTR(in3_input, S_IRUGO, show_in, NULL, 3);
+static SENSOR_DEVICE_ATTR(in3_max, S_IRUGO|S_IWUSR,
+ show_in_max, set_in_max, 3);
+static SENSOR_DEVICE_ATTR(in3_min, S_IRUGO|S_IWUSR,
+ show_in_min, set_in_min, 3);
+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp1_max_hyst, S_IRUGO|S_IWUSR,
+ show_temp_max_hyst, set_temp_max_hyst, 0);
+static SENSOR_DEVICE_ATTR(temp1_max, S_IRUGO|S_IWUSR,
+ show_temp_max, set_temp_max, 0);
+static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, show_temp, NULL, 1);
+static SENSOR_DEVICE_ATTR(temp2_max_hyst, S_IRUGO|S_IWUSR,
+ show_temp_max_hyst, set_temp_max_hyst, 1);
+static SENSOR_DEVICE_ATTR(temp2_max, S_IRUGO|S_IWUSR,
+ show_temp_max, set_temp_max, 1);
+static SENSOR_DEVICE_ATTR(fan1_input, S_IRUGO, show_fan, NULL, 0);
+static SENSOR_DEVICE_ATTR(fan1_full, S_IRUGO, show_fan_full, NULL, 0);
+static SENSOR_DEVICE_ATTR(fan1_min, S_IRUGO|S_IWUSR,
+ show_fan_min, set_fan_min, 0);
+static SENSOR_DEVICE_ATTR(fan1_exp, S_IRUGO|S_IWUSR,
+ show_fan_exp, set_fan_exp, 0);
+static SENSOR_DEVICE_ATTR(fan2_input, S_IRUGO, show_fan, NULL, 1);
+static SENSOR_DEVICE_ATTR(fan2_full, S_IRUGO, show_fan_full, NULL, 1);
+static SENSOR_DEVICE_ATTR(fan2_min, S_IRUGO|S_IWUSR,
+ show_fan_min, set_fan_min, 1);
+static SENSOR_DEVICE_ATTR(fan2_exp, S_IRUGO|S_IWUSR,
+ show_fan_exp, set_fan_exp, 1);
+static SENSOR_DEVICE_ATTR(pwm1, S_IRUGO|S_IWUSR,
+ show_pwm, set_pwm, 0);
+static SENSOR_DEVICE_ATTR(pwm1_enable, S_IRUGO|S_IWUSR,
+ show_pwm_enable, set_pwm_enable, 0);
+static SENSOR_DEVICE_ATTR(pwm1_mode, S_IRUGO|S_IWUSR,
+ show_pwm_mode, set_pwm_mode, 0);
+static SENSOR_DEVICE_ATTR(pwm2, S_IRUGO | S_IWUSR,
+ show_pwm, set_pwm, 1);
+static SENSOR_DEVICE_ATTR(pwm2_enable, S_IRUGO|S_IWUSR,
+ show_pwm_enable, set_pwm_enable, 1);
+static SENSOR_DEVICE_ATTR(pwm2_mode, S_IRUGO|S_IWUSR,
+ show_pwm_mode, set_pwm_mode, 1);
+
+static struct attribute *f75375_attributes[] = {
+ &sensor_dev_attr_temp1_input.dev_attr.attr,
+ &sensor_dev_attr_temp1_max.dev_attr.attr,
+ &sensor_dev_attr_temp1_max_hyst.dev_attr.attr,
+ &sensor_dev_attr_temp2_input.dev_attr.attr,
+ &sensor_dev_attr_temp2_max.dev_attr.attr,
+ &sensor_dev_attr_temp2_max_hyst.dev_attr.attr,
+ &sensor_dev_attr_fan1_input.dev_attr.attr,
+ &sensor_dev_attr_fan1_full.dev_attr.attr,
+ &sensor_dev_attr_fan1_min.dev_attr.attr,
+ &sensor_dev_attr_fan1_exp.dev_attr.attr,
+ &sensor_dev_attr_fan2_input.dev_attr.attr,
+ &sensor_dev_attr_fan2_full.dev_attr.attr,
+ &sensor_dev_attr_fan2_min.dev_attr.attr,
+ &sensor_dev_attr_fan2_exp.dev_attr.attr,
+ &sensor_dev_attr_pwm1.dev_attr.attr,
+ &sensor_dev_attr_pwm1_enable.dev_attr.attr,
+ &sensor_dev_attr_pwm1_mode.dev_attr.attr,
+ &sensor_dev_attr_pwm2.dev_attr.attr,
+ &sensor_dev_attr_pwm2_enable.dev_attr.attr,
+ &sensor_dev_attr_pwm2_mode.dev_attr.attr,
+ &sensor_dev_attr_in0_input.dev_attr.attr,
+ &sensor_dev_attr_in0_max.dev_attr.attr,
+ &sensor_dev_attr_in0_min.dev_attr.attr,
+ &sensor_dev_attr_in1_input.dev_attr.attr,
+ &sensor_dev_attr_in1_max.dev_attr.attr,
+ &sensor_dev_attr_in1_min.dev_attr.attr,
+ &sensor_dev_attr_in2_input.dev_attr.attr,
+ &sensor_dev_attr_in2_max.dev_attr.attr,
+ &sensor_dev_attr_in2_min.dev_attr.attr,
+ &sensor_dev_attr_in3_input.dev_attr.attr,
+ &sensor_dev_attr_in3_max.dev_attr.attr,
+ &sensor_dev_attr_in3_min.dev_attr.attr,
+ NULL
+};
+
+static const struct attribute_group f75375_group = {
+ .attrs = f75375_attributes,
+};
+
+static int f75375_detach_client(struct i2c_client *client)
+{
+ struct f75375_data *data = i2c_get_clientdata(client);
+ int err;
+
+ hwmon_device_unregister(data->class_dev);
+ sysfs_remove_group(&client->dev.kobj, &f75375_group);
+
+ err = i2c_detach_client(client);
+ if (err) {
+ dev_err(&client->dev,
+ "Client deregistration failed, "
+ "client not detached.\n");
+ return err;
+ }
+ kfree(data);
+ return 0;
+}
+
+static int f75375_attach_adapter(struct i2c_adapter *adapter)
+{
+ if (!(adapter->class & I2C_CLASS_HWMON))
+ return 0;
+ return i2c_probe(adapter, &addr_data, f75375_detect);
+}
+
+/* This function is called by i2c_probe */
+static int f75375_detect(struct i2c_adapter *adapter, int address, int kind)
+{
+ struct i2c_client *client;
+ struct f75375_data *data;
+ u8 version = 0;
+ int err = 0;
+ const char *name = "";
+
+ if (!(data = kzalloc(sizeof(struct f75375_data), GFP_KERNEL))) {
+ err = -ENOMEM;
+ goto exit;
+ }
+ client = &data->client;
+ i2c_set_clientdata(client, data);
+ client->addr = address;
+ client->adapter = adapter;
+ client->driver = &f75375_driver;
+
+ if (kind < 0) {
+ u16 vendid = f75375_read16(client, F75375_REG_VENDOR);
+ u16 chipid = f75375_read16(client, F75375_CHIP_ID);
+ version = f75375_read8(client, F75375_REG_VERSION);
+ if (chipid == 0x0306 && vendid == 0x1934) {
+ kind = f75375;
+ } else if (chipid == 0x0204 && vendid == 0x1934) {
+ kind = f75373;
+ } else {
+ dev_err(&adapter->dev,
+ "failed,%02X,%02X,%02X\n",
+ chipid, version, vendid);
+ goto exit_free;
+ }
+ }
+
+ if (kind == f75375) {
+ name = "f75375";
+ } else if (kind == f75373) {
+ name = "f75373";
+ }
+
+ dev_info(&adapter->dev, "found %s version: %02X\n", name, version);
+ strlcpy(client->name, name, I2C_NAME_SIZE);
+ data->kind = kind;
+ mutex_init(&data->update_lock);
+ if ((err = i2c_attach_client(client)))
+ goto exit_free;
+
+ if ((err = sysfs_create_group(&client->dev.kobj, &f75375_group)))
+ goto exit_detach;
+
+ data->class_dev = hwmon_device_register(&client->dev);
+ if (IS_ERR(data->class_dev)) {
+ err = PTR_ERR(data->class_dev);
+ goto exit_remove;
+ }
+
+ return 0;
+
+exit_remove:
+ sysfs_remove_group(&client->dev.kobj, &f75375_group);
+exit_detach:
+ i2c_detach_client(client);
+exit_free:
+ kfree(data);
+exit:
+ return err;
+}
+
+static int __init sensors_f75375_init(void)
+{
+ return i2c_add_driver(&f75375_driver);
+}
+
+static void __exit sensors_f75375_exit(void)
+{
+ i2c_del_driver(&f75375_driver);
+}
+
+MODULE_AUTHOR("Riku Voipio <riku.voipio@movial.fi>");
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("F75373/F75375 hardware monitoring driver");
+
+module_init(sensors_f75375_init);
+module_exit(sensors_f75375_exit);
--
1.5.2.3
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
[-- Attachment #2: Type: text/plain, Size: 153 bytes --]
_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [lm-sensors] [PATCH] Add f75375s driver
2007-06-28 23:07 [lm-sensors] [PATCH] Add f75375s driver Riku Voipio
` (6 preceding siblings ...)
2007-08-24 10:03 ` Riku Voipio
@ 2007-08-26 18:50 ` Mark M. Hoffman
7 siblings, 0 replies; 9+ messages in thread
From: Mark M. Hoffman @ 2007-08-26 18:50 UTC (permalink / raw)
To: lm-sensors
Hi Riku:
* Riku Voipio <riku.voipio@iki.fi> [2007-08-24 13:03:09 +0300]:
> After diving deeper into mutexes, I eventually figured that the
> driver is already doing the correct thing. f75375_read16 is only
> called from f75375_update_device() while holding update mutex and
> from f75375_detect when we are reading static values. So just
I'll try to be more clear: the driver is making "best effort". The remaining
possible race condition is if *the hardware itself* updates the 16-bit value
between the first and second read by the driver.
The mutex is there to keep the driver from racing with itself, but there's
nothing you can do to prevent the driver from racing with the hardware.
(AFAICT from reading the datasheet... see my original review comments.)
> document that. The rest of the issues Mark noticed have also
> been fixed.
Indeed. Nice work too.
> From 7dcb7e2d5a685f438ef3ad3cd0f92f256629189d Mon Sep 17 00:00:00 2001
> From: Riku Voipio <riku.voipio@movial.fi>
> Date: Fri, 24 Aug 2007 10:46:18 +0300
> Subject: [PATCH] Add f75375s driver
>
> Signed-off-by: Riku Voipio <riku.voipio@movial.fi>
Applied to hwmon-2.6.git/testing, thanks.
--
Mark M. Hoffman
mhoffman@lightlink.com
_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
^ permalink raw reply [flat|nested] 9+ messages in thread