From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161082AbcA1CU2 (ORCPT ); Wed, 27 Jan 2016 21:20:28 -0500 Received: from mail-by2on0091.outbound.protection.outlook.com ([207.46.100.91]:18366 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932991AbcA1CUY (ORCPT ); Wed, 27 Jan 2016 21:20:24 -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: 0O1N55T-08-IU8-02 X-M-MSG: Date: Thu, 28 Jan 2016 10:20:49 +0800 From: Huang Rui To: Gioh Kim CC: , , , Subject: Re: [PATCH] hwmon: (fam15h_power) Add bit masking for tdp_limit Message-ID: <20160128022048.GA26655@hr-amur2> References: <1453892529-17120-1-git-send-email-gi-oh.kim@profitbricks.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <1453892529-17120-1-git-send-email-gi-oh.kim@profitbricks.com> User-Agent: Mutt/1.5.21 (2010-09-15) 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)(24454002)(199003)(4326007)(19580405001)(50466002)(97756001)(92566002)(2906002)(86362001)(83506001)(87936001)(3470700001)(46406003)(77096005)(110136002)(23726003)(47776003)(1096002)(33716001)(11100500001)(54356999)(2950100001)(106466001)(101416001)(97736004)(189998001)(33656002)(1076002)(19580395003)(4001350100001)(50986999)(76176999)(105586002)(1220700001)(5008740100001)(586003)(107986001);DIR:OUT;SFP:1101;SCL:1;SRVR:SN1PR12MB0863;H:atltwp02.amd.com;FPR:;SPF:None;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0863;2:Krqqua1mS2N8TA3r90m0u7lKj3ds5jlmrqk648RjsZ+KI6DXHEYNDWm9Y5yYqJ8/RdcqtD/mVgpkKIHdfreys+ME06mPKZ5iqysTI4gRW0xv7gP8Erf9XSB65FsnE+gmI+yOidAlomgs9AU94ikp2Q==;3:jbSuBwaNQpQwNP2OuUqVnLMKTR8ZTm47Oyq/y+7L4iCFgJQ3IiOT1zRrzCrmMFctRoq8mOJ69DUuxUc9VdIoUjlCfSntiv3ZrTBV7kyy1H5+jPkPFapghMJppXQYnRup9KdC4EoSo+Odf1kPIyOGUS4UPL2bOzH0+IlOnjnXfduSoiaP5kJyMUH+I2g7zQrV1ZnjDfTYZFIkWUDrme8lYxnBGuRS+gJWmhFVLUx9m7s=;25:BKSkJCkRjUy/zsIwxqY/3E7K7T51L4M6MqGq31x0PxQ4upJuxK2/gi4rzuDS+0sRkDUYTse3k+8NuuUoweda3iDDMI4/Wbkp2J+cpnVHZLrdoOovMqecJqFyOGbGa4f37OS/UhqYyX3XDvyYZtxybtaM49/bfdDBg7L6yabfE7DuXu0HzauBzbhkD0O0Cbw0dp9n/8WBdqwgd0pW//hfxwUqKrN+i27L7Lh63y5+orkGaI2HMv7eHu1uE150awcM X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN1PR12MB0863; X-MS-Office365-Filtering-Correlation-Id: bb69319f-f607-4d02-f337-08d3278992d8 X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0863;20:OgTrLFqIi4ZeXAtJ+uyU4UylN18EKfeTYPPQXRX7LZo1SeDbvF7DNqV6qht4+woVlg4ycZdM/9c0DLjLhGO++pEehssRwR4fuAv1rqCE4AoxnR/Zi8tWolf9UFUxvjaJn3XhWiPGmWWEikhbnwfWSB0dwgEAmLVWrmxpztl8IqHib38sENr2NNonY9Y0siUyugebwXoxIeAVXbVLXHw6JalprkIyH3dP0NfMT+VQGBYNPGN8Rj2Yo7MFd/kCwlfWZlSZtp/Yt/o0wZrhHd0W+5bJAX7gD62m+eP1InHzhJVh8w91rMnFMsyC1SU1TRaOAP++CuyMm/3pP3aVBtCn4r5nTQJCpWcH6n/+mWJSfeEWLDEtJy91tctkf2TSCsudCxOjKeccj93M33KIwvRXWLQW52HGCID/OEM+mfuTq6jAJwpNqvGqPGCMxoQo1NRlw3TRsBGksyn8tG2YVl2mbr6+JdMUosT9luADQu4o1Gh9WEyqdPlCf9/N85sw13K8 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)(13024025)(13017025)(13018025)(5005006)(13023025)(13015025)(10201501046)(3002001);SRVR:SN1PR12MB0863;BCL:0;PCL:0;RULEID:;SRVR:SN1PR12MB0863; X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0863;4:i6Mt6nb/VASf4+Ie50KWtS2rv+uMJ498K2nIdqg8ybGyP3VoJZdgOBAelD4ENtfavPJWH3ovwG/MjVah1DH0b2d3LNc025jLn9XeJ9OKC5n/ZzQw7K1BqHOcGQwbZuhygeObQCDuT+1KKi7vFL9O4eXSQKRnC5QIy0U0FL3bj80xHUUzx2pAlxm/9dtBl5GzFqHhmhvlbMkjMM/xWn/J8anBXcSpPuTdWoH22lzq6RDnlpzOMtu9Pggr09MPJg6OO/BhNC7vHwjbSuDR3oBYeKb5RpDuMTb0oTzpu+0xfwSaI6rZQTKurZVKW4nUOSSglwsRlwqCkpioF0vyfptzMXeesES4L9QLizMWYFyKlwSQcyG713ZhaAjG+UPrXLirh1NzhAhJGQeD6OUi3RsvBBriv2m/7l80/bTLPA9yl+M45ciplfaF92Gurp5OXqJyuN+KEOODmGwkcLbRgr3ZHaq1aVk9Afo4xJxZp5Vb1VRL/S1SPEsFz2RCySgUEh/E X-Forefront-PRVS: 083526BF8A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;SN1PR12MB0863;23:nZ7LwiqvTguULyHomOPphxd2he7/H/lQiCz7lZx+B?= =?us-ascii?Q?BktfS94/qrGJA7cOz+1mU72kAD/6OxF1Mp4En7rKIsad2xt3kw/VsfePMaGc?= =?us-ascii?Q?AciplR9pYKQdr2sYceSlO8g7G9ot3RioQ4MvhkiNHJJZgzOMRHDfQYGRITQW?= =?us-ascii?Q?jWLlyANqzItXPXul57BqtAyupPnc+yRU2kZbeikEhV8OyrQ6wNgBjoiutoUO?= =?us-ascii?Q?wCLDA4b3Ae1myPAUKlHD1/ZavSxCo+4XCUc78/5OVRjpUaN+AYBrfy80+cxY?= =?us-ascii?Q?89cEJCCKl6lsWNlEBvi1aGv1HB+oHg1ZaQ5ppt1ObElqDbUWN2ct+CyOhstG?= =?us-ascii?Q?WT5QlYP19Kj0IO3tPnMPisfnN98IGhhOdsvyFSAMvg0wvR9hrk+e9ss0RynY?= =?us-ascii?Q?n5CbNyGI2IlhwjvN/ACxi1Ald4B7MdlmHncnqpx25cFcNstl4KVAIsdtoVnG?= =?us-ascii?Q?XbIl1Sd8NbpiB4tpZVWZBJ3T+q0IQYvKjLGFOY0utArkO86hbIyGXP5bZTRx?= =?us-ascii?Q?Y6j2mwBmeRLvm6Vs3CarZlss00Lt9PeESO1DmL61o8bJKnBb90CMeSoK1Bk+?= =?us-ascii?Q?70DoaAeVZcz0/bhs2K6kDk7JAALTnBCPeg5v50zEAuRfumnq1aBi5WxLB46X?= =?us-ascii?Q?4EVn5dtOfEOOvhwvfcQAKN7EY1+At/sVf77SLt21KLYTn2ElbeP8Jqyt4cy0?= =?us-ascii?Q?YyubMotSBBUNOdvywsvF4mfs/dSseZy/1ukbRm/uqQCwK+NTfs3DCCpY5dPK?= =?us-ascii?Q?elwqCHX7mfCTQL3g7LUFqQwSVKq1EcGS7CbwqXBeZrDOzfVkPCZAqOaC3Bh+?= =?us-ascii?Q?8NOnmTlgAKaxJfpNbcxfbpshoruLUY9/xh1AePHZVv5Ivp6TInmDIxbhuN2r?= =?us-ascii?Q?Kq2W0+o2cbQ5FhCKpt8ubu+6nFHTXHpHDvZXTrmneBgnQ18Glu7Zv/9KEupB?= =?us-ascii?Q?Ck8iceQWl29ubaumlV44fPlXm1JdbsTWDVnBfaFQIdCe+ZxyDoWKdvTa7DlZ?= =?us-ascii?Q?z0M3z3jzYfp4G1QfemA+Xf/J8iZnOmHfuHS16/pSoc+09kockENQ3YuPoz5V?= =?us-ascii?Q?a2jcWmUbCWWXnxuFX4psvuKGD4Y?= X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0863;5:hY4r46yDpM4VM6MlPep0eCDdWPSG0T4Q2vxqpkgGhQVdLpV4yUGETzwoH61YyB9efwwanQNo7YO4zEUFGGQLjR8RswB3AWe/Vq3XtKINFPYluVWgUiDs6h3noix2YViWEaoxQbuhutt9OfWT5QgrvQ==;24:ASMSJRPj2Rx1zcQr3In4A30yuagTHglrboakhtLEA3Oo70YWg/cJojjl7ETxDVT/z7CBmeOGunpf6a6RmH0P2cAkJRwKMSvp69MiI0xiTVA=;20:3RourKMsIrpxvpkv3mQE+dGYeKh+LuArlnzgnYHoRUrO/LdSZhN/BE+ZGL/Ebh1ZkmtPg2QzI12EEqXv/EFWRgNjEx7XgarDfKunj6I0nDrGe121H4ozpLVpynJKNZ/x154s+Eoh0wnwn0TbmITe1HtcNv0K/uwdisnamETaZ7p6S1e1CAjMV6Ss6513lLTSMZQ92a1qnOx5JZby+4a+GlVjtgiH7O7+0AsVcgnphuh7FTSygeFtTSJuiT7TSt2O SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jan 2016 02:20:20.9878 (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: SN1PR12MB0863 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jan 27, 2016 at 12:02:09PM +0100, Gioh Kim wrote: > Add bit masking to read ApmTdpLimit precisely > > Signed-off-by: Gioh Kim Looks good for me too. Acked-by: Huang Rui > --- > drivers/hwmon/fam15h_power.c | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c > index f77eb97..4f695d8 100644 > --- a/drivers/hwmon/fam15h_power.c > +++ b/drivers/hwmon/fam15h_power.c > @@ -90,7 +90,15 @@ static ssize_t show_power(struct device *dev, > pci_bus_read_config_dword(f4->bus, PCI_DEVFN(PCI_SLOT(f4->devfn), 5), > REG_TDP_LIMIT3, &val); > > - tdp_limit = val >> 16; > + /* > + * On Carrizo and later platforms, ApmTdpLimit bit field > + * is extended to 16:31 from 16:28. > + */ > + if (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model >= 0x60) > + tdp_limit = val >> 16; > + else > + tdp_limit = (val >> 16) & 0x1fff; > + > curr_pwr_watts = ((u64)(tdp_limit + > data->base_tdp)) << running_avg_range; > curr_pwr_watts -= running_avg_capture; > -- > 2.5.0 >