From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966278AbbJ3KAx (ORCPT ); Fri, 30 Oct 2015 06:00:53 -0400 Received: from mail-by2on0099.outbound.protection.outlook.com ([207.46.100.99]:4441 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1758784AbbJ3KAv (ORCPT ); Fri, 30 Oct 2015 06:00:51 -0400 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: 0NX12H8-07-F23-02 X-M-MSG: From: Huang Rui To: Borislav Petkov , Guenter Roeck , "Peter Zijlstra" , Jean Delvare , "Andy Lutomirski" , Andreas Herrmann , Thomas Gleixner , "Ingo Molnar" , "Rafael J. Wysocki" , "Len Brown" , John Stultz , =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Weisbecker?= CC: , , , Andreas Herrmann , Aravind Gopalakrishnan , Borislav Petkov , Fengguang Wu , Aaron Lu , SPG_Linux_Kernel , Huang Rui Subject: [PATCH v3 02/10] hwmon: (fam15h_power) Enable power1_input on AMD Carrizo Date: Fri, 30 Oct 2015 17:56:56 +0800 Message-ID: <1446199024-1896-3-git-send-email-ray.huang@amd.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1446199024-1896-1-git-send-email-ray.huang@amd.com> References: <1446199024-1896-1-git-send-email-ray.huang@amd.com> MIME-Version: 1.0 Content-Type: text/plain 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)(189002)(199003)(5003940100001)(50986999)(97736004)(33646002)(36756003)(53416004)(189998001)(5007970100001)(19580405001)(50466002)(47776003)(106466001)(229853001)(101416001)(76176999)(5003600100002)(92566002)(105586002)(87936001)(50226001)(48376002)(86362001)(5008740100001)(19580395003)(77096005)(2950100001)(5001770100001)(921003)(1121003);DIR:OUT;SFP:1101;SCL:1;SRVR:BN4PR12MB0851;H:atltwp01.amd.com;FPR:;SPF:None;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BN4PR12MB0851;2:BvjxXelHc3dIgm4J4wOB699zX+4+PPpLR1WPfe+bFEdntLfY1/jta1fpiZL+wxq+EfQ9ppvbe0+/nvfYnzw/hScrW1s4kvP+Nv6THLP4c8lKHIjyyY3mRE7bake/v2P8sSVxaPX9/m2O5Qs/58THIutgLTUz1qzaQp2UirZOyuU=;3:GC0hnxea+m/QbTdwdMbU0VOqzHvWsA3abdDX/0HAiLxNlyMGbkn6Q5ui2a3GJUJqfYHmOG99gWHqKxHz6kGSWnCBIO+M+Vw8W5zC+bKKEGW61GqXjJsPVODLNfYOa/eua+3hQJBp1Qk9eVHaujF6bofPIZGoewVH0GX5ocg81Gj0Vb8LrH16C/t5m4KPTJwFyBTmFghwEfn9AHhh0zFsz3KMWMXsJrui7CjrhWKO0ws0MRnrImno6aiX/MuDbNd2;25:Qc29RioAPQqgOgH88YjgG/yiuNXhbGCUOR3uccycAPLMbYIOs6+PgAvEEADgUmEoA/eYt7HsiVtie+Pfyykqk0SB9CkVkTRFbjHh07UBj1KEPKmA+dpKzCObhPM3l9zq891afzSjVq7BM8Ukiw1qwGrlu4KtA5m2oVvepGbTAdJ9zz3VGD0OD0APiBb+yukRP2ScFlLcbDVQsM5fsXzIQF1uAy8yROmvkiRlyBaNmI/GEO5URFAbsw5jcQ0F/d/wVlIZXsK1Rs0vm6LErbd/LQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN4PR12MB0851; X-Microsoft-Exchange-Diagnostics: 1;BN4PR12MB0851;20:j1O0WoBCDu/gZt7ycn/lgJ8J7t/Mtb4J0TBkc/3pE4zvPFJrRSAtFVgdoXmctGyvK9cmjFLC6ehmuvfpAmeWgSro0jkunAARjHDpXhEAgTIN4X+0JlWrXj7iJ2MeUypfue9KWigY6b4jQkONPUaUE/ZFC/Uz4u7lF3S2YN/h5FMVSOEF8U+XIk2kkGyudDswZMRkhwddbwZYI6ufdSfClgdXL2u9LER42j/inuzF4z1a1S91WURdU4akA7EC4nsRu/xf8vFW/fvCkEZta9dVzR9ryZKtUJKQs/JXUVb4p78NfmS/r0yX1XiRfBlNh27C1hgIAghjiKcW3KLJ4pJNSY+EM4L5M/HCscG4Gv9pKyQesNWKqzBl2Qa58cziL8M1RIqDPwpTr8a4+Lenk77RQ8IQ0+COcUiLhgoCujfKojeF+iMwpTgWCeWhwfn1WWbQ8l/qCvYj9CwRZz4JOj6pl/BLxX5XtE+hBYXXf4+Ot9ZQe6+1f47v88VmX46JaTwT;4:CPDJVCjkS/V4vlECl9K4R1cC6oSQWzu45J9mtbqhsvnebBW47Qov0MohAANyp/YdQednGUUiDC2fXSnLJTp4FqSyUKfTgRH4YRWxbS1nP9pZxTajjOm2uF7dyVqiuCcZsNJYsvkDBLQVfUF/ys9KHLj0wk/iiifTeORzt23H44rW6zGyQ6YH3zJCpWedErUq04nhbSX7FGa8gAxOvnKgG9zwXnABK7zadB+vjc1+NxKixGydvVJHbF4Q71XGNcwNKUVvw8fUK08/d28YPu4xa/N6AV/7W9BL4odkLiY6i2rrcxjX9kDvjP4rI/2NpcEe94FGKshXRsmX55RXeeYJgFKO1MjbQHK/FdgpCN8RRJkckq+LCSVt31yFcBdbOjItrIey4hgjxzIKQTrSsFY+WA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(8121501046)(5005006)(520078)(10201501046)(3002001)(102215026);SRVR:BN4PR12MB0851;BCL:0;PCL:0;RULEID:;SRVR:BN4PR12MB0851; X-Forefront-PRVS: 07459438AA X-Microsoft-Exchange-Diagnostics: 1;BN4PR12MB0851;23:xfgQJuOe3BJJes5tspVXxiR9gd1DeyL2y0vUW3ivgleL4JJzT22NmIqaf7KdDY11hQ/0ozOhzbEvoeaOZGAEn5jQ1Sr5zvCrldhHP5ON/V6TaSvBioEWxcoaLX0TJ2VbTUBQta8HlsYuZ5uMZR7mBYt1hrxfgovRudAyFVZZ4aKRomYTF152mNCgWS1IoA9JbfSM8+uUZ+k62DqHMbGTpgp1OOWWAd6+qYrcfEjFb/G4EjZftQ5xUbma9htJoPmyHpVPFPQKqBQMujvtZmUdjvT94LC3Gs0nFKy/x9FI2/EZhusd+QBHEAX2RIw97za8GR15UQ7QsiSXHa9cTNhEy51UH90ytkmWGAD3ydSYx3GeEd94MOnd+Ko+SaNBaA2tkjLTIslKRjkejIxIfmOZPCXxNVb5IaDM5dIGIf9klCFQ89ygzLZgYmcr75yDUXDrSL2B+XVjuMmCLqUnYlexM/vuHQzjwVlv6ekAq8vBob+KTpHeD6ZUKZCGhADqT/CUBhRI60TM+T5Y1XG9Y73lg5pbMwrvDKefGOFRNWWz3lF7tuJMa6pg1igSuO9Vuein6sxThY9dhal/xDWuVXjPM63osWNZw0Zq3+U3vWpdDG9KFZg+QZUW+pGbpIyIltRBpeneFaSvInB1IiC/+Tm5CC7+egt2lqZtOlEO1HMDg5oXYlBDXY46AE7JmpYWn635iaJ3tMH9E+2tWHnfAP2WYCbT9j1e5CnIUYXHCA2nsVAW8sbZdMJyFL+jKiVnQVxfVxbXjK+MfUed8inmfc/f73iwrhbF61tuY4yVfnGS3pVoL4ObySUqjIL5eIYTJv1fbUjFTm/JpYl4xQWXJww21Y5ZRE72eptmk9Lp28YCbQke/wGTGpmZ8AKMsnOtd5OKgFXc9SPxf0fo1kL7Y+DGPlV9+xSa7j1D9xyrNT87y5LF5DpUDhPLZVkSn7rQ7xXT X-Microsoft-Exchange-Diagnostics: 1;BN4PR12MB0851;5:oDb7qgv50vcT1UJSvB26fjlE2tZtfyFFDOb6MIFzFZ9hkgdDUSoErD3NY0obGWqcTpSHsLLHQ6ZZfV5SFceRB1bmS7c1IchO4cqxlkYoQgVuJTAmTDKBqoHyrgA+GYwah9CGlF7Y7unCFzoelI6DTQ==;24:M6PqA1XpN6UIfgNBkpYOsHuAGLh+5Cl6RPORlA6Q1+VOojVamxY373xs+AxzBWW0aii3lTP9SozjcNlKSJFTR7jDV3JMeaOG6goeiXv72o8=;20:W8y+J20uqP4x9iSvo6AE43ISMvFSkWdLOHGyHq1x/MCUHuYFj5kUFE6DpkQWN2UTMq0MMYjw55HDIt2vjDv25bXpGc19XA9Jx3TMrVvRbxuPQaBEaEz5p0Cl524ozI8HmZt9BtUJFFbo1Lsf4HGp27XTJYMBkSOBT38OQX+25Jaa+oyIIEq2W64/30fYvkBN6fzKGUKJ3AmH/98sUQ7I7aWTh3oDGpGL1gqEc8qzm1EbSW0ehUwTE4dwgVX2KYlZ SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Oct 2015 10:00:45.1361 (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: BN4PR12MB0851 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 2d899fd..a46e166 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 || + (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; data->group.attrs = fam15h_power_attrs; -- 1.9.1