From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965422AbcA1JDP (ORCPT ); Thu, 28 Jan 2016 04:03:15 -0500 Received: from mail-wm0-f47.google.com ([74.125.82.47]:37782 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934456AbcA1JDD (ORCPT ); Thu, 28 Jan 2016 04:03:03 -0500 Subject: Re: [PATCH] hwmon: (fam15h_power) Add bit masking for tdp_limit To: Huang Rui , Borislav Petkov References: <1453892529-17120-1-git-send-email-gi-oh.kim@profitbricks.com> <20160127111256.GG30712@pd.tnic> <20160128022538.GB26655@hr-amur2> Cc: linux@roeck-us.net, lm-sensors@lm-sensors.org, linux-kernel@vger.kernel.org From: Gi-Oh Kim Message-ID: <56A9D93E.6090508@profitbricks.com> Date: Thu, 28 Jan 2016 10:02:54 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: <20160128022538.GB26655@hr-amur2> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 28.01.2016 03:25, Huang Rui wrote: > On Wed, Jan 27, 2016 at 12:12:56PM +0100, Borislav Petkov wrote: >> On Wed, Jan 27, 2016 at 12:02:09PM +0100, Gioh Kim wrote: >>> 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; >>> -- >> Acked-by: Borislav Petkov >> >> Btw, Rui, you could consider unifying the code under a single >> >> if (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model >= 0x60) { >> ... >> >> else >> ... >> >> as with this patch you'll have two of those checks. Unified might be >> better readable but that is for another patch. >> > Make sence, I will do that. :-) > > Thanks, > Rui Agree. It'll be better. Thank you. -- Best regards, Gi-Oh Kim