diff options
| author | Huang Rui <ray.huang@amd.com> | 2015-08-27 16:07:35 +0800 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2015-08-27 07:47:33 -0700 |
| commit | e9cd4d55d16f880ddf436fbae8c0c82ce0a928d5 (patch) | |
| tree | 7fc871feea24320f4c5b527ca2315689c315e430 /drivers/hwmon | |
| parent | d83e92b3af602c6ebb6d25d5232ecba73201a0e5 (diff) | |
| download | op-kernel-dev-e9cd4d55d16f880ddf436fbae8c0c82ce0a928d5.zip op-kernel-dev-e9cd4d55d16f880ddf436fbae8c0c82ce0a928d5.tar.gz | |
hwmon: (fam15h_power) Update running_avg_capture bit field to 28
On Carrizo and later platforms, running_avg_capture bit field is
extended to 4:31 (28 bits) from 4:25.
Signed-off-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/fam15h_power.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c index 820adf1..4117490 100644 --- a/drivers/hwmon/fam15h_power.c +++ b/drivers/hwmon/fam15h_power.c @@ -59,8 +59,19 @@ static ssize_t show_power(struct device *dev, pci_bus_read_config_dword(f4->bus, PCI_DEVFN(PCI_SLOT(f4->devfn), 5), REG_TDP_RUNNING_AVERAGE, &val); - running_avg_capture = (val >> 4) & 0x3fffff; - running_avg_capture = sign_extend32(running_avg_capture, 21); + + /* + * On Carrizo and later platforms, TdpRunAvgAccCap bit field + * is extended to 4:31 from 4:25. + */ + if (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model >= 0x60) { + running_avg_capture = val >> 4; + running_avg_capture = sign_extend32(running_avg_capture, 27); + } else { + running_avg_capture = (val >> 4) & 0x3fffff; + running_avg_capture = sign_extend32(running_avg_capture, 21); + } + running_avg_range = (val & 0xf) + 1; pci_bus_read_config_dword(f4->bus, PCI_DEVFN(PCI_SLOT(f4->devfn), 5), |
