From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752706AbbJZCUL (ORCPT ); Sun, 25 Oct 2015 22:20:11 -0400 Received: from mail-bn1on0061.outbound.protection.outlook.com ([157.56.110.61]:6569 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752364AbbJZCUI (ORCPT ); Sun, 25 Oct 2015 22:20:08 -0400 X-Greylist: delayed 1217 seconds by postgrey-1.27 at vger.kernel.org; Sun, 25 Oct 2015 22:20:07 EDT Authentication-Results: spf=none (sender IP is 165.204.84.221) smtp.mailfrom=amd.com; alien8.de; dkim=none (message not signed) header.d=none;alien8.de; dmarc=permerror action=none header.from=amd.com; X-WSS-ID: 0NWT2HD-07-4K0-02 X-M-MSG: Date: Mon, 26 Oct 2015 10:19:05 +0800 From: Huang Rui To: Guenter Roeck CC: Borislav Petkov , Peter Zijlstra , "Jean Delvare" , Andy Lutomirski , "Andreas Herrmann" , Thomas Gleixner , Ingo Molnar , "Rafael J. Wysocki" , "Len Brown" , John Stultz , =?iso-8859-1?Q?Fr=E9d=E9ric?= Weisbecker , , , , Andreas Herrmann , Aravind Gopalakrishnan , Borislav Petkov , Fengguang Wu , Aaron Lu , Tony Li Subject: Re: [PATCH v2 02/10] hwmon: (fam15h_power) Enable power1_input on AMD Carrizo Message-ID: <20151026021905.GB8036@hr-amur2> References: <1445308109-17970-1-git-send-email-ray.huang@amd.com> <1445308109-17970-3-git-send-email-ray.huang@amd.com> <562A3A17.1080800@roeck-us.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <562A3A17.1080800@roeck-us.net> User-Agent: Mutt/1.5.21 (2010-09-15) X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:165.204.84.221;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(428002)(24454002)(189002)(164054003)(377454003)(479174004)(199003)(101416001)(47776003)(77096005)(76176999)(19580405001)(19580395003)(54356999)(50986999)(23726002)(87936001)(5007970100001)(97756001)(106466001)(83506001)(2950100001)(97736004)(33656002)(86362001)(33716001)(105586002)(5008740100001)(110136002)(189998001)(46406003)(92566002)(4001350100001)(50466002)(107986001);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR12MB0855;H:atltwp01.amd.com;FPR:;SPF:None;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0855;2:CVXF/CO6Kh/+LOmZ0Ums86np+NDu4IDb0BDDFrp3Jy0LTxYxvJ6sOjxeVC4xUsV+ZtOEO/XxygPiFFlaPY1AfsZ+s1GFCFzXDcPzyW1jZ4nsgk/h/ozs8otSnoFQjYVz6Ka/H3AjqN4M01m0qyqy65hKckH38aUbZLdQf10CwA0=;3:k1pfk6brqAQWjcJHRCjZw8JaAlBUcRC0N9RYGZEwzb0PFlJm6bYZu/3QpbSOieqqMDtb8CcBbflcB6CmPKQdQPuVmrLFheoPdv0gNxMo0fAerNnKDOjfk0Y15p3sGv/C/nxXN0vrQB+MkPyo+N/J9E+vY3Y8JHxS3mG1Ju+SDgUlBP6Ajt4D9w1PdqkRbLVUirrXfOUfvB7Ykcy5wbymeY+apPgNZYC0+IszZjREFzeGdEJdw57UuM1eImMgKg8r;25:4DYT7878tCvanL9K0spvPVtp3B8DT4xlJ1U3UWroFdyrOEad3CQ12cM2uvmL5YO2lyCjMsZmZGId44gY7IU7uDthP5QAH//Ip3uWoqjrgfezeNUAN/i+U2h5E8HToKQxpX1H0wh2z+HZqmgAHOqWa07HVpu3btzernDJoFS+eQCh74Vzvxrr/GREFahvzsSg/1r4M30sdbA3KA8ycYKT6cZJ0i5ChzL1nnLYKwokbW3wlgf/OFuwK38oPyLSMItrXYXZavlDLB2xIIEWzRfR0g== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR12MB0855; X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0855;20:Rpiy0/mftHP7e/t29pUQ7+50Vlq1GTimNDcx0SOTxtO5PbD4YirGI6Fif/GjPlhuM4ct2HUTdey1jNJ9DZL5kNu8kZSjuqfgcDH2eD7kNo1P7luQXcEcjN89mDpWICXYa0TNikYlHs5lR5IJUMvm1mvw8ORBVvT59izpslr30Jo4lCXjPxAElY2Uq+SXahmBdYP9KZQY2lORoyNMeVCeT/S7J2m4oE2DJITQpRbBLbtUOE6J5Hc0K90g/+fuZxihpD7c6rg4dtFcZgpr1so80F0cSX2Fa+939LgWpDywMhq7voJh6w1ZkD3W6DtPBLu7SiAaCUbBp8WLznnilMjOrXtnaHuM0jgTtOT/hqxJdS/1c4T9XNs963axlG8uWUOzxEYbvQ/CFd8KMkOsCu8LEqjBcCmqnAo1yHhyGmDP6pWC/2P4IMArInxFqCu2woBDrazrvYQScoHnpVQ7MRU6m8BpHzdw6AS5ZUE9fBbc1qhBn7NotXdsQw4vaj2kJKHZ;4:A+ugaWGhWnioYBSjDXPTGKXM5kknGkjO1RX/U1pqS8IDXZk6OZhMplKT5m4yz07kuM/4KCQF8y1DgkgY8MJjx6cMMbDnBmqjcHYvlMwTZCAAQoSsH6NT9rJIHW92I8Xecm45vkQ37V6TgfB7HyzHh+s4GPIHnzNo4ZcRlCQsQ2i9tATp8xN283vGWeOkb8DVILmGZwGtrtrF4ZF/hgESjgvg5wxyazXsXaQU3p6ERDoNhEWLtsJ6Czk/Q0Ic7JyHZiQ2I6fo3hZ7TYOOY8eMjPf245lBPzz+FCoxxZsaLM+z8BuyJUwD4/17y8EEAVuEHAc1jWMAof/PAeZqpQE0uxg18oaIEfBdlqQDSKd/wz8OWl2viIwhJEkgE3G8v1UM X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(5005006)(520078)(8121501046)(3002001)(102215026);SRVR:CY1PR12MB0855;BCL:0;PCL:0;RULEID:;SRVR:CY1PR12MB0855; X-Forefront-PRVS: 0741C77572 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY1PR12MB0855;23:c+9eQ6iDbKoxpm++bfa+yNvE3ZnNl7Hhd1Y8yZMmZ?= =?us-ascii?Q?593pvr9pihq3LumTYdgQGZUe3ZZ8dQwRbpDnG+Srfkuc8BYn9cyCSHWymXO7?= =?us-ascii?Q?tG6ZeTvbc+8egh7VT7JZqj61i2KN/jyeJ3ZdaIp0TiH95KKgv2OvdeGUFyxo?= =?us-ascii?Q?s5dxNz3LVVagZS8x3oBrg9agI0o8uRA7SZk/FOsAL89aQQMbUsrww9G7ily3?= =?us-ascii?Q?vh2FnSC59aLdqm6y+XF/j9RTXNCJtPh8vGCBgkRbHmxDD3Gz4bK4mAoOE1EY?= =?us-ascii?Q?pmXHgbwMcMoPRIWilU2sve+MXC616KwNXrVFWsBpato9fji0AXtxNFzLGNqw?= =?us-ascii?Q?g39yRXUQP9NdwuxYWbrA+wyPJ4fTIX3qrGtVjUHg2TCfhuIFoTat8yD8To+4?= =?us-ascii?Q?C2McnxDhv5/VY5dYjXd9DUulx3MXQbbHYP/KHsEwfoMZJdu45K+C67p6GawK?= =?us-ascii?Q?W4MvY1J2me7Nry9qIrgRa2lFAdkZFbJne1qDyCOUwfe0gl3IIdsy/1pnMsBh?= =?us-ascii?Q?t5VksAgfg27cSevMwYazTkMS81T32VucfDeNNvExgJsIb/lJW7w7cnSNg4t9?= =?us-ascii?Q?s3U38btnUugLlKVsa6PTTKQTrLLzM8XDkdjny+m5u/4VJQt2N18QSgiJOwkI?= =?us-ascii?Q?dDHXn0BhyFvt3R2C1ugX0VxkaV8W+uG6SozhlnDdm6Yv189kGKRWZLkqTO8s?= =?us-ascii?Q?BvLfZ4wtUiL9w0P73oj2x/mytVl+O9iVbig1cTyW2og5XaD/I6SHYiP+Won6?= =?us-ascii?Q?JQ1KfcfOnbD1skc2Je48Qqgpp/SdELg5R0waI+310YD+t5er1NpCV01Cnu1F?= =?us-ascii?Q?bZVPZ9HsPT2ea1KTQKlbPl9AfayAB/jzii92WfiJU+TTRch+v867Msq/UTru?= =?us-ascii?Q?sr7g6E0CyZGnjJ1xYz/NuXQm2c6y4MQZMUlXK+uqcWEm0Dlss8wkj18jRNUE?= =?us-ascii?Q?CX6DHEnHuEDRKM5nHuKGeRs0xqbXHwFlu61NS4QYIL46dABtmd4xT/lSPnk4?= =?us-ascii?Q?otF4dd7QlQwa2KiouDYizE2?= X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0855;5:qqMm1eOpNyyJ/7Fbcps6BDTi89EYCWPDrxc9lKHjK4/Ff85Coy9q69cv1ZjUXhQNemGVOP3NrZR2+juRsXc7SLv7JXK8UHy90GqcP5vEagYQNKhQBKZei4tOjKhp4gl7Fn3Jp50nb3M1NuY3eX6/QA==;24:NUGVMuHBhpsWTZp7Epv7tBaYZ1Jq5Dfu5RixEOJs/6ldd2hFbuEp74UuoAKoSvG9qAoRtv1sS1tH8Id5Pa88drv0dAk4ezRjFy5pYhqAep8=;20:qaBRgs6snPer7o+WcFMKSJm7K+cjqeGq3iJwgAOgogKffYPa3zNwZyxgnPFvTNDE6rekN44NP8Zj7U4VbaEUYvPNKI1sXIHBYSfKeAfoisGnJEyrH9Tiyuv/EEm2S8KQ/e1mHprAZPo/r7Obs7MH5SNyLGMW39QyxIh4/iZyW0Js527ZZTYCdK5MIgwHagqMjZLi9dQYyTgn5PAA0sXeJvEPGtElU8btYL95XCkP1BNHqQEejgAJvT2oYMAPbFDg SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2015 02:20:01.7249 (UTC) X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.221];Helo=[atltwp01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB0855 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Oct 23, 2015 at 06:45:59AM -0700, Guenter Roeck wrote: > On 10/19/2015 07:28 PM, Huang Rui wrote: > >This patch enables power1_input attribute for Carrizo platform. > > > >Signed-off-by: Huang Rui > >Cc: Borislav Petkov > >Cc: Guenter Roeck > >Cc: Peter Zijlstra > >Cc: Ingo Molnar > >--- > > 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 41d022e..a090adf 100644 > >--- a/drivers/hwmon/fam15h_power.c > >+++ b/drivers/hwmon/fam15h_power.c > >@@ -115,8 +115,11 @@ static int fam15h_power_init_attrs(struct pci_dev *pdev, > > { > > int n = FAM15H_MIN_NUM_ATTRS; > > 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) || > > Please no unnecessary ( ). > > >+ (c->x86_model >= 0x60 && c->x86_model <= 0x6f))) > > Those are acceptable to clarify that the && has precedence on purpose, > but "(c->x86_model <= 0xf)" is really unnecessary (and inconsistent > with the rest of the code). > OK, I will fixed it on V3. :) Thanks, Rui > > 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))) > > Same here. > > > fam15h_power_attrs[n++] = &dev_attr_power1_input.attr; > > > > data->fam15h_power_group.attrs = fam15h_power_attrs; > > >