Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753379AbbH0Oyg (ORCPT ); Thu, 27 Aug 2015 10:54:36 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:35866 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752502AbbH0Oye (ORCPT ); Thu, 27 Aug 2015 10:54:34 -0400 Message-ID: <55DF24A6.5050106@roeck-us.net> Date: Thu, 27 Aug 2015 07:54:30 -0700 From: Guenter Roeck User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.8.0 MIME-Version: 1.0 To: Huang Rui , Borislav Petkov , Jean Delvare , Andy Lutomirski , Andreas Herrmann , Thomas Gleixner , Peter Zijlstra , Ingo Molnar , "Rafael J. Wysocki" , Len Brown , John Stultz , =?windows-1252?Q?Fr=E9d=E9ric_We?= =?windows-1252?Q?isbecker?= CC: lm-sensors@lm-sensors.org, linux-kernel@vger.kernel.org, x86@kernel.org, Andreas Herrmann , Aravind Gopalakrishnan , Borislav Petkov , Fengguang Wu , Aaron Lu , Tony Li Subject: Re: [PATCH 07/15] hwmon, fam15h_power: add ratio of Tsample to the PTSC period References: <1440662866-28716-1-git-send-email-ray.huang@amd.com> <1440662866-28716-8-git-send-email-ray.huang@amd.com> In-Reply-To: <1440662866-28716-8-git-send-email-ray.huang@amd.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Authenticated_sender: linux@roeck-us.net X-OutGoing-Spam-Status: No, score=0.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: linux@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2199 Lines: 68 On 08/27/2015 01:07 AM, Huang Rui wrote: > This patch adds a member (cpu_pwr_sample_ratio) of fam15h_power_data, > that represents the ratio of compute unit power accumulator sample > period to the PTSC counter period. > > Tsample: compute unit power accumulator sample period > Tref: the performance timestamp counter period > PTSC: performance timestamp counter > > Signed-off-by: Huang Rui Applied to hwmon-next (after fixing spelling error 'detemine'). Thanks, Guenter > --- > drivers/hwmon/fam15h_power.c | 16 +++++++++++++++- > 1 file changed, 15 insertions(+), 1 deletion(-) > > diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c > index 55b25ef..d6efcf6 100644 > --- a/drivers/hwmon/fam15h_power.c > +++ b/drivers/hwmon/fam15h_power.c > @@ -48,6 +48,7 @@ struct fam15h_power_data { > unsigned int tdp_to_watts; > unsigned int base_tdp; > unsigned int processor_pwr_watts; > + unsigned int cpu_pwr_sample_ratio; > }; > > static ssize_t show_power(struct device *dev, > @@ -201,7 +202,7 @@ static int fam15h_power_resume(struct pci_dev *pdev) > static void fam15h_power_init_data(struct pci_dev *f4, > struct fam15h_power_data *data) > { > - u32 val; > + u32 val, eax, ebx, ecx, edx; > u64 tmp; > > pci_read_config_dword(f4, REG_PROCESSOR_TDP, &val); > @@ -222,6 +223,19 @@ static void fam15h_power_init_data(struct pci_dev *f4, > > /* convert to microWatt */ > data->processor_pwr_watts = (tmp * 15625) >> 10; > + > + cpuid(0x80000007, &eax, &ebx, &ecx, &edx); > + > + /* CPUID Fn8000_0007:EDX[12] indicates to support accumulated power */ > + if (!(edx & BIT(12))) > + return; > + > + /* > + * detemine the ratio of the compute unit power accumulator > + * sample period to the PTSC counter period by executing CPUID > + * Fn8000_0007:ECX > + */ > + data->cpu_pwr_sample_ratio = ecx; > } > > static int fam15h_power_probe(struct pci_dev *pdev, > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/