Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754464AbbH0O4k (ORCPT ); Thu, 27 Aug 2015 10:56:40 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:36200 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752221AbbH0O4j (ORCPT ); Thu, 27 Aug 2015 10:56:39 -0400 Message-ID: <55DF2523.1010605@roeck-us.net> Date: Thu, 27 Aug 2015 07:56:35 -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 08/15] hwmon, fam15h_power: add max compute unit accumulated power References: <1440662866-28716-1-git-send-email-ray.huang@amd.com> <1440662866-28716-9-git-send-email-ray.huang@amd.com> In-Reply-To: <1440662866-28716-9-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: 2945 Lines: 92 On 08/27/2015 01:07 AM, Huang Rui wrote: > This patch adds a member in fam15h_power_data which specifies the > maximum accumulated power in a compute unit. > > Signed-off-by: Huang Rui > --- > drivers/hwmon/fam15h_power.c | 24 ++++++++++++++++++++---- > 1 file changed, 20 insertions(+), 4 deletions(-) > > diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c > index d6efcf6..fdfa18e 100644 > --- a/drivers/hwmon/fam15h_power.c > +++ b/drivers/hwmon/fam15h_power.c > @@ -26,6 +26,7 @@ > #include > #include > #include > +#include > > MODULE_DESCRIPTION("AMD Family 15h CPU processor power monitor"); > MODULE_AUTHOR("Andreas Herrmann "); > @@ -43,12 +44,16 @@ MODULE_LICENSE("GPL"); > > #define FAM15H_MIN_POWER_GROUPS 2 > > +#define MSR_F15H_CU_MAX_PWR_ACCUMULATOR 0xc001007b > + > struct fam15h_power_data { > struct pci_dev *pdev; > unsigned int tdp_to_watts; > unsigned int base_tdp; > unsigned int processor_pwr_watts; > unsigned int cpu_pwr_sample_ratio; > + /* maximum accumulated power of a compute unit */ > + u64 max_cu_acc_power; > }; > > static ssize_t show_power(struct device *dev, > @@ -199,8 +204,8 @@ static int fam15h_power_resume(struct pci_dev *pdev) > #define fam15h_power_resume NULL > #endif > > -static void fam15h_power_init_data(struct pci_dev *f4, > - struct fam15h_power_data *data) > +static int fam15h_power_init_data(struct pci_dev *f4, > + struct fam15h_power_data *data) > { > u32 val, eax, ebx, ecx, edx; > u64 tmp; > @@ -228,7 +233,7 @@ static void fam15h_power_init_data(struct pci_dev *f4, > > /* CPUID Fn8000_0007:EDX[12] indicates to support accumulated power */ > if (!(edx & BIT(12))) > - return; > + return 0; > > /* > * detemine the ratio of the compute unit power accumulator > @@ -236,6 +241,15 @@ static void fam15h_power_init_data(struct pci_dev *f4, > * Fn8000_0007:ECX > */ > data->cpu_pwr_sample_ratio = ecx; > + > + if (rdmsrl_safe(MSR_F15H_CU_MAX_PWR_ACCUMULATOR, &tmp)) { > + pr_err("Failed to read max compute unit power accumulator MSR\n"); > + return -ENODEV; > + } > + > + data->max_cu_acc_power = tmp; > + > + return 0; > } > > static int fam15h_power_probe(struct pci_dev *pdev, > @@ -262,7 +276,9 @@ static int fam15h_power_probe(struct pci_dev *pdev, > if (fam15h_power_init_attrs(pdev)) > return -ENOMEM; > > - fam15h_power_init_data(pdev, data); > + if (fam15h_power_init_data(pdev, data)) > + return -ENODEV; > + This should return the error code from fam15h_power_init_data(). Thanks, Guenter -- 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/