diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2016-09-11 12:42:52 -0700 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2016-09-18 15:32:35 -0700 |
| commit | 7ce4190c4ca466ccd609845b97dce665317aee2a (patch) | |
| tree | 705b6081ec05400902c6ab4528da1408fac0c895 /drivers/hwmon | |
| parent | dc8b73ebe543f53ec78507a9d0d37073773f6157 (diff) | |
| download | linux-stable-7ce4190c4ca466ccd609845b97dce665317aee2a.tar.gz linux-stable-7ce4190c4ca466ccd609845b97dce665317aee2a.tar.bz2 linux-stable-7ce4190c4ca466ccd609845b97dce665317aee2a.zip | |
hwmon: (nct6775) Add support for multiple virtual temperature sources
For virtual temperatures, the actual temperature values are written
by software, presumably by the BIOS. This functionality is (as of
right now) supported on NCT6791D, NCT6792D, and NCT6793D. On those chips,
the temperatures are written into registers 0xea..0xef on page 0.
This is known to be used on some Asus motherboards, where the actual
temperature source can be configured in the BIOS.
Report the 'virtual' temperatures for all monotoring sources to address
this situation.
Example for the resulting output (as seen with the 'sensors' command):
nct6791-isa-0290
Adapter: ISA adapter
...
Virtual_TEMP: +31.0°C
PECI Agent 0: +38.5°C
Virtual_TEMP: +32.0°C
...
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/nct6775.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c index 7859a30ce31e..ce75dd4db7eb 100644 --- a/drivers/hwmon/nct6775.c +++ b/drivers/hwmon/nct6775.c @@ -195,6 +195,8 @@ superio_exit(int ioreg) #define NUM_FAN 6 +#define TEMP_SOURCE_VIRTUAL 0x1f + /* Common and NCT6775 specific data */ /* Voltage min/max registers for nr=7..14 are in bank 5 */ @@ -3940,7 +3942,7 @@ static int nct6775_probe(struct platform_device *pdev) continue; src = nct6775_read_value(data, data->REG_TEMP_SEL[i]) & 0x1f; - if (!src || (mask & (1 << src))) + if (!src) continue; if (src >= data->temp_label_num || @@ -3952,7 +3954,16 @@ static int nct6775_probe(struct platform_device *pdev) continue; } - mask |= 1 << src; + /* + * For virtual temperature sources, the 'virtual' temperature + * for each fan reflects a different temperature, and there + * are no duplicates. + */ + if (src != TEMP_SOURCE_VIRTUAL) { + if (mask & (1 << src)) + continue; + mask |= 1 << src; + } /* Use fixed index for SYSTIN(1), CPUTIN(2), AUXTIN(3) */ if (src <= data->temp_fixed_num) { |