X-Git-Url: https://git.sur5r.net/?p=groeck-it87;a=blobdiff_plain;f=it87.c;h=79bf6b14c0696772762cdbd4005c9fa4d7757501;hp=21e5724409cacdd3986e7df3249bfa0cf247b7ce;hb=HEAD;hpb=c242e32088bcc1b49695421e591e0b27aebffe5d diff --git a/it87.c b/it87.c index 21e5724..79bf6b1 100644 --- a/it87.c +++ b/it87.c @@ -11,10 +11,13 @@ * similar parts. The other devices are supported by different drivers. * * Supports: IT8603E Super I/O chip w/LPC interface + * IT8606E Super I/O chip w/LPC interface * IT8607E Super I/O chip w/LPC interface + * IT8613E Super I/O chip w/LPC interface * IT8620E Super I/O chip w/LPC interface * IT8622E Super I/O chip w/LPC interface * IT8623E Super I/O chip w/LPC interface + * IT8625E Super I/O chip w/LPC interface * IT8628E Super I/O chip w/LPC interface * IT8655E Super I/O chip w/LPC interface * IT8665E Super I/O chip w/LPC interface @@ -28,6 +31,8 @@ * IT8726F Super I/O chip w/LPC interface * IT8728F Super I/O chip w/LPC interface * IT8732F Super I/O chip w/LPC interface + * IT8736F Super I/O chip w/LPC interface + * IT8738E Super I/O chip w/LPC interface * IT8758E Super I/O chip w/LPC interface * IT8771E Super I/O chip w/LPC interface * IT8772E Super I/O chip w/LPC interface @@ -73,26 +78,31 @@ #include #include "compat.h" -#define DRVNAME "it87" +#ifndef IT87_DRIVER_VERSION +#define IT87_DRIVER_VERSION "" +#endif -/* Necessary API not (yet) exported in upstream kernel */ -/* #define __IT87_USE_ACPI_MUTEX */ +#define DRVNAME "it87" enum chips { it87, it8712, it8716, it8718, it8720, it8721, it8728, it8732, + it8736, it8738, it8771, it8772, it8781, it8782, it8783, it8786, it8790, - it8792, it8603, it8607, it8620, it8622, it8628, it8655, it8665, - it8686 }; + it8792, it8603, it8606, it8607, it8613, it8620, it8622, it8625, + it8628, it8655, it8665, it8686 }; static unsigned short force_id; -module_param(force_id, ushort, 0); +module_param(force_id, ushort, 0000); MODULE_PARM_DESC(force_id, "Override the detected device ID"); +static bool ignore_resource_conflict; +module_param(ignore_resource_conflict, bool, 0000); +MODULE_PARM_DESC(ignore_resource_conflict, "Ignore ACPI resource conflict"); + +static bool mmio; +module_param(mmio, bool, 0000); +MODULE_PARM_DESC(mmio, "Use MMIO if available"); + static struct platform_device *it87_pdev[2]; -static bool it87_sio4e_broken; -#ifdef __IT87_USE_ACPI_MUTEX -static acpi_handle it87_acpi_sio_handle; -static char *it87_acpi_sio_mutex; -#endif #define REG_2E 0x2e /* The register to read/write */ #define REG_4E 0x4e /* Secondary register to read/write */ @@ -120,12 +130,6 @@ static inline int superio_inb(int ioreg, int reg) outb(reg, ioreg); val = inb(ioreg + 1); - if (it87_sio4e_broken && ioreg == 0x4e && val == 0xff) { - __superio_enter(ioreg); - outb(reg, ioreg); - val = inb(ioreg + 1); - pr_warn("Retry access 0x4e:0x%x -> 0x%x\n", reg, val); - } return val; } @@ -149,45 +153,23 @@ static inline void superio_select(int ioreg, int ldn) static inline int superio_enter(int ioreg) { -#ifdef __IT87_USE_ACPI_MUTEX - if (it87_acpi_sio_mutex) { - acpi_status status; - - status = acpi_acquire_mutex(NULL, it87_acpi_sio_mutex, 0x10); - if (ACPI_FAILURE(status)) { - pr_err("Failed to acquire ACPI mutex\n"); - return -EBUSY; - } - } -#endif /* * Try to reserve ioreg and ioreg + 1 for exclusive access. */ if (!request_muxed_region(ioreg, 2, DRVNAME)) - goto error; + return -EBUSY; __superio_enter(ioreg); return 0; - -error: -#ifdef __IT87_USE_ACPI_MUTEX - if (it87_acpi_sio_mutex) - acpi_release_mutex(it87_acpi_sio_handle, NULL); -#endif - return -EBUSY; } -static inline void superio_exit(int ioreg) +static inline void superio_exit(int ioreg, bool doexit) { - if (!it87_sio4e_broken || ioreg != 0x4e) { + if (doexit) { outb(0x02, ioreg); outb(0x02, ioreg + 1); } release_region(ioreg, 2); -#ifdef __IT87_USE_ACPI_MUTEX - if (it87_acpi_sio_mutex) - acpi_release_mutex(it87_acpi_sio_handle, NULL); -#endif } /* Logical device 4 registers */ @@ -200,6 +182,8 @@ static inline void superio_exit(int ioreg) #define IT8726F_DEVID 0x8726 #define IT8728F_DEVID 0x8728 #define IT8732F_DEVID 0x8732 +#define IT8736F_DEVID 0x8736 +#define IT8738E_DEVID 0x8738 #define IT8792E_DEVID 0x8733 #define IT8771E_DEVID 0x8771 #define IT8772E_DEVID 0x8772 @@ -209,18 +193,25 @@ static inline void superio_exit(int ioreg) #define IT8786E_DEVID 0x8786 #define IT8790E_DEVID 0x8790 #define IT8603E_DEVID 0x8603 +#define IT8606E_DEVID 0x8606 #define IT8607E_DEVID 0x8607 +#define IT8613E_DEVID 0x8613 #define IT8620E_DEVID 0x8620 #define IT8622E_DEVID 0x8622 #define IT8623E_DEVID 0x8623 +#define IT8625E_DEVID 0x8625 #define IT8628E_DEVID 0x8628 #define IT8655E_DEVID 0x8655 #define IT8665E_DEVID 0x8665 #define IT8686E_DEVID 0x8686 -#define IT87_ACT_REG 0x30 -#define IT87_BASE_REG 0x60 -/* Logical device 7 registers (IT8712F and later) */ +/* Logical device 4 (Environmental Monitor) registers */ +#define IT87_ACT_REG 0x30 +#define IT87_BASE_REG 0x60 +#define IT87_SPECIAL_CFG_REG 0xf3 /* special configuration register */ + +/* Global configuration registers (IT8712F and later) */ +#define IT87_EC_HWM_MIO_REG 0x24 /* MMIO configuration register */ #define IT87_SIO_GPIO1_REG 0x25 #define IT87_SIO_GPIO2_REG 0x26 #define IT87_SIO_GPIO3_REG 0x27 @@ -230,6 +221,8 @@ static inline void superio_exit(int ioreg) #define IT87_SIO_PINX1_REG 0x2a /* Pin selection */ #define IT87_SIO_PINX2_REG 0x2c /* Pin selection */ #define IT87_SIO_PINX4_REG 0x2d /* Pin selection */ + +/* Logical device 7 (GPIO) registers (IT8712F and later) */ #define IT87_SIO_SPI_REG 0xef /* SPI function pin select */ #define IT87_SIO_VID_REG 0xfc /* VID value */ #define IT87_SIO_BEEP_PIN_REG 0xf6 /* Beep pin mapping */ @@ -257,11 +250,11 @@ static bool fix_pwm_polarity; /*----- The IT87 registers -----*/ -#define IT87_REG_CONFIG 0x00 +#define IT87_REG_CONFIG 0x00 -#define IT87_REG_ALARM1 0x01 -#define IT87_REG_ALARM2 0x02 -#define IT87_REG_ALARM3 0x03 +#define IT87_REG_ALARM1 0x01 +#define IT87_REG_ALARM2 0x02 +#define IT87_REG_ALARM3 0x03 #define IT87_REG_BANK 0x06 @@ -269,14 +262,18 @@ static bool fix_pwm_polarity; * The IT8718F and IT8720F have the VID value in a different register, in * Super-I/O configuration space. */ -#define IT87_REG_VID 0x0a +#define IT87_REG_VID 0x0a + +/* Interface Selection register on other chips */ +#define IT87_REG_IFSEL 0x0a + /* * The IT8705F and IT8712F earlier than revision 0x08 use register 0x0b * for fan divisors. Later IT8712F revisions must use 16-bit tachometer * mode. */ -#define IT87_REG_FAN_DIV 0x0b -#define IT87_REG_FAN_16BIT 0x0c +#define IT87_REG_FAN_DIV 0x0b +#define IT87_REG_FAN_16BIT 0x0c /* * Monitors: @@ -291,18 +288,19 @@ static const u8 IT87_REG_FANX[] = { 0x18, 0x19, 0x1a, 0x81, 0x83, 0x4d }; static const u8 IT87_REG_FANX_MIN[] = { 0x1b, 0x1c, 0x1d, 0x85, 0x87, 0x4f }; static const u8 IT87_REG_FAN_8665[] = { 0x0d, 0x0e, 0x0f, 0x80, 0x82, 0x93 }; -static const u8 IT87_REG_FAN_MIN_8665[] = - { 0x10, 0x11, 0x12, 0x84, 0x86, 0xb2 }; +static const u8 IT87_REG_FAN_MIN_8665[] = { + 0x10, 0x11, 0x12, 0x84, 0x86, 0xb2 }; static const u8 IT87_REG_FANX_8665[] = { 0x18, 0x19, 0x1a, 0x81, 0x83, 0x94 }; -static const u8 IT87_REG_FANX_MIN_8665[] = - { 0x1b, 0x1c, 0x1d, 0x85, 0x87, 0xb3 }; +static const u8 IT87_REG_FANX_MIN_8665[] = { + 0x1b, 0x1c, 0x1d, 0x85, 0x87, 0xb3 }; static const u8 IT87_REG_TEMP_OFFSET[] = { 0x56, 0x57, 0x59, 0x5a, 0x90, 0x91 }; -static const u8 IT87_REG_TEMP_OFFSET_8686[] = { 0x56, 0x57, 0x59, 0x90, 0x91, 0x92 }; +static const u8 IT87_REG_TEMP_OFFSET_8686[] = { + 0x56, 0x57, 0x59, 0x90, 0x91, 0x92 }; -#define IT87_REG_FAN_MAIN_CTRL 0x13 -#define IT87_REG_FAN_CTL 0x14 +#define IT87_REG_FAN_MAIN_CTRL 0x13 +#define IT87_REG_FAN_CTL 0x14 static const u8 IT87_REG_PWM[] = { 0x15, 0x16, 0x17, 0x7f, 0xa7, 0xaf }; static const u8 IT87_REG_PWM_8665[] = { 0x15, 0x16, 0x17, 0x1e, 0x1f, 0x92 }; @@ -312,25 +310,25 @@ static const u8 IT87_REG_PWM_DUTY[] = { 0x63, 0x6b, 0x73, 0x7b, 0xa3, 0xab }; static const u8 IT87_REG_VIN[] = { 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x2f, 0x2c, 0x2d, 0x2e }; -#define IT87_REG_TEMP(nr) (0x29 + (nr)) +#define IT87_REG_TEMP(nr) (0x29 + (nr)) -#define IT87_REG_VIN_MAX(nr) (0x30 + (nr) * 2) -#define IT87_REG_VIN_MIN(nr) (0x31 + (nr) * 2) +#define IT87_REG_VIN_MAX(nr) (0x30 + (nr) * 2) +#define IT87_REG_VIN_MIN(nr) (0x31 + (nr) * 2) static const u8 IT87_REG_TEMP_HIGH[] = { 0x40, 0x42, 0x44, 0x46, 0xb4, 0xb6 }; static const u8 IT87_REG_TEMP_LOW[] = { 0x41, 0x43, 0x45, 0x47, 0xb5, 0xb7 }; -static const u8 IT87_REG_TEMP_HIGH_8686[] = - { 0x40, 0x42, 0x44, 0xb4, 0xb6, 0xb8 }; -static const u8 IT87_REG_TEMP_LOW_8686[] = - { 0x41, 0x43, 0x45, 0xb5, 0xb7, 0xb9 }; +static const u8 IT87_REG_TEMP_HIGH_8686[] = { + 0x40, 0x42, 0x44, 0xb4, 0xb6, 0xb8 }; +static const u8 IT87_REG_TEMP_LOW_8686[] = { + 0x41, 0x43, 0x45, 0xb5, 0xb7, 0xb9 }; -#define IT87_REG_VIN_ENABLE 0x50 -#define IT87_REG_TEMP_ENABLE 0x51 -#define IT87_REG_TEMP_EXTRA 0x55 -#define IT87_REG_BEEP_ENABLE 0x5c +#define IT87_REG_VIN_ENABLE 0x50 +#define IT87_REG_TEMP_ENABLE 0x51 +#define IT87_REG_TEMP_EXTRA 0x55 +#define IT87_REG_BEEP_ENABLE 0x5c -#define IT87_REG_CHIPID 0x58 +#define IT87_REG_CHIPID 0x58 static const u8 IT87_REG_AUTO_BASE[] = { 0x60, 0x68, 0x70, 0x78, 0xa0, 0xa8 }; @@ -352,18 +350,21 @@ static const u16 IT87_REG_TEMP_SRC1[] = { 0x21d, 0x21e, 0x21f }; struct it87_devices { const char *name; - const char * const suffix; + const char * const model; u32 features; u8 num_temp_limit; + u8 num_temp_offset; + u8 num_temp_map; /* Number of temperature sources for pwm */ u8 peci_mask; u8 old_peci_mask; + u8 smbus_bitmap; /* SMBus enable bits in extra config register */ + u8 ec_special_config; }; #define FEAT_12MV_ADC BIT(0) #define FEAT_NEWER_AUTOPWM BIT(1) #define FEAT_OLD_AUTOPWM BIT(2) #define FEAT_16BIT_FANS BIT(3) -#define FEAT_TEMP_OFFSET BIT(4) #define FEAT_TEMP_PECI BIT(5) #define FEAT_TEMP_OLD_PECI BIT(6) #define FEAT_FAN16_CONFIG BIT(7) /* Need to enable 16-bit fans */ @@ -384,236 +385,354 @@ struct it87_devices { #define FEAT_SCALING BIT(22) /* Internal voltage scaling */ #define FEAT_FANCTL_ONOFF BIT(23) /* chip has FAN_CTL ON/OFF */ #define FEAT_11MV_ADC BIT(24) +#define FEAT_NEW_TEMPMAP BIT(25) /* new temp input selection */ +#define FEAT_MMIO BIT(26) /* Chip supports MMIO */ +#define FEAT_FOUR_TEMP BIT(27) static const struct it87_devices it87_devices[] = { [it87] = { .name = "it87", - .suffix = "F", + .model = "IT87F", .features = FEAT_OLD_AUTOPWM | FEAT_FANCTL_ONOFF, /* may need to overwrite */ .num_temp_limit = 3, + .num_temp_offset = 0, + .num_temp_map = 3, }, [it8712] = { .name = "it8712", - .suffix = "F", + .model = "IT8712F", .features = FEAT_OLD_AUTOPWM | FEAT_VID | FEAT_FANCTL_ONOFF, /* may need to overwrite */ .num_temp_limit = 3, + .num_temp_offset = 0, + .num_temp_map = 3, }, [it8716] = { .name = "it8716", - .suffix = "F", - .features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET | FEAT_VID + .model = "IT8716F", + .features = FEAT_16BIT_FANS | FEAT_VID | FEAT_FAN16_CONFIG | FEAT_FIVE_FANS | FEAT_PWM_FREQ2 | FEAT_FANCTL_ONOFF, .num_temp_limit = 3, + .num_temp_offset = 3, + .num_temp_map = 3, }, [it8718] = { .name = "it8718", - .suffix = "F", - .features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET | FEAT_VID + .model = "IT8718F", + .features = FEAT_16BIT_FANS | FEAT_VID | FEAT_TEMP_OLD_PECI | FEAT_FAN16_CONFIG | FEAT_FIVE_FANS | FEAT_PWM_FREQ2 | FEAT_FANCTL_ONOFF, .num_temp_limit = 3, + .num_temp_offset = 3, + .num_temp_map = 3, .old_peci_mask = 0x4, }, [it8720] = { .name = "it8720", - .suffix = "F", - .features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET | FEAT_VID + .model = "IT8720F", + .features = FEAT_16BIT_FANS | FEAT_VID | FEAT_TEMP_OLD_PECI | FEAT_FAN16_CONFIG | FEAT_FIVE_FANS | FEAT_PWM_FREQ2 | FEAT_FANCTL_ONOFF, .num_temp_limit = 3, + .num_temp_offset = 3, + .num_temp_map = 3, .old_peci_mask = 0x4, }, [it8721] = { .name = "it8721", - .suffix = "F", + .model = "IT8721F", .features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS - | FEAT_TEMP_OFFSET | FEAT_TEMP_OLD_PECI | FEAT_TEMP_PECI + | FEAT_TEMP_OLD_PECI | FEAT_TEMP_PECI | FEAT_FAN16_CONFIG | FEAT_FIVE_FANS | FEAT_IN7_INTERNAL | FEAT_PWM_FREQ2 | FEAT_SCALING | FEAT_FANCTL_ONOFF, .num_temp_limit = 3, + .num_temp_offset = 3, + .num_temp_map = 3, .peci_mask = 0x05, .old_peci_mask = 0x02, /* Actually reports PCH */ }, [it8728] = { .name = "it8728", - .suffix = "F", + .model = "IT8728F", .features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS - | FEAT_TEMP_OFFSET | FEAT_TEMP_PECI | FEAT_FIVE_FANS + | FEAT_TEMP_PECI | FEAT_FIVE_FANS | FEAT_IN7_INTERNAL | FEAT_PWM_FREQ2 | FEAT_SCALING | FEAT_FANCTL_ONOFF, - .num_temp_limit = 3, + .num_temp_limit = 6, + .num_temp_offset = 3, + .num_temp_map = 3, .peci_mask = 0x07, }, [it8732] = { .name = "it8732", - .suffix = "F", + .model = "IT8732F", .features = FEAT_NEWER_AUTOPWM | FEAT_16BIT_FANS - | FEAT_TEMP_OFFSET | FEAT_TEMP_OLD_PECI | FEAT_TEMP_PECI + | FEAT_TEMP_OLD_PECI | FEAT_TEMP_PECI | FEAT_10_9MV_ADC | FEAT_IN7_INTERNAL | FEAT_FOUR_FANS - | FEAT_FOUR_PWM | FEAT_FANCTL_ONOFF, + | FEAT_FOUR_PWM | FEAT_FANCTL_ONOFF | FEAT_SCALING, .num_temp_limit = 3, + .num_temp_offset = 3, + .num_temp_map = 3, .peci_mask = 0x07, .old_peci_mask = 0x02, /* Actually reports PCH */ }, + [it8736] = { + .name = "it8736", + .model = "IT8736F", + .features = FEAT_16BIT_FANS + | FEAT_TEMP_OLD_PECI | FEAT_TEMP_PECI + | FEAT_10_9MV_ADC | FEAT_IN7_INTERNAL | FEAT_FOUR_FANS + | FEAT_FANCTL_ONOFF | FEAT_SCALING, + .num_temp_limit = 3, + .num_temp_offset = 3, + .num_temp_map = 3, + .peci_mask = 0x07, + .old_peci_mask = 0x02, /* Actually reports PCH */ + }, + [it8738] = { + .name = "it8738", + .model = "IT8738E", + .features = FEAT_NEWER_AUTOPWM | FEAT_16BIT_FANS + | FEAT_TEMP_OLD_PECI | FEAT_TEMP_PECI + | FEAT_10_9MV_ADC | FEAT_IN7_INTERNAL + | FEAT_FANCTL_ONOFF | FEAT_SCALING + | FEAT_AVCC3, + .num_temp_limit = 3, + .num_temp_offset = 3, + .num_temp_map = 3, + .peci_mask = 0x07, + .old_peci_mask = 0x02, + }, [it8771] = { .name = "it8771", - .suffix = "E", + .model = "IT8771E", .features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS - | FEAT_TEMP_OFFSET | FEAT_TEMP_PECI | FEAT_IN7_INTERNAL + | FEAT_TEMP_PECI | FEAT_IN7_INTERNAL | FEAT_PWM_FREQ2 | FEAT_SCALING | FEAT_FANCTL_ONOFF, /* PECI: guesswork */ /* 12mV ADC (OHM) */ /* 16 bit fans (OHM) */ /* three fans, always 16 bit (guesswork) */ .num_temp_limit = 3, + .num_temp_offset = 3, + .num_temp_map = 3, .peci_mask = 0x07, }, [it8772] = { .name = "it8772", - .suffix = "E", + .model = "IT8772E", .features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS - | FEAT_TEMP_OFFSET | FEAT_TEMP_PECI | FEAT_IN7_INTERNAL + | FEAT_TEMP_PECI | FEAT_IN7_INTERNAL | FEAT_PWM_FREQ2 | FEAT_SCALING | FEAT_FANCTL_ONOFF, /* PECI (coreboot) */ /* 12mV ADC (HWSensors4, OHM) */ /* 16 bit fans (HWSensors4, OHM) */ /* three fans, always 16 bit (datasheet) */ .num_temp_limit = 3, + .num_temp_offset = 3, + .num_temp_map = 3, .peci_mask = 0x07, }, [it8781] = { .name = "it8781", - .suffix = "F", - .features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET + .model = "IT8781F", + .features = FEAT_16BIT_FANS | FEAT_TEMP_OLD_PECI | FEAT_FAN16_CONFIG | FEAT_PWM_FREQ2 | FEAT_FANCTL_ONOFF, .num_temp_limit = 3, + .num_temp_offset = 3, + .num_temp_map = 3, .old_peci_mask = 0x4, }, [it8782] = { .name = "it8782", - .suffix = "F", - .features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET + .model = "IT8782F", + .features = FEAT_16BIT_FANS | FEAT_TEMP_OLD_PECI | FEAT_FAN16_CONFIG | FEAT_PWM_FREQ2 | FEAT_FANCTL_ONOFF, .num_temp_limit = 3, + .num_temp_offset = 3, + .num_temp_map = 3, .old_peci_mask = 0x4, }, [it8783] = { .name = "it8783", - .suffix = "E/F", - .features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET + .model = "IT8783E/F", + .features = FEAT_16BIT_FANS | FEAT_TEMP_OLD_PECI | FEAT_FAN16_CONFIG | FEAT_PWM_FREQ2 | FEAT_FANCTL_ONOFF, .num_temp_limit = 3, + .num_temp_offset = 3, + .num_temp_map = 3, .old_peci_mask = 0x4, }, [it8786] = { .name = "it8786", - .suffix = "E", + .model = "IT8786E", .features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS - | FEAT_TEMP_OFFSET | FEAT_TEMP_PECI | FEAT_IN7_INTERNAL + | FEAT_TEMP_PECI | FEAT_IN7_INTERNAL | FEAT_PWM_FREQ2 | FEAT_FANCTL_ONOFF, .num_temp_limit = 3, + .num_temp_offset = 3, + .num_temp_map = 3, .peci_mask = 0x07, }, [it8790] = { .name = "it8790", - .suffix = "E", + .model = "IT8790E", .features = FEAT_NEWER_AUTOPWM | FEAT_10_9MV_ADC | FEAT_SCALING - | FEAT_16BIT_FANS | FEAT_TEMP_OFFSET | FEAT_TEMP_PECI + | FEAT_16BIT_FANS | FEAT_TEMP_PECI | FEAT_IN7_INTERNAL | FEAT_PWM_FREQ2 | FEAT_FANCTL_ONOFF, .num_temp_limit = 3, + .num_temp_offset = 3, + .num_temp_map = 3, .peci_mask = 0x07, }, [it8792] = { .name = "it8792", - .suffix = "E", + .model = "IT8792E/IT8795E", .features = FEAT_NEWER_AUTOPWM | FEAT_10_9MV_ADC | FEAT_SCALING - | FEAT_16BIT_FANS | FEAT_TEMP_OFFSET | FEAT_TEMP_PECI + | FEAT_16BIT_FANS | FEAT_TEMP_PECI | FEAT_IN7_INTERNAL | FEAT_PWM_FREQ2 | FEAT_FANCTL_ONOFF, .num_temp_limit = 3, + .num_temp_offset = 3, + .num_temp_map = 3, .peci_mask = 0x07, }, [it8603] = { .name = "it8603", - .suffix = "E", + .model = "IT8603E", + .features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS + | FEAT_TEMP_PECI | FEAT_IN7_INTERNAL + | FEAT_AVCC3 | FEAT_PWM_FREQ2 | FEAT_SCALING, + .num_temp_limit = 3, + .num_temp_offset = 3, + .num_temp_map = 4, + .peci_mask = 0x07, + }, + [it8606] = { + .name = "it8606", + .model = "IT8606E", .features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS - | FEAT_TEMP_OFFSET | FEAT_TEMP_PECI | FEAT_IN7_INTERNAL + | FEAT_TEMP_PECI | FEAT_IN7_INTERNAL | FEAT_AVCC3 | FEAT_PWM_FREQ2 | FEAT_SCALING, .num_temp_limit = 3, + .num_temp_offset = 3, + .num_temp_map = 3, .peci_mask = 0x07, }, [it8607] = { .name = "it8607", - .suffix = "E", + .model = "IT8607E", .features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS - | FEAT_TEMP_OFFSET | FEAT_TEMP_PECI | FEAT_IN7_INTERNAL + | FEAT_TEMP_PECI | FEAT_IN7_INTERNAL | FEAT_NEW_TEMPMAP | FEAT_AVCC3 | FEAT_PWM_FREQ2 | FEAT_SCALING | FEAT_FANCTL_ONOFF, .num_temp_limit = 3, + .num_temp_offset = 3, + .num_temp_map = 6, + .peci_mask = 0x07, + }, + [it8613] = { + .name = "it8613", + .model = "IT8613E", + .features = FEAT_NEWER_AUTOPWM | FEAT_11MV_ADC | FEAT_16BIT_FANS + | FEAT_TEMP_PECI | FEAT_FIVE_FANS + | FEAT_FIVE_PWM | FEAT_IN7_INTERNAL | FEAT_PWM_FREQ2 + | FEAT_AVCC3 | FEAT_SCALING | FEAT_NEW_TEMPMAP, + .num_temp_limit = 6, + .num_temp_offset = 6, + .num_temp_map = 6, .peci_mask = 0x07, }, [it8620] = { .name = "it8620", - .suffix = "E", + .model = "IT8620E", .features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS - | FEAT_TEMP_OFFSET | FEAT_TEMP_PECI | FEAT_SIX_FANS + | FEAT_TEMP_PECI | FEAT_SIX_FANS | FEAT_IN7_INTERNAL | FEAT_SIX_PWM | FEAT_PWM_FREQ2 | FEAT_SIX_TEMP | FEAT_VIN3_5V | FEAT_SCALING | FEAT_FANCTL_ONOFF, .num_temp_limit = 3, + .num_temp_offset = 3, + .num_temp_map = 3, .peci_mask = 0x07, }, [it8622] = { .name = "it8622", - .suffix = "E", + .model = "IT8622E", .features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS - | FEAT_TEMP_OFFSET | FEAT_TEMP_PECI | FEAT_FIVE_FANS + | FEAT_TEMP_PECI | FEAT_FIVE_FANS | FEAT_FOUR_TEMP | FEAT_FIVE_PWM | FEAT_IN7_INTERNAL | FEAT_PWM_FREQ2 | FEAT_AVCC3 | FEAT_VIN3_5V | FEAT_SCALING, .num_temp_limit = 3, - .peci_mask = 0x07, + .num_temp_offset = 3, + .num_temp_map = 4, + .peci_mask = 0x0f, + .smbus_bitmap = BIT(1) | BIT(2), + }, + [it8625] = { + .name = "it8625", + .model = "IT8625E", + .features = FEAT_NEWER_AUTOPWM | FEAT_16BIT_FANS + | FEAT_AVCC3 | FEAT_NEW_TEMPMAP + | FEAT_11MV_ADC | FEAT_IN7_INTERNAL | FEAT_SIX_FANS + | FEAT_SIX_PWM | FEAT_BANK_SEL | FEAT_SCALING, + .num_temp_limit = 6, + .num_temp_offset = 6, + .num_temp_map = 6, + .smbus_bitmap = BIT(1) | BIT(2), }, [it8628] = { .name = "it8628", - .suffix = "E", + .model = "IT8628E", .features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS - | FEAT_TEMP_OFFSET | FEAT_TEMP_PECI | FEAT_SIX_FANS + | FEAT_TEMP_PECI | FEAT_SIX_FANS | FEAT_IN7_INTERNAL | FEAT_SIX_PWM | FEAT_PWM_FREQ2 | FEAT_SIX_TEMP | FEAT_SCALING | FEAT_AVCC3 | FEAT_FANCTL_ONOFF, - .num_temp_limit = 3, + .num_temp_limit = 6, + .num_temp_offset = 3, + .num_temp_map = 3, .peci_mask = 0x07, }, [it8655] = { .name = "it8655", - .suffix = "E", + .model = "IT8655E", .features = FEAT_NEWER_AUTOPWM | FEAT_16BIT_FANS - | FEAT_TEMP_OFFSET | FEAT_AVCC3 - | FEAT_10_9MV_ADC | FEAT_IN7_INTERNAL | FEAT_BANK_SEL, + | FEAT_AVCC3 | FEAT_NEW_TEMPMAP | FEAT_SCALING + | FEAT_10_9MV_ADC | FEAT_IN7_INTERNAL | FEAT_BANK_SEL + | FEAT_SIX_TEMP | FEAT_MMIO, .num_temp_limit = 6, + .num_temp_offset = 6, + .num_temp_map = 6, + .smbus_bitmap = BIT(2), }, [it8665] = { .name = "it8665", - .suffix = "E", + .model = "IT8665E", .features = FEAT_NEWER_AUTOPWM | FEAT_16BIT_FANS - | FEAT_TEMP_OFFSET | FEAT_AVCC3 + | FEAT_AVCC3 | FEAT_NEW_TEMPMAP | FEAT_SCALING | FEAT_10_9MV_ADC | FEAT_IN7_INTERNAL | FEAT_SIX_FANS - | FEAT_SIX_PWM | FEAT_BANK_SEL, + | FEAT_SIX_PWM | FEAT_BANK_SEL | FEAT_MMIO | FEAT_SIX_TEMP, .num_temp_limit = 6, + .num_temp_offset = 6, + .num_temp_map = 6, + .smbus_bitmap = BIT(2), }, [it8686] = { .name = "it8686", - .suffix = "E", + .model = "IT8686E", .features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS - | FEAT_TEMP_OFFSET | FEAT_SIX_FANS + | FEAT_SIX_FANS | FEAT_NEW_TEMPMAP | FEAT_IN7_INTERNAL | FEAT_SIX_PWM | FEAT_PWM_FREQ2 | FEAT_SIX_TEMP | FEAT_BANK_SEL | FEAT_SCALING | FEAT_AVCC3, .num_temp_limit = 6, + .num_temp_offset = 6, + .num_temp_map = 7, + .smbus_bitmap = BIT(1) | BIT(2), }, }; @@ -622,7 +741,6 @@ static const struct it87_devices it87_devices[] = { #define has_10_9mv_adc(data) ((data)->features & FEAT_10_9MV_ADC) #define has_newer_autopwm(data) ((data)->features & FEAT_NEWER_AUTOPWM) #define has_old_autopwm(data) ((data)->features & FEAT_OLD_AUTOPWM) -#define has_temp_offset(data) ((data)->features & FEAT_TEMP_OFFSET) #define has_temp_peci(data, nr) (((data)->features & FEAT_TEMP_PECI) && \ ((data)->peci_mask & BIT(nr))) #define has_temp_old_peci(data, nr) \ @@ -651,9 +769,14 @@ static const struct it87_devices it87_devices[] = { #define has_scaling(data) ((data)->features & FEAT_SCALING) #define has_fanctl_onoff(data) ((data)->features & FEAT_FANCTL_ONOFF) #define has_11mv_adc(data) ((data)->features & FEAT_11MV_ADC) +#define has_new_tempmap(data) ((data)->features & FEAT_NEW_TEMPMAP) +#define has_mmio(data) ((data)->features & FEAT_MMIO) +#define has_four_temp(data) ((data)->features & FEAT_FOUR_TEMP) struct it87_sio_data { enum chips type; + u8 sioaddr; + u8 doexit; /* Values read from Super-I/O config space */ u8 revision; u8 vid_value; @@ -665,6 +788,8 @@ struct it87_sio_data { u8 skip_fan; u8 skip_pwm; u8 skip_temp; + u8 smbus_bitmap; + u8 ec_special_config; }; /* @@ -675,10 +800,19 @@ struct it87_data { const struct attribute_group *groups[7]; enum chips type; u32 features; - u8 bank; u8 peci_mask; u8 old_peci_mask; + u8 smbus_bitmap; /* !=0 if SMBus needs to be disabled */ + u8 saved_bank; /* saved bank register value */ + u8 ec_special_config; /* EC special config register restore value */ + u8 sioaddr; /* SIO port address */ + bool doexit; /* true if exit from sio config is ok */ + + void __iomem *mmio; /* Remapped MMIO address if available */ + int (*read)(struct it87_data *, u16); + void (*write)(struct it87_data *, u16, u8); + const u8 *REG_FAN; const u8 *REG_FANX; const u8 *REG_FAN_MIN; @@ -691,7 +825,6 @@ struct it87_data { const u8 *REG_TEMP_HIGH; unsigned short addr; - const char *name; struct mutex update_lock; char valid; /* !=0 if following fields are valid */ unsigned long last_updated; /* In jiffies */ @@ -704,7 +837,9 @@ struct it87_data { u16 fan[NUM_FAN][2]; /* Register values, [nr][0]=fan, [1]=min */ u8 has_temp; /* Bitfield, temp sensors enabled */ s8 temp[NUM_TEMP][4]; /* [nr][0]=temp, [1]=min, [2]=max, [3]=offset */ - u8 num_temp_limit; /* Number of temp limit/offset registers */ + u8 num_temp_limit; /* Number of temperature limit registers */ + u8 num_temp_offset; /* Number of temperature offset registers */ + u8 temp_src[4]; /* Up to 4 temperature source registers */ u8 sensor; /* Register value (IT87_REG_TEMP_ENABLE) */ u8 extra; /* Register value (IT87_REG_TEMP_EXTRA) */ u8 fan_div[NUM_FAN_DIV];/* Register encoding, shifted right */ @@ -731,6 +866,9 @@ struct it87_data { u8 pwm_ctrl[NUM_PWM]; /* Register value */ u8 pwm_duty[NUM_PWM]; /* Manual PWM value set by user */ u8 pwm_temp_map[NUM_PWM];/* PWM to temp. chan. mapping (bits 1-0) */ + u8 pwm_temp_map_mask; /* 0x03 for old, 0x07 for new temp map */ + u8 pwm_temp_map_shift; /* 0 for old, 3 for new temp map */ + u8 pwm_num_temp_map; /* from config data, 3..7 depending on chip */ /* Automatic fan speed control registers */ u8 auto_pwm[NUM_AUTO_PWM][4]; /* [nr][3] is hard-coded */ @@ -817,6 +955,25 @@ static int DIV_TO_REG(int val) #define DIV_FROM_REG(val) BIT(val) +static u8 temp_map_from_reg(const struct it87_data *data, u8 reg) +{ + u8 map; + + map = (reg >> data->pwm_temp_map_shift) & data->pwm_temp_map_mask; + if (map >= data->pwm_num_temp_map) /* map is 0-based */ + map = 0; + + return map; +} + +static u8 temp_map_to_reg(const struct it87_data *data, int nr, u8 map) +{ + u8 ctrl = data->pwm_ctrl[nr]; + + return (ctrl & ~(data->pwm_temp_map_mask << data->pwm_temp_map_shift)) | + (map << data->pwm_temp_map_shift); +} + /* * PWM base frequencies. The frequency has to be divided by either 128 or 256, * depending on the chip type, to calculate the actual PWM frequency. @@ -838,74 +995,139 @@ static const unsigned int pwm_freq[8] = { 750000, }; -static int _it87_read_value(struct it87_data *data, u8 reg) +static int _it87_io_read(struct it87_data *data, u16 reg) { outb_p(reg, data->addr + IT87_ADDR_REG_OFFSET); return inb_p(data->addr + IT87_DATA_REG_OFFSET); } -static void _it87_write_value(struct it87_data *data, u8 reg, u8 value) +static void _it87_io_write(struct it87_data *data, u16 reg, u8 value) { outb_p(reg, data->addr + IT87_ADDR_REG_OFFSET); outb_p(value, data->addr + IT87_DATA_REG_OFFSET); } -static void it87_set_bank(struct it87_data *data, u8 bank) +static int smbus_disable(struct it87_data *data) { - if (has_bank_sel(data) && bank != data->bank) { - u8 breg = _it87_read_value(data, IT87_REG_BANK); + int err; - breg &= 0x1f; - breg |= (bank << 5); - data->bank = bank; - _it87_write_value(data, IT87_REG_BANK, breg); + if (data->smbus_bitmap) { + err = superio_enter(data->sioaddr); + if (err) + return err; + superio_select(data->sioaddr, PME); + superio_outb(data->sioaddr, IT87_SPECIAL_CFG_REG, + data->ec_special_config & ~data->smbus_bitmap); + superio_exit(data->sioaddr, data->doexit); + if (has_bank_sel(data) && !data->mmio) + data->saved_bank = _it87_io_read(data, IT87_REG_BANK); } + return 0; +} + +static int smbus_enable(struct it87_data *data) +{ + int err; + + if (data->smbus_bitmap) { + if (has_bank_sel(data) && !data->mmio) + _it87_io_write(data, IT87_REG_BANK, data->saved_bank); + err = superio_enter(data->sioaddr); + if (err) + return err; + + superio_select(data->sioaddr, PME); + superio_outb(data->sioaddr, IT87_SPECIAL_CFG_REG, + data->ec_special_config); + superio_exit(data->sioaddr, data->doexit); + } + return 0; +} + +static u8 it87_io_set_bank(struct it87_data *data, u8 bank) +{ + u8 _bank = bank; + + if (has_bank_sel(data)) { + u8 breg = _it87_io_read(data, IT87_REG_BANK); + + _bank = breg >> 5; + if (bank != _bank) { + breg &= 0x1f; + breg |= (bank << 5); + _it87_io_write(data, IT87_REG_BANK, breg); + } + } + return _bank; } /* * Must be called with data->update_lock held, except during initialization. + * Must be called with SMBus accesses disabled. * We ignore the IT87 BUSY flag at this moment - it could lead to deadlocks, * would slow down the IT87 access and should not be necessary. */ -static int it87_read_value(struct it87_data *data, u16 reg) +static int it87_io_read(struct it87_data *data, u16 reg) { - it87_set_bank(data, reg >> 8); - return _it87_read_value(data, reg & 0xff); + u8 bank; + int val; + + bank = it87_io_set_bank(data, reg >> 8); + val = _it87_io_read(data, reg & 0xff); + it87_io_set_bank(data, bank); + + return val; } /* * Must be called with data->update_lock held, except during initialization. + * Must be called with SMBus accesses disabled * We ignore the IT87 BUSY flag at this moment - it could lead to deadlocks, * would slow down the IT87 access and should not be necessary. */ -static void it87_write_value(struct it87_data *data, u16 reg, u8 value) +static void it87_io_write(struct it87_data *data, u16 reg, u8 value) +{ + u8 bank; + + bank = it87_io_set_bank(data, reg >> 8); + _it87_io_write(data, reg & 0xff, value); + it87_io_set_bank(data, bank); +} + +static int it87_mmio_read(struct it87_data *data, u16 reg) { - it87_set_bank(data, reg >> 8); - _it87_write_value(data, reg & 0xff, value); + return readb(data->mmio + reg); +} + +static void it87_mmio_write(struct it87_data *data, u16 reg, u8 value) +{ + writeb(value, data->mmio + reg); } static void it87_update_pwm_ctrl(struct it87_data *data, int nr) { - data->pwm_ctrl[nr] = it87_read_value(data, data->REG_PWM[nr]); + u8 ctrl; + + ctrl = data->read(data, data->REG_PWM[nr]); + data->pwm_ctrl[nr] = ctrl; if (has_newer_autopwm(data)) { - data->pwm_temp_map[nr] = data->pwm_ctrl[nr] & 0x03; - data->pwm_duty[nr] = it87_read_value(data, - IT87_REG_PWM_DUTY[nr]); + data->pwm_temp_map[nr] = temp_map_from_reg(data, ctrl); + data->pwm_duty[nr] = data->read(data, IT87_REG_PWM_DUTY[nr]); } else { - if (data->pwm_ctrl[nr] & 0x80) /* Automatic mode */ - data->pwm_temp_map[nr] = data->pwm_ctrl[nr] & 0x03; + if (ctrl & 0x80) /* Automatic mode */ + data->pwm_temp_map[nr] = temp_map_from_reg(data, ctrl); else /* Manual mode */ - data->pwm_duty[nr] = data->pwm_ctrl[nr] & 0x7f; + data->pwm_duty[nr] = ctrl & 0x7f; } if (has_old_autopwm(data)) { int i; for (i = 0; i < 5 ; i++) - data->auto_temp[nr][i] = it87_read_value(data, + data->auto_temp[nr][i] = data->read(data, IT87_REG_AUTO_TEMP(nr, i)); for (i = 0; i < 3 ; i++) - data->auto_pwm[nr][i] = it87_read_value(data, + data->auto_pwm[nr][i] = data->read(data, IT87_REG_AUTO_PWM(nr, i)); } else if (has_newer_autopwm(data)) { int i; @@ -917,55 +1139,75 @@ static void it87_update_pwm_ctrl(struct it87_data *data, int nr) * 3: fan max temperature (base + 2) */ data->auto_temp[nr][0] = - it87_read_value(data, IT87_REG_AUTO_TEMP(nr, 5)); + data->read(data, IT87_REG_AUTO_TEMP(nr, 5)); for (i = 0; i < 3 ; i++) data->auto_temp[nr][i + 1] = - it87_read_value(data, - IT87_REG_AUTO_TEMP(nr, i)); + data->read(data, IT87_REG_AUTO_TEMP(nr, i)); /* * 0: start pwm value (base + 3) * 1: pwm slope (base + 4, 1/8th pwm) */ data->auto_pwm[nr][0] = - it87_read_value(data, IT87_REG_AUTO_TEMP(nr, 3)); + data->read(data, IT87_REG_AUTO_TEMP(nr, 3)); data->auto_pwm[nr][1] = - it87_read_value(data, IT87_REG_AUTO_TEMP(nr, 4)); + data->read(data, IT87_REG_AUTO_TEMP(nr, 4)); } } +static int it87_lock(struct it87_data *data) +{ + int err; + + mutex_lock(&data->update_lock); + err = smbus_disable(data); + if (err) + mutex_unlock(&data->update_lock); + return err; +} + +static void it87_unlock(struct it87_data *data) +{ + smbus_enable(data); + mutex_unlock(&data->update_lock); +} + static struct it87_data *it87_update_device(struct device *dev) { struct it87_data *data = dev_get_drvdata(dev); + struct it87_data *ret = data; + int err; int i; mutex_lock(&data->update_lock); if (time_after(jiffies, data->last_updated + HZ + HZ / 2) || !data->valid) { + err = smbus_disable(data); + if (err) { + ret = ERR_PTR(err); + goto unlock; + } if (update_vbat) { /* * Cleared after each update, so reenable. Value * returned by this read will be previous value */ - it87_write_value(data, IT87_REG_CONFIG, - it87_read_value(data, IT87_REG_CONFIG) | 0x40); + data->write(data, IT87_REG_CONFIG, + data->read(data, IT87_REG_CONFIG) | 0x40); } for (i = 0; i < NUM_VIN; i++) { if (!(data->has_in & BIT(i))) continue; - data->in[i][0] = - it87_read_value(data, IT87_REG_VIN[i]); + data->in[i][0] = data->read(data, IT87_REG_VIN[i]); /* VBAT and AVCC don't have limit registers */ if (i >= NUM_VIN_LIMIT) continue; - data->in[i][1] = - it87_read_value(data, IT87_REG_VIN_MIN(i)); - data->in[i][2] = - it87_read_value(data, IT87_REG_VIN_MAX(i)); + data->in[i][1] = data->read(data, IT87_REG_VIN_MIN(i)); + data->in[i][2] = data->read(data, IT87_REG_VIN_MAX(i)); } for (i = 0; i < NUM_FAN; i++) { @@ -973,15 +1215,14 @@ static struct it87_data *it87_update_device(struct device *dev) if (!(data->has_fan & BIT(i))) continue; - data->fan[i][1] = - it87_read_value(data, data->REG_FAN_MIN[i]); - data->fan[i][0] = it87_read_value(data, - data->REG_FAN[i]); + data->fan[i][1] = data->read(data, + data->REG_FAN_MIN[i]); + data->fan[i][0] = data->read(data, data->REG_FAN[i]); /* Add high byte if in 16-bit mode */ if (has_16bit_fans(data)) { - data->fan[i][0] |= it87_read_value(data, + data->fan[i][0] |= data->read(data, data->REG_FANX[i]) << 8; - data->fan[i][1] |= it87_read_value(data, + data->fan[i][1] |= data->read(data, data->REG_FANX_MIN[i]) << 8; } } @@ -989,54 +1230,52 @@ static struct it87_data *it87_update_device(struct device *dev) if (!(data->has_temp & BIT(i))) continue; data->temp[i][0] = - it87_read_value(data, IT87_REG_TEMP(i)); + data->read(data, IT87_REG_TEMP(i)); if (i >= data->num_temp_limit) continue; - if (has_temp_offset(data)) + if (i < data->num_temp_offset) data->temp[i][3] = - it87_read_value(data, - data->REG_TEMP_OFFSET[i]); + data->read(data, data->REG_TEMP_OFFSET[i]); data->temp[i][1] = - it87_read_value(data, data->REG_TEMP_LOW[i]); + data->read(data, data->REG_TEMP_LOW[i]); data->temp[i][2] = - it87_read_value(data, data->REG_TEMP_HIGH[i]); + data->read(data, data->REG_TEMP_HIGH[i]); } /* Newer chips don't have clock dividers */ if ((data->has_fan & 0x07) && !has_16bit_fans(data)) { - i = it87_read_value(data, IT87_REG_FAN_DIV); + i = data->read(data, IT87_REG_FAN_DIV); data->fan_div[0] = i & 0x07; data->fan_div[1] = (i >> 3) & 0x07; data->fan_div[2] = (i & 0x40) ? 3 : 1; } data->alarms = - it87_read_value(data, IT87_REG_ALARM1) | - (it87_read_value(data, IT87_REG_ALARM2) << 8) | - (it87_read_value(data, IT87_REG_ALARM3) << 16); - data->beeps = it87_read_value(data, IT87_REG_BEEP_ENABLE); - - data->fan_main_ctrl = it87_read_value(data, - IT87_REG_FAN_MAIN_CTRL); - data->fan_ctl = it87_read_value(data, IT87_REG_FAN_CTL); + data->read(data, IT87_REG_ALARM1) | + (data->read(data, IT87_REG_ALARM2) << 8) | + (data->read(data, IT87_REG_ALARM3) << 16); + data->beeps = data->read(data, IT87_REG_BEEP_ENABLE); + + data->fan_main_ctrl = data->read(data, IT87_REG_FAN_MAIN_CTRL); + data->fan_ctl = data->read(data, IT87_REG_FAN_CTL); for (i = 0; i < NUM_PWM; i++) { if (!(data->has_pwm & BIT(i))) continue; it87_update_pwm_ctrl(data, i); } - data->sensor = it87_read_value(data, IT87_REG_TEMP_ENABLE); - data->extra = it87_read_value(data, IT87_REG_TEMP_EXTRA); + data->sensor = data->read(data, IT87_REG_TEMP_ENABLE); + data->extra = data->read(data, IT87_REG_TEMP_EXTRA); /* * The IT8705F does not have VID capability. * The IT8718F and later don't use IT87_REG_VID for the * same purpose. */ if (data->type == it8712 || data->type == it8716) { - data->vid = it87_read_value(data, IT87_REG_VID); + data->vid = data->read(data, IT87_REG_VID); /* * The older IT8712F revisions had only 5 VID pins, * but we assume it is always safe to read 6 bits. @@ -1045,11 +1284,11 @@ static struct it87_data *it87_update_device(struct device *dev) } data->last_updated = jiffies; data->valid = 1; + smbus_enable(data); } - +unlock: mutex_unlock(&data->update_lock); - - return data; + return ret; } static ssize_t show_in(struct device *dev, struct device_attribute *attr, @@ -1060,6 +1299,9 @@ static ssize_t show_in(struct device *dev, struct device_attribute *attr, int index = sattr->index; int nr = sattr->nr; + if (IS_ERR(data)) + return PTR_ERR(data); + return sprintf(buf, "%d\n", in_from_reg(data, nr, data->in[nr][index])); } @@ -1071,73 +1313,60 @@ static ssize_t set_in(struct device *dev, struct device_attribute *attr, int index = sattr->index; int nr = sattr->nr; unsigned long val; + int err; if (kstrtoul(buf, 10, &val) < 0) return -EINVAL; - mutex_lock(&data->update_lock); + err = it87_lock(data); + if (err) + return err; + data->in[nr][index] = in_to_reg(data, nr, val); - it87_write_value(data, - index == 1 ? IT87_REG_VIN_MIN(nr) - : IT87_REG_VIN_MAX(nr), - data->in[nr][index]); - mutex_unlock(&data->update_lock); + data->write(data, index == 1 ? IT87_REG_VIN_MIN(nr) + : IT87_REG_VIN_MAX(nr), + data->in[nr][index]); + it87_unlock(data); return count; } -static SENSOR_DEVICE_ATTR_2(in0_input, S_IRUGO, show_in, NULL, 0, 0); -static SENSOR_DEVICE_ATTR_2(in0_min, S_IRUGO | S_IWUSR, show_in, set_in, - 0, 1); -static SENSOR_DEVICE_ATTR_2(in0_max, S_IRUGO | S_IWUSR, show_in, set_in, - 0, 2); - -static SENSOR_DEVICE_ATTR_2(in1_input, S_IRUGO, show_in, NULL, 1, 0); -static SENSOR_DEVICE_ATTR_2(in1_min, S_IRUGO | S_IWUSR, show_in, set_in, - 1, 1); -static SENSOR_DEVICE_ATTR_2(in1_max, S_IRUGO | S_IWUSR, show_in, set_in, - 1, 2); - -static SENSOR_DEVICE_ATTR_2(in2_input, S_IRUGO, show_in, NULL, 2, 0); -static SENSOR_DEVICE_ATTR_2(in2_min, S_IRUGO | S_IWUSR, show_in, set_in, - 2, 1); -static SENSOR_DEVICE_ATTR_2(in2_max, S_IRUGO | S_IWUSR, show_in, set_in, - 2, 2); - -static SENSOR_DEVICE_ATTR_2(in3_input, S_IRUGO, show_in, NULL, 3, 0); -static SENSOR_DEVICE_ATTR_2(in3_min, S_IRUGO | S_IWUSR, show_in, set_in, - 3, 1); -static SENSOR_DEVICE_ATTR_2(in3_max, S_IRUGO | S_IWUSR, show_in, set_in, - 3, 2); - -static SENSOR_DEVICE_ATTR_2(in4_input, S_IRUGO, show_in, NULL, 4, 0); -static SENSOR_DEVICE_ATTR_2(in4_min, S_IRUGO | S_IWUSR, show_in, set_in, - 4, 1); -static SENSOR_DEVICE_ATTR_2(in4_max, S_IRUGO | S_IWUSR, show_in, set_in, - 4, 2); - -static SENSOR_DEVICE_ATTR_2(in5_input, S_IRUGO, show_in, NULL, 5, 0); -static SENSOR_DEVICE_ATTR_2(in5_min, S_IRUGO | S_IWUSR, show_in, set_in, - 5, 1); -static SENSOR_DEVICE_ATTR_2(in5_max, S_IRUGO | S_IWUSR, show_in, set_in, - 5, 2); - -static SENSOR_DEVICE_ATTR_2(in6_input, S_IRUGO, show_in, NULL, 6, 0); -static SENSOR_DEVICE_ATTR_2(in6_min, S_IRUGO | S_IWUSR, show_in, set_in, - 6, 1); -static SENSOR_DEVICE_ATTR_2(in6_max, S_IRUGO | S_IWUSR, show_in, set_in, - 6, 2); - -static SENSOR_DEVICE_ATTR_2(in7_input, S_IRUGO, show_in, NULL, 7, 0); -static SENSOR_DEVICE_ATTR_2(in7_min, S_IRUGO | S_IWUSR, show_in, set_in, - 7, 1); -static SENSOR_DEVICE_ATTR_2(in7_max, S_IRUGO | S_IWUSR, show_in, set_in, - 7, 2); - -static SENSOR_DEVICE_ATTR_2(in8_input, S_IRUGO, show_in, NULL, 8, 0); -static SENSOR_DEVICE_ATTR_2(in9_input, S_IRUGO, show_in, NULL, 9, 0); -static SENSOR_DEVICE_ATTR_2(in10_input, S_IRUGO, show_in, NULL, 10, 0); -static SENSOR_DEVICE_ATTR_2(in11_input, S_IRUGO, show_in, NULL, 11, 0); -static SENSOR_DEVICE_ATTR_2(in12_input, S_IRUGO, show_in, NULL, 12, 0); +static SENSOR_DEVICE_ATTR_2(in0_input, 0444, show_in, NULL, 0, 0); +static SENSOR_DEVICE_ATTR_2(in0_min, 0644, show_in, set_in, 0, 1); +static SENSOR_DEVICE_ATTR_2(in0_max, 0644, show_in, set_in, 0, 2); + +static SENSOR_DEVICE_ATTR_2(in1_input, 0444, show_in, NULL, 1, 0); +static SENSOR_DEVICE_ATTR_2(in1_min, 0644, show_in, set_in, 1, 1); +static SENSOR_DEVICE_ATTR_2(in1_max, 0644, show_in, set_in, 1, 2); + +static SENSOR_DEVICE_ATTR_2(in2_input, 0444, show_in, NULL, 2, 0); +static SENSOR_DEVICE_ATTR_2(in2_min, 0644, show_in, set_in, 2, 1); +static SENSOR_DEVICE_ATTR_2(in2_max, 0644, show_in, set_in, 2, 2); + +static SENSOR_DEVICE_ATTR_2(in3_input, 0444, show_in, NULL, 3, 0); +static SENSOR_DEVICE_ATTR_2(in3_min, 0644, show_in, set_in, 3, 1); +static SENSOR_DEVICE_ATTR_2(in3_max, 0644, show_in, set_in, 3, 2); + +static SENSOR_DEVICE_ATTR_2(in4_input, 0444, show_in, NULL, 4, 0); +static SENSOR_DEVICE_ATTR_2(in4_min, 0644, show_in, set_in, 4, 1); +static SENSOR_DEVICE_ATTR_2(in4_max, 0644, show_in, set_in, 4, 2); + +static SENSOR_DEVICE_ATTR_2(in5_input, 0444, show_in, NULL, 5, 0); +static SENSOR_DEVICE_ATTR_2(in5_min, 0644, show_in, set_in, 5, 1); +static SENSOR_DEVICE_ATTR_2(in5_max, 0644, show_in, set_in, 5, 2); + +static SENSOR_DEVICE_ATTR_2(in6_input, 0444, show_in, NULL, 6, 0); +static SENSOR_DEVICE_ATTR_2(in6_min, 0644, show_in, set_in, 6, 1); +static SENSOR_DEVICE_ATTR_2(in6_max, 0644, show_in, set_in, 6, 2); + +static SENSOR_DEVICE_ATTR_2(in7_input, 0444, show_in, NULL, 7, 0); +static SENSOR_DEVICE_ATTR_2(in7_min, 0644, show_in, set_in, 7, 1); +static SENSOR_DEVICE_ATTR_2(in7_max, 0644, show_in, set_in, 7, 2); + +static SENSOR_DEVICE_ATTR_2(in8_input, 0444, show_in, NULL, 8, 0); +static SENSOR_DEVICE_ATTR_2(in9_input, 0444, show_in, NULL, 9, 0); +static SENSOR_DEVICE_ATTR_2(in10_input, 0444, show_in, NULL, 10, 0); +static SENSOR_DEVICE_ATTR_2(in11_input, 0444, show_in, NULL, 11, 0); +static SENSOR_DEVICE_ATTR_2(in12_input, 0444, show_in, NULL, 12, 0); /* Up to 6 temperatures */ static ssize_t show_temp(struct device *dev, struct device_attribute *attr, @@ -1148,6 +1377,9 @@ static ssize_t show_temp(struct device *dev, struct device_attribute *attr, int index = sattr->index; struct it87_data *data = it87_update_device(dev); + if (IS_ERR(data)) + return PTR_ERR(data); + return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[nr][index])); } @@ -1160,11 +1392,14 @@ static ssize_t set_temp(struct device *dev, struct device_attribute *attr, struct it87_data *data = dev_get_drvdata(dev); long val; u8 reg, regval; + int err; if (kstrtol(buf, 10, &val) < 0) return -EINVAL; - mutex_lock(&data->update_lock); + err = it87_lock(data); + if (err) + return err; switch (index) { default: @@ -1175,10 +1410,10 @@ static ssize_t set_temp(struct device *dev, struct device_attribute *attr, reg = data->REG_TEMP_HIGH[nr]; break; case 3: - regval = it87_read_value(data, IT87_REG_BEEP_ENABLE); + regval = data->read(data, IT87_REG_BEEP_ENABLE); if (!(regval & 0x80)) { regval |= 0x80; - it87_write_value(data, IT87_REG_BEEP_ENABLE, regval); + data->write(data, IT87_REG_BEEP_ENABLE, regval); } data->valid = 0; reg = data->REG_TEMP_OFFSET[nr]; @@ -1186,93 +1421,71 @@ static ssize_t set_temp(struct device *dev, struct device_attribute *attr, } data->temp[nr][index] = TEMP_TO_REG(val); - it87_write_value(data, reg, data->temp[nr][index]); - mutex_unlock(&data->update_lock); + data->write(data, reg, data->temp[nr][index]); + it87_unlock(data); return count; } -static SENSOR_DEVICE_ATTR_2(temp1_input, S_IRUGO, show_temp, NULL, 0, 0); -static SENSOR_DEVICE_ATTR_2(temp1_min, S_IRUGO | S_IWUSR, show_temp, set_temp, - 0, 1); -static SENSOR_DEVICE_ATTR_2(temp1_max, S_IRUGO | S_IWUSR, show_temp, set_temp, - 0, 2); -static SENSOR_DEVICE_ATTR_2(temp1_offset, S_IRUGO | S_IWUSR, show_temp, - set_temp, 0, 3); -static SENSOR_DEVICE_ATTR_2(temp2_input, S_IRUGO, show_temp, NULL, 1, 0); -static SENSOR_DEVICE_ATTR_2(temp2_min, S_IRUGO | S_IWUSR, show_temp, set_temp, - 1, 1); -static SENSOR_DEVICE_ATTR_2(temp2_max, S_IRUGO | S_IWUSR, show_temp, set_temp, - 1, 2); -static SENSOR_DEVICE_ATTR_2(temp2_offset, S_IRUGO | S_IWUSR, show_temp, - set_temp, 1, 3); -static SENSOR_DEVICE_ATTR_2(temp3_input, S_IRUGO, show_temp, NULL, 2, 0); -static SENSOR_DEVICE_ATTR_2(temp3_min, S_IRUGO | S_IWUSR, show_temp, set_temp, - 2, 1); -static SENSOR_DEVICE_ATTR_2(temp3_max, S_IRUGO | S_IWUSR, show_temp, set_temp, - 2, 2); -static SENSOR_DEVICE_ATTR_2(temp3_offset, S_IRUGO | S_IWUSR, show_temp, - set_temp, 2, 3); -static SENSOR_DEVICE_ATTR_2(temp4_input, S_IRUGO, show_temp, NULL, 3, 0); -static SENSOR_DEVICE_ATTR_2(temp4_min, S_IRUGO | S_IWUSR, show_temp, set_temp, - 3, 1); -static SENSOR_DEVICE_ATTR_2(temp4_max, S_IRUGO | S_IWUSR, show_temp, set_temp, - 3, 2); -static SENSOR_DEVICE_ATTR_2(temp4_offset, S_IRUGO | S_IWUSR, show_temp, - set_temp, 3, 3); -static SENSOR_DEVICE_ATTR_2(temp5_input, S_IRUGO, show_temp, NULL, 4, 0); -static SENSOR_DEVICE_ATTR_2(temp5_min, S_IRUGO | S_IWUSR, show_temp, set_temp, - 4, 1); -static SENSOR_DEVICE_ATTR_2(temp5_max, S_IRUGO | S_IWUSR, show_temp, set_temp, - 4, 2); -static SENSOR_DEVICE_ATTR_2(temp5_offset, S_IRUGO | S_IWUSR, show_temp, - set_temp, 4, 3); -static SENSOR_DEVICE_ATTR_2(temp6_input, S_IRUGO, show_temp, NULL, 5, 0); -static SENSOR_DEVICE_ATTR_2(temp6_min, S_IRUGO | S_IWUSR, show_temp, set_temp, - 5, 1); -static SENSOR_DEVICE_ATTR_2(temp6_max, S_IRUGO | S_IWUSR, show_temp, set_temp, - 5, 2); -static SENSOR_DEVICE_ATTR_2(temp6_offset, S_IRUGO | S_IWUSR, show_temp, - set_temp, 5, 3); +static SENSOR_DEVICE_ATTR_2(temp1_input, 0444, show_temp, NULL, 0, 0); +static SENSOR_DEVICE_ATTR_2(temp1_min, 0644, show_temp, set_temp, 0, 1); +static SENSOR_DEVICE_ATTR_2(temp1_max, 0644, show_temp, set_temp, 0, 2); +static SENSOR_DEVICE_ATTR_2(temp1_offset, 0644, show_temp, set_temp, 0, 3); +static SENSOR_DEVICE_ATTR_2(temp2_input, 0444, show_temp, NULL, 1, 0); +static SENSOR_DEVICE_ATTR_2(temp2_min, 0644, show_temp, set_temp, 1, 1); +static SENSOR_DEVICE_ATTR_2(temp2_max, 0644, show_temp, set_temp, 1, 2); +static SENSOR_DEVICE_ATTR_2(temp2_offset, 0644, show_temp, set_temp, 1, 3); +static SENSOR_DEVICE_ATTR_2(temp3_input, 0444, show_temp, NULL, 2, 0); +static SENSOR_DEVICE_ATTR_2(temp3_min, 0644, show_temp, set_temp, 2, 1); +static SENSOR_DEVICE_ATTR_2(temp3_max, 0644, show_temp, set_temp, 2, 2); +static SENSOR_DEVICE_ATTR_2(temp3_offset, 0644, show_temp, set_temp, 2, 3); +static SENSOR_DEVICE_ATTR_2(temp4_input, 0444, show_temp, NULL, 3, 0); +static SENSOR_DEVICE_ATTR_2(temp4_min, 0644, show_temp, set_temp, 3, 1); +static SENSOR_DEVICE_ATTR_2(temp4_max, 0644, show_temp, set_temp, 3, 2); +static SENSOR_DEVICE_ATTR_2(temp4_offset, 0644, show_temp, set_temp, 3, 3); +static SENSOR_DEVICE_ATTR_2(temp5_input, 0444, show_temp, NULL, 4, 0); +static SENSOR_DEVICE_ATTR_2(temp5_min, 0644, show_temp, set_temp, 4, 1); +static SENSOR_DEVICE_ATTR_2(temp5_max, 0644, show_temp, set_temp, 4, 2); +static SENSOR_DEVICE_ATTR_2(temp5_offset, 0644, show_temp, set_temp, 4, 3); +static SENSOR_DEVICE_ATTR_2(temp6_input, 0444, show_temp, NULL, 5, 0); +static SENSOR_DEVICE_ATTR_2(temp6_min, 0644, show_temp, set_temp, 5, 1); +static SENSOR_DEVICE_ATTR_2(temp6_max, 0644, show_temp, set_temp, 5, 2); +static SENSOR_DEVICE_ATTR_2(temp6_offset, 0644, show_temp, set_temp, 5, 3); + +static const u8 temp_types_8686[NUM_TEMP][9] = { + { 0, 8, 8, 8, 8, 8, 8, 8, 7 }, + { 0, 6, 8, 8, 6, 0, 0, 0, 7 }, + { 0, 6, 5, 8, 6, 0, 0, 0, 7 }, + { 4, 8, 8, 8, 8, 8, 8, 8, 7 }, + { 4, 6, 8, 8, 6, 0, 0, 0, 7 }, + { 4, 6, 5, 8, 6, 0, 0, 0, 7 }, +}; static int get_temp_type(struct it87_data *data, int index) { u8 reg, extra; - int type = 0; + int ttype, type = 0; if (has_bank_sel(data)) { - int s1reg = IT87_REG_TEMP_SRC1[index/2] >> ((index % 2) * 4); u8 src1, src2; - src1 = (it87_read_value(data, s1reg) >> ((index % 2) * 4)) & 0x0f; - src2 = it87_read_value(data, IT87_REG_TEMP_SRC2); + src1 = (data->temp_src[index / 2] >> ((index % 2) * 4)) & 0x0f; switch (data->type) { case it8686: - switch (src1) { - case 0: - if (index >= 3) - return 4; - break; - case 1: - if (index == 1 || index == 2 || - index == 4 || index == 5) - return 6; - break; - case 2: - if (index == 2 || index == 6) - return 5; - break; - default: - break; - } + if (src1 < 9) + type = temp_types_8686[index][src1]; break; + case it8625: + if (index < 3) + break; case it8655: case it8665: if (src1 < 3) { index = src1; break; } - switch(src1) { + src2 = data->temp_src[3]; + switch (src1) { case 3: type = (src2 & BIT(index)) ? 6 : 5; break; @@ -1290,16 +1503,39 @@ static int get_temp_type(struct it87_data *data, int index) return 0; } } - if (index >= 3) - return 0; + if (type) + return type; + + /* Dectect PECI vs. AMDTSI */ + ttype = 6; + if ((has_temp_peci(data, index)) || data->type == it8721 || + data->type == it8720) { + extra = data->read(data, IT87_REG_IFSEL); + if ((extra & 0x70) == 0x40) + ttype = 5; + } - reg = it87_read_value(data, IT87_REG_TEMP_ENABLE); - extra = it87_read_value(data, IT87_REG_TEMP_EXTRA); + reg = data->read(data, IT87_REG_TEMP_ENABLE); + + /* Per chip special detection */ + switch (data->type) { + case it8622: + if (!(reg & 0xc0) && index == 3) + type = ttype; + break; + default: + break; + } + + if (type || index >= 3) + return type; + + extra = data->read(data, IT87_REG_TEMP_EXTRA); if ((has_temp_peci(data, index) && (reg >> 6 == index + 1)) || (has_temp_old_peci(data, index) && (extra & 0x80))) - type = 6; /* Intel PECI */ - if (reg & BIT(index)) + type = ttype; /* Intel PECI or AMDTSI */ + else if (reg & BIT(index)) type = 3; /* thermal diode */ else if (reg & BIT(index + 3)) type = 4; /* thermistor */ @@ -1312,8 +1548,12 @@ static ssize_t show_temp_type(struct device *dev, struct device_attribute *attr, { struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); struct it87_data *data = it87_update_device(dev); - int type = get_temp_type(data, sensor_attr->index); + int type; + + if (IS_ERR(data)) + return PTR_ERR(data); + type = get_temp_type(data, sensor_attr->index); return sprintf(buf, "%d\n", type); } @@ -1326,16 +1566,21 @@ static ssize_t set_temp_type(struct device *dev, struct device_attribute *attr, struct it87_data *data = dev_get_drvdata(dev); long val; u8 reg, extra; + int err; if (kstrtol(buf, 10, &val) < 0) return -EINVAL; - reg = it87_read_value(data, IT87_REG_TEMP_ENABLE); + err = it87_lock(data); + if (err) + return err; + + reg = data->read(data, IT87_REG_TEMP_ENABLE); reg &= ~(1 << nr); reg &= ~(8 << nr); if (has_temp_peci(data, nr) && (reg >> 6 == nr + 1 || val == 6)) reg &= 0x3f; - extra = it87_read_value(data, IT87_REG_TEMP_EXTRA); + extra = data->read(data, IT87_REG_TEMP_EXTRA); if (has_temp_old_peci(data, nr) && ((extra & 0x80) || val == 6)) extra &= 0x7f; if (val == 2) { /* backwards compatibility */ @@ -1352,32 +1597,28 @@ static ssize_t set_temp_type(struct device *dev, struct device_attribute *attr, reg |= (nr + 1) << 6; else if (has_temp_old_peci(data, nr) && val == 6) extra |= 0x80; - else if (val != 0) - return -EINVAL; + else if (val != 0) { + count = -EINVAL; + goto unlock; + } - mutex_lock(&data->update_lock); data->sensor = reg; data->extra = extra; - it87_write_value(data, IT87_REG_TEMP_ENABLE, data->sensor); + data->write(data, IT87_REG_TEMP_ENABLE, data->sensor); if (has_temp_old_peci(data, nr)) - it87_write_value(data, IT87_REG_TEMP_EXTRA, data->extra); + data->write(data, IT87_REG_TEMP_EXTRA, data->extra); data->valid = 0; /* Force cache refresh */ - mutex_unlock(&data->update_lock); +unlock: + it87_unlock(data); return count; } -static SENSOR_DEVICE_ATTR(temp1_type, S_IRUGO | S_IWUSR, show_temp_type, - set_temp_type, 0); -static SENSOR_DEVICE_ATTR(temp2_type, S_IRUGO | S_IWUSR, show_temp_type, - set_temp_type, 1); -static SENSOR_DEVICE_ATTR(temp3_type, S_IRUGO | S_IWUSR, show_temp_type, - set_temp_type, 2); -static SENSOR_DEVICE_ATTR(temp4_type, S_IRUGO | S_IWUSR, show_temp_type, - set_temp_type, 3); -static SENSOR_DEVICE_ATTR(temp5_type, S_IRUGO | S_IWUSR, show_temp_type, - set_temp_type, 4); -static SENSOR_DEVICE_ATTR(temp6_type, S_IRUGO | S_IWUSR, show_temp_type, - set_temp_type, 5); +static SENSOR_DEVICE_ATTR(temp1_type, 0644, show_temp_type, set_temp_type, 0); +static SENSOR_DEVICE_ATTR(temp2_type, 0644, show_temp_type, set_temp_type, 1); +static SENSOR_DEVICE_ATTR(temp3_type, 0644, show_temp_type, set_temp_type, 2); +static SENSOR_DEVICE_ATTR(temp4_type, 0644, show_temp_type, set_temp_type, 3); +static SENSOR_DEVICE_ATTR(temp5_type, 0644, show_temp_type, set_temp_type, 4); +static SENSOR_DEVICE_ATTR(temp6_type, 0644, show_temp_type, set_temp_type, 5); /* 6 Fans */ @@ -1404,6 +1645,9 @@ static ssize_t show_fan(struct device *dev, struct device_attribute *attr, int speed; struct it87_data *data = it87_update_device(dev); + if (IS_ERR(data)) + return PTR_ERR(data); + speed = has_16bit_fans(data) ? FAN16_FROM_REG(data->fan[nr][index]) : FAN_FROM_REG(data->fan[nr][index], @@ -1418,6 +1662,9 @@ static ssize_t show_fan_div(struct device *dev, struct device_attribute *attr, struct it87_data *data = it87_update_device(dev); int nr = sensor_attr->index; + if (IS_ERR(data)) + return PTR_ERR(data); + return sprintf(buf, "%lu\n", DIV_FROM_REG(data->fan_div[nr])); } @@ -1428,6 +1675,9 @@ static ssize_t show_pwm_enable(struct device *dev, struct it87_data *data = it87_update_device(dev); int nr = sensor_attr->index; + if (IS_ERR(data)) + return PTR_ERR(data); + return sprintf(buf, "%d\n", pwm_mode(data, nr)); } @@ -1438,6 +1688,9 @@ static ssize_t show_pwm(struct device *dev, struct device_attribute *attr, struct it87_data *data = it87_update_device(dev); int nr = sensor_attr->index; + if (IS_ERR(data)) + return PTR_ERR(data); + return sprintf(buf, "%d\n", pwm_from_reg(data, data->pwm_duty[nr])); } @@ -1451,6 +1704,9 @@ static ssize_t show_pwm_freq(struct device *dev, struct device_attribute *attr, unsigned int freq; int index; + if (IS_ERR(data)) + return PTR_ERR(data); + if (has_pwm_freq2(data) && nr == 1) index = (data->extra >> 4) & 0x07; else @@ -1470,21 +1726,24 @@ static ssize_t set_fan(struct device *dev, struct device_attribute *attr, struct it87_data *data = dev_get_drvdata(dev); long val; + int err; u8 reg; if (kstrtol(buf, 10, &val) < 0) return -EINVAL; - mutex_lock(&data->update_lock); + err = it87_lock(data); + if (err) + return err; if (has_16bit_fans(data)) { data->fan[nr][index] = FAN16_TO_REG(val); - it87_write_value(data, data->REG_FAN_MIN[nr], - data->fan[nr][index] & 0xff); - it87_write_value(data, data->REG_FANX_MIN[nr], - data->fan[nr][index] >> 8); + data->write(data, data->REG_FAN_MIN[nr], + data->fan[nr][index] & 0xff); + data->write(data, data->REG_FANX_MIN[nr], + data->fan[nr][index] >> 8); } else { - reg = it87_read_value(data, IT87_REG_FAN_DIV); + reg = data->read(data, IT87_REG_FAN_DIV); switch (nr) { case 0: data->fan_div[nr] = reg & 0x07; @@ -1498,11 +1757,9 @@ static ssize_t set_fan(struct device *dev, struct device_attribute *attr, } data->fan[nr][index] = FAN_TO_REG(val, DIV_FROM_REG(data->fan_div[nr])); - it87_write_value(data, data->REG_FAN_MIN[nr], - data->fan[nr][index]); + data->write(data, data->REG_FAN_MIN[nr], data->fan[nr][index]); } - - mutex_unlock(&data->update_lock); + it87_unlock(data); return count; } @@ -1513,14 +1770,17 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr, struct it87_data *data = dev_get_drvdata(dev); int nr = sensor_attr->index; unsigned long val; - int min; + int min, err; u8 old; if (kstrtoul(buf, 10, &val) < 0) return -EINVAL; - mutex_lock(&data->update_lock); - old = it87_read_value(data, IT87_REG_FAN_DIV); + err = it87_lock(data); + if (err) + return err; + + old = data->read(data, IT87_REG_FAN_DIV); /* Save fan min limit */ min = FAN_FROM_REG(data->fan[nr][1], DIV_FROM_REG(data->fan_div[nr])); @@ -1541,13 +1801,12 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr, val |= (data->fan_div[1] & 0x07) << 3; if (data->fan_div[2] == 3) val |= 0x1 << 6; - it87_write_value(data, IT87_REG_FAN_DIV, val); + data->write(data, IT87_REG_FAN_DIV, val); /* Restore fan min limit */ data->fan[nr][1] = FAN_TO_REG(min, DIV_FROM_REG(data->fan_div[nr])); - it87_write_value(data, data->REG_FAN_MIN[nr], data->fan[nr][1]); - - mutex_unlock(&data->update_lock); + data->write(data, data->REG_FAN_MIN[nr], data->fan[nr][1]); + it87_unlock(data); return count; } @@ -1588,6 +1847,7 @@ static ssize_t set_pwm_enable(struct device *dev, struct device_attribute *attr, struct it87_data *data = dev_get_drvdata(dev); int nr = sensor_attr->index; long val; + int err; if (kstrtol(buf, 10, &val) < 0 || val < 0 || val > 2) return -EINVAL; @@ -1598,58 +1858,64 @@ static ssize_t set_pwm_enable(struct device *dev, struct device_attribute *attr, return -EINVAL; } - mutex_lock(&data->update_lock); + err = it87_lock(data); + if (err) + return err; + + it87_update_pwm_ctrl(data, nr); if (val == 0) { if (nr < 3 && has_fanctl_onoff(data)) { int tmp; /* make sure the fan is on when in on/off mode */ - tmp = it87_read_value(data, IT87_REG_FAN_CTL); - it87_write_value(data, IT87_REG_FAN_CTL, tmp | BIT(nr)); + tmp = data->read(data, IT87_REG_FAN_CTL); + data->write(data, IT87_REG_FAN_CTL, tmp | BIT(nr)); /* set on/off mode */ data->fan_main_ctrl &= ~BIT(nr); - it87_write_value(data, IT87_REG_FAN_MAIN_CTRL, - data->fan_main_ctrl); + data->write(data, IT87_REG_FAN_MAIN_CTRL, + data->fan_main_ctrl); } else { u8 ctrl; /* No on/off mode, set maximum pwm value */ data->pwm_duty[nr] = pwm_to_reg(data, 0xff); - it87_write_value(data, IT87_REG_PWM_DUTY[nr], - data->pwm_duty[nr]); + data->write(data, IT87_REG_PWM_DUTY[nr], + data->pwm_duty[nr]); /* and set manual mode */ if (has_newer_autopwm(data)) { - ctrl = (data->pwm_ctrl[nr] & 0x7c) | - data->pwm_temp_map[nr]; + ctrl = temp_map_to_reg(data, nr, + data->pwm_temp_map[nr]); + ctrl &= 0x7f; } else { ctrl = data->pwm_duty[nr]; } data->pwm_ctrl[nr] = ctrl; - it87_write_value(data, data->REG_PWM[nr], ctrl); + data->write(data, data->REG_PWM[nr], ctrl); } } else { u8 ctrl; if (has_newer_autopwm(data)) { - ctrl = (data->pwm_ctrl[nr] & 0x7c) | - data->pwm_temp_map[nr]; - if (val != 1) + ctrl = temp_map_to_reg(data, nr, + data->pwm_temp_map[nr]); + if (val == 1) + ctrl &= 0x7f; + else ctrl |= 0x80; } else { ctrl = (val == 1 ? data->pwm_duty[nr] : 0x80); } data->pwm_ctrl[nr] = ctrl; - it87_write_value(data, data->REG_PWM[nr], ctrl); + data->write(data, data->REG_PWM[nr], ctrl); if (has_fanctl_onoff(data) && nr < 3) { /* set SmartGuardian mode */ data->fan_main_ctrl |= BIT(nr); - it87_write_value(data, IT87_REG_FAN_MAIN_CTRL, - data->fan_main_ctrl); + data->write(data, IT87_REG_FAN_MAIN_CTRL, + data->fan_main_ctrl); } } - - mutex_unlock(&data->update_lock); + it87_unlock(data); return count; } @@ -1660,11 +1926,15 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr, struct it87_data *data = dev_get_drvdata(dev); int nr = sensor_attr->index; long val; + int err; if (kstrtol(buf, 10, &val) < 0 || val < 0 || val > 255) return -EINVAL; - mutex_lock(&data->update_lock); + err = it87_lock(data); + if (err) + return err; + it87_update_pwm_ctrl(data, nr); if (has_newer_autopwm(data)) { /* @@ -1672,12 +1942,12 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr, * is read-only so we can't write the value. */ if (data->pwm_ctrl[nr] & 0x80) { - mutex_unlock(&data->update_lock); - return -EBUSY; + count = -EBUSY; + goto unlock; } data->pwm_duty[nr] = pwm_to_reg(data, val); - it87_write_value(data, IT87_REG_PWM_DUTY[nr], - data->pwm_duty[nr]); + data->write(data, IT87_REG_PWM_DUTY[nr], + data->pwm_duty[nr]); } else { data->pwm_duty[nr] = pwm_to_reg(data, val); /* @@ -1686,11 +1956,12 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr, */ if (!(data->pwm_ctrl[nr] & 0x80)) { data->pwm_ctrl[nr] = data->pwm_duty[nr]; - it87_write_value(data, data->REG_PWM[nr], - data->pwm_ctrl[nr]); + data->write(data, data->REG_PWM[nr], + data->pwm_ctrl[nr]); } } - mutex_unlock(&data->update_lock); +unlock: + it87_unlock(data); return count; } @@ -1701,6 +1972,7 @@ static ssize_t set_pwm_freq(struct device *dev, struct device_attribute *attr, struct it87_data *data = dev_get_drvdata(dev); int nr = sensor_attr->index; unsigned long val; + int err; int i; if (kstrtoul(buf, 10, &val) < 0) @@ -1710,23 +1982,25 @@ static ssize_t set_pwm_freq(struct device *dev, struct device_attribute *attr, val *= has_newer_autopwm(data) ? 256 : 128; /* Search for the nearest available frequency */ - for (i = 0; i < 7; i++) { + for (i = 0; i < ARRAY_SIZE(pwm_freq) - 1; i++) { if (val > (pwm_freq[i] + pwm_freq[i + 1]) / 2) break; } - mutex_lock(&data->update_lock); + err = it87_lock(data); + if (err) + return err; + if (nr == 0) { - data->fan_ctl = it87_read_value(data, IT87_REG_FAN_CTL) & 0x8f; + data->fan_ctl = data->read(data, IT87_REG_FAN_CTL) & 0x8f; data->fan_ctl |= i << 4; - it87_write_value(data, IT87_REG_FAN_CTL, data->fan_ctl); + data->write(data, IT87_REG_FAN_CTL, data->fan_ctl); } else { - data->extra = it87_read_value(data, IT87_REG_TEMP_EXTRA) & 0x8f; + data->extra = data->read(data, IT87_REG_TEMP_EXTRA) & 0x8f; data->extra |= i << 4; - it87_write_value(data, IT87_REG_TEMP_EXTRA, data->extra); + data->write(data, IT87_REG_TEMP_EXTRA, data->extra); } - mutex_unlock(&data->update_lock); - + it87_unlock(data); return count; } @@ -1736,15 +2010,11 @@ static ssize_t show_pwm_temp_map(struct device *dev, struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); struct it87_data *data = it87_update_device(dev); int nr = sensor_attr->index; - int map; - map = data->pwm_temp_map[nr]; - if (map >= 3) - map = 0; /* Should never happen */ - if (nr >= 3) /* pwm channels 3..6 map to temp4..6 */ - map += 3; + if (IS_ERR(data)) + return PTR_ERR(data); - return sprintf(buf, "%d\n", (int)BIT(map)); + return sprintf(buf, "%d\n", data->pwm_temp_map[nr] + 1); } static ssize_t set_pwm_temp_map(struct device *dev, @@ -1754,42 +2024,33 @@ static ssize_t set_pwm_temp_map(struct device *dev, struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); struct it87_data *data = dev_get_drvdata(dev); int nr = sensor_attr->index; - long val; - u8 reg; + unsigned long val; + int err; + u8 map; - if (kstrtol(buf, 10, &val) < 0) + if (kstrtoul(buf, 10, &val) < 0) return -EINVAL; - if (nr >= 3) - val -= 3; - - switch (val) { - case BIT(0): - reg = 0x00; - break; - case BIT(1): - reg = 0x01; - break; - case BIT(2): - reg = 0x02; - break; - default: + if (!val || val > data->pwm_num_temp_map) return -EINVAL; - } - mutex_lock(&data->update_lock); + map = val - 1; + + err = it87_lock(data); + if (err) + return err; + it87_update_pwm_ctrl(data, nr); - data->pwm_temp_map[nr] = reg; + data->pwm_temp_map[nr] = map; /* * If we are in automatic mode, write the temp mapping immediately; * otherwise, just store it for later use. */ if (data->pwm_ctrl[nr] & 0x80) { - data->pwm_ctrl[nr] = (data->pwm_ctrl[nr] & 0xfc) | - data->pwm_temp_map[nr]; - it87_write_value(data, data->REG_PWM[nr], data->pwm_ctrl[nr]); + data->pwm_ctrl[nr] = temp_map_to_reg(data, nr, map); + data->write(data, data->REG_PWM[nr], data->pwm_ctrl[nr]); } - mutex_unlock(&data->update_lock); + it87_unlock(data); return count; } @@ -1802,6 +2063,9 @@ static ssize_t show_auto_pwm(struct device *dev, struct device_attribute *attr, int nr = sensor_attr->nr; int point = sensor_attr->index; + if (IS_ERR(data)) + return PTR_ERR(data); + return sprintf(buf, "%d\n", pwm_from_reg(data, data->auto_pwm[nr][point])); } @@ -1816,18 +2080,22 @@ static ssize_t set_auto_pwm(struct device *dev, struct device_attribute *attr, int point = sensor_attr->index; int regaddr; long val; + int err; if (kstrtol(buf, 10, &val) < 0 || val < 0 || val > 255) return -EINVAL; - mutex_lock(&data->update_lock); + err = it87_lock(data); + if (err) + return err; + data->auto_pwm[nr][point] = pwm_to_reg(data, val); if (has_newer_autopwm(data)) regaddr = IT87_REG_AUTO_TEMP(nr, 3); else regaddr = IT87_REG_AUTO_PWM(nr, point); - it87_write_value(data, regaddr, data->auto_pwm[nr][point]); - mutex_unlock(&data->update_lock); + data->write(data, regaddr, data->auto_pwm[nr][point]); + it87_unlock(data); return count; } @@ -1838,6 +2106,9 @@ static ssize_t show_auto_pwm_slope(struct device *dev, struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); int nr = sensor_attr->index; + if (IS_ERR(data)) + return PTR_ERR(data); + return sprintf(buf, "%d\n", data->auto_pwm[nr][1] & 0x7f); } @@ -1849,15 +2120,18 @@ static ssize_t set_auto_pwm_slope(struct device *dev, struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); int nr = sensor_attr->index; unsigned long val; + int err; if (kstrtoul(buf, 10, &val) < 0 || val > 127) return -EINVAL; - mutex_lock(&data->update_lock); + err = it87_lock(data); + if (err) + return err; + data->auto_pwm[nr][1] = (data->auto_pwm[nr][1] & 0x80) | val; - it87_write_value(data, IT87_REG_AUTO_TEMP(nr, 4), - data->auto_pwm[nr][1]); - mutex_unlock(&data->update_lock); + data->write(data, IT87_REG_AUTO_TEMP(nr, 4), data->auto_pwm[nr][1]); + it87_unlock(data); return count; } @@ -1871,6 +2145,9 @@ static ssize_t show_auto_temp(struct device *dev, struct device_attribute *attr, int point = sensor_attr->index; int reg; + if (IS_ERR(data)) + return PTR_ERR(data); + if (has_old_autopwm(data) || point) reg = data->auto_temp[nr][point]; else @@ -1889,200 +2166,194 @@ static ssize_t set_auto_temp(struct device *dev, struct device_attribute *attr, int point = sensor_attr->index; long val; int reg; + int err; if (kstrtol(buf, 10, &val) < 0 || val < -128000 || val > 127000) return -EINVAL; - mutex_lock(&data->update_lock); + err = it87_lock(data); + if (err) + return err; + if (has_newer_autopwm(data) && !point) { reg = data->auto_temp[nr][1] - TEMP_TO_REG(val); reg = clamp_val(reg, 0, 0x1f) | (data->auto_temp[nr][0] & 0xe0); data->auto_temp[nr][0] = reg; - it87_write_value(data, IT87_REG_AUTO_TEMP(nr, 5), reg); + data->write(data, IT87_REG_AUTO_TEMP(nr, 5), reg); } else { reg = TEMP_TO_REG(val); data->auto_temp[nr][point] = reg; if (has_newer_autopwm(data)) point--; - it87_write_value(data, IT87_REG_AUTO_TEMP(nr, point), reg); + data->write(data, IT87_REG_AUTO_TEMP(nr, point), reg); } - mutex_unlock(&data->update_lock); + it87_unlock(data); return count; } -static SENSOR_DEVICE_ATTR_2(fan1_input, S_IRUGO, show_fan, NULL, 0, 0); -static SENSOR_DEVICE_ATTR_2(fan1_min, S_IRUGO | S_IWUSR, show_fan, set_fan, - 0, 1); -static SENSOR_DEVICE_ATTR(fan1_div, S_IRUGO | S_IWUSR, show_fan_div, - set_fan_div, 0); +static SENSOR_DEVICE_ATTR_2(fan1_input, 0444, show_fan, NULL, 0, 0); +static SENSOR_DEVICE_ATTR_2(fan1_min, 0644, show_fan, set_fan, 0, 1); +static SENSOR_DEVICE_ATTR(fan1_div, 0644, show_fan_div, set_fan_div, 0); -static SENSOR_DEVICE_ATTR_2(fan2_input, S_IRUGO, show_fan, NULL, 1, 0); -static SENSOR_DEVICE_ATTR_2(fan2_min, S_IRUGO | S_IWUSR, show_fan, set_fan, - 1, 1); -static SENSOR_DEVICE_ATTR(fan2_div, S_IRUGO | S_IWUSR, show_fan_div, - set_fan_div, 1); +static SENSOR_DEVICE_ATTR_2(fan2_input, 0444, show_fan, NULL, 1, 0); +static SENSOR_DEVICE_ATTR_2(fan2_min, 0644, show_fan, set_fan, 1, 1); +static SENSOR_DEVICE_ATTR(fan2_div, 0644, show_fan_div, set_fan_div, 1); -static SENSOR_DEVICE_ATTR_2(fan3_input, S_IRUGO, show_fan, NULL, 2, 0); -static SENSOR_DEVICE_ATTR_2(fan3_min, S_IRUGO | S_IWUSR, show_fan, set_fan, - 2, 1); -static SENSOR_DEVICE_ATTR(fan3_div, S_IRUGO | S_IWUSR, show_fan_div, - set_fan_div, 2); +static SENSOR_DEVICE_ATTR_2(fan3_input, 0444, show_fan, NULL, 2, 0); +static SENSOR_DEVICE_ATTR_2(fan3_min, 0644, show_fan, set_fan, 2, 1); +static SENSOR_DEVICE_ATTR(fan3_div, 0644, show_fan_div, set_fan_div, 2); -static SENSOR_DEVICE_ATTR_2(fan4_input, S_IRUGO, show_fan, NULL, 3, 0); -static SENSOR_DEVICE_ATTR_2(fan4_min, S_IRUGO | S_IWUSR, show_fan, set_fan, - 3, 1); +static SENSOR_DEVICE_ATTR_2(fan4_input, 0444, show_fan, NULL, 3, 0); +static SENSOR_DEVICE_ATTR_2(fan4_min, 0644, show_fan, set_fan, 3, 1); -static SENSOR_DEVICE_ATTR_2(fan5_input, S_IRUGO, show_fan, NULL, 4, 0); -static SENSOR_DEVICE_ATTR_2(fan5_min, S_IRUGO | S_IWUSR, show_fan, set_fan, - 4, 1); +static SENSOR_DEVICE_ATTR_2(fan5_input, 0444, show_fan, NULL, 4, 0); +static SENSOR_DEVICE_ATTR_2(fan5_min, 0644, show_fan, set_fan, 4, 1); -static SENSOR_DEVICE_ATTR_2(fan6_input, S_IRUGO, show_fan, NULL, 5, 0); -static SENSOR_DEVICE_ATTR_2(fan6_min, S_IRUGO | S_IWUSR, show_fan, set_fan, - 5, 1); +static SENSOR_DEVICE_ATTR_2(fan6_input, 0444, show_fan, NULL, 5, 0); +static SENSOR_DEVICE_ATTR_2(fan6_min, 0644, show_fan, set_fan, 5, 1); -static SENSOR_DEVICE_ATTR(pwm1_enable, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR(pwm1_enable, 0644, show_pwm_enable, set_pwm_enable, 0); -static SENSOR_DEVICE_ATTR(pwm1, S_IRUGO | S_IWUSR, show_pwm, set_pwm, 0); -static SENSOR_DEVICE_ATTR(pwm1_freq, S_IRUGO | S_IWUSR, show_pwm_freq, - set_pwm_freq, 0); -static SENSOR_DEVICE_ATTR(pwm1_auto_channels_temp, S_IRUGO, +static SENSOR_DEVICE_ATTR(pwm1, 0644, show_pwm, set_pwm, 0); +static SENSOR_DEVICE_ATTR(pwm1_freq, 0644, show_pwm_freq, set_pwm_freq, 0); +static SENSOR_DEVICE_ATTR(pwm1_auto_channels_temp, 0444, show_pwm_temp_map, set_pwm_temp_map, 0); -static SENSOR_DEVICE_ATTR_2(pwm1_auto_point1_pwm, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm1_auto_point1_pwm, 0644, show_auto_pwm, set_auto_pwm, 0, 0); -static SENSOR_DEVICE_ATTR_2(pwm1_auto_point2_pwm, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm1_auto_point2_pwm, 0644, show_auto_pwm, set_auto_pwm, 0, 1); -static SENSOR_DEVICE_ATTR_2(pwm1_auto_point3_pwm, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm1_auto_point3_pwm, 0644, show_auto_pwm, set_auto_pwm, 0, 2); -static SENSOR_DEVICE_ATTR_2(pwm1_auto_point4_pwm, S_IRUGO, +static SENSOR_DEVICE_ATTR_2(pwm1_auto_point4_pwm, 0444, show_auto_pwm, NULL, 0, 3); -static SENSOR_DEVICE_ATTR_2(pwm1_auto_point1_temp, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm1_auto_point1_temp, 0644, show_auto_temp, set_auto_temp, 0, 1); -static SENSOR_DEVICE_ATTR_2(pwm1_auto_point1_temp_hyst, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm1_auto_point1_temp_hyst, 0644, show_auto_temp, set_auto_temp, 0, 0); -static SENSOR_DEVICE_ATTR_2(pwm1_auto_point2_temp, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm1_auto_point2_temp, 0644, show_auto_temp, set_auto_temp, 0, 2); -static SENSOR_DEVICE_ATTR_2(pwm1_auto_point3_temp, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm1_auto_point3_temp, 0644, show_auto_temp, set_auto_temp, 0, 3); -static SENSOR_DEVICE_ATTR_2(pwm1_auto_point4_temp, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm1_auto_point4_temp, 0644, show_auto_temp, set_auto_temp, 0, 4); -static SENSOR_DEVICE_ATTR_2(pwm1_auto_start, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm1_auto_start, 0644, show_auto_pwm, set_auto_pwm, 0, 0); -static SENSOR_DEVICE_ATTR(pwm1_auto_slope, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR(pwm1_auto_slope, 0644, show_auto_pwm_slope, set_auto_pwm_slope, 0); -static SENSOR_DEVICE_ATTR(pwm2_enable, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR(pwm2_enable, 0644, show_pwm_enable, set_pwm_enable, 1); -static SENSOR_DEVICE_ATTR(pwm2, S_IRUGO | S_IWUSR, show_pwm, set_pwm, 1); -static SENSOR_DEVICE_ATTR(pwm2_freq, S_IRUGO, show_pwm_freq, set_pwm_freq, 1); -static SENSOR_DEVICE_ATTR(pwm2_auto_channels_temp, S_IRUGO, +static SENSOR_DEVICE_ATTR(pwm2, 0644, show_pwm, set_pwm, 1); +static SENSOR_DEVICE_ATTR(pwm2_freq, 0444, show_pwm_freq, set_pwm_freq, 1); +static SENSOR_DEVICE_ATTR(pwm2_auto_channels_temp, 0444, show_pwm_temp_map, set_pwm_temp_map, 1); -static SENSOR_DEVICE_ATTR_2(pwm2_auto_point1_pwm, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm2_auto_point1_pwm, 0644, show_auto_pwm, set_auto_pwm, 1, 0); -static SENSOR_DEVICE_ATTR_2(pwm2_auto_point2_pwm, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm2_auto_point2_pwm, 0644, show_auto_pwm, set_auto_pwm, 1, 1); -static SENSOR_DEVICE_ATTR_2(pwm2_auto_point3_pwm, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm2_auto_point3_pwm, 0644, show_auto_pwm, set_auto_pwm, 1, 2); -static SENSOR_DEVICE_ATTR_2(pwm2_auto_point4_pwm, S_IRUGO, +static SENSOR_DEVICE_ATTR_2(pwm2_auto_point4_pwm, 0444, show_auto_pwm, NULL, 1, 3); -static SENSOR_DEVICE_ATTR_2(pwm2_auto_point1_temp, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm2_auto_point1_temp, 0644, show_auto_temp, set_auto_temp, 1, 1); -static SENSOR_DEVICE_ATTR_2(pwm2_auto_point1_temp_hyst, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm2_auto_point1_temp_hyst, 0644, show_auto_temp, set_auto_temp, 1, 0); -static SENSOR_DEVICE_ATTR_2(pwm2_auto_point2_temp, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm2_auto_point2_temp, 0644, show_auto_temp, set_auto_temp, 1, 2); -static SENSOR_DEVICE_ATTR_2(pwm2_auto_point3_temp, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm2_auto_point3_temp, 0644, show_auto_temp, set_auto_temp, 1, 3); -static SENSOR_DEVICE_ATTR_2(pwm2_auto_point4_temp, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm2_auto_point4_temp, 0644, show_auto_temp, set_auto_temp, 1, 4); -static SENSOR_DEVICE_ATTR_2(pwm2_auto_start, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm2_auto_start, 0644, show_auto_pwm, set_auto_pwm, 1, 0); -static SENSOR_DEVICE_ATTR(pwm2_auto_slope, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR(pwm2_auto_slope, 0644, show_auto_pwm_slope, set_auto_pwm_slope, 1); -static SENSOR_DEVICE_ATTR(pwm3_enable, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR(pwm3_enable, 0644, show_pwm_enable, set_pwm_enable, 2); -static SENSOR_DEVICE_ATTR(pwm3, S_IRUGO | S_IWUSR, show_pwm, set_pwm, 2); -static SENSOR_DEVICE_ATTR(pwm3_freq, S_IRUGO, show_pwm_freq, NULL, 2); -static SENSOR_DEVICE_ATTR(pwm3_auto_channels_temp, S_IRUGO, +static SENSOR_DEVICE_ATTR(pwm3, 0644, show_pwm, set_pwm, 2); +static SENSOR_DEVICE_ATTR(pwm3_freq, 0444, show_pwm_freq, NULL, 2); +static SENSOR_DEVICE_ATTR(pwm3_auto_channels_temp, 0444, show_pwm_temp_map, set_pwm_temp_map, 2); -static SENSOR_DEVICE_ATTR_2(pwm3_auto_point1_pwm, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm3_auto_point1_pwm, 0644, show_auto_pwm, set_auto_pwm, 2, 0); -static SENSOR_DEVICE_ATTR_2(pwm3_auto_point2_pwm, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm3_auto_point2_pwm, 0644, show_auto_pwm, set_auto_pwm, 2, 1); -static SENSOR_DEVICE_ATTR_2(pwm3_auto_point3_pwm, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm3_auto_point3_pwm, 0644, show_auto_pwm, set_auto_pwm, 2, 2); -static SENSOR_DEVICE_ATTR_2(pwm3_auto_point4_pwm, S_IRUGO, +static SENSOR_DEVICE_ATTR_2(pwm3_auto_point4_pwm, 0444, show_auto_pwm, NULL, 2, 3); -static SENSOR_DEVICE_ATTR_2(pwm3_auto_point1_temp, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm3_auto_point1_temp, 0644, show_auto_temp, set_auto_temp, 2, 1); -static SENSOR_DEVICE_ATTR_2(pwm3_auto_point1_temp_hyst, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm3_auto_point1_temp_hyst, 0644, show_auto_temp, set_auto_temp, 2, 0); -static SENSOR_DEVICE_ATTR_2(pwm3_auto_point2_temp, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm3_auto_point2_temp, 0644, show_auto_temp, set_auto_temp, 2, 2); -static SENSOR_DEVICE_ATTR_2(pwm3_auto_point3_temp, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm3_auto_point3_temp, 0644, show_auto_temp, set_auto_temp, 2, 3); -static SENSOR_DEVICE_ATTR_2(pwm3_auto_point4_temp, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm3_auto_point4_temp, 0644, show_auto_temp, set_auto_temp, 2, 4); -static SENSOR_DEVICE_ATTR_2(pwm3_auto_start, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm3_auto_start, 0644, show_auto_pwm, set_auto_pwm, 2, 0); -static SENSOR_DEVICE_ATTR(pwm3_auto_slope, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR(pwm3_auto_slope, 0644, show_auto_pwm_slope, set_auto_pwm_slope, 2); -static SENSOR_DEVICE_ATTR(pwm4_enable, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR(pwm4_enable, 0644, show_pwm_enable, set_pwm_enable, 3); -static SENSOR_DEVICE_ATTR(pwm4, S_IRUGO | S_IWUSR, show_pwm, set_pwm, 3); -static SENSOR_DEVICE_ATTR(pwm4_freq, S_IRUGO, show_pwm_freq, NULL, 3); -static SENSOR_DEVICE_ATTR(pwm4_auto_channels_temp, S_IRUGO, +static SENSOR_DEVICE_ATTR(pwm4, 0644, show_pwm, set_pwm, 3); +static SENSOR_DEVICE_ATTR(pwm4_freq, 0444, show_pwm_freq, NULL, 3); +static SENSOR_DEVICE_ATTR(pwm4_auto_channels_temp, 0444, show_pwm_temp_map, set_pwm_temp_map, 3); -static SENSOR_DEVICE_ATTR_2(pwm4_auto_point1_temp, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm4_auto_point1_temp, 0644, show_auto_temp, set_auto_temp, 2, 1); -static SENSOR_DEVICE_ATTR_2(pwm4_auto_point1_temp_hyst, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm4_auto_point1_temp_hyst, 0644, show_auto_temp, set_auto_temp, 2, 0); -static SENSOR_DEVICE_ATTR_2(pwm4_auto_point2_temp, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm4_auto_point2_temp, 0644, show_auto_temp, set_auto_temp, 2, 2); -static SENSOR_DEVICE_ATTR_2(pwm4_auto_point3_temp, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm4_auto_point3_temp, 0644, show_auto_temp, set_auto_temp, 2, 3); -static SENSOR_DEVICE_ATTR_2(pwm4_auto_start, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm4_auto_start, 0644, show_auto_pwm, set_auto_pwm, 3, 0); -static SENSOR_DEVICE_ATTR(pwm4_auto_slope, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR(pwm4_auto_slope, 0644, show_auto_pwm_slope, set_auto_pwm_slope, 3); -static SENSOR_DEVICE_ATTR(pwm5_enable, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR(pwm5_enable, 0644, show_pwm_enable, set_pwm_enable, 4); -static SENSOR_DEVICE_ATTR(pwm5, S_IRUGO | S_IWUSR, show_pwm, set_pwm, 4); -static SENSOR_DEVICE_ATTR(pwm5_freq, S_IRUGO, show_pwm_freq, NULL, 4); -static SENSOR_DEVICE_ATTR(pwm5_auto_channels_temp, S_IRUGO, +static SENSOR_DEVICE_ATTR(pwm5, 0644, show_pwm, set_pwm, 4); +static SENSOR_DEVICE_ATTR(pwm5_freq, 0444, show_pwm_freq, NULL, 4); +static SENSOR_DEVICE_ATTR(pwm5_auto_channels_temp, 0444, show_pwm_temp_map, set_pwm_temp_map, 4); -static SENSOR_DEVICE_ATTR_2(pwm5_auto_point1_temp, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm5_auto_point1_temp, 0644, show_auto_temp, set_auto_temp, 2, 1); -static SENSOR_DEVICE_ATTR_2(pwm5_auto_point1_temp_hyst, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm5_auto_point1_temp_hyst, 0644, show_auto_temp, set_auto_temp, 2, 0); -static SENSOR_DEVICE_ATTR_2(pwm5_auto_point2_temp, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm5_auto_point2_temp, 0644, show_auto_temp, set_auto_temp, 2, 2); -static SENSOR_DEVICE_ATTR_2(pwm5_auto_point3_temp, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm5_auto_point3_temp, 0644, show_auto_temp, set_auto_temp, 2, 3); -static SENSOR_DEVICE_ATTR_2(pwm5_auto_start, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm5_auto_start, 0644, show_auto_pwm, set_auto_pwm, 4, 0); -static SENSOR_DEVICE_ATTR(pwm5_auto_slope, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR(pwm5_auto_slope, 0644, show_auto_pwm_slope, set_auto_pwm_slope, 4); -static SENSOR_DEVICE_ATTR(pwm6_enable, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR(pwm6_enable, 0644, show_pwm_enable, set_pwm_enable, 5); -static SENSOR_DEVICE_ATTR(pwm6, S_IRUGO | S_IWUSR, show_pwm, set_pwm, 5); -static SENSOR_DEVICE_ATTR(pwm6_freq, S_IRUGO, show_pwm_freq, NULL, 5); -static SENSOR_DEVICE_ATTR(pwm6_auto_channels_temp, S_IRUGO, +static SENSOR_DEVICE_ATTR(pwm6, 0644, show_pwm, set_pwm, 5); +static SENSOR_DEVICE_ATTR(pwm6_freq, 0444, show_pwm_freq, NULL, 5); +static SENSOR_DEVICE_ATTR(pwm6_auto_channels_temp, 0444, show_pwm_temp_map, set_pwm_temp_map, 5); -static SENSOR_DEVICE_ATTR_2(pwm6_auto_point1_temp, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm6_auto_point1_temp, 0644, show_auto_temp, set_auto_temp, 2, 1); -static SENSOR_DEVICE_ATTR_2(pwm6_auto_point1_temp_hyst, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm6_auto_point1_temp_hyst, 0644, show_auto_temp, set_auto_temp, 2, 0); -static SENSOR_DEVICE_ATTR_2(pwm6_auto_point2_temp, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm6_auto_point2_temp, 0644, show_auto_temp, set_auto_temp, 2, 2); -static SENSOR_DEVICE_ATTR_2(pwm6_auto_point3_temp, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm6_auto_point3_temp, 0644, show_auto_temp, set_auto_temp, 2, 3); -static SENSOR_DEVICE_ATTR_2(pwm6_auto_start, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR_2(pwm6_auto_start, 0644, show_auto_pwm, set_auto_pwm, 5, 0); -static SENSOR_DEVICE_ATTR(pwm6_auto_slope, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR(pwm6_auto_slope, 0644, show_auto_pwm_slope, set_auto_pwm_slope, 5); /* Alarms */ @@ -2091,9 +2362,12 @@ static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, { struct it87_data *data = it87_update_device(dev); + if (IS_ERR(data)) + return PTR_ERR(data); + return sprintf(buf, "%u\n", data->alarms); } -static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL); +static DEVICE_ATTR(alarms, 0444, show_alarms, NULL); static ssize_t show_alarm(struct device *dev, struct device_attribute *attr, char *buf) @@ -2101,6 +2375,9 @@ static ssize_t show_alarm(struct device *dev, struct device_attribute *attr, struct it87_data *data = it87_update_device(dev); int bitnr = to_sensor_dev_attr(attr)->index; + if (IS_ERR(data)) + return PTR_ERR(data); + return sprintf(buf, "%u\n", (data->alarms >> bitnr) & 1); } @@ -2109,48 +2386,46 @@ static ssize_t clear_intrusion(struct device *dev, size_t count) { struct it87_data *data = dev_get_drvdata(dev); - int config; + int err, config; long val; if (kstrtol(buf, 10, &val) < 0 || val != 0) return -EINVAL; - mutex_lock(&data->update_lock); - config = it87_read_value(data, IT87_REG_CONFIG); - if (config < 0) { - count = config; - } else { - config |= BIT(5); - it87_write_value(data, IT87_REG_CONFIG, config); - /* Invalidate cache to force re-read */ - data->valid = 0; - } - mutex_unlock(&data->update_lock); + err = it87_lock(data); + if (err) + return err; + config = data->read(data, IT87_REG_CONFIG); + config |= BIT(5); + data->write(data, IT87_REG_CONFIG, config); + /* Invalidate cache to force re-read */ + data->valid = 0; + it87_unlock(data); return count; } -static SENSOR_DEVICE_ATTR(in0_alarm, S_IRUGO, show_alarm, NULL, 8); -static SENSOR_DEVICE_ATTR(in1_alarm, S_IRUGO, show_alarm, NULL, 9); -static SENSOR_DEVICE_ATTR(in2_alarm, S_IRUGO, show_alarm, NULL, 10); -static SENSOR_DEVICE_ATTR(in3_alarm, S_IRUGO, show_alarm, NULL, 11); -static SENSOR_DEVICE_ATTR(in4_alarm, S_IRUGO, show_alarm, NULL, 12); -static SENSOR_DEVICE_ATTR(in5_alarm, S_IRUGO, show_alarm, NULL, 13); -static SENSOR_DEVICE_ATTR(in6_alarm, S_IRUGO, show_alarm, NULL, 14); -static SENSOR_DEVICE_ATTR(in7_alarm, S_IRUGO, show_alarm, NULL, 15); -static SENSOR_DEVICE_ATTR(fan1_alarm, S_IRUGO, show_alarm, NULL, 0); -static SENSOR_DEVICE_ATTR(fan2_alarm, S_IRUGO, show_alarm, NULL, 1); -static SENSOR_DEVICE_ATTR(fan3_alarm, S_IRUGO, show_alarm, NULL, 2); -static SENSOR_DEVICE_ATTR(fan4_alarm, S_IRUGO, show_alarm, NULL, 3); -static SENSOR_DEVICE_ATTR(fan5_alarm, S_IRUGO, show_alarm, NULL, 6); -static SENSOR_DEVICE_ATTR(fan6_alarm, S_IRUGO, show_alarm, NULL, 7); -static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 16); -static SENSOR_DEVICE_ATTR(temp2_alarm, S_IRUGO, show_alarm, NULL, 17); -static SENSOR_DEVICE_ATTR(temp3_alarm, S_IRUGO, show_alarm, NULL, 18); -static SENSOR_DEVICE_ATTR(temp4_alarm, S_IRUGO, show_alarm, NULL, 19); -static SENSOR_DEVICE_ATTR(temp5_alarm, S_IRUGO, show_alarm, NULL, 20); -static SENSOR_DEVICE_ATTR(temp6_alarm, S_IRUGO, show_alarm, NULL, 21); -static SENSOR_DEVICE_ATTR(intrusion0_alarm, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR(in0_alarm, 0444, show_alarm, NULL, 8); +static SENSOR_DEVICE_ATTR(in1_alarm, 0444, show_alarm, NULL, 9); +static SENSOR_DEVICE_ATTR(in2_alarm, 0444, show_alarm, NULL, 10); +static SENSOR_DEVICE_ATTR(in3_alarm, 0444, show_alarm, NULL, 11); +static SENSOR_DEVICE_ATTR(in4_alarm, 0444, show_alarm, NULL, 12); +static SENSOR_DEVICE_ATTR(in5_alarm, 0444, show_alarm, NULL, 13); +static SENSOR_DEVICE_ATTR(in6_alarm, 0444, show_alarm, NULL, 14); +static SENSOR_DEVICE_ATTR(in7_alarm, 0444, show_alarm, NULL, 15); +static SENSOR_DEVICE_ATTR(fan1_alarm, 0444, show_alarm, NULL, 0); +static SENSOR_DEVICE_ATTR(fan2_alarm, 0444, show_alarm, NULL, 1); +static SENSOR_DEVICE_ATTR(fan3_alarm, 0444, show_alarm, NULL, 2); +static SENSOR_DEVICE_ATTR(fan4_alarm, 0444, show_alarm, NULL, 3); +static SENSOR_DEVICE_ATTR(fan5_alarm, 0444, show_alarm, NULL, 6); +static SENSOR_DEVICE_ATTR(fan6_alarm, 0444, show_alarm, NULL, 7); +static SENSOR_DEVICE_ATTR(temp1_alarm, 0444, show_alarm, NULL, 16); +static SENSOR_DEVICE_ATTR(temp2_alarm, 0444, show_alarm, NULL, 17); +static SENSOR_DEVICE_ATTR(temp3_alarm, 0444, show_alarm, NULL, 18); +static SENSOR_DEVICE_ATTR(temp4_alarm, 0444, show_alarm, NULL, 19); +static SENSOR_DEVICE_ATTR(temp5_alarm, 0444, show_alarm, NULL, 20); +static SENSOR_DEVICE_ATTR(temp6_alarm, 0444, show_alarm, NULL, 21); +static SENSOR_DEVICE_ATTR(intrusion0_alarm, 0644, show_alarm, clear_intrusion, 4); static ssize_t show_beep(struct device *dev, struct device_attribute *attr, @@ -2159,6 +2434,9 @@ static ssize_t show_beep(struct device *dev, struct device_attribute *attr, struct it87_data *data = it87_update_device(dev); int bitnr = to_sensor_dev_attr(attr)->index; + if (IS_ERR(data)) + return PTR_ERR(data); + return sprintf(buf, "%u\n", (data->beeps >> bitnr) & 1); } @@ -2168,44 +2446,48 @@ static ssize_t set_beep(struct device *dev, struct device_attribute *attr, int bitnr = to_sensor_dev_attr(attr)->index; struct it87_data *data = dev_get_drvdata(dev); long val; + int err; if (kstrtol(buf, 10, &val) < 0 || (val != 0 && val != 1)) return -EINVAL; - mutex_lock(&data->update_lock); - data->beeps = it87_read_value(data, IT87_REG_BEEP_ENABLE); + err = it87_lock(data); + if (err) + return err; + + data->beeps = data->read(data, IT87_REG_BEEP_ENABLE); if (val) data->beeps |= BIT(bitnr); else data->beeps &= ~BIT(bitnr); - it87_write_value(data, IT87_REG_BEEP_ENABLE, data->beeps); - mutex_unlock(&data->update_lock); + data->write(data, IT87_REG_BEEP_ENABLE, data->beeps); + it87_unlock(data); return count; } -static SENSOR_DEVICE_ATTR(in0_beep, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR(in0_beep, 0644, show_beep, set_beep, 1); -static SENSOR_DEVICE_ATTR(in1_beep, S_IRUGO, show_beep, NULL, 1); -static SENSOR_DEVICE_ATTR(in2_beep, S_IRUGO, show_beep, NULL, 1); -static SENSOR_DEVICE_ATTR(in3_beep, S_IRUGO, show_beep, NULL, 1); -static SENSOR_DEVICE_ATTR(in4_beep, S_IRUGO, show_beep, NULL, 1); -static SENSOR_DEVICE_ATTR(in5_beep, S_IRUGO, show_beep, NULL, 1); -static SENSOR_DEVICE_ATTR(in6_beep, S_IRUGO, show_beep, NULL, 1); -static SENSOR_DEVICE_ATTR(in7_beep, S_IRUGO, show_beep, NULL, 1); +static SENSOR_DEVICE_ATTR(in1_beep, 0444, show_beep, NULL, 1); +static SENSOR_DEVICE_ATTR(in2_beep, 0444, show_beep, NULL, 1); +static SENSOR_DEVICE_ATTR(in3_beep, 0444, show_beep, NULL, 1); +static SENSOR_DEVICE_ATTR(in4_beep, 0444, show_beep, NULL, 1); +static SENSOR_DEVICE_ATTR(in5_beep, 0444, show_beep, NULL, 1); +static SENSOR_DEVICE_ATTR(in6_beep, 0444, show_beep, NULL, 1); +static SENSOR_DEVICE_ATTR(in7_beep, 0444, show_beep, NULL, 1); /* fanX_beep writability is set later */ -static SENSOR_DEVICE_ATTR(fan1_beep, S_IRUGO, show_beep, set_beep, 0); -static SENSOR_DEVICE_ATTR(fan2_beep, S_IRUGO, show_beep, set_beep, 0); -static SENSOR_DEVICE_ATTR(fan3_beep, S_IRUGO, show_beep, set_beep, 0); -static SENSOR_DEVICE_ATTR(fan4_beep, S_IRUGO, show_beep, set_beep, 0); -static SENSOR_DEVICE_ATTR(fan5_beep, S_IRUGO, show_beep, set_beep, 0); -static SENSOR_DEVICE_ATTR(fan6_beep, S_IRUGO, show_beep, set_beep, 0); -static SENSOR_DEVICE_ATTR(temp1_beep, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR(fan1_beep, 0444, show_beep, set_beep, 0); +static SENSOR_DEVICE_ATTR(fan2_beep, 0444, show_beep, set_beep, 0); +static SENSOR_DEVICE_ATTR(fan3_beep, 0444, show_beep, set_beep, 0); +static SENSOR_DEVICE_ATTR(fan4_beep, 0444, show_beep, set_beep, 0); +static SENSOR_DEVICE_ATTR(fan5_beep, 0444, show_beep, set_beep, 0); +static SENSOR_DEVICE_ATTR(fan6_beep, 0444, show_beep, set_beep, 0); +static SENSOR_DEVICE_ATTR(temp1_beep, 0644, show_beep, set_beep, 2); -static SENSOR_DEVICE_ATTR(temp2_beep, S_IRUGO, show_beep, NULL, 2); -static SENSOR_DEVICE_ATTR(temp3_beep, S_IRUGO, show_beep, NULL, 2); -static SENSOR_DEVICE_ATTR(temp4_beep, S_IRUGO, show_beep, NULL, 2); -static SENSOR_DEVICE_ATTR(temp5_beep, S_IRUGO, show_beep, NULL, 2); -static SENSOR_DEVICE_ATTR(temp6_beep, S_IRUGO, show_beep, NULL, 2); +static SENSOR_DEVICE_ATTR(temp2_beep, 0444, show_beep, NULL, 2); +static SENSOR_DEVICE_ATTR(temp3_beep, 0444, show_beep, NULL, 2); +static SENSOR_DEVICE_ATTR(temp4_beep, 0444, show_beep, NULL, 2); +static SENSOR_DEVICE_ATTR(temp5_beep, 0444, show_beep, NULL, 2); +static SENSOR_DEVICE_ATTR(temp6_beep, 0444, show_beep, NULL, 2); static ssize_t show_vrm_reg(struct device *dev, struct device_attribute *attr, char *buf) @@ -2228,16 +2510,19 @@ static ssize_t store_vrm_reg(struct device *dev, struct device_attribute *attr, return count; } -static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm_reg, store_vrm_reg); +static DEVICE_ATTR(vrm, 0644, show_vrm_reg, store_vrm_reg); static ssize_t show_vid_reg(struct device *dev, struct device_attribute *attr, char *buf) { struct it87_data *data = it87_update_device(dev); + if (IS_ERR(data)) + return PTR_ERR(data); + return sprintf(buf, "%ld\n", (long)vid_from_reg(data->vid, data->vrm)); } -static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid_reg, NULL); +static DEVICE_ATTR(cpu0_vid, 0444, show_vid_reg, NULL); static ssize_t show_label(struct device *dev, struct device_attribute *attr, char *buf) @@ -2268,11 +2553,11 @@ static ssize_t show_label(struct device *dev, struct device_attribute *attr, return sprintf(buf, "%s\n", label); } -static SENSOR_DEVICE_ATTR(in3_label, S_IRUGO, show_label, NULL, 0); -static SENSOR_DEVICE_ATTR(in7_label, S_IRUGO, show_label, NULL, 1); -static SENSOR_DEVICE_ATTR(in8_label, S_IRUGO, show_label, NULL, 2); +static SENSOR_DEVICE_ATTR(in3_label, 0444, show_label, NULL, 0); +static SENSOR_DEVICE_ATTR(in7_label, 0444, show_label, NULL, 1); +static SENSOR_DEVICE_ATTR(in8_label, 0444, show_label, NULL, 2); /* AVCC3 */ -static SENSOR_DEVICE_ATTR(in9_label, S_IRUGO, show_label, NULL, 3); +static SENSOR_DEVICE_ATTR(in9_label, 0444, show_label, NULL, 3); static umode_t it87_in_is_visible(struct kobject *kobj, struct attribute *attr, int index) @@ -2382,7 +2667,7 @@ static umode_t it87_temp_is_visible(struct kobject *kobj, return attr->mode; } - if (a == 5 && !has_temp_offset(data)) + if (a == 5 && i >= data->num_temp_offset) return 0; if (a == 6 && !data->has_beep) @@ -2500,7 +2785,7 @@ static umode_t it87_fan_is_visible(struct kobject *kobj, return 0; /* first fan beep attribute is writable */ if (i == __ffs(data->has_fan)) - return attr->mode | S_IWUSR; + return attr->mode | 0200; } if (a == 4 && has_16bit_fans(data)) /* divisor */ @@ -2563,11 +2848,11 @@ static umode_t it87_pwm_is_visible(struct kobject *kobj, /* pwmX_auto_channels_temp is only writable if auto pwm is supported */ if (a == 3 && (has_old_autopwm(data) || has_newer_autopwm(data))) - return attr->mode | S_IWUSR; + return attr->mode | 0200; /* pwm2_freq is writable if there are two pwm frequency selects */ if (has_pwm_freq2(data) && i == 1 && a == 2) - return attr->mode | S_IWUSR; + return attr->mode | 0200; return attr->mode; } @@ -2709,16 +2994,22 @@ static const struct attribute_group it87_group_auto_pwm = { /* SuperIO detection - will change isa_address if a chip is found */ static int __init it87_find(int sioaddr, unsigned short *address, + phys_addr_t *mmio_address, struct it87_sio_data *sio_data) { - int err; - u16 chip_type; const struct it87_devices *config; + phys_addr_t base = 0; + bool doexit = true; + char mmio_str[32]; + u16 chip_type; + int err; err = superio_enter(sioaddr); if (err) return err; + sio_data->sioaddr = sioaddr; + err = -ENODEV; chip_type = superio_inw(sioaddr, DEVID); if (chip_type == 0xffff) @@ -2753,8 +3044,21 @@ static int __init it87_find(int sioaddr, unsigned short *address, case IT8732F_DEVID: sio_data->type = it8732; break; + case IT8736F_DEVID: + sio_data->type = it8736; + break; + case IT8738E_DEVID: + sio_data->type = it8738; + break; case IT8792E_DEVID: sio_data->type = it8792; + /* + * Disabling configuration mode on IT8792E can result in system + * hang-ups and access failures to the Super-IO chip at the + * second SIO address. Never exit configuration mode on this + * chip to avoid the problem. + */ + doexit = false; break; case IT8771E_DEVID: sio_data->type = it8771; @@ -2776,20 +3080,30 @@ static int __init it87_find(int sioaddr, unsigned short *address, break; case IT8790E_DEVID: sio_data->type = it8790; + doexit = false; /* See IT8792E comment above */ break; case IT8603E_DEVID: case IT8623E_DEVID: sio_data->type = it8603; break; + case IT8606E_DEVID: + sio_data->type = it8606; + break; case IT8607E_DEVID: sio_data->type = it8607; break; + case IT8613E_DEVID: + sio_data->type = it8613; + break; case IT8620E_DEVID: sio_data->type = it8620; break; case IT8622E_DEVID: sio_data->type = it8622; break; + case IT8625E_DEVID: + sio_data->type = it8625; + break; case IT8628E_DEVID: sio_data->type = it8628; break; @@ -2821,14 +3135,32 @@ static int __init it87_find(int sioaddr, unsigned short *address, goto exit; } + sio_data->doexit = doexit; + err = 0; sio_data->revision = superio_inb(sioaddr, DEVREV) & 0x0f; - pr_info("Found IT%04x%s chip at 0x%x, revision %d\n", chip_type, - it87_devices[sio_data->type].suffix, - *address, sio_data->revision); config = &it87_devices[sio_data->type]; + if (has_mmio(config) && mmio) { + u8 reg; + + reg = superio_inb(sioaddr, IT87_EC_HWM_MIO_REG); + if (reg & BIT(5)) { + base = 0xf0000000 + ((reg & 0x0f) << 24); + base += (reg & 0xc0) << 14; + } + } + *mmio_address = base; + + mmio_str[0] = '\0'; + if (base) + snprintf(mmio_str, sizeof(mmio_str), " [MMIO at %pa]", &base); + + pr_info("Found %s chip at 0x%x%s, revision %d\n", + it87_devices[sio_data->type].model, + *address, mmio_str, sio_data->revision); + /* in7 (VSB or VCCH5V) is always internal on some chips */ if (has_in7_internal(config)) sio_data->internal |= BIT(1); @@ -2925,7 +3257,8 @@ static int __init it87_find(int sioaddr, unsigned short *address, sio_data->beep_pin = superio_inb(sioaddr, IT87_SIO_BEEP_PIN_REG) & 0x3f; - } else if (sio_data->type == it8603 || sio_data->type == it8607) { + } else if (sio_data->type == it8603 || sio_data->type == it8606 || + sio_data->type == it8607) { int reg27, reg29; superio_select(sioaddr, GPIO); @@ -2945,11 +3278,55 @@ static int __init it87_find(int sioaddr, unsigned short *address, if (reg29 & BIT(2)) sio_data->skip_fan |= BIT(1); - if (sio_data->type == it8603) { + switch (sio_data->type) { + case it8603: sio_data->skip_in |= BIT(5); /* No VIN5 */ sio_data->skip_in |= BIT(6); /* No VIN6 */ + break; + case it8607: + sio_data->skip_pwm |= BIT(0);/* No fan1 */ + sio_data->skip_fan |= BIT(0); + default: + break; + } + + sio_data->beep_pin = superio_inb(sioaddr, + IT87_SIO_BEEP_PIN_REG) & 0x3f; + } else if (sio_data->type == it8613) { + int reg27, reg29, reg2a; + + superio_select(sioaddr, GPIO); + + /* Check for pwm3, fan3, pwm5, fan5 */ + reg27 = superio_inb(sioaddr, IT87_SIO_GPIO3_REG); + if (reg27 & BIT(1)) + sio_data->skip_fan |= BIT(4); + if (reg27 & BIT(3)) + sio_data->skip_pwm |= BIT(4); + if (reg27 & BIT(6)) + sio_data->skip_pwm |= BIT(2); + if (reg27 & BIT(7)) + sio_data->skip_fan |= BIT(2); + + /* Check for pwm2, fan2 */ + reg29 = superio_inb(sioaddr, IT87_SIO_GPIO5_REG); + if (reg29 & BIT(1)) + sio_data->skip_pwm |= BIT(1); + if (reg29 & BIT(2)) + sio_data->skip_fan |= BIT(1); + + /* Check for pwm4, fan4 */ + reg2a = superio_inb(sioaddr, IT87_SIO_PINX1_REG); + if (!(reg2a & BIT(0)) || (reg29 & BIT(7))) { + sio_data->skip_fan |= BIT(3); + sio_data->skip_pwm |= BIT(3); } + sio_data->skip_pwm |= BIT(0); /* No pwm1 */ + sio_data->skip_fan |= BIT(0); /* No fan1 */ + sio_data->skip_in |= BIT(3); /* No VIN3 */ + sio_data->skip_in |= BIT(6); /* No VIN6 */ + sio_data->beep_pin = superio_inb(sioaddr, IT87_SIO_BEEP_PIN_REG) & 0x3f; } else if (sio_data->type == it8620 || sio_data->type == it8628 || @@ -3044,7 +3421,8 @@ static int __init it87_find(int sioaddr, unsigned short *address, sio_data->beep_pin = superio_inb(sioaddr, IT87_SIO_BEEP_PIN_REG) & 0x3f; - } else if (sio_data->type == it8732) { + } else if (sio_data->type == it8732 || sio_data->type == it8736 || + sio_data->type == it8738) { int reg; superio_select(sioaddr, GPIO); @@ -3066,9 +3444,11 @@ static int __init it87_find(int sioaddr, unsigned short *address, sio_data->skip_fan |= BIT(3); /* Check if AVCC is on VIN3 */ - reg = superio_inb(sioaddr, IT87_SIO_PINX2_REG); - if (reg & BIT(0)) - sio_data->internal |= BIT(0); + if (sio_data->type != it8738) { + reg = superio_inb(sioaddr, IT87_SIO_PINX2_REG); + if (reg & BIT(0)) + sio_data->internal |= BIT(0); + } sio_data->beep_pin = superio_inb(sioaddr, IT87_SIO_BEEP_PIN_REG) & 0x3f; @@ -3096,44 +3476,65 @@ static int __init it87_find(int sioaddr, unsigned short *address, sio_data->beep_pin = superio_inb(sioaddr, IT87_SIO_BEEP_PIN_REG) & 0x3f; - } else if (sio_data->type == it8665) { - int reg; + } else if (sio_data->type == it8665 || sio_data->type == it8625) { + int reg27, reg29, reg2d, regd3; superio_select(sioaddr, GPIO); + reg27 = superio_inb(sioaddr, IT87_SIO_GPIO3_REG); + reg29 = superio_inb(sioaddr, IT87_SIO_GPIO5_REG); + reg2d = superio_inb(sioaddr, IT87_SIO_PINX4_REG); + regd3 = superio_inb(sioaddr, IT87_SIO_GPIO9_REG); + /* Check for pwm2 */ - reg = superio_inb(sioaddr, IT87_SIO_GPIO5_REG); - if (reg & BIT(1)) + if (reg29 & BIT(1)) sio_data->skip_pwm |= BIT(1); - /* Check for fan2 */ - reg = superio_inb(sioaddr, IT87_SIO_PINX4_REG); - if (reg & BIT(4)) - sio_data->skip_fan |= BIT(1); - /* Check for pwm3, fan3 */ - reg = superio_inb(sioaddr, IT87_SIO_GPIO3_REG); - if (reg & BIT(6)) + if (reg27 & BIT(6)) sio_data->skip_pwm |= BIT(2); - if (reg & BIT(7)) + if (reg27 & BIT(7)) sio_data->skip_fan |= BIT(2); - /* Check for pwm5, fan5 */ - reg = superio_inb(sioaddr, IT87_SIO_GPIO2_REG); - if (reg & BIT(5)) - sio_data->skip_pwm |= BIT(4); - if (!(reg & BIT(4))) - sio_data->skip_fan |= BIT(4); + /* Check for fan2, pwm4, fan4, pwm5, fan5 */ + if (sio_data->type == it8625) { + int reg25 = superio_inb(sioaddr, IT87_SIO_GPIO1_REG); + + if (reg29 & BIT(2)) + sio_data->skip_fan |= BIT(1); + if (reg25 & BIT(6)) + sio_data->skip_fan |= BIT(3); + if (reg25 & BIT(5)) + sio_data->skip_pwm |= BIT(3); + if (reg27 & BIT(3)) + sio_data->skip_pwm |= BIT(4); + if (!(reg27 & BIT(1))) + sio_data->skip_fan |= BIT(4); + } else { + int reg26 = superio_inb(sioaddr, IT87_SIO_GPIO2_REG); + + if (reg2d & BIT(4)) + sio_data->skip_fan |= BIT(1); + if (regd3 & BIT(2)) + sio_data->skip_pwm |= BIT(3); + if (regd3 & BIT(3)) + sio_data->skip_fan |= BIT(3); + if (reg26 & BIT(5)) + sio_data->skip_pwm |= BIT(4); + /* + * Table 6-1 in datasheet claims that FAN_TAC5 would + * be enabled with 26h[4]=0. This contradicts with the + * information in section 8.3.9 and with feedback from + * users. + */ + if (!(reg26 & BIT(4))) + sio_data->skip_fan |= BIT(4); + } - /* Check for pwm4, fan4, pwm6, fan6 */ - reg = superio_inb(sioaddr, IT87_SIO_GPIO9_REG); - if (reg & BIT(2)) - sio_data->skip_pwm |= BIT(3); - if (reg & BIT(3)) - sio_data->skip_fan |= BIT(3); - if (reg & BIT(0)) + /* Check for pwm6, fan6 */ + if (regd3 & BIT(0)) sio_data->skip_pwm |= BIT(5); - if (reg & BIT(1)) + if (regd3 & BIT(1)) sio_data->skip_fan |= BIT(5); sio_data->beep_pin = superio_inb(sioaddr, @@ -3242,21 +3643,27 @@ static int __init it87_find(int sioaddr, unsigned short *address, if (sio_data->beep_pin) pr_info("Beeping is supported\n"); + if (config->smbus_bitmap && !base) { + u8 reg; + + superio_select(sioaddr, PME); + reg = superio_inb(sioaddr, IT87_SPECIAL_CFG_REG); + sio_data->ec_special_config = reg; + sio_data->smbus_bitmap = reg & config->smbus_bitmap; + } + exit: - superio_exit(sioaddr); + superio_exit(sioaddr, doexit); return err; } -/* Called when we have found a new IT87. */ -static void it87_init_device(struct platform_device *pdev) +static void it87_init_regs(struct platform_device *pdev) { - struct it87_sio_data *sio_data = dev_get_platdata(&pdev->dev); struct it87_data *data = platform_get_drvdata(pdev); - int tmp, i; - u8 mask; /* Initialize chip specific register pointers */ switch (data->type) { + case it8628: case it8686: data->REG_FAN = IT87_REG_FAN; data->REG_FANX = IT87_REG_FANX; @@ -3267,6 +3674,7 @@ static void it87_init_device(struct platform_device *pdev) data->REG_TEMP_LOW = IT87_REG_TEMP_LOW_8686; data->REG_TEMP_HIGH = IT87_REG_TEMP_HIGH_8686; break; + case it8625: case it8655: case it8665: data->REG_FAN = IT87_REG_FAN_8665; @@ -3288,6 +3696,16 @@ static void it87_init_device(struct platform_device *pdev) data->REG_TEMP_LOW = IT87_REG_TEMP_LOW; data->REG_TEMP_HIGH = IT87_REG_TEMP_HIGH; break; + case it8613: + data->REG_FAN = IT87_REG_FAN; + data->REG_FANX = IT87_REG_FANX; + data->REG_FAN_MIN = IT87_REG_FAN_MIN; + data->REG_FANX_MIN = IT87_REG_FANX_MIN; + data->REG_PWM = IT87_REG_PWM_8665; + data->REG_TEMP_OFFSET = IT87_REG_TEMP_OFFSET; + data->REG_TEMP_LOW = IT87_REG_TEMP_LOW; + data->REG_TEMP_HIGH = IT87_REG_TEMP_HIGH; + break; default: data->REG_FAN = IT87_REG_FAN; data->REG_FANX = IT87_REG_FANX; @@ -3300,13 +3718,41 @@ static void it87_init_device(struct platform_device *pdev) break; } + if (data->mmio) { + data->read = it87_mmio_read; + data->write = it87_mmio_write; + } else if (has_bank_sel(data)) { + data->read = it87_io_read; + data->write = it87_io_write; + } else { + data->read = _it87_io_read; + data->write = _it87_io_write; + } +} + +/* Called when we have found a new IT87. */ +static void it87_init_device(struct platform_device *pdev) +{ + struct it87_sio_data *sio_data = dev_get_platdata(&pdev->dev); + struct it87_data *data = platform_get_drvdata(pdev); + int tmp, i; + u8 mask; + + if (has_new_tempmap(data)) { + data->pwm_temp_map_shift = 3; + data->pwm_temp_map_mask = 0x07; + } else { + data->pwm_temp_map_shift = 0; + data->pwm_temp_map_mask = 0x03; + } + /* * For each PWM channel: * - If it is in automatic mode, setting to manual mode should set * the fan to full speed by default. * - If it is in manual mode, we need a mapping to temperature * channels to use when later setting to automatic mode later. - * Use a 1:1 mapping by default (we are clueless.) + * Map to the first sensor by default (we are clueless.) * In both cases, the value can (and should) be changed by the user * prior to switching to a different mode. * Note that this is no longer needed for the IT8721F and later, as @@ -3314,7 +3760,7 @@ static void it87_init_device(struct platform_device *pdev) * manual duty cycle. */ for (i = 0; i < NUM_AUTO_PWM; i++) { - data->pwm_temp_map[i] = i; + data->pwm_temp_map[i] = 0; data->pwm_duty[i] = 0x7f; /* Full speed */ data->auto_pwm[i][3] = 0x7f; /* Full speed, hard-coded */ } @@ -3327,14 +3773,14 @@ static void it87_init_device(struct platform_device *pdev) * but is still confusing, so change to 127 degrees C. */ for (i = 0; i < NUM_VIN_LIMIT; i++) { - tmp = it87_read_value(data, IT87_REG_VIN_MIN(i)); + tmp = data->read(data, IT87_REG_VIN_MIN(i)); if (tmp == 0xff) - it87_write_value(data, IT87_REG_VIN_MIN(i), 0); + data->write(data, IT87_REG_VIN_MIN(i), 0); } for (i = 0; i < data->num_temp_limit; i++) { - tmp = it87_read_value(data, data->REG_TEMP_HIGH[i]); + tmp = data->read(data, data->REG_TEMP_HIGH[i]); if (tmp == 0xff) - it87_write_value(data, data->REG_TEMP_HIGH[i], 127); + data->write(data, data->REG_TEMP_HIGH[i], 127); } /* @@ -3345,32 +3791,30 @@ static void it87_init_device(struct platform_device *pdev) */ /* Check if voltage monitors are reset manually or by some reason */ - tmp = it87_read_value(data, IT87_REG_VIN_ENABLE); + tmp = data->read(data, IT87_REG_VIN_ENABLE); if ((tmp & 0xff) == 0) { /* Enable all voltage monitors */ - it87_write_value(data, IT87_REG_VIN_ENABLE, 0xff); + data->write(data, IT87_REG_VIN_ENABLE, 0xff); } /* Check if tachometers are reset manually or by some reason */ mask = 0x70 & ~(sio_data->skip_fan << 4); - data->fan_main_ctrl = it87_read_value(data, IT87_REG_FAN_MAIN_CTRL); + data->fan_main_ctrl = data->read(data, IT87_REG_FAN_MAIN_CTRL); if ((data->fan_main_ctrl & mask) == 0) { /* Enable all fan tachometers */ data->fan_main_ctrl |= mask; - it87_write_value(data, IT87_REG_FAN_MAIN_CTRL, - data->fan_main_ctrl); + data->write(data, IT87_REG_FAN_MAIN_CTRL, data->fan_main_ctrl); } data->has_fan = (data->fan_main_ctrl >> 4) & 0x07; - tmp = it87_read_value(data, IT87_REG_FAN_16BIT); + tmp = data->read(data, IT87_REG_FAN_16BIT); /* Set tachometers to 16-bit mode if needed */ if (has_fan16_config(data)) { if (~tmp & 0x07 & data->has_fan) { dev_dbg(&pdev->dev, "Setting fan1-3 to 16-bit mode\n"); - it87_write_value(data, IT87_REG_FAN_16BIT, - tmp | 0x07); + data->write(data, IT87_REG_FAN_16BIT, tmp | 0x07); } } @@ -3387,8 +3831,9 @@ static void it87_init_device(struct platform_device *pdev) if (tmp & BIT(2)) data->has_fan |= BIT(5); /* fan6 enabled */ break; + case it8625: case it8665: - tmp = it87_read_value(data, IT87_REG_FAN_DIV); + tmp = data->read(data, IT87_REG_FAN_DIV); if (tmp & BIT(3)) data->has_fan |= BIT(5); /* fan6 enabled */ break; @@ -3405,7 +3850,7 @@ static void it87_init_device(struct platform_device *pdev) switch (data->type) { case it8620: case it8686: - tmp = it87_read_value(data, IT87_REG_FAN_DIV); + tmp = data->read(data, IT87_REG_FAN_DIV); if (!(tmp & BIT(3))) sio_data->skip_pwm |= BIT(5); break; @@ -3414,10 +3859,17 @@ static void it87_init_device(struct platform_device *pdev) } } + if (has_bank_sel(data)) { + for (i = 0; i < 3; i++) + data->temp_src[i] = + data->read(data, IT87_REG_TEMP_SRC1[i]); + data->temp_src[3] = data->read(data, IT87_REG_TEMP_SRC2); + } + /* Start monitoring */ - it87_write_value(data, IT87_REG_CONFIG, - (it87_read_value(data, IT87_REG_CONFIG) & 0x3e) - | (update_vbat ? 0x41 : 0x01)); + data->write(data, IT87_REG_CONFIG, + (data->read(data, IT87_REG_CONFIG) & 0x3e) | + (update_vbat ? 0x41 : 0x01)); } /* Return 1 if and only if the PWM interface is safe to use */ @@ -3429,7 +3881,7 @@ static int it87_check_pwm(struct device *dev) * and polarity set to active low is sign that this is the case so we * disable pwm control to protect the user. */ - int tmp = it87_read_value(data, IT87_REG_FAN_CTL); + int tmp = data->read(data, IT87_REG_FAN_CTL); if ((tmp & 0x87) == 0) { if (fix_pwm_polarity) { @@ -3442,7 +3894,7 @@ static int it87_check_pwm(struct device *dev) u8 pwm[3]; for (i = 0; i < ARRAY_SIZE(pwm); i++) - pwm[i] = it87_read_value(data, + pwm[i] = data->read(data, data->REG_PWM[i]); /* @@ -3454,12 +3906,10 @@ static int it87_check_pwm(struct device *dev) if (!((pwm[0] | pwm[1] | pwm[2]) & 0x80)) { dev_info(dev, "Reconfiguring PWM to active high polarity\n"); - it87_write_value(data, IT87_REG_FAN_CTL, - tmp | 0x87); + data->write(data, IT87_REG_FAN_CTL, tmp | 0x87); for (i = 0; i < 3; i++) - it87_write_value(data, - data->REG_PWM[i], - 0x7f & ~pwm[i]); + data->write(data, data->REG_PWM[i], + 0x7f & ~pwm[i]); return 1; } @@ -3486,27 +3936,38 @@ static int it87_probe(struct platform_device *pdev) struct it87_sio_data *sio_data = dev_get_platdata(dev); int enable_pwm_interface; struct device *hwmon_dev; + int err; - res = platform_get_resource(pdev, IORESOURCE_IO, 0); - if (!devm_request_region(&pdev->dev, res->start, IT87_EC_EXTENT, - DRVNAME)) { - dev_err(dev, "Failed to request region 0x%lx-0x%lx\n", - (unsigned long)res->start, - (unsigned long)(res->start + IT87_EC_EXTENT - 1)); - return -EBUSY; - } - - data = devm_kzalloc(&pdev->dev, sizeof(struct it87_data), GFP_KERNEL); + data = devm_kzalloc(dev, sizeof(struct it87_data), GFP_KERNEL); if (!data) return -ENOMEM; + res = platform_get_resource(pdev, IORESOURCE_IO, 0); + if (res) { + if (!devm_request_region(dev, res->start, IT87_EC_EXTENT, + DRVNAME)) { + dev_err(dev, "Failed to request region %pR\n", res); + return -EBUSY; + } + } else { + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + data->mmio = devm_ioremap_resource(dev, res); + if (IS_ERR(data->mmio)) + return PTR_ERR(data->mmio); + } + data->addr = res->start; data->type = sio_data->type; + data->sioaddr = sio_data->sioaddr; + data->smbus_bitmap = sio_data->smbus_bitmap; + data->ec_special_config = sio_data->ec_special_config; + data->doexit = sio_data->doexit; data->features = it87_devices[sio_data->type].features; data->num_temp_limit = it87_devices[sio_data->type].num_temp_limit; + data->num_temp_offset = it87_devices[sio_data->type].num_temp_offset; + data->pwm_num_temp_map = it87_devices[sio_data->type].num_temp_map; data->peci_mask = it87_devices[sio_data->type].peci_mask; data->old_peci_mask = it87_devices[sio_data->type].old_peci_mask; - data->bank = 0xff; /* * IT8705F Datasheet 0.4.1, 3h == Version G. @@ -3531,15 +3992,35 @@ static int it87_probe(struct platform_device *pdev) break; } - /* Now, we do the remaining detection. */ - if ((it87_read_value(data, IT87_REG_CONFIG) & 0x80) || - it87_read_value(data, IT87_REG_CHIPID) != 0x90) - return -ENODEV; - platform_set_drvdata(pdev, data); mutex_init(&data->update_lock); + /* Initialize register pointers */ + it87_init_regs(pdev); + + /* + * We need to disable SMBus before we can read any registers in + * the envmon address space, even if it is for chip identification + * purposes. If the chip has SMBus client support, it likely also has + * multi-page envmon registers, so we have to set the page anyway + * before accessing those registers. Kind of a chicken-and-egg + * problem. + * Fortunately, the chip was already identified through the SIO + * address space, only recent chips are affected, and this is just + * an additional safeguard. + */ + err = smbus_disable(data); + if (err) + return err; + + /* Now, we do the remaining detection. */ + if ((data->read(data, IT87_REG_CONFIG) & 0x80) || + data->read(data, IT87_REG_CHIPID) != 0x90) { + smbus_enable(data); + return -ENODEV; + } + /* Check PWM configuration */ enable_pwm_interface = it87_check_pwm(dev); @@ -3564,31 +4045,37 @@ static int it87_probe(struct platform_device *pdev) data->has_temp = 0x07; if (sio_data->skip_temp & BIT(2)) { if (sio_data->type == it8782 && - !(it87_read_value(data, IT87_REG_TEMP_EXTRA) & 0x80)) + !(data->read(data, IT87_REG_TEMP_EXTRA) & 0x80)) data->has_temp &= ~BIT(2); } data->in_internal = sio_data->internal; data->has_in = 0x3ff & ~sio_data->skip_in; - if (has_six_temp(data)) { - u8 reg = it87_read_value(data, IT87_REG_TEMP456_ENABLE); - - /* Check for additional temperature sensors */ - if ((reg & 0x03) >= 0x02) - data->has_temp |= BIT(3); - if (((reg >> 2) & 0x03) >= 0x02) - data->has_temp |= BIT(4); - if (((reg >> 4) & 0x03) >= 0x02) - data->has_temp |= BIT(5); - - /* Check for additional voltage sensors */ - if ((reg & 0x03) == 0x01) - data->has_in |= BIT(10); - if (((reg >> 2) & 0x03) == 0x01) - data->has_in |= BIT(11); - if (((reg >> 4) & 0x03) == 0x01) - data->has_in |= BIT(12); + if (has_four_temp(data)) { + data->has_temp |= BIT(3); + } else if (has_six_temp(data)) { + if (sio_data->type == it8655 || sio_data->type == it8665) { + data->has_temp |= BIT(3) | BIT(4) | BIT(5); + } else { + u8 reg = data->read(data, IT87_REG_TEMP456_ENABLE); + + /* Check for additional temperature sensors */ + if ((reg & 0x03) >= 0x02) + data->has_temp |= BIT(3); + if (((reg >> 2) & 0x03) >= 0x02) + data->has_temp |= BIT(4); + if (((reg >> 4) & 0x03) >= 0x02) + data->has_temp |= BIT(5); + + /* Check for additional voltage sensors */ + if ((reg & 0x03) == 0x01) + data->has_in |= BIT(10); + if (((reg >> 2) & 0x03) == 0x01) + data->has_in |= BIT(11); + if (((reg >> 4) & 0x03) == 0x01) + data->has_in |= BIT(12); + } } data->has_beep = !!sio_data->beep_pin; @@ -3596,6 +4083,8 @@ static int it87_probe(struct platform_device *pdev) /* Initialize the IT87 chip */ it87_init_device(pdev); + smbus_enable(data); + if (!sio_data->skip_vid) { data->has_vid = true; data->vrm = vid_which_vrm(); @@ -3631,23 +4120,33 @@ static struct platform_driver it87_driver = { .probe = it87_probe, }; -static int __init it87_device_add(int index, unsigned short address, +static int __init it87_device_add(int index, unsigned short sio_address, + phys_addr_t mmio_address, const struct it87_sio_data *sio_data) { struct platform_device *pdev; struct resource res = { - .start = address + IT87_EC_OFFSET, - .end = address + IT87_EC_OFFSET + IT87_EC_EXTENT - 1, .name = DRVNAME, - .flags = IORESOURCE_IO, }; int err; + if (mmio_address) { + res.start = mmio_address; + res.end = mmio_address + 0x400 - 1; + res.flags = IORESOURCE_MEM; + } else { + res.start = sio_address + IT87_EC_OFFSET; + res.end = sio_address + IT87_EC_OFFSET + IT87_EC_EXTENT - 1; + res.flags = IORESOURCE_IO; + } + err = acpi_check_resource_conflict(&res); - if (err) - return err; + if (err) { + if (!ignore_resource_conflict) + return err; + } - pdev = platform_device_alloc(DRVNAME, address); + pdev = platform_device_alloc(DRVNAME, sio_address); if (!pdev) return -ENOMEM; @@ -3679,19 +4178,26 @@ exit_device_put: } struct it87_dmi_data { - bool sio4e_broken; /* SIO accesses @ 0x4e are broken */ - char *sio_mutex; /* SIO ACPI mutex */ + bool sio2_force_config; /* force sio2 into configuration mode */ u8 skip_pwm; /* pwm channels to skip for this board */ }; /* - * On Gigabyte AB350 boards, accesses to the Super-IO chip - * at address 0x4e/0x4f can result in a system hang. - * Accesses to address 0x2e/0x2f need to be mutex protected. + * On various Gigabyte AM4 boards (AB350, AX370), the second Super-IO chip + * (IT8792E) needs to be in configuration mode before accessing the first + * due to a bug in IT8792E which otherwise results in LPC bus access errors. + * This needs to be done before accessing the first Super-IO chip since + * the second chip may have been accessed prior to loading this driver. + * + * The problem is also reported to affect IT8795E, which is used on X299 boards + * and has the same chip ID as IT8792E (0x8733). It also appears to affect + * systems with IT8790E, which is used on some Z97X-Gaming boards as well as + * Z87X-OC. + * DMI entries for those systems will be added as they become available and + * as the problem is confirmed to affect those boards. */ -static struct it87_dmi_data gigabyte_ab350_gaming = { - .sio4e_broken = true, - .sio_mutex = "\\_SB.PCI0.SBRG.SIO1.MUT0", +static struct it87_dmi_data gigabyte_sio2_force = { + .sio2_force_config = true, }; /* @@ -3709,17 +4215,27 @@ static struct it87_dmi_data nvidia_fn68pt = { static const struct dmi_system_id it87_dmi_table[] __initconst = { { .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Gigabyte Technology Co., Ltd."), - DMI_MATCH(DMI_BOARD_NAME, "AB350-Gaming-CF"), + DMI_MATCH(DMI_SYS_VENDOR, + "Gigabyte Technology Co., Ltd."), + DMI_MATCH(DMI_BOARD_NAME, "AB350"), }, - .driver_data = &gigabyte_ab350_gaming, + .driver_data = &gigabyte_sio2_force, }, { .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Gigabyte Technology Co., Ltd."), - DMI_MATCH(DMI_BOARD_NAME, "AB350-Gaming 3-CF"), + DMI_MATCH(DMI_SYS_VENDOR, + "Gigabyte Technology Co., Ltd."), + DMI_MATCH(DMI_BOARD_NAME, "AX370"), }, - .driver_data = &gigabyte_ab350_gaming, + .driver_data = &gigabyte_sio2_force, + }, + { + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, + "Gigabyte Technology Co., Ltd."), + DMI_MATCH(DMI_BOARD_NAME, "Z97X-Gaming G1"), + }, + .driver_data = &gigabyte_sio2_force, }, { .matches = { @@ -3738,52 +4254,34 @@ static int __init sm_it87_init(void) int sioaddr[2] = { REG_2E, REG_4E }; struct it87_sio_data sio_data; unsigned short isa_address; + phys_addr_t mmio_address; bool found = false; int i, err; + pr_info("it87 driver version %s\n", IT87_DRIVER_VERSION); + if (dmi) dmi_data = dmi->driver_data; - if (dmi_data) { - it87_sio4e_broken = dmi_data->sio4e_broken; -#ifdef __IT87_USE_ACPI_MUTEX - if (dmi_data->sio_mutex) { - static acpi_status status; - - status = acpi_get_handle(NULL, dmi_data->sio_mutex, - &it87_acpi_sio_handle); - if (ACPI_SUCCESS(status)) { - it87_acpi_sio_mutex = dmi_data->sio_mutex; - pr_debug("Found ACPI SIO mutex %s\n", - dmi_data->sio_mutex); - } else { - pr_warn("ACPI SIO mutex %s not found\n", - dmi_data->sio_mutex); - } - } -#endif /* __IT87_USE_ACPI_MUTEX */ - } - err = platform_driver_register(&it87_driver); if (err) return err; + if (dmi_data && dmi_data->sio2_force_config) + __superio_enter(REG_4E); + for (i = 0; i < ARRAY_SIZE(sioaddr); i++) { - /* - * Accessing the second Super-IO chi can result in board - * hangs. Disable until we figure out what is going on. - */ - if (it87_sio4e_broken && sioaddr[i] == 0x4e) - continue; memset(&sio_data, 0, sizeof(struct it87_sio_data)); isa_address = 0; - err = it87_find(sioaddr[i], &isa_address, &sio_data); + mmio_address = 0; + err = it87_find(sioaddr[i], &isa_address, &mmio_address, + &sio_data); if (err || isa_address == 0) continue; if (dmi_data) sio_data.skip_pwm |= dmi_data->skip_pwm; - err = it87_device_add(i, isa_address, &sio_data); + err = it87_device_add(i, isa_address, mmio_address, &sio_data); if (err) goto exit_dev_unregister; found = true; @@ -3813,12 +4311,13 @@ static void __exit sm_it87_exit(void) MODULE_AUTHOR("Chris Gauthron, Jean Delvare "); MODULE_DESCRIPTION("IT8705F/IT871xF/IT872xF hardware monitoring driver"); -module_param(update_vbat, bool, 0); +module_param(update_vbat, bool, 0000); MODULE_PARM_DESC(update_vbat, "Update vbat if set else return powerup value"); -module_param(fix_pwm_polarity, bool, 0); +module_param(fix_pwm_polarity, bool, 0000); MODULE_PARM_DESC(fix_pwm_polarity, "Force PWM polarity to active high (DANGEROUS)"); MODULE_LICENSE("GPL"); +MODULE_VERSION(IT87_DRIVER_VERSION); module_init(sm_it87_init); module_exit(sm_it87_exit);