Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752653AbbH0IYx (ORCPT ); Thu, 27 Aug 2015 04:24:53 -0400 Received: from mail-bn1bon0058.outbound.protection.outlook.com ([157.56.111.58]:3461 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752453AbbH0IYs (ORCPT ); Thu, 27 Aug 2015 04:24:48 -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: 0NTQENV-07-T6Z-02 X-M-MSG: From: Huang Rui To: Borislav Petkov , Jean Delvare , "Guenter Roeck" , Andy Lutomirski , "Andreas Herrmann" , Thomas Gleixner , Peter Zijlstra , 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 04/15] hwmon, fam15h_power: update running_avg_capture bit field to 28 Date: Thu, 27 Aug 2015 16:07:35 +0800 Message-ID: <1440662866-28716-5-git-send-email-ray.huang@amd.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1440662866-28716-1-git-send-email-ray.huang@amd.com> References: <1440662866-28716-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)(3050300001)(199003)(189002)(5001770100001)(189998001)(97736004)(4001540100001)(48376002)(68736005)(5001830100001)(36756003)(64706001)(50466002)(106466001)(47776003)(62966003)(19580405001)(5001860100001)(86362001)(2950100001)(50226001)(5007970100001)(77156002)(33646002)(105586002)(87936001)(53416004)(101416001)(76176999)(46102003)(19580395003)(50986999)(77096005)(5003940100001)(92566002)(229853001)(5003600100002)(921003)(1121003);DIR:OUT;SFP:1101;SCL:1;SRVR:BLUPR12MB0708;H:atltwp01.amd.com;FPR:;SPF:None;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BLUPR12MB0708;2:VypyispnSB/s2WoPkYX6KSO0BZpCXuFirEodWGHRL4Rjpm7KM+9VkhipUjXhwDyAXPhsRe7D8uPvYZFwFovLKramMvQpyMGQNyD099TJ/emaZ2zUZNgiB0bJOXUwd4heyCVOWbGOJdJynPE/uCv1lSvEljr2eHKvgawxbtZemq4=;3:XkclRaABXDFfMQB1W+4tXkRH0kr7RBqkKfTW3eQbQ/k9C4aMl/pCm9M3K9jiSX/LPTLJ+rPfhHLodxbpR0cuNyoYPQQDY3VGc4jsiu2BroMbdq9XA86U92TKnTKNwwl4GqwPCcpkbL8zVwATXkxAI2pEHEWYu191037KqD9F5aElf4L2a+FTKIcqLQ21m3lJ06tye1WPt7maMgjit3Z5RVHHcaBdD7MfA5QsjH3q6NN/gayl9LyOvj4svwM2zDP8;25:gb6QUoi7IB+U0TEaa7TKpp/w91g5jbNgZIZTOLWeL6gjKHdlZS4yqAXqwKHj5w/HukllsTjZYuzCZsDmSWCZQDwMfNMqMcciKZMehkeE9URnINDzizhPAZqcutYOpTRuLQ2gfnnwuKW2hOFmKi8WLknzB18OgQZdszyZpDv5G36OipLbSO+pnNkGbdyqJH8GgNoSX4ExIgKP+BsmCygUURCCZsM2woAuvWn+XPpLGU/QTtZ21rrqFMTZcIl8sfxp7HSk54PwbQqLtLusLNUIgA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR12MB0708; X-Microsoft-Exchange-Diagnostics: 1;BLUPR12MB0708;20:dMBnyCawXFbXBiY7Uy+BGIkgHPiDmHV+Ir+6G2VY5K4LCa2qRm9eQn9YBB9c2SgasIgZSPWMezIdTI/Hv01BJSvzYCpJD27GPzU3KWEbc0fn5cRconhBAgKVJDHPPeoRXpYHlzltBzDDEZgpKRWHjusHFZWoyzeia+8NN/THv2LtZaeuvtIUIxhAE1oPl7kSDk1dfU1ULFGs5+KIDjjE6Ks21mhFTBa13VyttLOkbtfkxgbRxDB+Krmu8WjJZWMflwZxAa5j9crpO/e9U7OZUKjREtCfdQkOtHpC6TC8cO5pF8lCzNPEknaC737DvXuPmZFb4lFRs0WNjGrxRbbUpiD+sWDvjbts0l7GpRN9o+ZXP8XWv8IpC9amR8ZzNt5p5kfayjiiUzbYJ6vySsAR7MrEdjSFziU8jwEy7XHuzEdL5epuc6NAK1DpF5/n5mYZKsu5kJe6wDvix0wf+0qlfjAWyeHqPMoYJJ8aqb5UDwHVnK1MxNB9N/VJsdc5I4SK;4:ufuRLxtuPZLYoarnNlTRk7mGfXkePUpdsIUWeK0bAelZ1LxfVosZZKCCREOdmWrLAXcRk0JyPahMlLfHx/AgDIGyzpCFL6GARM+DkUp9wtvsMBgkKBw+W5F8UuHb6D9rZqM2+jORVYT64V/5zAMh7au1bVu/+pvQLvv6j4NLALqJtg5+bbWUw8X7miIoOg1Qi29FCp1pz3RTSJQWrox2JWALF09K97MmM0kpeH2oldWaZHgKk35ZuQ6c8Kb2RkLnQYdJ6RkRWiBZNGg/Au/9cZg/KkQ4P+0HoG9IG9EOUfwtGnGTr6qeQrWN09YpwB8q X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(5005006)(8121501046)(3002001);SRVR:BLUPR12MB0708;BCL:0;PCL:0;RULEID:;SRVR:BLUPR12MB0708; X-Forefront-PRVS: 06818431B9 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BLUPR12MB0708;23:zdwtKxm25LMG+hpM60tKzpgWNd9O8awS/n0chn9w6?= =?us-ascii?Q?gKdGbyjyM75H6yNA2YCsYpOa25PDd7ro5ThCjIl2S2fecG4i/6h3IJc1y6Mv?= =?us-ascii?Q?6p4eRur8TYHM8R8OD9lY0LoI0Not2YJlqd9OGPo+PfDvd1dlmdk4DHCb+KTY?= =?us-ascii?Q?1P22ZMIi87Vsj7oZU9hXJv5QIJa2SWLrIqyEJuexEBj08eq1pm5Gwp7gik8R?= =?us-ascii?Q?AZzQWZcG3Dow9zykUGQTZY4eL2E8J9K1aKufm48NrJ3Iv9H8sKepFVrsdtXr?= =?us-ascii?Q?7GMs3BynnYbVnh4yFz5QiMMSZPxqXOmbvJqJYLaf0rtlLKaKRTUAPE36GRe5?= =?us-ascii?Q?XJ5flb/o6H6G/O4jBC2vFSU4Y48axy8salQPRNurlW/9Pr9Bc7VbXCmYVF+u?= =?us-ascii?Q?VTArKQCGlNErfP+qyqMRrC/m+Nbp7jyP361obzg84gP8GygCmTLSxWmLau04?= =?us-ascii?Q?mk2xFxL1uVZZ10kZbcmDFFFXfqmqBxKcTYGFbRrvQGaZgn1RtUbnOesfNM72?= =?us-ascii?Q?A3nb2o/Fz2SpaLrHQthATinDYTjzqE4JLcFajM6LpA9W6LcIdZG/ktjnYfVw?= =?us-ascii?Q?SaXX6mV/evXy3Tv150W/ot4FuKNSVPT3oUw5KZb5o+sOYR6bNHc4phXRCEqJ?= =?us-ascii?Q?ZpYyjzV97TmWdqmP0Lblx5xWfwhnqkBkXsy39Ncr/GKMP826u82da5ZDHZc1?= =?us-ascii?Q?uVdB7fjhdRq0WRHFlVx0iBhPbexLa1qzKaRTXGPnfETU83pH96NITo8hJBYZ?= =?us-ascii?Q?rsNw3vuiVTWo3w5x+P2g/WFtT3TIGggMA6bCP+11pJUjQjxMwkVG1vdQeRdl?= =?us-ascii?Q?BmHY+u8OEqdz3cGoRonLpSD5Xi7ujDPl6BnwqoD+NDMk5Uv1577aYQGyPTPH?= =?us-ascii?Q?lbrW7Sl5P497VQ9/mF+Htiap43dfdgfXtmV1hm8JIkVDZuGDgXWp/M9O5VGA?= =?us-ascii?Q?E9GClq+hZfT/R1yDbUb6A67FeGFaS7auoiuzTEcI5pGi80p6vbIZPGnfZ3+4?= =?us-ascii?Q?+tHAc3SVx+2Nsciz+J7RjNENDxB909cxVi/tHohYDM6VRmsDfApjrrvITvjH?= =?us-ascii?Q?5u7z8FltmDwlYJkbllR1/WcZoEB94bYe2JHd8JaOQQctjaCRmE7bwvpevxMv?= =?us-ascii?Q?jef1Lbdqw5YM0TCq6LC5ElHSccPC+6x?= X-Microsoft-Exchange-Diagnostics: 1;BLUPR12MB0708;5:M+5AJyIjJAWHSjhr5Qm2u3g1k+5+UohHjv9bjm8pwn2eKjKTRtUkdWONjIU7gbzPAI9ipVj05rqoOcFYRlzQJ4ALEDExnNzwOr/CMNyElPejRV8tDqBj27lVmXiNUmiTOTSHdW+QQK0Urtme+lfOfQ==;24:mMS7kfXVFDI6UJ2q5R0Wa3Fo/+Q1LrRMQv8jh0smOAN4zFcmM1aTVi8Y42rHUv8K+d96GJGAXc8TF+hy7vNIZ/zXUytqFDs2s8mb88XgNl4=;20:zlYVxcJ9lrtxKhL+/g3Sk9BAXo/aJ4V2pPhTeRY80BwZkAozgqVrGL2Iz8j2qZT47xfujBqjiSHaiIA2zDV9Rg== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2015 08:09:33.7872 (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: BLUPR12MB0708 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1498 Lines: 42 On Carrizo and later platforms, running_avg_capture bit field is extended to 4:31 (28 bits) from 4:25. Signed-off-by: Huang Rui --- drivers/hwmon/fam15h_power.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c index 65ffb06..3e9b3b9 100644 --- a/drivers/hwmon/fam15h_power.c +++ b/drivers/hwmon/fam15h_power.c @@ -61,8 +61,19 @@ static ssize_t show_power(struct device *dev, pci_bus_read_config_dword(f4->bus, PCI_DEVFN(PCI_SLOT(f4->devfn), 5), REG_TDP_RUNNING_AVERAGE, &val); - running_avg_capture = (val >> 4) & 0x3fffff; - running_avg_capture = sign_extend32(running_avg_capture, 21); + + /* + * On Carrizo and later platforms, TdpRunAvgAccCap bit field + * is extended to 4:31 from 4:25. + */ + if (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model >= 0x60) { + running_avg_capture = val >> 4; + running_avg_capture = sign_extend32(running_avg_capture, 27); + } else { + running_avg_capture = (val >> 4) & 0x3fffff; + running_avg_capture = sign_extend32(running_avg_capture, 21); + } + running_avg_range = (val & 0xf) + 1; pci_bus_read_config_dword(f4->bus, PCI_DEVFN(PCI_SLOT(f4->devfn), 5), -- 1.9.1 -- 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/