From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752548AbcA0LDE (ORCPT ); Wed, 27 Jan 2016 06:03:04 -0500 Received: from mail-wm0-f45.google.com ([74.125.82.45]:35655 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752233AbcA0LDB (ORCPT ); Wed, 27 Jan 2016 06:03:01 -0500 From: Gioh Kim To: ray.huang@amd.com Cc: linux@roeck-us.net, bp@alien8.de, lm-sensors@lm-sensors.org, linux-kernel@vger.kernel.org, Gioh Kim Subject: [PATCH] hwmon: (fam15h_power) Add bit masking for tdp_limit Date: Wed, 27 Jan 2016 12:02:09 +0100 Message-Id: <1453892529-17120-1-git-send-email-gi-oh.kim@profitbricks.com> X-Mailer: git-send-email 2.5.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add bit masking to read ApmTdpLimit precisely Signed-off-by: Gioh Kim --- 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