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>

diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c
index 820adf19f4e23c1f3580fbae01285b0d981b1852..41174903009c5999e986ea5f89e6d6123e240462 100644 (file)
--- 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),