From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752174AbbJTDEr (ORCPT ); Mon, 19 Oct 2015 23:04:47 -0400 Received: from mail-bn1bon0099.outbound.protection.outlook.com ([157.56.111.99]:2944 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751063AbbJTDEp (ORCPT ); Mon, 19 Oct 2015 23:04:45 -0400 Authentication-Results: spf=none (sender IP is 165.204.84.222) 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: 0NWHYY9-08-8UO-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 , Tony Li , Huang Rui Subject: [PATCH v2 02/10] hwmon: (fam15h_power) Enable power1_input on AMD Carrizo Date: Tue, 20 Oct 2015 10:28:21 +0800 Message-ID: <1445308109-17970-3-git-send-email-ray.huang@amd.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1445308109-17970-1-git-send-email-ray.huang@amd.com> References: <1445308109-17970-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.222;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(428002)(189002)(199003)(229853001)(53416004)(46102003)(92566002)(47776003)(101416001)(106466001)(33646002)(5008740100001)(50986999)(36756003)(76176999)(97736004)(5001920100001)(87936001)(77096005)(189998001)(64706001)(2950100001)(5001770100001)(19580395003)(48376002)(5003600100002)(5003940100001)(105586002)(19580405001)(50226001)(50466002)(86362001)(5007970100001)(921003)(1121003);DIR:OUT;SFP:1101;SCL:1;SRVR:DM3PR12MB0860;H:atltwp02.amd.com;FPR:;SPF:None;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:; X-Microsoft-Exchange-Diagnostics: 1;DM3PR12MB0860;2:ZvQkZQwK8VVlieQP+Ho3af+9Q0+8asmrqsv8D71Iue8CBLQ5M19tdvHPYGESJX+KqK52Vv0Zm5s3PVOC/XF7jx9RSUlmhkFWmnjPta9937I6EZyyDyzxH6eOV2dC/cA+lyWW/fkvsiqUdfr0S7M5meVM0QznqX+34rCbM1OxnS4=;3:q7+PqD9rBU4uz/mS/kfYwGa1GxjQT2WisfT6RtNqoww9Q9R/fHlAt7XYuaCDD17JDyF7+gQm2avUSGgfjZLjjw5Q7Sy7aoPcq8hPFhuafWo4aWdpbmEqpVkKRg71YaTpCZuOx2hivV2S48Lr2H5Ponn32U7DEwkOlo7cR93DhhmWgvC0dxzY4hUlM1VU60AZkKa4EiL27rl0sosam6Rcnm95iBExEB/IxOTPH90zEZGlq1tpf683WDuk7HMgkIAN;25:PMOG6dZeT6vGFLDvmXK/q3KfExitnn4/hJ6kOajzEnju8ucoOJ/CXF/MVIumj80gfBpswgBKeHe2geLUBDJGsdmzjm5mFN+ilcV/O8cyktqllqpzou2WL5yjINRr0A3dUU5K411K+MmEQYTAA8GX05DYQWY8yTNr52luk71EBhIXtTB0VMPb7bTVj3EJBvQo4fyKwHAmcZNMvUaEJdhvgnFfbqk5MyBToC61H0MEDNVYxdBh8IQbQkE/+Dy4QMcb6B2c5NXrrbBySdPnwQKqhg== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM3PR12MB0860; X-Microsoft-Exchange-Diagnostics: 1;DM3PR12MB0860;20:RBHYULZQzEkT4S+FJVsvgIoFoljkMZ4zdZdZ9eDH6kV5vPSjPFkgldZZjSzxjbO5eFFu9gUM4ex1496v0cE5459zleatyugVWfa1Rg5e+mCVr9CHuZmMnsgAOIHRpj729Ui/KYubEtxLT14dn3BdSyk7i9BHutTEF1Ixo3sRQ3wj39giZYGYldHaoTDVlOq42HwXJ7AyOipNt/vd/FjrwDnBj/xJNXEuA/ViOEoCuKcBYgcXNDjhNGLfwAqwYRok+JXMOz3LsUuupFuXyN8id/jqXJNE9tJb70Dc5F+yjjGecWVM4AvdpnrpeVhst11ndCd6ld2w+FZApthnYlBm4HaQRhsaHI4yAuZu/MAdtZIdhT/jrtpux1l3fLtI9TqIHcGOb9hagIMzk7OrGxvil7iE6dTgOs4lsfG/D/JNgiWUou+SJISQhMwIB87aDdYx70rvpTdSQ6TcGUFbfQNqmG6F5/dNp1pMXz+f8y/FZ88kaPII1hZfrQ90BGJ0H0o1;4:WCTeq1az9xNLATlNdS1uO+ujfCr63yxDsbP6B/IHWV9R5AlxeE+ooarmPSHBcU0Y18FVIxvEUp8qALI58WtUhtgEHSNggDHYjfEDSAGEOJF0wzkQI4yUCABGzuYVRoT3FFmAXRBSzsxEtWOYPvhAbMf6cSpN3Tq5TX2Y3OKXStUQKlbr7Rt8tDFyMk0VVonrUugAdP/UH1HXGUGkZfr5Kl8LTdVzV6r25m2k2fMKc5VMVI11OPfdSECxjdECclZQ+v4PvRhPAocAoig3zoma/JxjPYjMT3jEtogQ536AQAtkWDJYmFhFs3W8Uli4V2EBuO9w/UlM3c9XTwB/BkQ/y79G6vuo0tCgzUwLrJydeAQ= 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)(3002001);SRVR:DM3PR12MB0860;BCL:0;PCL:0;RULEID:;SRVR:DM3PR12MB0860; X-Forefront-PRVS: 073515755F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM3PR12MB0860;23:mZZjQOm2NacsdJdTUqPrCMoqEIzBM5kI8Jb5/PIi9?= =?us-ascii?Q?vQdz8H2g4NegUp9qj2U/jIink9FNEkJlXn8+Z1ykdFqPNiVJeQMU/EC4BrTv?= =?us-ascii?Q?EkUPiWf3hx2G0aPd5SZ/QMpNryCyDRM5RrFWRjobP65JILz4m1y0wVPmsKWX?= =?us-ascii?Q?mf+r8T6PF81GBQm/h2A08s9mhZ1dRkGqdAC9Ex64Nnl4Quct6QqkRKEBEZvu?= =?us-ascii?Q?SbiOkZl4DE684NmalaUyAY7mCh1mqkzxfgMkwjyELvXWoNGsIZ4teMh9qM3k?= =?us-ascii?Q?m1WJ915Y02LAqbyv823QxJbv+AogICQWcd+izFupWS3vxf97O0mLt9FVSvtR?= =?us-ascii?Q?F2pB44v+nJUiaCxsA9ozj5MH/wQ9g5EPZP+TRhn4yRUoxp7vqfqKTJWhbnvZ?= =?us-ascii?Q?u/E93KngOyLhK+EZN9nwl27NyaTgfbC+Gds3tpoQGyQIDApElqKEgbawzuWp?= =?us-ascii?Q?VWSkCOYnTBIdcJxTqPfzCIIsMhqd1xDfVQ1woNDsDI0ins2xxfP80eNgAZ1T?= =?us-ascii?Q?fZsLXzO4gIR3BMlZ30TC0EVWb03pVlx9DNSybk4wGzXjEfpZHkjLjJ/Arvlo?= =?us-ascii?Q?rlCEqZnT1pSnijfiy9BIopMa3CzpsoHo7OteWY2kf+FcNU1S27//8NlYiAaH?= =?us-ascii?Q?Ry/JFpxLOA1PvElJpvfX2mjDGxylPpxxua4MPgeN4XeBvkq7T+8PWd3LFh3h?= =?us-ascii?Q?bhLRppNAJzuuPk/cNxUbJSygxBqhvZia1lSReb8yLy1B6hTzkRw9G9ck20nK?= =?us-ascii?Q?gP+XvE0/xgXFbxq+uxh2xIihL3aiqJ45KtELWdyrrY2486jiglXxN/xXk/ce?= =?us-ascii?Q?SLbOxiJoULdBwmZe2OdXWAOwS2y0aLgfvMyqtsNHppRIrtAEtUg38JDpAD8j?= =?us-ascii?Q?KzXZ39ZPUwR8ZewJTPJkkEYy62CUyMc4vz3GHIPD/iUZXzX0GJ9JABgnbfRH?= =?us-ascii?Q?BjJOqsTzHgt7hz5ujZkxlt/deQnZLoQ4S8EMZqBUeHsj7vf9hZULWXXrASEO?= =?us-ascii?Q?FsYkBCr+1loTr49JPLCU6dYbNTAV1g5uDiM1YBPPIS6bQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;DM3PR12MB0860;5:+UFI0Rc56X4sBKcokb+1pHI7YSiEvcQ0skvjRXTrOwJI0saRdH3KPVghqN/2ZN/HSOUl1UxzL8fBRqZsSVlNtAy65Gt7l8OH7k10/2Q5c6/ax/WFrJfbC89GVw5woX0k2G+j2PL628WZSX3bgL8ywg==;24:zw+YhYW/MTJyBz46/Y6pWhQJ1n3tOvXjhVh0ja9Xwd7tAI6uTs6xkuSj/hiyNGNLAL6Nk2RFgGeh7wOEhbv5iO0cJL8Muuwl017+IpVKi0s=;20:wkYhNYYR/BSSRskN4SOv52DdnsmsLGH5oT46cBiUSnqGlVZgGjdx38kDnxXRJh4YCUhAj9HXvl9xZeD0kbWqlaGly+oM40xmwP4x2kUmruDDOV301O+iRocC1pRQj3Ao3gEQPe6YOrTdLB3sR7mN0HeSAjk/mLtSrM1aCQ1vV49ohjrz3aM3Qhse8N8FdszRV3zFxxu47xGwvV/TaQLxeTqMmuEf6IfAK31oxbLHEItSE7kWZmicPb8I5p2seAHZ SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2015 02:30:11.8923 (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.222];Helo=[atltwp02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR12MB0860 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 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) || + (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->fam15h_power_group.attrs = fam15h_power_attrs; -- 1.9.1