X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=nct6775.c;h=3592371ac247bdd95e3ce8e46fed884dea79e141;hb=15dfa7b40b26f103cc9237554b9a52415c687f38;hp=dbed5d285e5fc5cca8768a81529934d0723adc4f;hpb=ca4642d5e78389c171f5042892215d6a379e7122;p=groeck-nct6775 diff --git a/nct6775.c b/nct6775.c index dbed5d2..3592371 100644 --- a/nct6775.c +++ b/nct6775.c @@ -117,11 +117,19 @@ superio_select(int ioreg, int ld) outb(ld, ioreg + 1); } -static inline void +static inline int superio_enter(int ioreg) { + /* + * Try to reserve and for exclusive access. + */ + if (!request_muxed_region(ioreg, 2, DRVNAME)) + return -EBUSY; + outb(0x87, ioreg); outb(0x87, ioreg); + + return 0; } static inline void @@ -130,6 +138,7 @@ superio_exit(int ioreg) outb(0xaa, ioreg); outb(0x02, ioreg); outb(0x02, ioreg + 1); + release_region(ioreg, 2); } /* @@ -153,14 +162,14 @@ superio_exit(int ioreg) * REG_CHIP_ID is at port 0x58 */ -static const u16 NCT6775_REG_FAN_MIN[] = { 0x3b, 0x3c, 0x3d }; - /* Voltage min/max registers for nr=7..14 are in bank 5 */ static const u16 NCT6775_REG_IN_MAX[] = { - 0x2b, 0x2d, 0x2f, 0x31, 0x33, 0x35, 0x37, 0x554, 0x556 }; + 0x2b, 0x2d, 0x2f, 0x31, 0x33, 0x35, 0x37, 0x554, 0x556, 0x558, 0x55a, + 0x55c, 0x55e, 0x560, 0x562 }; static const u16 NCT6775_REG_IN_MIN[] = { - 0x2c, 0x2e, 0x30, 0x32, 0x34, 0x36, 0x38, 0x555, 0x557 }; + 0x2c, 0x2e, 0x30, 0x32, 0x34, 0x36, 0x38, 0x555, 0x557, 0x559, 0x55b, + 0x55d, 0x55f, 0x561, 0x563 }; static const u16 NCT6775_REG_IN[] = { 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x550, 0x551, 0x552 }; @@ -226,6 +235,11 @@ static const u8 NCT6776_PWM_MODE_MASK[] = { 0x01, 0, 0 }; /* Advanced Fan control, some values are common for all fans */ +static const u16 NCT6775_REG_FAN_PULSES[] = { 0x641, 0x642, 0x643, 0x644, 0 }; +static const u16 NCT6776_REG_FAN_PULSES[] = { 0x644, 0x645, 0x646, 0, 0 }; +static const u16 NCT6779_REG_FAN_PULSES[] + = { 0x644, 0x645, 0x646, 0x647, 0x648 }; + static const u16 NCT6775_REG_TARGET[] = { 0x101, 0x201, 0x301, 0x801, 0x901 }; static const u16 NCT6775_REG_FAN_MODE[] = { 0x102, 0x202, 0x302, 0x802, 0x902 }; static const u16 NCT6775_REG_FAN_STEP_DOWN_TIME[] = { @@ -236,6 +250,8 @@ static const u16 NCT6775_REG_FAN_STOP_OUTPUT[] = { 0x105, 0x205, 0x305, 0x805, 0x905 }; static const u16 NCT6775_REG_FAN_START_OUTPUT[] = { 0x106, 0x206, 0x306, 0x806, 0x906 }; +static const u16 NCT6775_REG_FAN_STEP_ENABLE[] = { + 0x120, 0x220, 0x320, 0x820, 0x920 }; static const u16 NCT6775_REG_FAN_MAX_OUTPUT[] = { 0x10a, 0x20a, 0x30a }; static const u16 NCT6775_REG_FAN_STEP_OUTPUT[] = { 0x10b, 0x20b, 0x30b }; @@ -245,13 +261,14 @@ static const u16 NCT6775_REG_PWM[] = { 0x109, 0x209, 0x309, 0x809, 0x909 }; static const u16 NCT6775_REG_PWM_READ[] = { 0x01, 0x03, 0x11, 0x13, 0x15 }; static const u16 NCT6775_REG_FAN[] = { 0x630, 0x632, 0x634, 0x636, 0x638 }; +static const u16 NCT6775_REG_FAN_MIN[] = { 0x3b, 0x3c, 0x3d }; static const u16 NCT6776_REG_FAN_MIN[] = { 0x63a, 0x63c, 0x63e, 0x640, 0x642}; -static const u16 NCT6779_REG_TOLERANCE_H[] - = { 0x10c, 0x20c, 0x30c, 0x40c, 0x50c }; +static const u16 NCT6779_REG_FAN[] = { 0x4b0, 0x4b2, 0x4b4, 0x4b6, 0x4b8 }; -static const u16 NCT6779_REG_FAN[] = { 0x4c0, 0x4c2, 0x4c4, 0x4c6, 0x4c8 }; +static const u16 NCT6779_REG_TOLERANCE_H[] + = { 0x10c, 0x20c, 0x30c, 0x80c, 0x90c }; static const u16 NCT6775_REG_TEMP[] = { 0x27, 0x150, 0x250, 0x62b, 0x62c, 0x62d }; @@ -264,6 +281,11 @@ static const u16 NCT6775_REG_TEMP_HYST[] static const u16 NCT6775_REG_TEMP_OVER[] = { 0x39, 0x155, 0x255, 0x672, 0x677, 0x67C }; +static const u16 NCT6779_REG_TEMP_HYST[] + = { 0x3a, 0x153, 0, 0, 0, 0 }; +static const u16 NCT6779_REG_TEMP_OVER[] + = { 0x39, 0x155, 0, 0, 0, 0 }; + static const u16 NCT6775_REG_TEMP_SOURCE[] = { 0x621, 0x622, 0x623, 0x624, 0x625, 0x626 }; @@ -292,7 +314,7 @@ static const u16 NCT6779_REG_TEMP_OFFSET[] static const u16 NCT6776_REG_TEMP_CONFIG[11] = { 0x18, 0x152, 0x252, 0x628, 0x629, 0x62A }; -static const u16 NCT6775_REG_TEMP_MON[] = { 0x73, 0x75, 0x77, 0x79, 0x7b }; +static const u16 NCT6779_REG_TEMP_CONFIG[11] = { 0x18, 0x152 }; static const u16 NCT6775_REG_AUTO_TEMP[] = { 0x121, 0x221, 0x321, 0x821, 0x921 }; @@ -394,22 +416,31 @@ static const char *const nct6779_temp_label[] = { "BYTE_TEMP" }; -static const u16 NCT6775_REG_TEMP_ALTERNATE[ARRAY_SIZE(nct6779_temp_label)] +static const u16 NCT6775_REG_TEMP_ALTERNATE[ARRAY_SIZE(nct6775_temp_label) - 1] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x661, 0x662, 0x664 }; -static const u16 NCT6776_REG_TEMP_ALTERNATE[ARRAY_SIZE(nct6776_temp_label)] +static const u16 NCT6776_REG_TEMP_ALTERNATE[ARRAY_SIZE(nct6776_temp_label) - 1] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x401, 0x402, 0x404 }; -static const u16 NCT6779_REG_TEMP_ALTERNATE[ARRAY_SIZE(nct6779_temp_label)] +static const u16 NCT6779_REG_TEMP_ALTERNATE[ARRAY_SIZE(nct6779_temp_label) - 1] = { 0x490, 0x491, 0x492, 0x493, 0x494, 0x495, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0x401, 0x402, 0x404 }; + 0, 0x400, 0x401, 0x402, 0x404, 0x405, 0x406, 0x407, + 0x408, 0 }; + +static const u16 NCT6775_REG_TEMP_CRIT[ARRAY_SIZE(nct6775_temp_label) - 1] + = { 0, 0, 0, 0, 0xa00, 0xa01, 0xa02, 0xa03, 0xa04, 0xa05, 0xa06, + 0xa07 }; + +static const u16 NCT6776_REG_TEMP_CRIT[ARRAY_SIZE(nct6776_temp_label) - 1] + = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x709, 0x70a }; + +static const u16 NCT6779_REG_TEMP_CRIT[ARRAY_SIZE(nct6779_temp_label) - 1] + = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x709, 0x70a }; #define NUM_TEMP 10 /* Max number of temp attribute sets w/ limits*/ #define NUM_TEMP_FIXED 6 /* Max number of fixed temp attribute sets */ -#define NUM_REG_TEMP ARRAY_SIZE(NCT6775_REG_TEMP) - static inline int reg_to_pwm_enable(int pwm, int mode) { if (mode == 0 && pwm == 255) @@ -510,7 +541,9 @@ struct nct6775_data { struct device *hwmon_dev; struct mutex lock; - u16 reg_temp[3][NUM_TEMP]; /* 0=temp, 1=temp_over, 2=temp_hyst */ + u16 reg_temp[4][NUM_TEMP]; /* 0=temp, 1=temp_over, 2=temp_hyst, + * 3=temp_crit + */ u8 temp_src[NUM_TEMP]; u16 reg_temp_config[NUM_TEMP]; const char * const *temp_label; @@ -540,8 +573,6 @@ struct nct6775_data { */ const u16 *REG_PWM_READ; - const u16 *REG_TEMP_ALTERNATE; - const u16 *REG_TEMP_MON; const u16 *REG_AUTO_TEMP; const u16 *REG_AUTO_PWM; @@ -549,7 +580,9 @@ struct nct6775_data { const u16 *REG_CRITICAL_TEMP_TOLERANCE; const u16 *REG_TEMP_SOURCE; /* temp register sources */ - const u16 *REG_TEMP_SEL[2]; /* pwm temp, 0=base, 1=weight */ + const u16 *REG_TEMP_SEL[3]; /* pwm temp: + * 0=base, 1=weight, 2=step enable + */ const u16 *REG_WEIGHT_TEMP[3]; /* 0=base, 1=hyst, 2=step */ @@ -597,7 +630,6 @@ struct nct6775_data { * [5]=weight_duty_step, [6]=weight_duty_base */ u8 target_temp[5]; - s16 pwm_temp[5]; u8 tolerance[5][2]; u8 fan_time[3][5]; /* 0 = stop_time, 1 = step_up, 2 = step_down */ @@ -609,7 +641,7 @@ struct nct6775_data { u8 pwm_temp_sel[2][5]; - bool pwm_sel_enable[2][5];/* 0->stop_val, 1->weight; + bool pwm_sel_enable[3][5];/* 0->stop_val, 1->weight, 2->step; * false->off, true->on */ u8 weight_temp[3][5]; /* 0->temp_step, 1->temp_step_tol, @@ -656,7 +688,7 @@ static bool is_word_sized(struct nct6775_data *data, u16 reg) reg == 0x73 || reg == 0x75 || reg == 0x77; case nct6779: return reg == 0x150 || reg == 0x153 || reg == 0x155 || - ((reg & 0xfff0) == 0x4c0 && (reg & 0x000f) < 0x09) || + ((reg & 0xfff0) == 0x4b0 && (reg & 0x000f) < 0x09) || reg == 0x402 || reg == 0x63a || reg == 0x63c || reg == 0x63e || reg == 0x640 || reg == 0x642 || @@ -754,6 +786,7 @@ static void nct6775_write_fan_div(struct nct6775_data *data, int nr) reg = (nct6775_read_value(data, NCT6775_REG_FANDIV1) & 0x7) | ((data->fan_div[1] << 4) & 0x70); nct6775_write_value(data, NCT6775_REG_FANDIV1, reg); + break; case 2: reg = (nct6775_read_value(data, NCT6775_REG_FANDIV2) & 0x70) | (data->fan_div[2] & 0x7); @@ -838,6 +871,9 @@ static void nct6775_update_pwm(struct device *dev) data->pwm_sel_enable[1][i] = nct6775_read_value(data, data->REG_TEMP_SEL[1][i]) & 0x80; + data->pwm_sel_enable[2][i] = + nct6775_read_value(data, data->REG_TEMP_SEL[2][i]) + & 0x01; /* Weight data */ for (j = 0; j < 2; j++) { @@ -872,8 +908,6 @@ static void nct6775_update_pwm_limits(struct device *dev) data->target_temp[i] = nct6775_read_value(data, data->REG_TARGET[i]) & (data->pwm_mode[i] ? 0xff : 0x7f); - data->pwm_temp[i] = - nct6775_read_value(data, data->REG_TEMP_MON[i]); for (j = 0; j < data->auto_pwm_num; j++) { data->auto_pwm[i][j] = @@ -957,12 +991,10 @@ static struct nct6775_data *nct6775_update_device(struct device *dev) * divider can be increased, let's try that for next * time */ - if (data->has_fan_div - && (reg >= 0xff || (data->kind == nct6775 - && reg == 0x00)) + if (data->has_fan_div && (reg >= 0xff || reg == 0x00) && data->fan_div[i] < 0x07) { - dev_dbg(dev, "Increasing fan%d " - "clock divider from %u to %u\n", + dev_dbg(dev, + "Increasing fan%d clock divider from %u to %u\n", i + 1, div_from_reg(data->fan_div[i]), div_from_reg(data->fan_div[i] + 1)); data->fan_div[i]++; @@ -984,7 +1016,7 @@ static struct nct6775_data *nct6775_update_device(struct device *dev) for (i = 0; i < NUM_TEMP; i++) { if (!(data->have_temp & (1 << i))) continue; - for (j = 0; j < 3; j++) { + for (j = 0; j < 4; j++) { if (data->reg_temp[j][i]) data->temp[j][i] = nct6775_read_temp(data, @@ -1323,10 +1355,7 @@ store_fan_min(struct device *dev, struct device_attribute *attr, mutex_lock(&data->update_lock); if (!data->has_fan_div) { - /* - * Only NCT6776F for now, so we know that this is a 13 bit - * register - */ + /* NCT6776F or NCT6779D; we know this is a 13 bit register */ if (!val) { val = 0xff1f; } else { @@ -1353,9 +1382,9 @@ store_fan_min(struct device *dev, struct device_attribute *attr, */ data->fan_min[nr] = 254; new_div = 7; /* 128 == (1 << 7) */ - dev_warn(dev, "fan%u low limit %lu below minimum %u, set to " - "minimum\n", nr + 1, val, - data->fan_from_reg_min(254, 7)); + dev_warn(dev, + "fan%u low limit %lu below minimum %u, set to minimum\n", + nr + 1, val, data->fan_from_reg_min(254, 7)); } else if (!reg) { /* * Speed above this value cannot possibly be represented, @@ -1363,9 +1392,9 @@ store_fan_min(struct device *dev, struct device_attribute *attr, */ data->fan_min[nr] = 1; new_div = 0; /* 1 == (1 << 0) */ - dev_warn(dev, "fan%u low limit %lu above maximum %u, set to " - "maximum\n", nr + 1, val, - data->fan_from_reg_min(1, 0)); + dev_warn(dev, + "fan%u low limit %lu above maximum %u, set to maximum\n", + nr + 1, val, data->fan_from_reg_min(1, 0)); } else { /* * Automatically pick the best divider, i.e. the one such @@ -1396,8 +1425,7 @@ write_div: } write_min: - nct6775_write_value(data, data->REG_FAN_MIN[nr], - data->fan_min[nr]); + nct6775_write_value(data, data->REG_FAN_MIN[nr], data->fan_min[nr]); mutex_unlock(&data->update_lock); return count; @@ -1635,10 +1663,33 @@ static struct sensor_device_attribute_2 sda_temp_max_hyst[] = { 7, 2), SENSOR_ATTR_2(temp9_max_hyst, S_IRUGO | S_IWUSR, show_temp, store_temp, 8, 2), - SENSOR_ATTR_2(temp9_max_hyst, S_IRUGO | S_IWUSR, show_temp, store_temp, + SENSOR_ATTR_2(temp10_max_hyst, S_IRUGO | S_IWUSR, show_temp, store_temp, 9, 2), }; +static struct sensor_device_attribute_2 sda_temp_crit[] = { + SENSOR_ATTR_2(temp1_crit, S_IRUGO | S_IWUSR, show_temp, store_temp, + 0, 3), + SENSOR_ATTR_2(temp2_crit, S_IRUGO | S_IWUSR, show_temp, store_temp, + 1, 3), + SENSOR_ATTR_2(temp3_crit, S_IRUGO | S_IWUSR, show_temp, store_temp, + 2, 3), + SENSOR_ATTR_2(temp4_crit, S_IRUGO | S_IWUSR, show_temp, store_temp, + 3, 3), + SENSOR_ATTR_2(temp5_crit, S_IRUGO | S_IWUSR, show_temp, store_temp, + 4, 3), + SENSOR_ATTR_2(temp6_crit, S_IRUGO | S_IWUSR, show_temp, store_temp, + 5, 3), + SENSOR_ATTR_2(temp7_crit, S_IRUGO | S_IWUSR, show_temp, store_temp, + 6, 3), + SENSOR_ATTR_2(temp8_crit, S_IRUGO | S_IWUSR, show_temp, store_temp, + 7, 3), + SENSOR_ATTR_2(temp9_crit, S_IRUGO | S_IWUSR, show_temp, store_temp, + 8, 3), + SENSOR_ATTR_2(temp10_crit, S_IRUGO | S_IWUSR, show_temp, store_temp, + 9, 3), +}; + static struct sensor_device_attribute sda_temp_offset[] = { SENSOR_ATTR(temp1_offset, S_IRUGO | S_IWUSR, show_temp_offset, store_temp_offset, 0), @@ -1855,24 +1906,25 @@ store_pwm_enable(struct device *dev, struct device_attribute *attr, return count; } -static ssize_t -show_pwm_temp(struct device *dev, struct device_attribute *attr, char *buf) -{ - struct nct6775_data *data = nct6775_update_device(dev); - struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr); - int nr = sattr->index; - - return sprintf(buf, "%d\n", LM75_TEMP_FROM_REG(data->pwm_temp[nr])); -} - static ssize_t show_pwm_temp_sel(struct device *dev, struct device_attribute *attr, char *buf) { struct nct6775_data *data = nct6775_update_device(dev); struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr); + int i, src, sel = 0; - return sprintf(buf, "%d\n", - data->pwm_temp_sel[sattr->index][sattr->nr]); + src = data->pwm_temp_sel[sattr->index][sattr->nr]; + + for (i = 0; i < NUM_TEMP; i++) { + if (!(data->have_temp & (1 << i))) + continue; + if (src == data->temp_src[i]) { + sel = i + 1; + break; + } + } + + return sprintf(buf, "%d\n", sel); } static ssize_t @@ -1884,25 +1936,22 @@ store_pwm_temp_sel(struct device *dev, struct device_attribute *attr, int nr = sattr->nr; int index = sattr->index; unsigned long val; - int err; - int reg; + int err, reg, src; err = kstrtoul(buf, 10, &val); if (err < 0) return err; - if (val == 0 || val > 0x1f) + if (val == 0 || val > NUM_TEMP) return -EINVAL; - - val = SENSORS_LIMIT(val, 1, data->temp_label_num - 1); - - if (!strlen(data->temp_label[val])) + if (!(data->have_temp & (1 << (val - 1))) || !data->temp_src[val - 1]) return -EINVAL; mutex_lock(&data->update_lock); - data->pwm_temp_sel[index][nr] = val; + src = data->temp_src[val - 1]; + data->pwm_temp_sel[index][nr] = src; reg = nct6775_read_value(data, data->REG_TEMP_SEL[index][nr]); reg &= 0xe0; - reg |= val; + reg |= src; nct6775_write_value(data, data->REG_TEMP_SEL[index][nr], reg); mutex_unlock(&data->update_lock); @@ -2054,13 +2103,6 @@ static SENSOR_DEVICE_ATTR(pwm4_target, S_IWUSR | S_IRUGO, show_target_temp, static SENSOR_DEVICE_ATTR(pwm5_target, S_IWUSR | S_IRUGO, show_target_temp, store_target_temp, 4); -/* Monitored pwm temperatures */ -static SENSOR_DEVICE_ATTR(temp11_input, S_IRUGO, show_pwm_temp, NULL, 0); -static SENSOR_DEVICE_ATTR(temp12_input, S_IRUGO, show_pwm_temp, NULL, 1); -static SENSOR_DEVICE_ATTR(temp13_input, S_IRUGO, show_pwm_temp, NULL, 2); -static SENSOR_DEVICE_ATTR(temp14_input, S_IRUGO, show_pwm_temp, NULL, 3); -static SENSOR_DEVICE_ATTR(temp15_input, S_IRUGO, show_pwm_temp, NULL, 4); - /* Smart Fan registers */ static ssize_t @@ -2085,6 +2127,8 @@ store_pwm_sel_enable(struct device *dev, struct device_attribute *attr, unsigned long val; int err; u8 reg; + static const u8 bit[] = { 0x80, 0x80, 0x01 }; + err = kstrtoul(buf, 10, &val); if (err < 0) @@ -2096,9 +2140,9 @@ store_pwm_sel_enable(struct device *dev, struct device_attribute *attr, mutex_lock(&data->update_lock); data->pwm_sel_enable[index][nr] = val; reg = nct6775_read_value(data, data->REG_TEMP_SEL[index][nr]); - reg &= 0x7f; + reg &= ~bit[index]; if (val) - reg |= 0x80; + reg |= bit[index]; nct6775_write_value(data, data->REG_TEMP_SEL[index][nr], reg); mutex_unlock(&data->update_lock); return count; @@ -2161,6 +2205,17 @@ static SENSOR_DEVICE_ATTR_2(pwm4_weight_enable, S_IWUSR | S_IRUGO, static SENSOR_DEVICE_ATTR_2(pwm5_weight_enable, S_IWUSR | S_IRUGO, show_pwm_sel_enable, store_pwm_sel_enable, 4, 1); +static SENSOR_DEVICE_ATTR_2(pwm1_step_enable, S_IWUSR | S_IRUGO, + show_pwm_sel_enable, store_pwm_sel_enable, 0, 2); +static SENSOR_DEVICE_ATTR_2(pwm2_step_enable, S_IWUSR | S_IRUGO, + show_pwm_sel_enable, store_pwm_sel_enable, 1, 2); +static SENSOR_DEVICE_ATTR_2(pwm3_step_enable, S_IWUSR | S_IRUGO, + show_pwm_sel_enable, store_pwm_sel_enable, 2, 2); +static SENSOR_DEVICE_ATTR_2(pwm4_step_enable, S_IWUSR | S_IRUGO, + show_pwm_sel_enable, store_pwm_sel_enable, 3, 2); +static SENSOR_DEVICE_ATTR_2(pwm5_step_enable, S_IWUSR | S_IRUGO, + show_pwm_sel_enable, store_pwm_sel_enable, 4, 2); + static SENSOR_DEVICE_ATTR_2(pwm1_weight_temp_sel, S_IWUSR | S_IRUGO, show_pwm_temp_sel, store_pwm_temp_sel, 0, 1); static SENSOR_DEVICE_ATTR_2(pwm2_weight_temp_sel, S_IWUSR | S_IRUGO, @@ -2361,12 +2416,12 @@ static struct sensor_device_attribute_2 sda_step_output[] = { static struct attribute *nct6775_attributes_pwm[5][20] = { { - &sensor_dev_attr_temp11_input.dev_attr.attr, &sensor_dev_attr_pwm1.dev_attr.attr, &sensor_dev_attr_pwm1_mode.dev_attr.attr, &sensor_dev_attr_pwm1_enable.dev_attr.attr, &sensor_dev_attr_pwm1_stop_output_enable.dev_attr.attr, &sensor_dev_attr_pwm1_weight_enable.dev_attr.attr, + &sensor_dev_attr_pwm1_step_enable.dev_attr.attr, &sensor_dev_attr_pwm1_temp_sel.dev_attr.attr, &sensor_dev_attr_pwm1_target.dev_attr.attr, &sensor_dev_attr_pwm1_stop_time.dev_attr.attr, @@ -2382,12 +2437,12 @@ static struct attribute *nct6775_attributes_pwm[5][20] = { NULL }, { - &sensor_dev_attr_temp12_input.dev_attr.attr, &sensor_dev_attr_pwm2.dev_attr.attr, &sensor_dev_attr_pwm2_mode.dev_attr.attr, &sensor_dev_attr_pwm2_enable.dev_attr.attr, &sensor_dev_attr_pwm2_stop_output_enable.dev_attr.attr, &sensor_dev_attr_pwm2_weight_enable.dev_attr.attr, + &sensor_dev_attr_pwm2_step_enable.dev_attr.attr, &sensor_dev_attr_pwm2_temp_sel.dev_attr.attr, &sensor_dev_attr_pwm2_target.dev_attr.attr, &sensor_dev_attr_pwm2_stop_time.dev_attr.attr, @@ -2403,12 +2458,12 @@ static struct attribute *nct6775_attributes_pwm[5][20] = { NULL }, { - &sensor_dev_attr_temp13_input.dev_attr.attr, &sensor_dev_attr_pwm3.dev_attr.attr, &sensor_dev_attr_pwm3_mode.dev_attr.attr, &sensor_dev_attr_pwm3_enable.dev_attr.attr, &sensor_dev_attr_pwm3_stop_output_enable.dev_attr.attr, &sensor_dev_attr_pwm3_weight_enable.dev_attr.attr, + &sensor_dev_attr_pwm3_step_enable.dev_attr.attr, &sensor_dev_attr_pwm3_temp_sel.dev_attr.attr, &sensor_dev_attr_pwm3_target.dev_attr.attr, &sensor_dev_attr_pwm3_stop_time.dev_attr.attr, @@ -2424,12 +2479,12 @@ static struct attribute *nct6775_attributes_pwm[5][20] = { NULL }, { - &sensor_dev_attr_temp14_input.dev_attr.attr, &sensor_dev_attr_pwm4.dev_attr.attr, &sensor_dev_attr_pwm4_mode.dev_attr.attr, &sensor_dev_attr_pwm4_enable.dev_attr.attr, &sensor_dev_attr_pwm4_stop_output_enable.dev_attr.attr, &sensor_dev_attr_pwm4_weight_enable.dev_attr.attr, + &sensor_dev_attr_pwm4_step_enable.dev_attr.attr, &sensor_dev_attr_pwm4_temp_sel.dev_attr.attr, &sensor_dev_attr_pwm4_target.dev_attr.attr, &sensor_dev_attr_pwm4_stop_time.dev_attr.attr, @@ -2445,12 +2500,12 @@ static struct attribute *nct6775_attributes_pwm[5][20] = { NULL }, { - &sensor_dev_attr_temp15_input.dev_attr.attr, &sensor_dev_attr_pwm5.dev_attr.attr, &sensor_dev_attr_pwm5_mode.dev_attr.attr, &sensor_dev_attr_pwm5_enable.dev_attr.attr, &sensor_dev_attr_pwm5_stop_output_enable.dev_attr.attr, &sensor_dev_attr_pwm5_weight_enable.dev_attr.attr, + &sensor_dev_attr_pwm5_step_enable.dev_attr.attr, &sensor_dev_attr_pwm5_temp_sel.dev_attr.attr, &sensor_dev_attr_pwm5_target.dev_attr.attr, &sensor_dev_attr_pwm5_stop_time.dev_attr.attr, @@ -2836,6 +2891,7 @@ clear_caseopen(struct device *dev, struct device_attribute *attr, int nr = to_sensor_dev_attr(attr)->index - INTRUSION_ALARM_BASE; unsigned long val; u8 reg; + int ret; if (kstrtoul(buf, 10, &val) || val != 0) return -EINVAL; @@ -2847,7 +2903,12 @@ clear_caseopen(struct device *dev, struct device_attribute *attr, * The CR registers are the same for all chips, and not all chips * support clearing the caseopen status through "regular" registers. */ - superio_enter(sio_data->sioreg); + ret = superio_enter(sio_data->sioreg); + if (ret) { + count = ret; + goto error; + } + superio_select(sio_data->sioreg, NCT6775_LD_ACPI); reg = superio_inb(sio_data->sioreg, NCT6775_REG_CR_CASEOPEN_CLR[nr]); reg |= NCT6775_CR_CASEOPEN_CLR_MASK[nr]; @@ -2857,9 +2918,8 @@ clear_caseopen(struct device *dev, struct device_attribute *attr, superio_exit(sio_data->sioreg); data->valid = 0; /* Force cache refresh */ - +error: mutex_unlock(&data->update_lock); - return count; } @@ -2914,6 +2974,7 @@ static void nct6775_device_remove_files(struct device *dev) device_remove_file(dev, &sda_temp_label[i].dev_attr); device_remove_file(dev, &sda_temp_max[i].dev_attr); device_remove_file(dev, &sda_temp_max_hyst[i].dev_attr); + device_remove_file(dev, &sda_temp_crit[i].dev_attr); if (!(data->have_temp_fixed & (1 << i))) continue; device_remove_file(dev, &sda_temp_type[i].dev_attr); @@ -2972,15 +3033,18 @@ static inline void __devinit nct6775_init_device(struct nct6775_data *data) } } -static void __devinit +static int __devinit nct6775_check_fan_inputs(const struct nct6775_sio_data *sio_data, struct nct6775_data *data) { int regval; bool fan3pin, fan3min, fan4pin, fan4min, fan5pin; bool pwm3pin, pwm4pin, pwm5pin; + int ret; - superio_enter(sio_data->sioreg); + ret = superio_enter(sio_data->sioreg); + if (ret) + return ret; /* fan4 and fan5 share some pins with the GPIO and serial flash */ if (data->kind == nct6775) { @@ -3033,8 +3097,8 @@ nct6775_check_fan_inputs(const struct nct6775_sio_data *sio_data, pwm4pin = !(regval & (1 << 1)); pwm5pin = !(regval & (1 << 2)); - fan3min = 0; - fan4min = 0; + fan3min = fan3pin; + fan4min = fan4pin; } superio_exit(sio_data->sioreg); @@ -3047,6 +3111,8 @@ nct6775_check_fan_inputs(const struct nct6775_sio_data *sio_data, data->has_fan_min |= (fan4min << 3) | (fan5pin << 4); data->has_pwm = 0x03 | (pwm3pin << 2) | (pwm4pin << 3) | (pwm5pin << 4); + + return 0; } static int __devinit nct6775_probe(struct platform_device *pdev) @@ -3058,22 +3124,18 @@ static int __devinit nct6775_probe(struct platform_device *pdev) int i, s, err = 0; int src, mask, available; const u16 *reg_temp, *reg_temp_over, *reg_temp_hyst, *reg_temp_config; + const u16 *reg_temp_alternate, *reg_temp_crit; + int num_reg_temp; res = platform_get_resource(pdev, IORESOURCE_IO, 0); - if (!request_region(res->start, IOREGION_LENGTH, DRVNAME)) { - err = -EBUSY; - dev_err(dev, "Failed to request region 0x%lx-0x%lx\n", - (unsigned long)res->start, - (unsigned long)res->start + IOREGION_LENGTH - 1); - goto exit; - } + if (!devm_request_region(&pdev->dev, res->start, IOREGION_LENGTH, + DRVNAME)) + return -EBUSY; data = devm_kzalloc(&pdev->dev, sizeof(struct nct6775_data), GFP_KERNEL); - if (!data) { - err = -ENOMEM; - goto exit_release; - } + if (!data) + return -ENOMEM; data->kind = sio_data->kind; data->addr = res->start; @@ -3085,7 +3147,6 @@ static int __devinit nct6775_probe(struct platform_device *pdev) switch (data->kind) { case nct6775: data->in_num = 9; - data->have_in = 0x1ff; data->pwm_num = 3; data->auto_pwm_num = 6; data->has_fan_div = true; @@ -3121,8 +3182,6 @@ static int __devinit nct6775_probe(struct platform_device *pdev) data->REG_PWM_READ = NCT6775_REG_PWM_READ; data->REG_PWM_MODE = NCT6775_REG_PWM_MODE; data->PWM_MODE_MASK = NCT6775_PWM_MODE_MASK; - data->REG_TEMP_ALTERNATE = NCT6775_REG_TEMP_ALTERNATE; - data->REG_TEMP_MON = NCT6775_REG_TEMP_MON; data->REG_AUTO_TEMP = NCT6775_REG_AUTO_TEMP; data->REG_AUTO_PWM = NCT6775_REG_AUTO_PWM; data->REG_CRITICAL_TEMP = NCT6775_REG_CRITICAL_TEMP; @@ -3132,20 +3191,23 @@ static int __devinit nct6775_probe(struct platform_device *pdev) data->REG_TEMP_SOURCE = NCT6775_REG_TEMP_SOURCE; data->REG_TEMP_SEL[0] = NCT6775_REG_TEMP_SEL; data->REG_TEMP_SEL[1] = NCT6775_REG_WEIGHT_TEMP_SEL; + data->REG_TEMP_SEL[2] = NCT6775_REG_FAN_STEP_ENABLE; data->REG_WEIGHT_TEMP[0] = NCT6775_REG_WEIGHT_TEMP_STEP; data->REG_WEIGHT_TEMP[1] = NCT6775_REG_WEIGHT_TEMP_STEP_TOL; data->REG_WEIGHT_TEMP[2] = NCT6775_REG_WEIGHT_TEMP_BASE; data->REG_ALARM = NCT6775_REG_ALARM; reg_temp = NCT6775_REG_TEMP; + num_reg_temp = ARRAY_SIZE(NCT6775_REG_TEMP); reg_temp_over = NCT6775_REG_TEMP_OVER; reg_temp_hyst = NCT6775_REG_TEMP_HYST; reg_temp_config = NCT6775_REG_TEMP_CONFIG; + reg_temp_alternate = NCT6775_REG_TEMP_ALTERNATE; + reg_temp_crit = NCT6775_REG_TEMP_CRIT; break; case nct6776: data->in_num = 9; - data->have_in = 0x1ff; data->pwm_num = 3; data->auto_pwm_num = 4; data->has_fan_div = false; @@ -3180,8 +3242,6 @@ static int __devinit nct6775_probe(struct platform_device *pdev) data->REG_PWM_READ = NCT6775_REG_PWM_READ; data->REG_PWM_MODE = NCT6776_REG_PWM_MODE; data->PWM_MODE_MASK = NCT6776_PWM_MODE_MASK; - data->REG_TEMP_ALTERNATE = NCT6776_REG_TEMP_ALTERNATE; - data->REG_TEMP_MON = NCT6775_REG_TEMP_MON; data->REG_AUTO_TEMP = NCT6775_REG_AUTO_TEMP; data->REG_AUTO_PWM = NCT6775_REG_AUTO_PWM; data->REG_CRITICAL_TEMP = NCT6775_REG_CRITICAL_TEMP; @@ -3191,20 +3251,23 @@ static int __devinit nct6775_probe(struct platform_device *pdev) data->REG_TEMP_SOURCE = NCT6775_REG_TEMP_SOURCE; data->REG_TEMP_SEL[0] = NCT6775_REG_TEMP_SEL; data->REG_TEMP_SEL[1] = NCT6775_REG_WEIGHT_TEMP_SEL; + data->REG_TEMP_SEL[2] = NCT6775_REG_FAN_STEP_ENABLE; data->REG_WEIGHT_TEMP[0] = NCT6775_REG_WEIGHT_TEMP_STEP; data->REG_WEIGHT_TEMP[1] = NCT6775_REG_WEIGHT_TEMP_STEP_TOL; data->REG_WEIGHT_TEMP[2] = NCT6775_REG_WEIGHT_TEMP_BASE; data->REG_ALARM = NCT6775_REG_ALARM; reg_temp = NCT6775_REG_TEMP; + num_reg_temp = ARRAY_SIZE(NCT6775_REG_TEMP); reg_temp_over = NCT6775_REG_TEMP_OVER; reg_temp_hyst = NCT6775_REG_TEMP_HYST; reg_temp_config = NCT6776_REG_TEMP_CONFIG; + reg_temp_alternate = NCT6776_REG_TEMP_ALTERNATE; + reg_temp_crit = NCT6776_REG_TEMP_CRIT; break; case nct6779: data->in_num = 15; - data->have_in = 0x7fff; data->pwm_num = 5; data->auto_pwm_num = 4; data->has_fan_div = false; @@ -3239,8 +3302,6 @@ static int __devinit nct6775_probe(struct platform_device *pdev) data->REG_PWM_READ = NCT6775_REG_PWM_READ; data->REG_PWM_MODE = NCT6776_REG_PWM_MODE; data->PWM_MODE_MASK = NCT6776_PWM_MODE_MASK; - data->REG_TEMP_ALTERNATE = NCT6779_REG_TEMP_ALTERNATE; - data->REG_TEMP_MON = NCT6775_REG_TEMP_MON; data->REG_AUTO_TEMP = NCT6775_REG_AUTO_TEMP; data->REG_AUTO_PWM = NCT6775_REG_AUTO_PWM; data->REG_CRITICAL_TEMP = NCT6775_REG_CRITICAL_TEMP; @@ -3250,22 +3311,25 @@ static int __devinit nct6775_probe(struct platform_device *pdev) data->REG_TEMP_SOURCE = NCT6775_REG_TEMP_SOURCE; data->REG_TEMP_SEL[0] = NCT6775_REG_TEMP_SEL; data->REG_TEMP_SEL[1] = NCT6775_REG_WEIGHT_TEMP_SEL; + data->REG_TEMP_SEL[2] = NCT6775_REG_FAN_STEP_ENABLE; data->REG_WEIGHT_TEMP[0] = NCT6775_REG_WEIGHT_TEMP_STEP; data->REG_WEIGHT_TEMP[1] = NCT6775_REG_WEIGHT_TEMP_STEP_TOL; data->REG_WEIGHT_TEMP[2] = NCT6775_REG_WEIGHT_TEMP_BASE; data->REG_ALARM = NCT6779_REG_ALARM; reg_temp = NCT6779_REG_TEMP; - reg_temp_over = NCT6775_REG_TEMP_OVER; - reg_temp_hyst = NCT6775_REG_TEMP_HYST; - reg_temp_config = NCT6776_REG_TEMP_CONFIG; + num_reg_temp = ARRAY_SIZE(NCT6779_REG_TEMP); + reg_temp_over = NCT6779_REG_TEMP_OVER; + reg_temp_hyst = NCT6779_REG_TEMP_HYST; + reg_temp_config = NCT6779_REG_TEMP_CONFIG; + reg_temp_alternate = NCT6779_REG_TEMP_ALTERNATE; + reg_temp_crit = NCT6779_REG_TEMP_CRIT; break; default: - err = -ENODEV; - goto exit_release; + return -ENODEV; } - + data->have_in = (1 << data->in_num) - 1; data->have_temp = 0; /* @@ -3278,7 +3342,7 @@ static int __devinit nct6775_probe(struct platform_device *pdev) */ mask = 0; available = 0; - for (i = 0; i < NUM_REG_TEMP; i++) { + for (i = 0; i < num_reg_temp; i++) { if (reg_temp[i] == 0) continue; @@ -3308,6 +3372,13 @@ static int __devinit nct6775_probe(struct platform_device *pdev) src &= 0x1f; if (!src || (mask & (1 << src))) continue; + if (src >= data->temp_label_num || + !strlen(data->temp_label[src])) { + dev_info(dev, + "Select source %d:%d reg 0x%x invalid (%d)\n", + i, j, data->REG_TEMP_SEL[i][j], src); + continue; + } index = __ffs(available); nct6775_write_value(data, @@ -3320,7 +3391,7 @@ static int __devinit nct6775_probe(struct platform_device *pdev) mask = 0; s = NUM_TEMP_FIXED; /* First dynamic temperature attribute */ - for (i = 0; i < NUM_REG_TEMP; i++) { + for (i = 0; i < num_reg_temp; i++) { if (reg_temp[i] == 0) continue; @@ -3328,6 +3399,14 @@ static int __devinit nct6775_probe(struct platform_device *pdev) if (!src || (mask & (1 << src))) continue; + if (src >= data->temp_label_num || + !strlen(data->temp_label[src])) { + dev_info(dev, + "Invalid temperature source %d at index %d, source register 0x%x, temp register 0x%x\n", + src, i, data->REG_TEMP_SOURCE[i], reg_temp[i]); + continue; + } + mask |= 1 << src; /* Use fixed index for SYSTIN(1), CPUTIN(2), AUXTIN(3) */ @@ -3351,6 +3430,8 @@ static int __devinit nct6775_probe(struct platform_device *pdev) data->reg_temp[1][s] = reg_temp_over[i]; data->reg_temp[2][s] = reg_temp_hyst[i]; data->reg_temp_config[s] = reg_temp_config[i]; + if (reg_temp_crit[src - 1]) + data->reg_temp[3][s] = reg_temp_crit[src - 1]; data->temp_src[s] = src; s++; @@ -3358,34 +3439,35 @@ static int __devinit nct6775_probe(struct platform_device *pdev) #ifdef TESTING /* - * We may have alternate registers for some sensors. - * Go through the list and enable if possible. + * Go through the list of alternate temp registers and enable + * if possible. * The temperature is already monitored if the respective bit in * is set. */ - if (data->REG_TEMP_ALTERNATE) { - for (i = 0; i < data->temp_label_num; i++) { - if (!data->REG_TEMP_ALTERNATE[i]) - continue; - if (mask & (1 << (i + 1))) - continue; - if (i < data->temp_fixed_num) { - if (data->have_temp & (1 << i)) - continue; - data->have_temp |= 1 << i; - data->reg_temp[0][i] = data->REG_TEMP_ALTERNATE[i]; - data->temp_src[i] = i + 1; + for (i = 0; i < data->temp_label_num - 1; i++) { + if (!reg_temp_alternate[i]) + continue; + if (mask & (1 << (i + 1))) + continue; + if (i < data->temp_fixed_num) { + if (data->have_temp & (1 << i)) continue; - } + data->have_temp |= 1 << i; + data->have_temp_fixed |= 1 << i; + data->reg_temp[0][i] = reg_temp_alternate[i]; + data->reg_temp[1][i] = reg_temp_over[i]; + data->reg_temp[2][i] = reg_temp_hyst[i]; + data->temp_src[i] = i + 1; + continue; + } - if (s >= NUM_TEMP) /* Abort if no more space */ - break; + if (s >= NUM_TEMP) /* Abort if no more space */ + break; - data->have_temp |= 1 << s; - data->reg_temp[0][s] = data->REG_TEMP_ALTERNATE[i]; - data->temp_src[s] = i + 1; - s++; - } + data->have_temp |= 1 << s; + data->reg_temp[0][s] = reg_temp_alternate[i]; + data->temp_src[s] = i + 1; + s++; } #endif /* TESTING */ @@ -3418,21 +3500,11 @@ static int __devinit nct6775_probe(struct platform_device *pdev) * VIN5 / AUXTIN1 * VIN6 / AUXTIN2 * VIN7 / AUXTIN3 - * Assume voltage is disabled if the respective temperature is - * used as temperature source. + * + * There does not seem to be a clean way to detect if VINx or + * AUXTINx is active, so for keep both sensor types enabled + * for now. */ - for (i = 0; i < ARRAY_SIZE(NCT6779_REG_TEMP); i++) { - if (!(data->have_temp & (1 << i))) - continue; - if (i == 2) /* AUXTIN0 */ - data->have_in &= ~(1 << 6); /* no VIN4 */ - if (i == 3) /* AUXTIN1 */ - data->have_in &= ~(1 << 10); /* no VIN5 */ - if (i == 4) /* AUXTIN2 */ - data->have_in &= ~(1 << 11); /* no VIN6 */ - if (i == 5) /* AUXTIN3 */ - data->have_in &= ~(1 << 14); /* no VIN7 */ - } break; } @@ -3440,16 +3512,16 @@ static int __devinit nct6775_probe(struct platform_device *pdev) nct6775_init_device(data); data->vrm = vid_which_vrm(); - superio_enter(sio_data->sioreg); + err = superio_enter(sio_data->sioreg); + if (err) + return err; + /* * Read VID value * We can get the VID input values directly at logical device D 0xe3. */ superio_select(sio_data->sioreg, NCT6775_LD_VID); data->vid = superio_inb(sio_data->sioreg, 0xe3); - err = device_create_file(dev, &dev_attr_cpu0_vid); - if (err) - goto exit_release; if (fan_debounce) { u8 tmp; @@ -3468,12 +3540,19 @@ static int __devinit nct6775_probe(struct platform_device *pdev) } superio_outb(sio_data->sioreg, NCT6775_REG_CR_FAN_DEBOUNCE, tmp); - pr_info("Enabled fan debounce for chip %s\n", data->name); + dev_info(&pdev->dev, "Enabled fan debounce for chip %s\n", + data->name); } superio_exit(sio_data->sioreg); - nct6775_check_fan_inputs(sio_data, data); + err = device_create_file(dev, &dev_attr_cpu0_vid); + if (err) + return err; + + err = nct6775_check_fan_inputs(sio_data, data); + if (err) + goto exit_remove; /* Read fan clock dividers immediately */ nct6775_update_fan_div_common(dev, data); @@ -3577,13 +3656,18 @@ static int __devinit nct6775_probe(struct platform_device *pdev) if (err) goto exit_remove; } + if (data->reg_temp[3][i]) { + err = device_create_file(dev, + &sda_temp_crit[i].dev_attr); + if (err) + goto exit_remove; + } if (!(data->have_temp_fixed & (1 << i))) continue; err = device_create_file(dev, &sda_temp_type[i].dev_attr); if (err) goto exit_remove; - err = device_create_file(dev, - &sda_temp_offset[i].dev_attr); + err = device_create_file(dev, &sda_temp_offset[i].dev_attr); if (err) goto exit_remove; if (i >= NUM_TEMP_ALARM || @@ -3616,9 +3700,6 @@ static int __devinit nct6775_probe(struct platform_device *pdev) exit_remove: nct6775_device_remove_files(dev); -exit_release: - release_region(res->start, IOREGION_LENGTH); -exit: return err; } @@ -3628,7 +3709,6 @@ static int __devexit nct6775_remove(struct platform_device *pdev) hwmon_device_unregister(data->hwmon_dev); nct6775_device_remove_files(&pdev->dev); - release_region(data->addr, IOREGION_LENGTH); return 0; } @@ -3646,14 +3726,17 @@ static struct platform_driver nct6775_driver = { static int __init nct6775_find(int sioaddr, unsigned short *addr, struct nct6775_sio_data *sio_data) { - static const char __initdata sio_name_NCT6775[] = "NCT6775F"; - static const char __initdata sio_name_NCT6776[] = "NCT6776F"; - static const char __initdata sio_name_NCT6779[] = "NCT6779D"; + static const char sio_name_NCT6775[] __initconst = "NCT6775F"; + static const char sio_name_NCT6776[] __initconst = "NCT6776F"; + static const char sio_name_NCT6779[] __initconst = "NCT6779D"; u16 val; const char *sio_name; + int err; - superio_enter(sioaddr); + err = superio_enter(sioaddr); + if (err) + return err; if (force_id) val = force_id; @@ -3694,8 +3777,7 @@ static int __init nct6775_find(int sioaddr, unsigned short *addr, /* Activate logical device if needed */ val = superio_inb(sioaddr, SIO_REG_ENABLE); if (!(val & 0x01)) { - pr_warn("Forcibly enabling Super-I/O. " - "Sensor is probably unusable.\n"); + pr_warn("Forcibly enabling Super-I/O. Sensor is probably unusable.\n"); superio_outb(sioaddr, SIO_REG_ENABLE, val | 0x01); }