From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752138AbbJTCqA (ORCPT ); Mon, 19 Oct 2015 22:46:00 -0400 Received: from mail-by2on0083.outbound.protection.outlook.com ([207.46.100.83]:6272 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751194AbbJTCp6 (ORCPT ); Mon, 19 Oct 2015 22:45:58 -0400 X-Greylist: delayed 945 seconds by postgrey-1.27 at vger.kernel.org; Mon, 19 Oct 2015 22:45:58 EDT 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: 0NWHYZK-07-3E6-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 06/10] hwmon: (fam15h_power) Add ptsc counter value for accumulated power Date: Tue, 20 Oct 2015 10:28:25 +0800 Message-ID: <1445308109-17970-7-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.221;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(428002)(199003)(189002)(76176999)(64706001)(50986999)(86362001)(50466002)(47776003)(97736004)(2950100001)(92566002)(33646002)(105586002)(5003940100001)(48376002)(46102003)(5001770100001)(101416001)(36756003)(53416004)(575784001)(106466001)(87936001)(50226001)(11100500001)(77096005)(19580395003)(229853001)(5003600100002)(189998001)(19580405001)(5007970100001)(5008740100001)(921003)(1121003);DIR:OUT;SFP:1101;SCL:1;SRVR:DM3PR12MB0857;H:atltwp01.amd.com;FPR:;SPF:None;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;DM3PR12MB0857;2:Wrv0gZcoL/1gcdM/3Bo3Br1+sPPmuX72aFBxw5dG+Tpj/MCf25kmROb5Qnh4EOdAmpk0Vb/85/RukMuNAqCr2l/Hg8/8zY9O6KDMw+pkUGQ+KI+Tzvxd4dj0DX3+i6quUTokPaFdicTTXP3DaWBUHRk7Vtb5lX8wq+riMUH6bdE=;3:CNyqYaU3fUKMJ4IX22DJuzA+YcqvniSvioV3tMeKiWnkL30ov+B16BbeiEij06eV69HWuLDLL0Y1HtA1mFgthegH61Hhx/s7404JUb5TPaWd38cbETVcVvVuEvM2B5hMsE51ugZe4Q7qE7K2UraMqq9IoN7CglVtRhsR0bPGiMjLH+f4mDHCzqMo04Vt0QJN8+VOFO3lGtc/GMIGtE7MrMp8401bFES4rTp3ctWNLlDW8IrSIzdj1xVsL/UAcZAZ;25:CvByqrR8R69x8N3Ud7bObnHiMKSwC6Juv3cZ4UBvyyQol/TQKrLYdDaz7c8sBID4mHsHO6lacifZEuFcZQJCVksI63rAOTgRYhQHhaKuchKIyjAovYrU6RRfOoDCHEncS6UuXfjqapugPPQxptIjpLvD4LJtTsiRvlnSXC7cZApEqakX6urd3STP+AeGAMLEh5mpc2qYAHfd1/O64s+aO0hKlRUfHlIY7uibYvWM9pHIUN0xSvq3hzAFP4rbND4v X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM3PR12MB0857; X-Microsoft-Exchange-Diagnostics: 1;DM3PR12MB0857;20:XudTjjbiVc9UwCLZBRbqxjn9qDnHzgzVyvw5+VmmHiakkvRqHwuDj2Ek5u7vrjZYzInszBpyDM8dPS3ZEmAAjcyuwaAQMx30Rhsuc+vqCMTYloVfea367uJ5CSZUs360fe/rkZhXVwOan3Vy4mdTNwxT292tq82tF7wN2cBxIarVNBq0yeDH2KRQBoPe8rD0+ClCMwKLT5AWJW2eoySAE4u60faPdWjK9DhoO2We/PSvcp13w+m20mrfcRy9PWBcQa3PMOHP6GznONrunyuZ+pmuA3JRS6MkEB7/AyE5deJN12ORP/xhMFRZ2lmUTgfWAbE1ptIRcs8rQZZ1dcT4J3KNZ+7a0Nng/iGVWr/EcUmxMPHmurH30wlJugvbkMjdkpjWqzcWj9rd1vvf6PloVIzpfFxoTp764VCe35BoVfKs3Ic4N1udofjWVErxFRlA94o40++rkxXeKhxrZsrVLCoejie3xF+U4LqO/3hME6f/9iFVRNTlHXUYxClDGhMk;4:PWmXpQ02zlwU/ChuYLMeUhMzcBwjH4IOv32SscVIEy0+HqDBh5j9+2V8v0w5sMu0VC09WwZ0uhuqUF1HXN7S/P4gbM0Ael2bvnPUPhfRqn5avlJ/Bm27cxxznXVUfNWPCCoiUC2GY8r6qZjpY5SrvSn5NYKJn92z4w7+El9KJVQoOTJkSj8+tETrGGGEAltcMtjbmOZFSay/EFoHxm3pNkilST0hCheGAnDxJG5pH2cHFpG7wigO1NZvB7LRWH0tIEqOGOWtZYd+sjRX2PWd/wxwEJT2IBfNDqgJVowzX/sCjhECnBPzsiD2/LYzAXOA7UMQiUeUSANZMS8Zl+CXNfh/Pka0/oDBDRZ4B2wRBYc= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(5005006)(520078)(8121501046)(3002001);SRVR:DM3PR12MB0857;BCL:0;PCL:0;RULEID:;SRVR:DM3PR12MB0857; X-Forefront-PRVS: 073515755F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM3PR12MB0857;23:RhirCrukJQ15wlu9Td4zT+pKvA+rb3UUfHzjD2jW0?= =?us-ascii?Q?z6WU0iZE9Iq+kGhfBl2CamH88qQU9p+huSDhekkuaSu7WACZ8I4r+HJQ+Czy?= =?us-ascii?Q?3RjrPfZ3dxrqv7EdcZwTLAKrC7mJFzvDJrKOn7vUqD+oMe/IKd0WIqcgbfS+?= =?us-ascii?Q?xNwTSUsXwGRe1QYlYlf3/qKWiDlEwy0B8hjM7EeMkuubdyWU0ZhcpYGlBtBE?= =?us-ascii?Q?cujnZNPl1rg2GNx2x/HQPd/dGQ6h/zxMsI4dOJ+OmdLxJ6f7LpKj4/XXVEL1?= =?us-ascii?Q?5iNBf1midEcT4FL/oSnfPNVKXkJ0crvFQqIaOgh99kD0cuh9nCTf2zypakS+?= =?us-ascii?Q?yH66dWgEe2aioM7wF/bWofE9jjkIsjTawibydrJ0zWocWXDtkXlR5xRGyYJv?= =?us-ascii?Q?rXNIOM11kDMcPHVtYskRE9Z0JHp9CEbI01K5WE/cf6vMJY8vYWk8aNef+10J?= =?us-ascii?Q?lDdMez9LhZLtjsomN5LHPjygUfocQ4nqVtmGNTKmAwQ4vH7oHMZAJKYoU4Xt?= =?us-ascii?Q?BJGOuf6iRXihUcV7eV+89bD1TUdX2SU9r0pGLhYAyfsj4Qsc5y4MSg5LqIqH?= =?us-ascii?Q?dlHn7IEaEGbFrE7x7I/YIeXO2BSqQrmJErMaKnM+ORKE6eWF4fi3y79FiFMZ?= =?us-ascii?Q?x0I+Z/ePbeXB54lC+hCpR/ECcS0N5ZfqqhlHiPQu/CvGqEr11Nn2e/p1RsD9?= =?us-ascii?Q?L/z4G5312pYF9ClGajxM5PksHmPEY9To6cjR2971HqcRWPkoBaAz8Elp+Uby?= =?us-ascii?Q?BT4J0Iz3rmD8D0stqCK0v65ZnpHcWECcomyWH9cBlnNlvvXehFZLnTCB/y9i?= =?us-ascii?Q?/q7KfT0o5xAmBM65rpvln4xOkgCIjx5AtrOipqdG9DhrBEY8wAnhJsS0dJN8?= =?us-ascii?Q?Oto0hOj696RlPT5BIgvHJHwf4UtLzZki2HxJxA69QetwezXXdv63RnRhN0TQ?= =?us-ascii?Q?LFRv05ciJaIcsUwtwbexz31QUF402W2maMYG/my8BQyma4jXJDMw8BW1v5gQ?= =?us-ascii?Q?L7ZQG+CFXbLT19mNQ55iQjsE/5a44BuFID6exBs/Y3/4g=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;DM3PR12MB0857;5:TTmgwuv/WPw7v+NyYORkNIDIjsFyy5vL+rDTIdRDGCRvyCNFQ3j74geq/mwYqAjZEcYd24zQpgujZpkf+5/bLUUrdSUZvbO1KG3YCWehU3brUzo/L3ZKg2m3JsqrEU9whIL0NAnlnhUj5Svp9HHg2A==;24:M749V1nrgi68SC4pWPsMYodKT72C22AzcUBAS/ungo709v8uthQL+NdoRXNx75yJXAHO2tEkj3iRC1EuJJ6Y+yd+CQ+FV6W+DOl6uYmOP30=;20:S4XmlH1sj8TJRckIPqt3oduqI8CFTWqZ0oOH5Kun5b1ghz9RQCUQ8jyMYj8VwGVCyMAja2TsKfQGPhNdvxrKcH5fHKWTMAnfZqBd5M2tHg+XHXXkD0wYiFhCyylH6wKs+2P8Xb6N0sTmKmcbG5BL/JqP7cxR7Kw5la3hJI9nMqs0oXkMznEvDxtCHHfWBRq+k486XHBtBKwXxbn35aLfX8UxL2JTiXNwgDl4Rn/KUzSDrELXxjAeZ2crge1LxNOM SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2015 02:30:57.5167 (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: DM3PR12MB0857 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org PTSC is the performance timestamp counter value in a cpu core and the cores in one compute unit have the fixed frequency. So it picks up the performance timestamp counter value of the first core per compute unit to measure the interval for average power per compute unit. Signed-off-by: Huang Rui Cc: Borislav Petkov Cc: Guenter Roeck Cc: Peter Zijlstra Cc: Ingo Molnar --- arch/x86/include/asm/msr-index.h | 1 + drivers/hwmon/fam15h_power.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index c1c0a1c..3686eaa 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -313,6 +313,7 @@ #define MSR_F15H_PERF_CTR 0xc0010201 #define MSR_F15H_NB_PERF_CTL 0xc0010240 #define MSR_F15H_NB_PERF_CTR 0xc0010241 +#define MSR_F15H_PTSC 0xc0010280 /* Fam 10h MSRs */ #define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058 diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c index 88e4f3e..6321f73 100644 --- a/drivers/hwmon/fam15h_power.c +++ b/drivers/hwmon/fam15h_power.c @@ -62,6 +62,8 @@ struct fam15h_power_data { u64 max_cu_acc_power; /* accumulated power of the compute units */ u64 cu_acc_power[MAX_CUS]; + /* performance timestamp counter */ + u64 cpu_sw_pwr_ptsc[MAX_CUS]; }; static ssize_t show_power(struct device *dev, @@ -132,6 +134,9 @@ static void do_read_registers_on_cu(void *_data) WARN_ON(rdmsrl_safe(MSR_F15H_CU_PWR_ACCUMULATOR, &data->cu_acc_power[cu])); + + WARN_ON(rdmsrl_safe(MSR_F15H_PTSC, + &data->cpu_sw_pwr_ptsc[cu])); } static int read_registers(struct fam15h_power_data *data) -- 1.9.1