diff options
| author | Gioh Kim <gi-oh.kim@profitbricks.com> | 2016-01-27 12:02:09 +0100 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2016-01-28 03:48:46 +0100 |
| commit | 60dee3ca27b3613e6519df52d02eadf71f853859 (patch) | |
| tree | d5e2eebed02e636b352933a3e7f8b9f4d1bd0c7c /drivers/hwmon | |
| parent | hwmon: (dell-smm) Blacklist Dell Studio XPS 8000 (diff) | |
| download | linux-60dee3ca27b3613e6519df52d02eadf71f853859.tar.xz linux-60dee3ca27b3613e6519df52d02eadf71f853859.zip | |
hwmon: (fam15h_power) Add bit masking for tdp_limit
Add bit masking to read ApmTdpLimit precisely
Signed-off-by: Gioh Kim <gi-oh.kim@profitbricks.com>
Acked-by: Borislav Petkov <bp@suse.de>
Acked-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 | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c index f77eb971ce95..4f695d8fcafa 100644 --- a/drivers/hwmon/fam15h_power.c +++ b/drivers/hwmon/fam15h_power.c @@ -90,7 +90,15 @@ static ssize_t show_power(struct device *dev, pci_bus_read_config_dword(f4->bus, PCI_DEVFN(PCI_SLOT(f4->devfn), 5), REG_TDP_LIMIT3, &val); - tdp_limit = val >> 16; + /* + * On Carrizo and later platforms, ApmTdpLimit bit field + * is extended to 16:31 from 16:28. + */ + if (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model >= 0x60) + tdp_limit = val >> 16; + else + tdp_limit = (val >> 16) & 0x1fff; + curr_pwr_watts = ((u64)(tdp_limit + data->base_tdp)) << running_avg_range; curr_pwr_watts -= running_avg_capture; |