Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1318860
| From | Gioh Kim <gi-oh.kim@profitbricks.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH] hwmon: (fam15h_power) Add bit masking for tdp_limit |
| Date | 2016-01-27 12:10 +0100 |
| Message-ID | <qVw94-2C5-13@gated-at.bofh.it> (permalink) |
| Organization | linux.* mail to news gateway |
Add bit masking to read ApmTdpLimit precisely Signed-off-by: Gioh Kim <gi-oh.kim@profitbricks.com> --- drivers/hwmon/fam15h_power.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c index f77eb97..4f695d8 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; -- 2.5.0
Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread
[PATCH] hwmon: (fam15h_power) Add bit masking for tdp_limit Gioh Kim <gi-oh.kim@profitbricks.com> - 2016-01-27 12:10 +0100 Re: [PATCH] hwmon: (fam15h_power) Add bit masking for tdp_limit Borislav Petkov <bp@alien8.de> - 2016-01-27 12:20 +0100
csiph-web