hwmon: (nct6775) Use NUM_FAN consistently
Subsystems (2)
Guenter Roeck
maintainerPATCH 1/4 hwmon: (nct6775) Use NUM_FAN consistently
The size of some of the arrays using the number of fans is hardcoded. Use NUM_FAN consistently throughout the driver.
--- drivers/hwmon/nct6775.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/hwmon/nct6775.c +6 -6
@@ -570,12 +570,12 @@ static const u16 NCT6779_REG_TEMP_CRIT[32] = {#define NCT6791_REG_HM_IO_SPACE_LOCK_ENABLE 0x28 -static const u16 NCT6791_REG_WEIGHT_TEMP_SEL [6 ] = {0 ,0x239 }; -static const u16 NCT6791_REG_WEIGHT_TEMP_STEP [6 ] = {0 ,0x23a }; -static const u16 NCT6791_REG_WEIGHT_TEMP_STEP_TOL [6 ] = {0 ,0x23b }; -static const u16 NCT6791_REG_WEIGHT_DUTY_STEP [6 ] = {0 ,0x23c }; -static const u16 NCT6791_REG_WEIGHT_TEMP_BASE [6 ] = {0 ,0x23d }; -static const u16 NCT6791_REG_WEIGHT_DUTY_BASE [6 ] = {0 ,0x23e }; +static const u16 NCT6791_REG_WEIGHT_TEMP_SEL [NUM_FAN ] = {0 ,0x239 }; +static const u16 NCT6791_REG_WEIGHT_TEMP_STEP [NUM_FAN ] = {0 ,0x23a }; +static const u16 NCT6791_REG_WEIGHT_TEMP_STEP_TOL [NUM_FAN ] = {0 ,0x23b }; +static const u16 NCT6791_REG_WEIGHT_DUTY_STEP [NUM_FAN ] = {0 ,0x23c }; +static const u16 NCT6791_REG_WEIGHT_TEMP_BASE [NUM_FAN ] = {0 ,0x23d }; +static const u16 NCT6791_REG_WEIGHT_DUTY_BASE [NUM_FAN ] = {0 ,0x23e };static const u16 NCT6791_REG_ALARM [NUM_REG_ALARM ] = {0x459 ,0x45A ,0x45B ,0x568 ,0x45D };
Signature · 1 line
2.7.4
Guenter Roeck
maintainerPATCH 2/4 hwmon: (nct6775) Improve fan6/pwm6 support
Improve fan6/pwm6 detection on NCT6795D. Add support for fan pulses for fans 4..6 and fan min limits for fan6.
--- drivers/hwmon/nct6775.c | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-)
drivers/hwmon/nct6775.c +30 -7
@@ -419,8 +419,10 @@ static const u16 NCT6776_REG_TOLERANCE_H[] = {static const u8 NCT6776_REG_PWM_MODE [] = {0x04 ,0 ,0 ,0 ,0 ,0 };static const u8 NCT6776_PWM_MODE_MASK [] = {0x01 ,0 ,0 ,0 ,0 ,0 }; -static const u16 NCT6776_REG_FAN_MIN [] = {0x63a ,0x63c ,0x63e ,0x640 ,0x642 }; -static const u16 NCT6776_REG_FAN_PULSES [] = {0x644 ,0x645 ,0x646 ,0 ,0 }; +static const u16 NCT6776_REG_FAN_MIN [] = { +0x63a ,0x63c ,0x63e ,0x640 ,0x642 ,0x64a }; +static const u16 NCT6776_REG_FAN_PULSES [] = { +0x644 ,0x645 ,0x646 ,0x647 ,0x648 ,0x649 };static const u16 NCT6776_REG_WEIGHT_DUTY_BASE [] = {0x13e ,0x23e ,0x33e ,0x83e ,0x93e ,0xa3e };
@@ -1235,7 +1237,7 @@ static bool is_word_sized(struct nct6775_data *data, u16 reg) ((reg &0xfff0 ) ==0x4b0 && (reg &0x000f ) <0x0b ) || reg ==0x402 || reg ==0x63a || reg ==0x63c || reg ==0x63e || - reg ==0x640 || reg ==0x642 || + reg ==0x640 || reg ==0x642 || reg ==0x64a || reg ==0x73 || reg ==0x75 || reg ==0x77 || reg ==0x79 || reg ==0x7b || reg ==0x7d ; }
@@ -3439,7 +3441,8 @@ nct6775_check_fan_inputs(struct nct6775_data *data) pwm5pin = false; pwm6pin = false; }else {/* NCT6779D, NCT6791D, NCT6792D, NCT6793D, or NCT6795D */ -int regval_1b, regval_2a, regval_eb; +int regval_1b, regval_2a, regval_2f, regval_eb; +bool dsw_en; regval =superio_inb (sioreg,0x1c );
@@ -3462,14 +3465,22 @@ nct6775_check_fan_inputs(struct nct6775_data *data)case nct6795: regval_1b =superio_inb (sioreg,0x1b ); regval_2a =superio_inb (sioreg,0x2a ); + regval_2f =superio_inb (sioreg,0x2f ); + dsw_en = regval_2f &BIT (3 );if (!pwm5pin) pwm5pin = regval &BIT (7 ); - fan6pin = regval &BIT (1 ); - pwm6pin = regval &BIT (0 ); +if (!fan5pin) fan5pin = regval_1b &BIT (5 ); + fan6pin = false; + pwm6pin = false; +if (!dsw_en) { + fan6pin = regval &BIT (1 ); + pwm6pin = regval &BIT (0 ); + } +superio_select (sioreg,NCT6775_LD_12 ); regval_eb =superio_inb (sioreg,0xeb );if (!fan5pin)
@@ -3481,6 +3492,18 @@ nct6775_check_fan_inputs(struct nct6775_data *data) fan6pin = regval_eb &BIT (3 );if (!pwm6pin) pwm6pin = regval_eb &BIT (2 ); + +if (data->kind == nct6795) { +int regval_ed =superio_inb (sioreg,0xed ); + +if (!fan6pin) + fan6pin = (regval_2a &BIT (4 )) && + (!dsw_en || + (dsw_en && (regval_ed &BIT (4 )))); +if (!pwm6pin) + pwm6pin = (regval_2a &BIT (3 )) && + (regval_ed &BIT (2 )); + }break ;default :/* NCT6779D */ fan6pin = false;
@@ -3495,7 +3518,7 @@ nct6775_check_fan_inputs(struct nct6775_data *data) data->has_fan =0x03 | (fan3pin <<2 ) | (fan4pin <<3 ) | (fan5pin <<4 ) | (fan6pin <<5 ); data->has_fan_min =0x03 | (fan3pin <<2 ) | (fan4min <<3 ) | - (fan5pin <<4 ); + (fan5pin <<4 ) | (fan6pin <<5 ); data->has_pwm =0x03 | (pwm3pin <<2 ) | (pwm4pin <<3 ) | (pwm5pin <<4 ) | (pwm6pin <<5 ); }
Signature · 1 line
2.7.4
Guenter Roeck
maintainerPATCH 3/4 hwmon: (nct6775) Initialize boolean variables with declaration
In reply to Guenter RoeckInitialize boolean flags in nct6775_check_fan_inputs() while declaring them instead of several times throughout the code.
--- drivers/hwmon/nct6775.c | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-)
drivers/hwmon/nct6775.c +4 -24
@@ -3360,8 +3360,10 @@ static inline void nct6775_init_device(struct nct6775_data *data)static void nct6775_check_fan_inputs (struct nct6775_data *data) { -bool fan3pin, fan4pin, fan4min, fan5pin, fan6pin; -bool pwm3pin, pwm4pin, pwm5pin, pwm6pin; +bool fan3pin = false, fan4pin = false, fan4min = false; +bool fan5pin = false, fan6pin = false; +bool pwm3pin = false, pwm4pin = false, pwm5pin = false; +bool pwm6pin = false;int sioreg = data->sioreg;int regval;
@@ -3378,12 +3380,6 @@ nct6775_check_fan_inputs(struct nct6775_data *data)/* On NCT6775, fan4 shares pins with the fdc interface */ fan4pin = !(superio_inb (sioreg,0x2A ) &0x80 ); - fan4min = false; - fan5pin = false; - fan6pin = false; - pwm4pin = false; - pwm5pin = false; - pwm6pin = false; }else if (data->kind == nct6776) {bool gpok =superio_inb (sioreg,0x27 ) &0x80 ;const char *board_vendor, *board_name;
@@ -3423,23 +3419,11 @@ nct6775_check_fan_inputs(struct nct6775_data *data) fan5pin =superio_inb (sioreg,0x1C ) &0x02 ; fan4min = fan4pin; - fan6pin = false; pwm3pin = fan3pin; - pwm4pin = false; - pwm5pin = false; - pwm6pin = false; }else if (data->kind == nct6106) { regval =superio_inb (sioreg,0x24 ); fan3pin = !(regval &0x80 ); pwm3pin = regval &0x08 ; - - fan4pin = false; - fan4min = false; - fan5pin = false; - fan6pin = false; - pwm4pin = false; - pwm5pin = false; - pwm6pin = false; }else {/* NCT6779D, NCT6791D, NCT6792D, NCT6793D, or NCT6795D */ int regval_1b, regval_2a, regval_2f, regval_eb;bool dsw_en;
@@ -3474,8 +3458,6 @@ nct6775_check_fan_inputs(struct nct6775_data *data)if (!fan5pin) fan5pin = regval_1b &BIT (5 ); - fan6pin = false; - pwm6pin = false;if (!dsw_en) { fan6pin = regval &BIT (1 ); pwm6pin = regval &BIT (0 );
@@ -3506,8 +3488,6 @@ nct6775_check_fan_inputs(struct nct6775_data *data) }break ;default :/* NCT6779D */ - fan6pin = false; - pwm6pin = false;break ; }
Signature · 1 line
2.7.4
Guenter Roeck
maintainerPATCH 4/4 hwmon: (nct6775) Add support for NCT6796D
In reply to Guenter RoeckNCT6796D is mostly compatible to NCT6795D. It supports an additional pwm control and fan speed channel.
While we are at it, update documentation for NCT6795D.
--- Documentation/hwmon/nct6775 | 56 ++++++++------- drivers/hwmon/Kconfig | 5 +- drivers/hwmon/nct6775.c | 172 +++++++++++++++++++++++++++++++------------- 3 files changed, 157 insertions(+), 76 deletions(-)
Documentation/hwmon/nct6775 +32 -24
@@ -36,6 +36,14 @@ Supported chips: Prefix: 'nct6793' Addresses scanned: ISA address retrieved from Super I/O registers Datasheet: Available from Nuvoton upon request + * Nuvoton NCT6795D + Prefix: 'nct6795' + Addresses scanned: ISA address retrieved from Super I/O registers + Datasheet: Available from Nuvoton upon request + * Nuvoton NCT6796D + Prefix: 'nct6796' + Addresses scanned: ISA address retrieved from Super I/O registers + Datasheet: Available from Nuvoton upon request Authors: Guenter Roeck <[email protected]>
@@ -88,10 +96,10 @@ The mode works for fan1-fan5. sysfs attributes ---------------- -pwm[1-5] - this file stores PWM duty cycle or DC value (fan speed) in range: +pwm[1-7] - this file stores PWM duty cycle or DC value (fan speed) in range: 0 (lowest speed) to 255 (full) -pwm[1-5]_enable - this file controls mode of fan/temperature control: +pwm[1-7]_enable - this file controls mode of fan/temperature control: * 0 Fan control disabled (fans set to maximum speed) * 1 Manual mode, write to pwm[0-5] any value 0-255 * 2 "Thermal Cruise" mode
@@ -99,16 +107,16 @@ pwm[1-5]_enable - this file controls mode of fan/temperature control: * 4 "Smart Fan III" mode (NCT6775F only) * 5 "Smart Fan IV" mode -pwm[1-5]_mode - controls if output is PWM or DC level +pwm[1-7]_mode - controls if output is PWM or DC level * 0 DC output * 1 PWM output Common fan control attributes ----------------------------- -pwm[1-5]_temp_sel Temperature source. Value is temperature sensor index. +pwm[1-7]_temp_sel Temperature source. Value is temperature sensor index. For example, select '1' for temp1_input. -pwm[1-5]_weight_temp_sel +pwm[1-7]_weight_temp_sel Secondary temperature source. Value is temperature sensor index. For example, select '1' for temp1_input. Set to 0 to disable secondary temperature control.
@@ -116,16 +124,16 @@ pwm[1-5]_weight_temp_sel If secondary temperature functionality is enabled, it is controlled with the following attributes. -pwm[1-5]_weight_duty_step +pwm[1-7]_weight_duty_step Duty step size. -pwm[1-5]_weight_temp_step +pwm[1-7]_weight_temp_step Temperature step size. With each step over temp_step_base, the value of weight_duty_step is added to the current pwm value. -pwm[1-5]_weight_temp_step_base +pwm[1-7]_weight_temp_step_base Temperature at which secondary temperature control kicks in. -pwm[1-5]_weight_temp_step_tol +pwm[1-7]_weight_temp_step_tol Temperature step tolerance. Thermal Cruise mode (2)
@@ -133,9 +141,9 @@ Thermal Cruise mode (2) If the temperature is in the range defined by: -pwm[1-5]_target_temp Target temperature, unit millidegree Celsius +pwm[1-7]_target_temp Target temperature, unit millidegree Celsius (range 0 - 127000) -pwm[1-5]_temp_tolerance +pwm[1-7]_temp_tolerance Target temperature tolerance, unit millidegree Celsius there are no changes to fan speed. Once the temperature leaves the interval, fan
@@ -143,14 +151,14 @@ speed increases (if temperature is higher that desired) or decreases (if temperature is lower than desired), using the following limits and time intervals. -pwm[1-5]_start fan pwm start value (range 1 - 255), to start fan +pwm[1-7]_start fan pwm start value (range 1 - 255), to start fan when the temperature is above defined range. -pwm[1-5]_floor lowest fan pwm (range 0 - 255) if temperature is below +pwm[1-7]_floor lowest fan pwm (range 0 - 255) if temperature is below the defined range. If set to 0, the fan is expected to stop if the temperature is below the defined range. -pwm[1-5]_step_up_time milliseconds before fan speed is increased -pwm[1-5]_step_down_time milliseconds before fan speed is decreased -pwm[1-5]_stop_time how many milliseconds must elapse to switch +pwm[1-7]_step_up_time milliseconds before fan speed is increased +pwm[1-7]_step_down_time milliseconds before fan speed is decreased +pwm[1-7]_stop_time how many milliseconds must elapse to switch corresponding fan off (when the temperature was below defined range).
@@ -159,8 +167,8 @@ Speed Cruise mode (3) This modes tries to keep the fan speed constant. -fan[1-5]_target Target fan speed -fan[1-5]_tolerance +fan[1-7]_target Target fan speed +fan[1-7]_tolerance Target speed tolerance
@@ -177,19 +185,19 @@ points should be set to higher temperatures and higher pwm values to achieve higher fan speeds with increasing temperature. The last data point reflects critical temperature mode, in which the fans should run at full speed. -pwm[1-5]_auto_point[1-7]_pwm +pwm[1-7]_auto_point[1-7]_pwm pwm value to be set if temperature reaches matching temperature range. -pwm[1-5]_auto_point[1-7]_temp +pwm[1-7]_auto_point[1-7]_temp Temperature over which the matching pwm is enabled. -pwm[1-5]_temp_tolerance +pwm[1-7]_temp_tolerance Temperature tolerance, unit millidegree Celsius -pwm[1-5]_crit_temp_tolerance +pwm[1-7]_crit_temp_tolerance Temperature tolerance for critical temperature, unit millidegree Celsius -pwm[1-5]_step_up_time milliseconds before fan speed is increased -pwm[1-5]_step_down_time milliseconds before fan speed is decreased +pwm[1-7]_step_up_time milliseconds before fan speed is increased +pwm[1-7]_step_down_time milliseconds before fan speed is decreased Usage Notes -----------
drivers/hwmon/Kconfig +3 -2
@@ -1219,8 +1219,9 @@ config SENSORS_NCT6775 help If you say yes here you get support for the hardware monitoring functionality of the Nuvoton NCT6106D, NCT6775F, NCT6776F, NCT6779D, - NCT6791D, NCT6792D, NCT6793D, and compatible Super-I/O chips. This - driver replaces the w83627ehf driver for NCT6775F and NCT6776F. + NCT6791D, NCT6792D, NCT6793D, NCT6795D, NCT6796D, and compatible + Super-I/O chips. This driver replaces the w83627ehf driver for + NCT6775F and NCT6776F. This driver can also be built as a module. If so, the module will be called nct6775.
drivers/hwmon/nct6775.c +122 -50
387 lines not on this page · raw message
Signature · 1 line
2.7.4