public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

hwmon: (nct6775) Restore hardware monitoring logical device status on resume

Browse source 
After a suspend/resume cycle it is not guaranteed that the hardware monitoring
device is still enabled. Ensure that this is the case after resume.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Guenter Roeck 2015-02-06 18:53:21 -08:00
parent 48e9318256
commit d2a14ea51a
1 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
drivers/hwmon/nct6775.c
View file

@ -885,6 +885,7 @@ struct nct6775_data {
u8 vbat; u8 vbat;
u8 fandiv1; u8 fandiv1;
u8 fandiv2; u8 fandiv2;
u8 sio_reg_enable;
}; };
struct nct6775_sio_data { struct nct6775_sio_data {
@ -3177,6 +3178,10 @@ nct6775_check_fan_inputs(struct nct6775_data *data)
int sioreg = data->sioreg; int sioreg = data->sioreg;
int regval; int regval;
/* Store SIO_REG_ENABLE for use during resume */
superio_select(sioreg, NCT6775_LD_HWM);
data->sio_reg_enable = superio_inb(sioreg, SIO_REG_ENABLE);
/* fan4 and fan5 share some pins with the GPIO and serial flash */ /* fan4 and fan5 share some pins with the GPIO and serial flash */
if (data->kind == nct6775) { if (data->kind == nct6775) {
regval = superio_inb(sioreg, 0x2c); regval = superio_inb(sioreg, 0x2c);
@ -3195,20 +3200,17 @@ nct6775_check_fan_inputs(struct nct6775_data *data)
} else if (data->kind == nct6776) { } else if (data->kind == nct6776) {
bool gpok = superio_inb(sioreg, 0x27) & 0x80; bool gpok = superio_inb(sioreg, 0x27) & 0x80;
superio_select(sioreg, NCT6775_LD_HWM); if (data->sio_reg_enable & 0x80)
regval = superio_inb(sioreg, SIO_REG_ENABLE);
if (regval & 0x80)
fan3pin = gpok; fan3pin = gpok;
else else
fan3pin = !(superio_inb(sioreg, 0x24) & 0x40); fan3pin = !(superio_inb(sioreg, 0x24) & 0x40);
if (regval & 0x40) if (data->sio_reg_enable & 0x40)
fan4pin = gpok; fan4pin = gpok;
else else
fan4pin = superio_inb(sioreg, 0x1C) & 0x01; fan4pin = superio_inb(sioreg, 0x1C) & 0x01;
if (regval & 0x20) if (data->sio_reg_enable & 0x20)
fan5pin = gpok; fan5pin = gpok;
else else
fan5pin = superio_inb(sioreg, 0x1C) & 0x02; fan5pin = superio_inb(sioreg, 0x1C) & 0x02;
@ -4006,19 +4008,26 @@ static int __maybe_unused nct6775_suspend(struct device *dev)
static int __maybe_unused nct6775_resume(struct device *dev) static int __maybe_unused nct6775_resume(struct device *dev)
{ {
struct nct6775_data *data = dev_get_drvdata(dev); struct nct6775_data *data = dev_get_drvdata(dev);
int sioreg = data->sioreg;
int i, j, err = 0; int i, j, err = 0;
u8 reg;
mutex_lock(&data->update_lock); mutex_lock(&data->update_lock);
data->bank = 0xff; /* Force initial bank selection */ data->bank = 0xff; /* Force initial bank selection */
if (data->kind == nct6791 || data->kind == nct6792) { err = superio_enter(sioreg);
err = superio_enter(data->sioreg); if (err)
if (err) goto abort;
goto abort;
nct6791_enable_io_mapping(data->sioreg); superio_select(sioreg, NCT6775_LD_HWM);
superio_exit(data->sioreg); reg = superio_inb(sioreg, SIO_REG_ENABLE);
} if (reg != data->sio_reg_enable)
superio_outb(sioreg, SIO_REG_ENABLE, data->sio_reg_enable);
if (data->kind == nct6791 || data->kind == nct6792)
nct6791_enable_io_mapping(sioreg);
superio_exit(sioreg);
/* Restore limits */ /* Restore limits */
for (i = 0; i < data->in_num; i++) { for (i = 0; i < data->in_num; i++) {