Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753696AbbH0Oud (ORCPT ); Thu, 27 Aug 2015 10:50:33 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:35242 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752033AbbH0Ouc (ORCPT ); Thu, 27 Aug 2015 10:50:32 -0400 Message-ID: <55DF23B4.40609@roeck-us.net> Date: Thu, 27 Aug 2015 07:50:28 -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 05/15] hwmon, fam15h_power: enable power1_input on AMD Carrizo References: <1440662866-28716-1-git-send-email-ray.huang@amd.com> <1440662866-28716-6-git-send-email-ray.huang@amd.com> In-Reply-To: <1440662866-28716-6-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: 1686 Lines: 49 On 08/27/2015 01:07 AM, Huang Rui wrote: > This patch enables power1_input attribute for Carrizo platform. > > Signed-off-by: Huang Rui Needs rebase to updated #3, otherwise looks good. Thanks, Guenter > --- > drivers/hwmon/fam15h_power.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c > index 3e9b3b9..55b25ef 100644 > --- a/drivers/hwmon/fam15h_power.c > +++ b/drivers/hwmon/fam15h_power.c > @@ -113,8 +113,11 @@ static int fam15h_power_init_attrs(struct pci_dev *pdev) > { > int n = FAM15H_MIN_POWER_GROUPS; > struct attribute **fam15h_power_attrs; > + struct cpuinfo_x86 *c = &boot_cpu_data; > > - if (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model <= 0xf) > + if (c->x86 == 0x15 && > + ((c->x86_model <= 0xf) || > + (c->x86_model >= 0x60 && c->x86_model <= 0x6f))) > n += 1; > > fam15h_power_attrs = devm_kcalloc(&pdev->dev, n, > @@ -128,7 +131,9 @@ static int fam15h_power_init_attrs(struct pci_dev *pdev) > > n = 0; > fam15h_power_attrs[n++] = &dev_attr_power1_crit.attr; > - if (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model <= 0xf) > + if (c->x86 == 0x15 && > + ((c->x86_model <= 0xf) || > + (c->x86_model >= 0x60 && c->x86_model <= 0x6f))) > fam15h_power_attrs[n++] = &dev_attr_power1_input.attr; > > fam15h_power_group.attrs = fam15h_power_attrs; > -- 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/