|
|
@@ -1,7 +1,7 @@
|
|
|
/*
|
|
|
* pc87427.c - hardware monitoring driver for the
|
|
|
* National Semiconductor PC87427 Super-I/O chip
|
|
|
- * Copyright (C) 2006 Jean Delvare <khali@linux-fr.org>
|
|
|
+ * Copyright (C) 2006, 2008, 2010 Jean Delvare <khali@linux-fr.org>
|
|
|
*
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
|
@@ -15,10 +15,11 @@
|
|
|
* Supports the following chips:
|
|
|
*
|
|
|
* Chip #vin #fan #pwm #temp devid
|
|
|
- * PC87427 - 8 - - 0xF2
|
|
|
+ * PC87427 - 8 4 6 0xF2
|
|
|
*
|
|
|
* This driver assumes that no more than one chip is present.
|
|
|
- * Only fan inputs are supported so far, although the chip can do much more.
|
|
|
+ * Only fans are fully supported so far. Temperatures are in read-only
|
|
|
+ * mode, and voltages aren't supported at all.
|
|
|
*/
|
|
|
|
|
|
#include <linux/module.h>
|
|
|
@@ -57,6 +58,25 @@ struct pc87427_data {
|
|
|
u16 fan[8]; /* register values */
|
|
|
u16 fan_min[8]; /* register values */
|
|
|
u8 fan_status[8]; /* register values */
|
|
|
+
|
|
|
+ u8 pwm_enabled; /* bit vector */
|
|
|
+ u8 pwm_auto_ok; /* bit vector */
|
|
|
+ u8 pwm_enable[4]; /* register values */
|
|
|
+ u8 pwm[4]; /* register values */
|
|
|
+
|
|
|
+ u8 temp_enabled; /* bit vector */
|
|
|
+ s16 temp[6]; /* register values */
|
|
|
+ s8 temp_min[6]; /* register values */
|
|
|
+ s8 temp_max[6]; /* register values */
|
|
|
+ s8 temp_crit[6]; /* register values */
|
|
|
+ u8 temp_status[6]; /* register values */
|
|
|
+ u8 temp_type[6]; /* register values */
|
|
|
+};
|
|
|
+
|
|
|
+struct pc87427_sio_data {
|
|
|
+ unsigned short address[2];
|
|
|
+ u8 has_fanin;
|
|
|
+ u8 has_fanout;
|
|
|
};
|
|
|
|
|
|
/*
|
|
|
@@ -65,6 +85,13 @@ struct pc87427_data {
|
|
|
|
|
|
#define SIOREG_LDSEL 0x07 /* Logical device select */
|
|
|
#define SIOREG_DEVID 0x20 /* Device ID */
|
|
|
+#define SIOREG_CF2 0x22 /* Configuration 2 */
|
|
|
+#define SIOREG_CF3 0x23 /* Configuration 3 */
|
|
|
+#define SIOREG_CF4 0x24 /* Configuration 4 */
|
|
|
+#define SIOREG_CF5 0x25 /* Configuration 5 */
|
|
|
+#define SIOREG_CFB 0x2B /* Configuration B */
|
|
|
+#define SIOREG_CFC 0x2C /* Configuration C */
|
|
|
+#define SIOREG_CFD 0x2D /* Configuration D */
|
|
|
#define SIOREG_ACT 0x30 /* Device activation */
|
|
|
#define SIOREG_MAP 0x50 /* I/O or memory mapping */
|
|
|
#define SIOREG_IOBASE 0x60 /* I/O base address */
|
|
|
@@ -102,6 +129,8 @@ static inline void superio_exit(int sioaddr)
|
|
|
#define BANK_FM(nr) (nr)
|
|
|
#define BANK_FT(nr) (0x08 + (nr))
|
|
|
#define BANK_FC(nr) (0x10 + (nr) * 2)
|
|
|
+#define BANK_TM(nr) (nr)
|
|
|
+#define BANK_VM(nr) (0x08 + (nr))
|
|
|
|
|
|
/*
|
|
|
* I/O access functions
|
|
|
@@ -178,6 +207,127 @@ static inline u16 fan_to_reg(unsigned long val)
|
|
|
return ((1350000UL + val / 2) / val) << 2;
|
|
|
}
|
|
|
|
|
|
+/*
|
|
|
+ * PWM registers and conversions
|
|
|
+ */
|
|
|
+
|
|
|
+#define PC87427_REG_PWM_ENABLE 0x10
|
|
|
+#define PC87427_REG_PWM_DUTY 0x12
|
|
|
+
|
|
|
+#define PWM_ENABLE_MODE_MASK (7 << 4)
|
|
|
+#define PWM_ENABLE_CTLEN (1 << 0)
|
|
|
+
|
|
|
+#define PWM_MODE_MANUAL (0 << 4)
|
|
|
+#define PWM_MODE_AUTO (1 << 4)
|
|
|
+#define PWM_MODE_OFF (2 << 4)
|
|
|
+#define PWM_MODE_ON (7 << 4)
|
|
|
+
|
|
|
+/* Dedicated function to read all registers related to a given PWM output.
|
|
|
+ This saves us quite a few locks and bank selections.
|
|
|
+ Must be called with data->lock held.
|
|
|
+ nr is from 0 to 3 */
|
|
|
+static void pc87427_readall_pwm(struct pc87427_data *data, u8 nr)
|
|
|
+{
|
|
|
+ int iobase = data->address[LD_FAN];
|
|
|
+
|
|
|
+ outb(BANK_FC(nr), iobase + PC87427_REG_BANK);
|
|
|
+ data->pwm_enable[nr] = inb(iobase + PC87427_REG_PWM_ENABLE);
|
|
|
+ data->pwm[nr] = inb(iobase + PC87427_REG_PWM_DUTY);
|
|
|
+}
|
|
|
+
|
|
|
+static inline int pwm_enable_from_reg(u8 reg)
|
|
|
+{
|
|
|
+ switch (reg & PWM_ENABLE_MODE_MASK) {
|
|
|
+ case PWM_MODE_ON:
|
|
|
+ return 0;
|
|
|
+ case PWM_MODE_MANUAL:
|
|
|
+ case PWM_MODE_OFF:
|
|
|
+ return 1;
|
|
|
+ case PWM_MODE_AUTO:
|
|
|
+ return 2;
|
|
|
+ default:
|
|
|
+ return -EPROTO;
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+static inline u8 pwm_enable_to_reg(unsigned long val, u8 pwmval)
|
|
|
+{
|
|
|
+ switch (val) {
|
|
|
+ default:
|
|
|
+ return PWM_MODE_ON;
|
|
|
+ case 1:
|
|
|
+ return pwmval ? PWM_MODE_MANUAL : PWM_MODE_OFF;
|
|
|
+ case 2:
|
|
|
+ return PWM_MODE_AUTO;
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+/*
|
|
|
+ * Temperature registers and conversions
|
|
|
+ */
|
|
|
+
|
|
|
+#define PC87427_REG_TEMP_STATUS 0x10
|
|
|
+#define PC87427_REG_TEMP 0x14
|
|
|
+#define PC87427_REG_TEMP_MAX 0x18
|
|
|
+#define PC87427_REG_TEMP_MIN 0x19
|
|
|
+#define PC87427_REG_TEMP_CRIT 0x1a
|
|
|
+#define PC87427_REG_TEMP_TYPE 0x1d
|
|
|
+
|
|
|
+#define TEMP_STATUS_CHANEN (1 << 0)
|
|
|
+#define TEMP_STATUS_LOWFLG (1 << 1)
|
|
|
+#define TEMP_STATUS_HIGHFLG (1 << 2)
|
|
|
+#define TEMP_STATUS_CRITFLG (1 << 3)
|
|
|
+#define TEMP_STATUS_SENSERR (1 << 5)
|
|
|
+#define TEMP_TYPE_MASK (3 << 5)
|
|
|
+
|
|
|
+#define TEMP_TYPE_THERMISTOR (1 << 5)
|
|
|
+#define TEMP_TYPE_REMOTE_DIODE (2 << 5)
|
|
|
+#define TEMP_TYPE_LOCAL_DIODE (3 << 5)
|
|
|
+
|
|
|
+/* Dedicated function to read all registers related to a given temperature
|
|
|
+ input. This saves us quite a few locks and bank selections.
|
|
|
+ Must be called with data->lock held.
|
|
|
+ nr is from 0 to 5 */
|
|
|
+static void pc87427_readall_temp(struct pc87427_data *data, u8 nr)
|
|
|
+{
|
|
|
+ int iobase = data->address[LD_TEMP];
|
|
|
+
|
|
|
+ outb(BANK_TM(nr), iobase + PC87427_REG_BANK);
|
|
|
+ data->temp[nr] = le16_to_cpu(inw(iobase + PC87427_REG_TEMP));
|
|
|
+ data->temp_max[nr] = inb(iobase + PC87427_REG_TEMP_MAX);
|
|
|
+ data->temp_min[nr] = inb(iobase + PC87427_REG_TEMP_MIN);
|
|
|
+ data->temp_crit[nr] = inb(iobase + PC87427_REG_TEMP_CRIT);
|
|
|
+ data->temp_type[nr] = inb(iobase + PC87427_REG_TEMP_TYPE);
|
|
|
+ data->temp_status[nr] = inb(iobase + PC87427_REG_TEMP_STATUS);
|
|
|
+ /* Clear fan alarm bits */
|
|
|
+ outb(data->temp_status[nr], iobase + PC87427_REG_TEMP_STATUS);
|
|
|
+}
|
|
|
+
|
|
|
+static inline unsigned int temp_type_from_reg(u8 reg)
|
|
|
+{
|
|
|
+ switch (reg & TEMP_TYPE_MASK) {
|
|
|
+ case TEMP_TYPE_THERMISTOR:
|
|
|
+ return 4;
|
|
|
+ case TEMP_TYPE_REMOTE_DIODE:
|
|
|
+ case TEMP_TYPE_LOCAL_DIODE:
|
|
|
+ return 3;
|
|
|
+ default:
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+/* We assume 8-bit thermal sensors; 9-bit thermal sensors are possible
|
|
|
+ too, but I have no idea how to figure out when they are used. */
|
|
|
+static inline long temp_from_reg(s16 reg)
|
|
|
+{
|
|
|
+ return reg * 1000 / 256;
|
|
|
+}
|
|
|
+
|
|
|
+static inline long temp_from_reg8(s8 reg)
|
|
|
+{
|
|
|
+ return reg * 1000;
|
|
|
+}
|
|
|
+
|
|
|
/*
|
|
|
* Data interface
|
|
|
*/
|
|
|
@@ -198,6 +348,21 @@ static struct pc87427_data *pc87427_update_device(struct device *dev)
|
|
|
continue;
|
|
|
pc87427_readall_fan(data, i);
|
|
|
}
|
|
|
+
|
|
|
+ /* PWM outputs */
|
|
|
+ for (i = 0; i < 4; i++) {
|
|
|
+ if (!(data->pwm_enabled & (1 << i)))
|
|
|
+ continue;
|
|
|
+ pc87427_readall_pwm(data, i);
|
|
|
+ }
|
|
|
+
|
|
|
+ /* Temperature channels */
|
|
|
+ for (i = 0; i < 6; i++) {
|
|
|
+ if (!(data->temp_enabled & (1 << i)))
|
|
|
+ continue;
|
|
|
+ pc87427_readall_temp(data, i);
|
|
|
+ }
|
|
|
+
|
|
|
data->last_updated = jiffies;
|
|
|
|
|
|
done:
|
|
|
@@ -208,9 +373,8 @@ done:
|
|
|
static ssize_t show_fan_input(struct device *dev, struct device_attribute
|
|
|
*devattr, char *buf)
|
|
|
{
|
|
|
- struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
|
|
struct pc87427_data *data = pc87427_update_device(dev);
|
|
|
- int nr = attr->index;
|
|
|
+ int nr = to_sensor_dev_attr(devattr)->index;
|
|
|
|
|
|
return sprintf(buf, "%lu\n", fan_from_reg(data->fan[nr]));
|
|
|
}
|
|
|
@@ -218,9 +382,8 @@ static ssize_t show_fan_input(struct device *dev, struct device_attribute
|
|
|
static ssize_t show_fan_min(struct device *dev, struct device_attribute
|
|
|
*devattr, char *buf)
|
|
|
{
|
|
|
- struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
|
|
struct pc87427_data *data = pc87427_update_device(dev);
|
|
|
- int nr = attr->index;
|
|
|
+ int nr = to_sensor_dev_attr(devattr)->index;
|
|
|
|
|
|
return sprintf(buf, "%lu\n", fan_from_reg(data->fan_min[nr]));
|
|
|
}
|
|
|
@@ -228,9 +391,8 @@ static ssize_t show_fan_min(struct device *dev, struct device_attribute
|
|
|
static ssize_t show_fan_alarm(struct device *dev, struct device_attribute
|
|
|
*devattr, char *buf)
|
|
|
{
|
|
|
- struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
|
|
struct pc87427_data *data = pc87427_update_device(dev);
|
|
|
- int nr = attr->index;
|
|
|
+ int nr = to_sensor_dev_attr(devattr)->index;
|
|
|
|
|
|
return sprintf(buf, "%d\n", !!(data->fan_status[nr]
|
|
|
& FAN_STATUS_LOSPD));
|
|
|
@@ -239,9 +401,8 @@ static ssize_t show_fan_alarm(struct device *dev, struct device_attribute
|
|
|
static ssize_t show_fan_fault(struct device *dev, struct device_attribute
|
|
|
*devattr, char *buf)
|
|
|
{
|
|
|
- struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
|
|
struct pc87427_data *data = pc87427_update_device(dev);
|
|
|
- int nr = attr->index;
|
|
|
+ int nr = to_sensor_dev_attr(devattr)->index;
|
|
|
|
|
|
return sprintf(buf, "%d\n", !!(data->fan_status[nr]
|
|
|
& FAN_STATUS_STALL));
|
|
|
@@ -251,11 +412,13 @@ static ssize_t set_fan_min(struct device *dev, struct device_attribute
|
|
|
*devattr, const char *buf, size_t count)
|
|
|
{
|
|
|
struct pc87427_data *data = dev_get_drvdata(dev);
|
|
|
- struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
|
|
- int nr = attr->index;
|
|
|
- unsigned long val = simple_strtoul(buf, NULL, 10);
|
|
|
+ int nr = to_sensor_dev_attr(devattr)->index;
|
|
|
+ unsigned long val;
|
|
|
int iobase = data->address[LD_FAN];
|
|
|
|
|
|
+ if (strict_strtoul(buf, 10, &val) < 0)
|
|
|
+ return -EINVAL;
|
|
|
+
|
|
|
mutex_lock(&data->lock);
|
|
|
outb(BANK_FM(nr), iobase + PC87427_REG_BANK);
|
|
|
/* The low speed limit registers are read-only while monitoring
|
|
|
@@ -377,6 +540,390 @@ static const struct attribute_group pc87427_group_fan[8] = {
|
|
|
{ .attrs = pc87427_attributes_fan[7] },
|
|
|
};
|
|
|
|
|
|
+/* Must be called with data->lock held and pc87427_readall_pwm() freshly
|
|
|
+ called */
|
|
|
+static void update_pwm_enable(struct pc87427_data *data, int nr, u8 mode)
|
|
|
+{
|
|
|
+ int iobase = data->address[LD_FAN];
|
|
|
+ data->pwm_enable[nr] &= ~PWM_ENABLE_MODE_MASK;
|
|
|
+ data->pwm_enable[nr] |= mode;
|
|
|
+ outb(data->pwm_enable[nr], iobase + PC87427_REG_PWM_ENABLE);
|
|
|
+}
|
|
|
+
|
|
|
+static ssize_t show_pwm_enable(struct device *dev, struct device_attribute
|
|
|
+ *devattr, char *buf)
|
|
|
+{
|
|
|
+ struct pc87427_data *data = pc87427_update_device(dev);
|
|
|
+ int nr = to_sensor_dev_attr(devattr)->index;
|
|
|
+ int pwm_enable;
|
|
|
+
|
|
|
+ pwm_enable = pwm_enable_from_reg(data->pwm_enable[nr]);
|
|
|
+ if (pwm_enable < 0)
|
|
|
+ return pwm_enable;
|
|
|
+ return sprintf(buf, "%d\n", pwm_enable);
|
|
|
+}
|
|
|
+
|
|
|
+static ssize_t set_pwm_enable(struct device *dev, struct device_attribute
|
|
|
+ *devattr, const char *buf, size_t count)
|
|
|
+{
|
|
|
+ struct pc87427_data *data = dev_get_drvdata(dev);
|
|
|
+ int nr = to_sensor_dev_attr(devattr)->index;
|
|
|
+ unsigned long val;
|
|
|
+
|
|
|
+ if (strict_strtoul(buf, 10, &val) < 0 || val > 2)
|
|
|
+ return -EINVAL;
|
|
|
+ /* Can't go to automatic mode if it isn't configured */
|
|
|
+ if (val == 2 && !(data->pwm_auto_ok & (1 << nr)))
|
|
|
+ return -EINVAL;
|
|
|
+
|
|
|
+ mutex_lock(&data->lock);
|
|
|
+ pc87427_readall_pwm(data, nr);
|
|
|
+ update_pwm_enable(data, nr, pwm_enable_to_reg(val, data->pwm[nr]));
|
|
|
+ mutex_unlock(&data->lock);
|
|
|
+
|
|
|
+ return count;
|
|
|
+}
|
|
|
+
|
|
|
+static ssize_t show_pwm(struct device *dev, struct device_attribute
|
|
|
+ *devattr, char *buf)
|
|
|
+{
|
|
|
+ struct pc87427_data *data = pc87427_update_device(dev);
|
|
|
+ int nr = to_sensor_dev_attr(devattr)->index;
|
|
|
+
|
|
|
+ return sprintf(buf, "%d\n", (int)data->pwm[nr]);
|
|
|
+}
|
|
|
+
|
|
|
+static ssize_t set_pwm(struct device *dev, struct device_attribute
|
|
|
+ *devattr, const char *buf, size_t count)
|
|
|
+{
|
|
|
+ struct pc87427_data *data = dev_get_drvdata(dev);
|
|
|
+ int nr = to_sensor_dev_attr(devattr)->index;
|
|
|
+ unsigned long val;
|
|
|
+ int iobase = data->address[LD_FAN];
|
|
|
+ u8 mode;
|
|
|
+
|
|
|
+ if (strict_strtoul(buf, 10, &val) < 0 || val > 0xff)
|
|
|
+ return -EINVAL;
|
|
|
+
|
|
|
+ mutex_lock(&data->lock);
|
|
|
+ pc87427_readall_pwm(data, nr);
|
|
|
+ mode = data->pwm_enable[nr] & PWM_ENABLE_MODE_MASK;
|
|
|
+ if (mode != PWM_MODE_MANUAL && mode != PWM_MODE_OFF) {
|
|
|
+ dev_notice(dev, "Can't set PWM%d duty cycle while not in "
|
|
|
+ "manual mode\n", nr + 1);
|
|
|
+ mutex_unlock(&data->lock);
|
|
|
+ return -EPERM;
|
|
|
+ }
|
|
|
+
|
|
|
+ /* We may have to change the mode */
|
|
|
+ if (mode == PWM_MODE_MANUAL && val == 0) {
|
|
|
+ /* Transition from Manual to Off */
|
|
|
+ update_pwm_enable(data, nr, PWM_MODE_OFF);
|
|
|
+ mode = PWM_MODE_OFF;
|
|
|
+ dev_dbg(dev, "Switching PWM%d from %s to %s\n", nr + 1,
|
|
|
+ "manual", "off");
|
|
|
+ } else if (mode == PWM_MODE_OFF && val != 0) {
|
|
|
+ /* Transition from Off to Manual */
|
|
|
+ update_pwm_enable(data, nr, PWM_MODE_MANUAL);
|
|
|
+ mode = PWM_MODE_MANUAL;
|
|
|
+ dev_dbg(dev, "Switching PWM%d from %s to %s\n", nr + 1,
|
|
|
+ "off", "manual");
|
|
|
+ }
|
|
|
+
|
|
|
+ data->pwm[nr] = val;
|
|
|
+ if (mode == PWM_MODE_MANUAL)
|
|
|
+ outb(val, iobase + PC87427_REG_PWM_DUTY);
|
|
|
+ mutex_unlock(&data->lock);
|
|
|
+
|
|
|
+ return count;
|
|
|
+}
|
|
|
+
|
|
|
+static SENSOR_DEVICE_ATTR(pwm1_enable, S_IWUSR | S_IRUGO,
|
|
|
+ show_pwm_enable, set_pwm_enable, 0);
|
|
|
+static SENSOR_DEVICE_ATTR(pwm2_enable, S_IWUSR | S_IRUGO,
|
|
|
+ show_pwm_enable, set_pwm_enable, 1);
|
|
|
+static SENSOR_DEVICE_ATTR(pwm3_enable, S_IWUSR | S_IRUGO,
|
|
|
+ show_pwm_enable, set_pwm_enable, 2);
|
|
|
+static SENSOR_DEVICE_ATTR(pwm4_enable, S_IWUSR | S_IRUGO,
|
|
|
+ show_pwm_enable, set_pwm_enable, 3);
|
|
|
+
|
|
|
+static SENSOR_DEVICE_ATTR(pwm1, S_IWUSR | S_IRUGO, show_pwm, set_pwm, 0);
|
|
|
+static SENSOR_DEVICE_ATTR(pwm2, S_IWUSR | S_IRUGO, show_pwm, set_pwm, 1);
|
|
|
+static SENSOR_DEVICE_ATTR(pwm3, S_IWUSR | S_IRUGO, show_pwm, set_pwm, 2);
|
|
|
+static SENSOR_DEVICE_ATTR(pwm4, S_IWUSR | S_IRUGO, show_pwm, set_pwm, 3);
|
|
|
+
|
|
|
+static struct attribute *pc87427_attributes_pwm[4][3] = {
|
|
|
+ {
|
|
|
+ &sensor_dev_attr_pwm1_enable.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_pwm1.dev_attr.attr,
|
|
|
+ NULL
|
|
|
+ }, {
|
|
|
+ &sensor_dev_attr_pwm2_enable.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_pwm2.dev_attr.attr,
|
|
|
+ NULL
|
|
|
+ }, {
|
|
|
+ &sensor_dev_attr_pwm3_enable.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_pwm3.dev_attr.attr,
|
|
|
+ NULL
|
|
|
+ }, {
|
|
|
+ &sensor_dev_attr_pwm4_enable.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_pwm4.dev_attr.attr,
|
|
|
+ NULL
|
|
|
+ }
|
|
|
+};
|
|
|
+
|
|
|
+static const struct attribute_group pc87427_group_pwm[4] = {
|
|
|
+ { .attrs = pc87427_attributes_pwm[0] },
|
|
|
+ { .attrs = pc87427_attributes_pwm[1] },
|
|
|
+ { .attrs = pc87427_attributes_pwm[2] },
|
|
|
+ { .attrs = pc87427_attributes_pwm[3] },
|
|
|
+};
|
|
|
+
|
|
|
+static ssize_t show_temp_input(struct device *dev, struct device_attribute
|
|
|
+ *devattr, char *buf)
|
|
|
+{
|
|
|
+ struct pc87427_data *data = pc87427_update_device(dev);
|
|
|
+ int nr = to_sensor_dev_attr(devattr)->index;
|
|
|
+
|
|
|
+ return sprintf(buf, "%ld\n", temp_from_reg(data->temp[nr]));
|
|
|
+}
|
|
|
+
|
|
|
+static ssize_t show_temp_min(struct device *dev, struct device_attribute
|
|
|
+ *devattr, char *buf)
|
|
|
+{
|
|
|
+ struct pc87427_data *data = pc87427_update_device(dev);
|
|
|
+ int nr = to_sensor_dev_attr(devattr)->index;
|
|
|
+
|
|
|
+ return sprintf(buf, "%ld\n", temp_from_reg8(data->temp_min[nr]));
|
|
|
+}
|
|
|
+
|
|
|
+static ssize_t show_temp_max(struct device *dev, struct device_attribute
|
|
|
+ *devattr, char *buf)
|
|
|
+{
|
|
|
+ struct pc87427_data *data = pc87427_update_device(dev);
|
|
|
+ int nr = to_sensor_dev_attr(devattr)->index;
|
|
|
+
|
|
|
+ return sprintf(buf, "%ld\n", temp_from_reg8(data->temp_max[nr]));
|
|
|
+}
|
|
|
+
|
|
|
+static ssize_t show_temp_crit(struct device *dev, struct device_attribute
|
|
|
+ *devattr, char *buf)
|
|
|
+{
|
|
|
+ struct pc87427_data *data = pc87427_update_device(dev);
|
|
|
+ int nr = to_sensor_dev_attr(devattr)->index;
|
|
|
+
|
|
|
+ return sprintf(buf, "%ld\n", temp_from_reg8(data->temp_crit[nr]));
|
|
|
+}
|
|
|
+
|
|
|
+static ssize_t show_temp_type(struct device *dev, struct device_attribute
|
|
|
+ *devattr, char *buf)
|
|
|
+{
|
|
|
+ struct pc87427_data *data = pc87427_update_device(dev);
|
|
|
+ int nr = to_sensor_dev_attr(devattr)->index;
|
|
|
+
|
|
|
+ return sprintf(buf, "%u\n", temp_type_from_reg(data->temp_type[nr]));
|
|
|
+}
|
|
|
+
|
|
|
+static ssize_t show_temp_min_alarm(struct device *dev, struct device_attribute
|
|
|
+ *devattr, char *buf)
|
|
|
+{
|
|
|
+ struct pc87427_data *data = pc87427_update_device(dev);
|
|
|
+ int nr = to_sensor_dev_attr(devattr)->index;
|
|
|
+
|
|
|
+ return sprintf(buf, "%d\n", !!(data->temp_status[nr]
|
|
|
+ & TEMP_STATUS_LOWFLG));
|
|
|
+}
|
|
|
+
|
|
|
+static ssize_t show_temp_max_alarm(struct device *dev, struct device_attribute
|
|
|
+ *devattr, char *buf)
|
|
|
+{
|
|
|
+ struct pc87427_data *data = pc87427_update_device(dev);
|
|
|
+ int nr = to_sensor_dev_attr(devattr)->index;
|
|
|
+
|
|
|
+ return sprintf(buf, "%d\n", !!(data->temp_status[nr]
|
|
|
+ & TEMP_STATUS_HIGHFLG));
|
|
|
+}
|
|
|
+
|
|
|
+static ssize_t show_temp_crit_alarm(struct device *dev, struct device_attribute
|
|
|
+ *devattr, char *buf)
|
|
|
+{
|
|
|
+ struct pc87427_data *data = pc87427_update_device(dev);
|
|
|
+ int nr = to_sensor_dev_attr(devattr)->index;
|
|
|
+
|
|
|
+ return sprintf(buf, "%d\n", !!(data->temp_status[nr]
|
|
|
+ & TEMP_STATUS_CRITFLG));
|
|
|
+}
|
|
|
+
|
|
|
+static ssize_t show_temp_fault(struct device *dev, struct device_attribute
|
|
|
+ *devattr, char *buf)
|
|
|
+{
|
|
|
+ struct pc87427_data *data = pc87427_update_device(dev);
|
|
|
+ int nr = to_sensor_dev_attr(devattr)->index;
|
|
|
+
|
|
|
+ return sprintf(buf, "%d\n", !!(data->temp_status[nr]
|
|
|
+ & TEMP_STATUS_SENSERR));
|
|
|
+}
|
|
|
+
|
|
|
+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp_input, NULL, 0);
|
|
|
+static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, show_temp_input, NULL, 1);
|
|
|
+static SENSOR_DEVICE_ATTR(temp3_input, S_IRUGO, show_temp_input, NULL, 2);
|
|
|
+static SENSOR_DEVICE_ATTR(temp4_input, S_IRUGO, show_temp_input, NULL, 3);
|
|
|
+static SENSOR_DEVICE_ATTR(temp5_input, S_IRUGO, show_temp_input, NULL, 4);
|
|
|
+static SENSOR_DEVICE_ATTR(temp6_input, S_IRUGO, show_temp_input, NULL, 5);
|
|
|
+
|
|
|
+static SENSOR_DEVICE_ATTR(temp1_min, S_IRUGO, show_temp_min, NULL, 0);
|
|
|
+static SENSOR_DEVICE_ATTR(temp2_min, S_IRUGO, show_temp_min, NULL, 1);
|
|
|
+static SENSOR_DEVICE_ATTR(temp3_min, S_IRUGO, show_temp_min, NULL, 2);
|
|
|
+static SENSOR_DEVICE_ATTR(temp4_min, S_IRUGO, show_temp_min, NULL, 3);
|
|
|
+static SENSOR_DEVICE_ATTR(temp5_min, S_IRUGO, show_temp_min, NULL, 4);
|
|
|
+static SENSOR_DEVICE_ATTR(temp6_min, S_IRUGO, show_temp_min, NULL, 5);
|
|
|
+
|
|
|
+static SENSOR_DEVICE_ATTR(temp1_max, S_IRUGO, show_temp_max, NULL, 0);
|
|
|
+static SENSOR_DEVICE_ATTR(temp2_max, S_IRUGO, show_temp_max, NULL, 1);
|
|
|
+static SENSOR_DEVICE_ATTR(temp3_max, S_IRUGO, show_temp_max, NULL, 2);
|
|
|
+static SENSOR_DEVICE_ATTR(temp4_max, S_IRUGO, show_temp_max, NULL, 3);
|
|
|
+static SENSOR_DEVICE_ATTR(temp5_max, S_IRUGO, show_temp_max, NULL, 4);
|
|
|
+static SENSOR_DEVICE_ATTR(temp6_max, S_IRUGO, show_temp_max, NULL, 5);
|
|
|
+
|
|
|
+static SENSOR_DEVICE_ATTR(temp1_crit, S_IRUGO, show_temp_crit, NULL, 0);
|
|
|
+static SENSOR_DEVICE_ATTR(temp2_crit, S_IRUGO, show_temp_crit, NULL, 1);
|
|
|
+static SENSOR_DEVICE_ATTR(temp3_crit, S_IRUGO, show_temp_crit, NULL, 2);
|
|
|
+static SENSOR_DEVICE_ATTR(temp4_crit, S_IRUGO, show_temp_crit, NULL, 3);
|
|
|
+static SENSOR_DEVICE_ATTR(temp5_crit, S_IRUGO, show_temp_crit, NULL, 4);
|
|
|
+static SENSOR_DEVICE_ATTR(temp6_crit, S_IRUGO, show_temp_crit, NULL, 5);
|
|
|
+
|
|
|
+static SENSOR_DEVICE_ATTR(temp1_type, S_IRUGO, show_temp_type, NULL, 0);
|
|
|
+static SENSOR_DEVICE_ATTR(temp2_type, S_IRUGO, show_temp_type, NULL, 1);
|
|
|
+static SENSOR_DEVICE_ATTR(temp3_type, S_IRUGO, show_temp_type, NULL, 2);
|
|
|
+static SENSOR_DEVICE_ATTR(temp4_type, S_IRUGO, show_temp_type, NULL, 3);
|
|
|
+static SENSOR_DEVICE_ATTR(temp5_type, S_IRUGO, show_temp_type, NULL, 4);
|
|
|
+static SENSOR_DEVICE_ATTR(temp6_type, S_IRUGO, show_temp_type, NULL, 5);
|
|
|
+
|
|
|
+static SENSOR_DEVICE_ATTR(temp1_min_alarm, S_IRUGO,
|
|
|
+ show_temp_min_alarm, NULL, 0);
|
|
|
+static SENSOR_DEVICE_ATTR(temp2_min_alarm, S_IRUGO,
|
|
|
+ show_temp_min_alarm, NULL, 1);
|
|
|
+static SENSOR_DEVICE_ATTR(temp3_min_alarm, S_IRUGO,
|
|
|
+ show_temp_min_alarm, NULL, 2);
|
|
|
+static SENSOR_DEVICE_ATTR(temp4_min_alarm, S_IRUGO,
|
|
|
+ show_temp_min_alarm, NULL, 3);
|
|
|
+static SENSOR_DEVICE_ATTR(temp5_min_alarm, S_IRUGO,
|
|
|
+ show_temp_min_alarm, NULL, 4);
|
|
|
+static SENSOR_DEVICE_ATTR(temp6_min_alarm, S_IRUGO,
|
|
|
+ show_temp_min_alarm, NULL, 5);
|
|
|
+
|
|
|
+static SENSOR_DEVICE_ATTR(temp1_max_alarm, S_IRUGO,
|
|
|
+ show_temp_max_alarm, NULL, 0);
|
|
|
+static SENSOR_DEVICE_ATTR(temp2_max_alarm, S_IRUGO,
|
|
|
+ show_temp_max_alarm, NULL, 1);
|
|
|
+static SENSOR_DEVICE_ATTR(temp3_max_alarm, S_IRUGO,
|
|
|
+ show_temp_max_alarm, NULL, 2);
|
|
|
+static SENSOR_DEVICE_ATTR(temp4_max_alarm, S_IRUGO,
|
|
|
+ show_temp_max_alarm, NULL, 3);
|
|
|
+static SENSOR_DEVICE_ATTR(temp5_max_alarm, S_IRUGO,
|
|
|
+ show_temp_max_alarm, NULL, 4);
|
|
|
+static SENSOR_DEVICE_ATTR(temp6_max_alarm, S_IRUGO,
|
|
|
+ show_temp_max_alarm, NULL, 5);
|
|
|
+
|
|
|
+static SENSOR_DEVICE_ATTR(temp1_crit_alarm, S_IRUGO,
|
|
|
+ show_temp_crit_alarm, NULL, 0);
|
|
|
+static SENSOR_DEVICE_ATTR(temp2_crit_alarm, S_IRUGO,
|
|
|
+ show_temp_crit_alarm, NULL, 1);
|
|
|
+static SENSOR_DEVICE_ATTR(temp3_crit_alarm, S_IRUGO,
|
|
|
+ show_temp_crit_alarm, NULL, 2);
|
|
|
+static SENSOR_DEVICE_ATTR(temp4_crit_alarm, S_IRUGO,
|
|
|
+ show_temp_crit_alarm, NULL, 3);
|
|
|
+static SENSOR_DEVICE_ATTR(temp5_crit_alarm, S_IRUGO,
|
|
|
+ show_temp_crit_alarm, NULL, 4);
|
|
|
+static SENSOR_DEVICE_ATTR(temp6_crit_alarm, S_IRUGO,
|
|
|
+ show_temp_crit_alarm, NULL, 5);
|
|
|
+
|
|
|
+static SENSOR_DEVICE_ATTR(temp1_fault, S_IRUGO, show_temp_fault, NULL, 0);
|
|
|
+static SENSOR_DEVICE_ATTR(temp2_fault, S_IRUGO, show_temp_fault, NULL, 1);
|
|
|
+static SENSOR_DEVICE_ATTR(temp3_fault, S_IRUGO, show_temp_fault, NULL, 2);
|
|
|
+static SENSOR_DEVICE_ATTR(temp4_fault, S_IRUGO, show_temp_fault, NULL, 3);
|
|
|
+static SENSOR_DEVICE_ATTR(temp5_fault, S_IRUGO, show_temp_fault, NULL, 4);
|
|
|
+static SENSOR_DEVICE_ATTR(temp6_fault, S_IRUGO, show_temp_fault, NULL, 5);
|
|
|
+
|
|
|
+static struct attribute *pc87427_attributes_temp[6][10] = {
|
|
|
+ {
|
|
|
+ &sensor_dev_attr_temp1_input.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp1_min.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp1_max.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp1_crit.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp1_type.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp1_min_alarm.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp1_max_alarm.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp1_crit_alarm.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp1_fault.dev_attr.attr,
|
|
|
+ NULL
|
|
|
+ }, {
|
|
|
+ &sensor_dev_attr_temp2_input.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp2_min.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp2_max.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp2_crit.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp2_type.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp2_min_alarm.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp2_max_alarm.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp2_crit_alarm.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp2_fault.dev_attr.attr,
|
|
|
+ NULL
|
|
|
+ }, {
|
|
|
+ &sensor_dev_attr_temp3_input.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp3_min.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp3_max.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp3_crit.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp3_type.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp3_min_alarm.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp3_max_alarm.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp3_crit_alarm.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp3_fault.dev_attr.attr,
|
|
|
+ NULL
|
|
|
+ }, {
|
|
|
+ &sensor_dev_attr_temp4_input.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp4_min.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp4_max.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp4_crit.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp4_type.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp4_min_alarm.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp4_max_alarm.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp4_crit_alarm.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp4_fault.dev_attr.attr,
|
|
|
+ NULL
|
|
|
+ }, {
|
|
|
+ &sensor_dev_attr_temp5_input.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp5_min.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp5_max.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp5_crit.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp5_type.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp5_min_alarm.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp5_max_alarm.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp5_crit_alarm.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp5_fault.dev_attr.attr,
|
|
|
+ NULL
|
|
|
+ }, {
|
|
|
+ &sensor_dev_attr_temp6_input.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp6_min.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp6_max.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp6_crit.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp6_type.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp6_min_alarm.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp6_max_alarm.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp6_crit_alarm.dev_attr.attr,
|
|
|
+ &sensor_dev_attr_temp6_fault.dev_attr.attr,
|
|
|
+ NULL
|
|
|
+ }
|
|
|
+};
|
|
|
+
|
|
|
+static const struct attribute_group pc87427_group_temp[6] = {
|
|
|
+ { .attrs = pc87427_attributes_temp[0] },
|
|
|
+ { .attrs = pc87427_attributes_temp[1] },
|
|
|
+ { .attrs = pc87427_attributes_temp[2] },
|
|
|
+ { .attrs = pc87427_attributes_temp[3] },
|
|
|
+ { .attrs = pc87427_attributes_temp[4] },
|
|
|
+ { .attrs = pc87427_attributes_temp[5] },
|
|
|
+};
|
|
|
+
|
|
|
static ssize_t show_name(struct device *dev, struct device_attribute
|
|
|
*devattr, char *buf)
|
|
|
{
|
|
|
@@ -391,8 +938,49 @@ static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
|
|
|
* Device detection, attach and detach
|
|
|
*/
|
|
|
|
|
|
+static void pc87427_release_regions(struct platform_device *pdev, int count)
|
|
|
+{
|
|
|
+ struct resource *res;
|
|
|
+ int i;
|
|
|
+
|
|
|
+ for (i = 0; i < count; i++) {
|
|
|
+ res = platform_get_resource(pdev, IORESOURCE_IO, i);
|
|
|
+ release_region(res->start, resource_size(res));
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+static int __devinit pc87427_request_regions(struct platform_device *pdev,
|
|
|
+ int count)
|
|
|
+{
|
|
|
+ struct resource *res;
|
|
|
+ int i, err = 0;
|
|
|
+
|
|
|
+ for (i = 0; i < count; i++) {
|
|
|
+ res = platform_get_resource(pdev, IORESOURCE_IO, i);
|
|
|
+ if (!res) {
|
|
|
+ err = -ENOENT;
|
|
|
+ dev_err(&pdev->dev, "Missing resource #%d\n", i);
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ if (!request_region(res->start, resource_size(res), DRVNAME)) {
|
|
|
+ err = -EBUSY;
|
|
|
+ dev_err(&pdev->dev,
|
|
|
+ "Failed to request region 0x%lx-0x%lx\n",
|
|
|
+ (unsigned long)res->start,
|
|
|
+ (unsigned long)res->end);
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if (err && i)
|
|
|
+ pc87427_release_regions(pdev, i);
|
|
|
+
|
|
|
+ return err;
|
|
|
+}
|
|
|
+
|
|
|
static void __devinit pc87427_init_device(struct device *dev)
|
|
|
{
|
|
|
+ struct pc87427_sio_data *sio_data = dev->platform_data;
|
|
|
struct pc87427_data *data = dev_get_drvdata(dev);
|
|
|
int i;
|
|
|
u8 reg;
|
|
|
@@ -400,10 +988,12 @@ static void __devinit pc87427_init_device(struct device *dev)
|
|
|
/* The FMC module should be ready */
|
|
|
reg = pc87427_read8(data, LD_FAN, PC87427_REG_BANK);
|
|
|
if (!(reg & 0x80))
|
|
|
- dev_warn(dev, "FMC module not ready!\n");
|
|
|
+ dev_warn(dev, "%s module not ready!\n", "FMC");
|
|
|
|
|
|
/* Check which fans are enabled */
|
|
|
for (i = 0; i < 8; i++) {
|
|
|
+ if (!(sio_data->has_fanin & (1 << i))) /* Not wired */
|
|
|
+ continue;
|
|
|
reg = pc87427_read8_bank(data, LD_FAN, BANK_FM(i),
|
|
|
PC87427_REG_FAN_STATUS);
|
|
|
if (reg & FAN_STATUS_MONEN)
|
|
|
@@ -411,37 +1001,93 @@ static void __devinit pc87427_init_device(struct device *dev)
|
|
|
}
|
|
|
|
|
|
if (!data->fan_enabled) {
|
|
|
- dev_dbg(dev, "Enabling all fan inputs\n");
|
|
|
- for (i = 0; i < 8; i++)
|
|
|
+ dev_dbg(dev, "Enabling monitoring of all fans\n");
|
|
|
+ for (i = 0; i < 8; i++) {
|
|
|
+ if (!(sio_data->has_fanin & (1 << i))) /* Not wired */
|
|
|
+ continue;
|
|
|
pc87427_write8_bank(data, LD_FAN, BANK_FM(i),
|
|
|
PC87427_REG_FAN_STATUS,
|
|
|
FAN_STATUS_MONEN);
|
|
|
- data->fan_enabled = 0xff;
|
|
|
+ }
|
|
|
+ data->fan_enabled = sio_data->has_fanin;
|
|
|
+ }
|
|
|
+
|
|
|
+ /* Check which PWM outputs are enabled */
|
|
|
+ for (i = 0; i < 4; i++) {
|
|
|
+ if (!(sio_data->has_fanout & (1 << i))) /* Not wired */
|
|
|
+ continue;
|
|
|
+ reg = pc87427_read8_bank(data, LD_FAN, BANK_FC(i),
|
|
|
+ PC87427_REG_PWM_ENABLE);
|
|
|
+ if (reg & PWM_ENABLE_CTLEN)
|
|
|
+ data->pwm_enabled |= (1 << i);
|
|
|
+
|
|
|
+ /* We don't expose an interface to reconfigure the automatic
|
|
|
+ fan control mode, so only allow to return to this mode if
|
|
|
+ it was originally set. */
|
|
|
+ if ((reg & PWM_ENABLE_MODE_MASK) == PWM_MODE_AUTO) {
|
|
|
+ dev_dbg(dev, "PWM%d is in automatic control mode\n",
|
|
|
+ i + 1);
|
|
|
+ data->pwm_auto_ok |= (1 << i);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ /* The HMC module should be ready */
|
|
|
+ reg = pc87427_read8(data, LD_TEMP, PC87427_REG_BANK);
|
|
|
+ if (!(reg & 0x80))
|
|
|
+ dev_warn(dev, "%s module not ready!\n", "HMC");
|
|
|
+
|
|
|
+ /* Check which temperature channels are enabled */
|
|
|
+ for (i = 0; i < 6; i++) {
|
|
|
+ reg = pc87427_read8_bank(data, LD_TEMP, BANK_TM(i),
|
|
|
+ PC87427_REG_TEMP_STATUS);
|
|
|
+ if (reg & TEMP_STATUS_CHANEN)
|
|
|
+ data->temp_enabled |= (1 << i);
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+static void pc87427_remove_files(struct device *dev)
|
|
|
+{
|
|
|
+ struct pc87427_data *data = dev_get_drvdata(dev);
|
|
|
+ int i;
|
|
|
+
|
|
|
+ device_remove_file(dev, &dev_attr_name);
|
|
|
+ for (i = 0; i < 8; i++) {
|
|
|
+ if (!(data->fan_enabled & (1 << i)))
|
|
|
+ continue;
|
|
|
+ sysfs_remove_group(&dev->kobj, &pc87427_group_fan[i]);
|
|
|
+ }
|
|
|
+ for (i = 0; i < 4; i++) {
|
|
|
+ if (!(data->pwm_enabled & (1 << i)))
|
|
|
+ continue;
|
|
|
+ sysfs_remove_group(&dev->kobj, &pc87427_group_pwm[i]);
|
|
|
+ }
|
|
|
+ for (i = 0; i < 6; i++) {
|
|
|
+ if (!(data->temp_enabled & (1 << i)))
|
|
|
+ continue;
|
|
|
+ sysfs_remove_group(&dev->kobj, &pc87427_group_temp[i]);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
static int __devinit pc87427_probe(struct platform_device *pdev)
|
|
|
{
|
|
|
+ struct pc87427_sio_data *sio_data = pdev->dev.platform_data;
|
|
|
struct pc87427_data *data;
|
|
|
- struct resource *res;
|
|
|
- int i, err;
|
|
|
+ int i, err, res_count;
|
|
|
|
|
|
- if (!(data = kzalloc(sizeof(struct pc87427_data), GFP_KERNEL))) {
|
|
|
+ data = kzalloc(sizeof(struct pc87427_data), GFP_KERNEL);
|
|
|
+ if (!data) {
|
|
|
err = -ENOMEM;
|
|
|
printk(KERN_ERR DRVNAME ": Out of memory\n");
|
|
|
goto exit;
|
|
|
}
|
|
|
|
|
|
- /* This will need to be revisited when we add support for
|
|
|
- temperature and voltage monitoring. */
|
|
|
- res = platform_get_resource(pdev, IORESOURCE_IO, 0);
|
|
|
- if (!request_region(res->start, resource_size(res), DRVNAME)) {
|
|
|
- err = -EBUSY;
|
|
|
- dev_err(&pdev->dev, "Failed to request region 0x%lx-0x%lx\n",
|
|
|
- (unsigned long)res->start, (unsigned long)res->end);
|
|
|
+ data->address[0] = sio_data->address[0];
|
|
|
+ data->address[1] = sio_data->address[1];
|
|
|
+ res_count = (data->address[0] != 0) + (data->address[1] != 0);
|
|
|
+
|
|
|
+ err = pc87427_request_regions(pdev, res_count);
|
|
|
+ if (err)
|
|
|
goto exit_kfree;
|
|
|
- }
|
|
|
- data->address[0] = res->start;
|
|
|
|
|
|
mutex_init(&data->lock);
|
|
|
data->name = "pc87427";
|
|
|
@@ -449,13 +1095,31 @@ static int __devinit pc87427_probe(struct platform_device *pdev)
|
|
|
pc87427_init_device(&pdev->dev);
|
|
|
|
|
|
/* Register sysfs hooks */
|
|
|
- if ((err = device_create_file(&pdev->dev, &dev_attr_name)))
|
|
|
+ err = device_create_file(&pdev->dev, &dev_attr_name);
|
|
|
+ if (err)
|
|
|
goto exit_release_region;
|
|
|
for (i = 0; i < 8; i++) {
|
|
|
if (!(data->fan_enabled & (1 << i)))
|
|
|
continue;
|
|
|
- if ((err = sysfs_create_group(&pdev->dev.kobj,
|
|
|
- &pc87427_group_fan[i])))
|
|
|
+ err = sysfs_create_group(&pdev->dev.kobj,
|
|
|
+ &pc87427_group_fan[i]);
|
|
|
+ if (err)
|
|
|
+ goto exit_remove_files;
|
|
|
+ }
|
|
|
+ for (i = 0; i < 4; i++) {
|
|
|
+ if (!(data->pwm_enabled & (1 << i)))
|
|
|
+ continue;
|
|
|
+ err = sysfs_create_group(&pdev->dev.kobj,
|
|
|
+ &pc87427_group_pwm[i]);
|
|
|
+ if (err)
|
|
|
+ goto exit_remove_files;
|
|
|
+ }
|
|
|
+ for (i = 0; i < 6; i++) {
|
|
|
+ if (!(data->temp_enabled & (1 << i)))
|
|
|
+ continue;
|
|
|
+ err = sysfs_create_group(&pdev->dev.kobj,
|
|
|
+ &pc87427_group_temp[i]);
|
|
|
+ if (err)
|
|
|
goto exit_remove_files;
|
|
|
}
|
|
|
|
|
|
@@ -469,13 +1133,9 @@ static int __devinit pc87427_probe(struct platform_device *pdev)
|
|
|
return 0;
|
|
|
|
|
|
exit_remove_files:
|
|
|
- for (i = 0; i < 8; i++) {
|
|
|
- if (!(data->fan_enabled & (1 << i)))
|
|
|
- continue;
|
|
|
- sysfs_remove_group(&pdev->dev.kobj, &pc87427_group_fan[i]);
|
|
|
- }
|
|
|
+ pc87427_remove_files(&pdev->dev);
|
|
|
exit_release_region:
|
|
|
- release_region(res->start, resource_size(res));
|
|
|
+ pc87427_release_regions(pdev, res_count);
|
|
|
exit_kfree:
|
|
|
platform_set_drvdata(pdev, NULL);
|
|
|
kfree(data);
|
|
|
@@ -486,21 +1146,16 @@ exit:
|
|
|
static int __devexit pc87427_remove(struct platform_device *pdev)
|
|
|
{
|
|
|
struct pc87427_data *data = platform_get_drvdata(pdev);
|
|
|
- struct resource *res;
|
|
|
- int i;
|
|
|
+ int res_count;
|
|
|
+
|
|
|
+ res_count = (data->address[0] != 0) + (data->address[1] != 0);
|
|
|
|
|
|
hwmon_device_unregister(data->hwmon_dev);
|
|
|
- device_remove_file(&pdev->dev, &dev_attr_name);
|
|
|
- for (i = 0; i < 8; i++) {
|
|
|
- if (!(data->fan_enabled & (1 << i)))
|
|
|
- continue;
|
|
|
- sysfs_remove_group(&pdev->dev.kobj, &pc87427_group_fan[i]);
|
|
|
- }
|
|
|
+ pc87427_remove_files(&pdev->dev);
|
|
|
platform_set_drvdata(pdev, NULL);
|
|
|
kfree(data);
|
|
|
|
|
|
- res = platform_get_resource(pdev, IORESOURCE_IO, 0);
|
|
|
- release_region(res->start, resource_size(res));
|
|
|
+ pc87427_release_regions(pdev, res_count);
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
|
@@ -515,34 +1170,50 @@ static struct platform_driver pc87427_driver = {
|
|
|
.remove = __devexit_p(pc87427_remove),
|
|
|
};
|
|
|
|
|
|
-static int __init pc87427_device_add(unsigned short address)
|
|
|
+static int __init pc87427_device_add(const struct pc87427_sio_data *sio_data)
|
|
|
{
|
|
|
- struct resource res = {
|
|
|
- .start = address,
|
|
|
- .end = address + REGION_LENGTH - 1,
|
|
|
- .name = logdev_str[0],
|
|
|
- .flags = IORESOURCE_IO,
|
|
|
+ struct resource res[2] = {
|
|
|
+ { .flags = IORESOURCE_IO },
|
|
|
+ { .flags = IORESOURCE_IO },
|
|
|
};
|
|
|
- int err;
|
|
|
+ int err, i, res_count;
|
|
|
|
|
|
- err = acpi_check_resource_conflict(&res);
|
|
|
- if (err)
|
|
|
- goto exit;
|
|
|
+ res_count = 0;
|
|
|
+ for (i = 0; i < 2; i++) {
|
|
|
+ if (!sio_data->address[i])
|
|
|
+ continue;
|
|
|
+ res[res_count].start = sio_data->address[i];
|
|
|
+ res[res_count].end = sio_data->address[i] + REGION_LENGTH - 1;
|
|
|
+ res[res_count].name = logdev_str[i];
|
|
|
|
|
|
- pdev = platform_device_alloc(DRVNAME, address);
|
|
|
+ err = acpi_check_resource_conflict(&res[res_count]);
|
|
|
+ if (err)
|
|
|
+ goto exit;
|
|
|
+
|
|
|
+ res_count++;
|
|
|
+ }
|
|
|
+
|
|
|
+ pdev = platform_device_alloc(DRVNAME, res[0].start);
|
|
|
if (!pdev) {
|
|
|
err = -ENOMEM;
|
|
|
printk(KERN_ERR DRVNAME ": Device allocation failed\n");
|
|
|
goto exit;
|
|
|
}
|
|
|
|
|
|
- err = platform_device_add_resources(pdev, &res, 1);
|
|
|
+ err = platform_device_add_resources(pdev, res, res_count);
|
|
|
if (err) {
|
|
|
printk(KERN_ERR DRVNAME ": Device resource addition failed "
|
|
|
"(%d)\n", err);
|
|
|
goto exit_device_put;
|
|
|
}
|
|
|
|
|
|
+ err = platform_device_add_data(pdev, sio_data,
|
|
|
+ sizeof(struct pc87427_sio_data));
|
|
|
+ if (err) {
|
|
|
+ printk(KERN_ERR DRVNAME ": Platform data allocation failed\n");
|
|
|
+ goto exit_device_put;
|
|
|
+ }
|
|
|
+
|
|
|
err = platform_device_add(pdev);
|
|
|
if (err) {
|
|
|
printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n",
|
|
|
@@ -558,9 +1229,10 @@ exit:
|
|
|
return err;
|
|
|
}
|
|
|
|
|
|
-static int __init pc87427_find(int sioaddr, unsigned short *address)
|
|
|
+static int __init pc87427_find(int sioaddr, struct pc87427_sio_data *sio_data)
|
|
|
{
|
|
|
u16 val;
|
|
|
+ u8 cfg, cfg_b;
|
|
|
int i, err = 0;
|
|
|
|
|
|
/* Identify device */
|
|
|
@@ -571,7 +1243,7 @@ static int __init pc87427_find(int sioaddr, unsigned short *address)
|
|
|
}
|
|
|
|
|
|
for (i = 0; i < 2; i++) {
|
|
|
- address[i] = 0;
|
|
|
+ sio_data->address[i] = 0;
|
|
|
/* Select logical device */
|
|
|
superio_outb(sioaddr, SIOREG_LDSEL, logdev[i]);
|
|
|
|
|
|
@@ -596,9 +1268,58 @@ static int __init pc87427_find(int sioaddr, unsigned short *address)
|
|
|
"for logical device 0x%02x\n", logdev[i]);
|
|
|
continue;
|
|
|
}
|
|
|
- address[i] = val;
|
|
|
+ sio_data->address[i] = val;
|
|
|
}
|
|
|
|
|
|
+ /* No point in loading the driver if everything is disabled */
|
|
|
+ if (!sio_data->address[0] && !sio_data->address[1]) {
|
|
|
+ err = -ENODEV;
|
|
|
+ goto exit;
|
|
|
+ }
|
|
|
+
|
|
|
+ /* Check which fan inputs are wired */
|
|
|
+ sio_data->has_fanin = (1 << 2) | (1 << 3); /* FANIN2, FANIN3 */
|
|
|
+
|
|
|
+ cfg = superio_inb(sioaddr, SIOREG_CF2);
|
|
|
+ if (!(cfg & (1 << 3)))
|
|
|
+ sio_data->has_fanin |= (1 << 0); /* FANIN0 */
|
|
|
+ if (!(cfg & (1 << 2)))
|
|
|
+ sio_data->has_fanin |= (1 << 4); /* FANIN4 */
|
|
|
+
|
|
|
+ cfg = superio_inb(sioaddr, SIOREG_CFD);
|
|
|
+ if (!(cfg & (1 << 0)))
|
|
|
+ sio_data->has_fanin |= (1 << 1); /* FANIN1 */
|
|
|
+
|
|
|
+ cfg = superio_inb(sioaddr, SIOREG_CF4);
|
|
|
+ if (!(cfg & (1 << 0)))
|
|
|
+ sio_data->has_fanin |= (1 << 7); /* FANIN7 */
|
|
|
+ cfg_b = superio_inb(sioaddr, SIOREG_CFB);
|
|
|
+ if (!(cfg & (1 << 1)) && (cfg_b & (1 << 3)))
|
|
|
+ sio_data->has_fanin |= (1 << 5); /* FANIN5 */
|
|
|
+ cfg = superio_inb(sioaddr, SIOREG_CF3);
|
|
|
+ if ((cfg & (1 << 3)) && !(cfg_b & (1 << 5)))
|
|
|
+ sio_data->has_fanin |= (1 << 6); /* FANIN6 */
|
|
|
+
|
|
|
+ /* Check which fan outputs are wired */
|
|
|
+ sio_data->has_fanout = (1 << 0); /* FANOUT0 */
|
|
|
+ if (cfg_b & (1 << 0))
|
|
|
+ sio_data->has_fanout |= (1 << 3); /* FANOUT3 */
|
|
|
+
|
|
|
+ cfg = superio_inb(sioaddr, SIOREG_CFC);
|
|
|
+ if (!(cfg & (1 << 4))) {
|
|
|
+ if (cfg_b & (1 << 1))
|
|
|
+ sio_data->has_fanout |= (1 << 1); /* FANOUT1 */
|
|
|
+ if (cfg_b & (1 << 2))
|
|
|
+ sio_data->has_fanout |= (1 << 2); /* FANOUT2 */
|
|
|
+ }
|
|
|
+
|
|
|
+ /* FANOUT1 and FANOUT2 can each be routed to 2 different pins */
|
|
|
+ cfg = superio_inb(sioaddr, SIOREG_CF5);
|
|
|
+ if (cfg & (1 << 6))
|
|
|
+ sio_data->has_fanout |= (1 << 1); /* FANOUT1 */
|
|
|
+ if (cfg & (1 << 5))
|
|
|
+ sio_data->has_fanout |= (1 << 2); /* FANOUT2 */
|
|
|
+
|
|
|
exit:
|
|
|
superio_exit(sioaddr);
|
|
|
return err;
|
|
|
@@ -607,15 +1328,10 @@ exit:
|
|
|
static int __init pc87427_init(void)
|
|
|
{
|
|
|
int err;
|
|
|
- unsigned short address[2];
|
|
|
-
|
|
|
- if (pc87427_find(0x2e, address)
|
|
|
- && pc87427_find(0x4e, address))
|
|
|
- return -ENODEV;
|
|
|
+ struct pc87427_sio_data sio_data;
|
|
|
|
|
|
- /* For now the driver only handles fans so we only care about the
|
|
|
- first address. */
|
|
|
- if (!address[0])
|
|
|
+ if (pc87427_find(0x2e, &sio_data)
|
|
|
+ && pc87427_find(0x4e, &sio_data))
|
|
|
return -ENODEV;
|
|
|
|
|
|
err = platform_driver_register(&pc87427_driver);
|
|
|
@@ -623,7 +1339,7 @@ static int __init pc87427_init(void)
|
|
|
goto exit;
|
|
|
|
|
|
/* Sets global pdev as a side effect */
|
|
|
- err = pc87427_device_add(address[0]);
|
|
|
+ err = pc87427_device_add(&sio_data);
|
|
|
if (err)
|
|
|
goto exit_driver;
|
|
|
|
Linus Torvalds