From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967444AbcA1CZb (ORCPT ); Wed, 27 Jan 2016 21:25:31 -0500 Received: from mail-by2on0095.outbound.protection.outlook.com ([207.46.100.95]:14464 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965058AbcA1CZ1 (ORCPT ); Wed, 27 Jan 2016 21:25:27 -0500 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: 0O1N5EA-07-4DQ-02 X-M-MSG: Date: Thu, 28 Jan 2016 10:25:39 +0800 From: Huang Rui To: Borislav Petkov CC: Gioh Kim , , , Subject: Re: [PATCH] hwmon: (fam15h_power) Add bit masking for tdp_limit Message-ID: <20160128022538.GB26655@hr-amur2> References: <1453892529-17120-1-git-send-email-gi-oh.kim@profitbricks.com> <20160127111256.GG30712@pd.tnic> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <20160127111256.GG30712@pd.tnic> User-Agent: Mutt/1.5.21 (2010-09-15) 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)(24454002)(164054003)(189002)(199003)(54356999)(106466001)(2950100001)(110136002)(23726003)(77096005)(11100500001)(33716001)(1096002)(47776003)(101416001)(76176999)(50986999)(1220700001)(5008740100001)(586003)(105586002)(1076002)(189998001)(33656002)(97736004)(4001350100001)(19580395003)(97756001)(50466002)(19580405001)(4326007)(3470700001)(87936001)(46406003)(92566002)(83506001)(2906002)(86362001)(107986001);DIR:OUT;SFP:1101;SCL:1;SRVR:SN1PR12MB0863;H:atltwp01.amd.com;FPR:;SPF:None;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0863;2:z21s/aSwzSCbs8Ix29oqnMBsm/prspZ/QifKhyCaSyFfHMhpLiBgJVWISt8M1F8LCUft1RZJQn2Yk11VhxevZjsEFiPEEf/vMrhYjaIKwx91PqXZo3fwbQ7XPBatAl6b56nFKYxT84SDBIqkSOqySA==;3:evYAv/Y/T4Wgl3l689s44g2vTphAkwd8mlPVFoSS9OcrEsS7iE62pwFSc3zE58R6dXzobuWCzHNtJg/mTnWD2nr2MgkpDGa4DsFWGYt2QmvLJlO57DOIa68XLQdROrl9t9Dw3tKKiHp8P5qPJL927bxTyPU+cdosIkxBeOIUZf1hNSweW9O+LVx7eJF4ClxPNQ4GTNt3P9NCRW0teC74rHo3IocCcAyqH6tbcpjWnX4=;25:CPKZxUiIKBAJALaNWPE6T4RpBXR8r1Peb2+z/IyZ+Q0xeQA8Nlk/47HjfXz1iiTZi/IDcKSrjY1xnGbi6+dIqwl7VFP4cHVw31Zl2VoNaPBuEeGnyP5cI7Q4JJ72dACIskLYzBH9QNTPKHDmy+AH3Dzf/AHMuXejA7GLQtkgKYRio47gCa1qOYEdzGEM1pyf4qh0cnxVXy/ER/bgiyRLCsOczjEDUP4Wo4pDjdrATFeZs7hsl/ntkLPzQ+tUvP5e X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN1PR12MB0863; X-MS-Office365-Filtering-Correlation-Id: 10afb0a7-427e-4331-a4f6-08d3278a46e5 X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0863;20:yyz0rgktr/NxYzat3l00ETFCGkZVE5tWTWGhX1lD27/aFgRy4XmOx2fyxTIcyfLZ5F15JSTBtr0zQSA1eRQsWToTnZG/IHrBvYcWdrqrvIVUB3DC1MqdkSXnpvv8c89ihLjXJlRq6I4kBjq2+B+OfHu9l7TqBqHqgHzLK/nN6HayTM/ci7j3cnr56AN5yB3Ty7Scue6xNu+gfuL2/Sg8b5zT2KH/vETZNyBbA3nhywlv+vqHV8hjJHYOAOEjXbDfGad5K2vrYwc762L6zNixEeyGXXTg4Y9Pf2h2yX/jgU/8pz6+jpnc2yOyzn2saGS729zSbDOo0tergtbyCu6T/upueyFnr46D3rCRotFwi8bi4/XwbfcDTyOyOs8P+mqxaH0kRf6zjuOiDRURiUK9bhw8mfgI0AkNZoNxLLoQWzGN9HdHguYPMC1BK/9hl1vKfXx9slhpgri+4zDYC7cOAqFgt5vbaCHE055DAPb1HP2gzgy2Jn0NTkJmsAPVvbrn X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; 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:qgdC9ZolMm+SJ3RqsxkAh6JqVBk7/p1z2W6hiBW2BPj+K2dfTiM1nVhy1Sh/NHF05kWj9PvfUJ7485t7Aqr73Q35QiE23lyICpWEgnmKeq4A4pHPomIbG4ijAm6cRu0nCucDqUrB1uKZLzXFjNBrIutlGLyRPwEp+kOkD2zD3/lUAjCVggGV2J4FcpBa7v3JB5+kseJtNAuincQ5TZwff0TDQBXwqvXBw+X7BJ3t444fY6fzlgtxMkyTw2BqGIXDc5rhPplPsRe1sJCcyFJereEc6Dv6YHMWSX+Z5m/yglRI/iFkht7jWp7njaIWnfZTkM8i1gLkeL94nVQQE3rUpLBDfnsZQqUxPdZF3soAq0/StaKFnsqdP2ix3H66m2AneMhYArdNSIRUmyOf6aHXVCRE3bHpTtQ01y2HVclyw/Uoc+70U1oQaaKyQ+G37Pc9/yJERsnYxuQgtsyB6ZM7Pg== X-Forefront-PRVS: 083526BF8A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;SN1PR12MB0863;23:TxZmCzbQsrw65iNSt8dBAMvZT09s/Cci1aD7MBryA?= =?us-ascii?Q?NpI4l5gU0b4SQSOOCdA/DTlth2DBqCrfTJfY6uPLXw1+iVxU0T2rP/XfTQJ+?= =?us-ascii?Q?dldrScieG3dQNZxXUy0CZ4wwmJwAZKTynHLbrGxEIXwSVoNo24+AGZ/0US+P?= =?us-ascii?Q?RVH5OAzynD3MxcL9B5pw/v8UNQzhmvgIq6KbK2rprKGvrc/7QEMhS1IZ/UkW?= =?us-ascii?Q?hQaYgQgN4S9w/tZ0CCfBIkzuO9f+Kip0HnZfApoV0E0BSqjRT4i1KZGZXfm0?= =?us-ascii?Q?/HStk58bABPS6c/BN+79N6Ck0doJUw85QQUdmuF45VPtdXl+fD1fyMpoTOgk?= =?us-ascii?Q?EKgFlP4C1E0PrNH5NGxzJCFuk4ECcljfDOvDlofXLF2mlRSjI8hWEsT/HJ9L?= =?us-ascii?Q?ee64KZdiLladzUDQfWzlWyGOydmWrBl3D4pQEc1jOoLyFnKaYNhjBOLq6uUe?= =?us-ascii?Q?IJFidCCTBkW2uXxxgBYv6jJ4sJ13rb10sIE4Q+0vHUCNPDbYUHJhn+fD1xek?= =?us-ascii?Q?eEZxrZ6GDQlCVdKL9axysNG2NgRDbXZyxzaqepGNNoB1tiT27VROoJPqypLh?= =?us-ascii?Q?PeO1HqxMX8xP4Jxv339PV2z04n8XCgOZlf5eEWw19bL0Jpr76oXh9raIgAIX?= =?us-ascii?Q?RmyNNO0zkcI3VLs0OT00gRR4U410LW9oTeqU5DPTJLKBkqDVOsIVrV5VkMm6?= =?us-ascii?Q?n55Ii5/ZfuiMzNfe8dpZ0FqIDExcs8fOSyuiDHFOSVnkZVVNeJo30aGhy/M7?= =?us-ascii?Q?Wi2HvnpohWUlqGziEDOnUU+pXcUrBTciJRTKenIryXtJk1ahH73dzUauTCmF?= =?us-ascii?Q?Lj/0lCXCSoz/ifWYOyT0wDSvR89RUaD+wZ+iXZiPQNLq+F4Ef1lHDobm2mxE?= =?us-ascii?Q?ycN8tNWZtvS4n4av/WPDip8uGAYQgf/eTuIBaAa4HendZbEM9QKhqlSV+ORD?= =?us-ascii?Q?UbSDN8mazWR5OnKF6GlDeEfdcfsr7vSD4DI/5Z7p8ltCx2ZnlDyrLOuS8R/O?= =?us-ascii?Q?sRkKqsN/KZ1K8xUfaLedd9gzL8I509H2UdPwz3nOBiq34u9mvzx8hQShNXHr?= =?us-ascii?Q?k/yLbNytXBT9kkGTm1DZt2jYKh3/9Y466b9hJA7iDWhAlItrg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0863;5:W393RehCANi5lHuFrzQ0B9eyRWo3A7LNW3vkvvuLmrDxCtyTDqJJ+x9OxrQ1p+fep/C1EKdEroP02sKR43YayBaRzniP6JEvU9M1YYzqaC+C1as8WFHu6+rz5VQPp2/O4eIZSR0XWJqAGGypsSgdKQ==;24:EjKW4Unl0l32AlOMompmfi2j9GEYccXtVSECBqPd0sDvyUruwtUPh2rFbuZMSFonakZu1wpE/0Qp2mwl2zoRdCe18xGQhx0luRZgxfMZXoM=;20:A6AXSs21pFuCJHWRoOn8Irh1MWbmKsQCmDAEQYQ37ekB11y7/eKZ0TzCRB1rAzP6IBGkADNWUUmMa8UrBKrJm1ddBZNODGYOixYCB8bfqKOVEwXfwcFagpL09DGveDbxWYsb4Oni3PhR2b09ErMkQucBjqMuAnrtt0rlUdjQV/hzdzACfUye/yYqY7LSybkohJZgGLmIL5YFm4TGIYxsH6S/ja5v7Qli8Nr2pE+FTM/fu1uZKykMS2I7UNOunhjW SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jan 2016 02:25:23.3265 (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: 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:12:56PM +0100, Borislav Petkov wrote: > 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 > > --- > > 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; > > -- > > Acked-by: Borislav Petkov > > Btw, Rui, you could consider unifying the code under a single > > if (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model >= 0x60) { > ... > > else > ... > > as with this patch you'll have two of those checks. Unified might be > better readable but that is for another patch. > Make sence, I will do that. :-) Thanks, Rui