From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753023AbbLJDzq (ORCPT ); Wed, 9 Dec 2015 22:55:46 -0500 Received: from mail-by2on0056.outbound.protection.outlook.com ([207.46.100.56]:31648 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752303AbbLJDzm (ORCPT ); Wed, 9 Dec 2015 22:55:42 -0500 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: 0NZ4IWN-08-NBR-02 X-M-MSG: From: Huang Rui To: Guenter Roeck , Jean Delvare , Andreas Herrmann CC: , , "Andreas Herrmann" , Aravind Gopalakrishnan , Borislav Petkov , Huang Rui Subject: [PATCH 1/2] hwmon: (fam15h_power) Add support for AMD new 15h processors Date: Thu, 10 Dec 2015 11:56:10 +0800 Message-ID: <1449719771-12837-2-git-send-email-ray.huang@amd.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1449719771-12837-1-git-send-email-ray.huang@amd.com> References: <1449719771-12837-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)(50986999)(77096005)(5008740100001)(1220700001)(87936001)(2950100001)(5003600100002)(36756003)(229853001)(101416001)(50226001)(189998001)(53416004)(86362001)(92566002)(97736004)(33646002)(586003)(19580395003)(105586002)(47776003)(106466001)(19580405001)(76176999)(50466002)(5001770100001)(48376002)(11100500001)(5003940100001)(1096002);DIR:OUT;SFP:1101;SCL:1;SRVR:BLUPR12MB0706;H:atltwp02.amd.com;FPR:;SPF:None;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BLUPR12MB0706;2:y0tCAxDu0WhUI2sEbBidgaJ2lk2ueUmWS3p5je71agPcuk3hAbBkS1OrPIfEHRq22sMypTOQysT6IzBASevdr4eqUJ0DTo9LvnH+9tZ0bv4+mU2wqOo65VKdJKR3gCkVZfSAziv5CPuj+k+2eQePjg==;3:bU9Wnq14Ig5kY9AHcqRBFrohT8B5lUexlu7B5sCDU80F32MIuk/x19c4TkZjHvklH6tEbKqoyYD/uVs88wOlrfYjOIyLSb5P6ORFG7berexHJm5k5mi2aqPcp3xjNdG/3hr+bi1ByzW+bN3qgD95dMZMzggX5M7r2HLhq5OlrRMCTzwOhc3X8kdRQK38DNQhnSXaHTGJgp8ClZcNEqIyJdqMhlv4eFI+AbOATUF36IY=;25:rDUN/SkgC05e99eSZPVdA5mEB00tR1mOxdQPhmJhRRrsHCd2pkYxVrfu+o11q/0fxTz5Qkw/V0yZOgKFUoDwngp0KewO171qLBYPj4voKjAMJlRRqkbNt+s9yaAMgaG5MCZKJdZEkjtk7k3d+X9KC2EAV8WSZIpzRpyMNb+urNM+axDLoYhPoGoDqwZH0hsKI/AhkUsZSUsD+vNfqcj/COFkofymdUAnx6m/RNJQe4CPgEyCNUYLcmg7Zk7JKJQvidbkwV90aVJjEIOgALNrDQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR12MB0706; X-Microsoft-Exchange-Diagnostics: 1;BLUPR12MB0706;20:ndl22nLm3mlapzu+WFeuHHxxONW8VJxXXrSDvppLYLRy+RLNQbg24NjUA2VoSDGefeXogdnksgO+stR4dZsxC6LnfGTnc+0qFTRxqat+5caFpUXUsV1KehRiOOf+T6YmY7nOwEVfc99qp5IA16+zZPtCqkKqMpGz5XZSgae9YVVxioRvYvJkuA4N9zZx6iZ/IwOUWb/1ir7Rj1TlHA+ZbYOnXLIgxaTfRxlL27XFKy+hnV5NzkQtilgoVIdyoXb2TbxEMJyNoiZwu9j4I0jyc6Xc89g/gux/7zJg7qu4K4lwqdMPjPsT78NK00wVAzLZpuOyXVsmvKzdzQjzEKWfZZX3E/ngLGZJHYz9Bj3w0shpdaXiLxBjiEj9Y+8M7xk6OXgE6pPCT8o1puVRMCrN9WvQQQaU5spuyVSV4lwdMt9iZx8Afhi3K6+WG5UN4B6L2bIakVh/3jFGo/zLaed1PQfoyfrUDa/A4DtqY3GkhRnvWEVWIfVWpdqqIAogob3S;4:Dq8WpEZBIaKgwArW7nEARaoeUl9SciFN6vk/hj27Zp38macqYAvvKLsDGI1JFlouDTy8JQh2XYLQfKzG5VzngnRp1+aAoWFgyGF8ObFmWj06XETe2ySXA5V3+GgyvHNZqUolksOPEyohqk0O1I8q7czMKK/P1PJ1yQdE4F1OZR4hItaR85UKgHdKq366yIw/Ni/jvaDL9NEfWtGaDXEvvjQvlajBvO6lDhSfbWvECs1T/jjeXqT+0GCa0ztJqoKRFj+qh0uJA8LK5IPaKVBB1NYRkk6KlJd3bLMMTHHm9yhJWBqwU/yiF3LCk+LFlIW0DQoyj3nzzyiRU9zfnMBvtdAqpXl66Cw9MSyd9u+B8DDutrulD7gq4dGRBYzlfOq3et3og66uxIbAggG6/mN8HhSVYQBdkTy/iGFlJk6dtLc= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(520078)(8121501046)(5005006)(3002001)(10201501046);SRVR:BLUPR12MB0706;BCL:0;PCL:0;RULEID:;SRVR:BLUPR12MB0706; X-Forefront-PRVS: 078693968A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BLUPR12MB0706;23:5BpcOcBPuOtTTQ5H4GhgjKUFciLCcjx4sY92AwSlf?= =?us-ascii?Q?SOhHKTZgmfmnMZ5YXyD/Qn2aTYK7FQmufV+YP4Q2/J2KRR5apMMPXuYu9ctN?= =?us-ascii?Q?ZDncpEMP+zwGST62jh2BWlW0a0MOLpAZHBdE43w63GNGeJrecUUAsr58fQYM?= =?us-ascii?Q?U812LoLgQtdjcvJaNm8HlsAmdpoj80Yj9jLMqvk+eNw/8mRedRBDJzGkWOCq?= =?us-ascii?Q?Aledz7KoTBzx3UzbOZJ/S1nKHTVBIa4XugCwWNTVmwvK4Mcuy3KuqUZ5HY7s?= =?us-ascii?Q?hwWVSpWME8Qmkbc1g+GJeCefZRCxrWYWXTIdD6UB+cnh6H7LF5YUs0cr8aYG?= =?us-ascii?Q?6Fk9TIx15rlnhTEF2SxhKMpk57O/GN19gMjQK7liIULrx8E+t+8VmUCcvr2s?= =?us-ascii?Q?AtzEPr/yOTG/VdS4QIadJHiXKTUD+gB2H8WWR3x6Di0wsNPMeph2q6Qxp//h?= =?us-ascii?Q?VayZyme2tNXVegWhaXelKz4q1tAiwdLf8HjkCCqhlTVdjoQCAMH5AiRz2K2q?= =?us-ascii?Q?i1lZHFm3vTCrS3DcEmJix/DFAnoCrInS7XoEhEq1w70XXZnOf24iejN82g2Q?= =?us-ascii?Q?WJFDpnmq6+DZIxAd+/xULW9i3AWObcvWEP+ty3ZkT/xzQ6Il14NmXZryRUVa?= =?us-ascii?Q?HhK3cv9uXwwYi+imASwU5Lqr6DRB5RA8I9rhhARl1e/BMmGoZPncHuE2+N8a?= =?us-ascii?Q?Go/bekN2R+9+WvYVwpzChRfksk3SFt2ybppDTXX2ypAmoufzfGaNBCC3W0oV?= =?us-ascii?Q?5lniYYdbYIXJFeIZGnX/a0ZoZtF8kqjtijMk+5Sfhd+GZAI2JwLpVDMpB8ds?= =?us-ascii?Q?Kd9Cn0PcTAhbWStbniUyAiFLy7iu4vKtn1JknP7DWTi4D4HJtqqOAYExsFbm?= =?us-ascii?Q?8PPXWUEVJOH/lAfchw+uAW7xE8prTaqNjBSxuQqNT9/05OCSLhSrvDYOlBcd?= =?us-ascii?Q?UIfPDdc6DPxMOYtTsRSekY7Dy4uYmy7WZ6lAEU8aw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;BLUPR12MB0706;5:zF13iCXa68wNq26MEgjuXCnOEAfOzzshphbR4VZUlEWtqElnFbNmxpJtvm9uKICPg+Fj4/6ZqG8N2Lh/1nJdC9mG9k+vELkv6RXzz0cBw1YPsSE405uG1mlTNYpUPoJkF9kjcvxpQ+WpmilKAC92Vw==;24:6N97gJyV1E108fimnVRsKTW04DlKwESmtEQZHJP/KfR46+dIchJc6hbyiJeCZeXSdUgiFyPFuBKKMUWnIBHnlCtkQWms80VKTxvrb6bUvNI=;20:nJtZ1wcRaBzqCq5abc7gUjegyUclqt5a8uJMVmtSe9XAfCdwphKD1CEJiXlGPXvhvCKL/G9ceoQKsN/OIGNuZ/qUCSN85X1fxAX7WWSxaNsSjUHqwrmvT6e2tGzPaUsNxHFCOV+1+UD49zHy+FkuvNybA3R3NpbOMdNZ4mZByflY9eU5eA3zpLYhCTeYTsFNlxu5dktLnXXKjRxLQ3gpXiFzmTcNM5wDGzdZcWBWPn8sgG1zmhbZ/9HGacKyQNFF SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Dec 2015 03:55:38.8658 (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: BLUPR12MB0706 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org AMD Family 15h Models 70h-7fh processors also support TDP power reporting interface. Signed-off-by: Huang Rui --- drivers/hwmon/fam15h_power.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c index 5f7067d..f77eb97 100644 --- a/drivers/hwmon/fam15h_power.c +++ b/drivers/hwmon/fam15h_power.c @@ -47,6 +47,8 @@ MODULE_LICENSE("GPL"); #define MSR_F15H_CU_MAX_PWR_ACCUMULATOR 0xc001007b +#define PCI_DEVICE_ID_AMD_15H_M70H_NB_F4 0x15b4 + struct fam15h_power_data { struct pci_dev *pdev; unsigned int tdp_to_watts; @@ -124,7 +126,7 @@ static int fam15h_power_init_attrs(struct pci_dev *pdev, if (c->x86 == 0x15 && (c->x86_model <= 0xf || - (c->x86_model >= 0x60 && c->x86_model <= 0x6f))) + (c->x86_model >= 0x60 && c->x86_model <= 0x7f))) n += 1; fam15h_power_attrs = devm_kcalloc(&pdev->dev, n, @@ -138,7 +140,7 @@ static int fam15h_power_init_attrs(struct pci_dev *pdev, fam15h_power_attrs[n++] = &dev_attr_power1_crit.attr; if (c->x86 == 0x15 && (c->x86_model <= 0xf || - (c->x86_model >= 0x60 && c->x86_model <= 0x6f))) + (c->x86_model >= 0x60 && c->x86_model <= 0x7f))) fam15h_power_attrs[n++] = &dev_attr_power1_input.attr; data->group.attrs = fam15h_power_attrs; @@ -296,6 +298,7 @@ static const struct pci_device_id fam15h_power_id_table[] = { { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M30H_NB_F4) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M60H_NB_F4) }, + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M70H_NB_F4) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_NB_F4) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_M30H_NB_F4) }, {} -- 1.9.1