From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755657AbcANCwo (ORCPT ); Wed, 13 Jan 2016 21:52:44 -0500 Received: from mail-bn1bon0075.outbound.protection.outlook.com ([157.56.111.75]:14115 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755362AbcANCv2 (ORCPT ); Wed, 13 Jan 2016 21:51:28 -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: 0O0X99L-07-C6C-02 X-M-MSG: From: Huang Rui To: Borislav Petkov , Peter Zijlstra , "Ingo Molnar" , Andy Lutomirski , "Thomas Gleixner" , Robert Richter , Jacob Shin , John Stultz , =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Weisbecker?= CC: , , , Guenter Roeck , Andreas Herrmann , Suravee Suthikulpanit , Aravind Gopalakrishnan , Borislav Petkov , "Fengguang Wu" , Aaron Lu , Huang Rui Subject: [PATCH v2 3/5] x86/cpufeature: add AMD Accumulated Power Mechanism feature flag Date: Thu, 14 Jan 2016 10:50:06 +0800 Message-ID: <1452739808-11871-4-git-send-email-ray.huang@amd.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1452739808-11871-1-git-send-email-ray.huang@amd.com> References: <1452739808-11871-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)(5003600100002)(5003940100001)(50466002)(48376002)(11100500001)(101416001)(4326007)(50226001)(586003)(2906002)(92566002)(36756003)(1096002)(77096005)(1220700001)(189998001)(47776003)(19580395003)(5001770100001)(86362001)(97736004)(50986999)(76176999)(19580405001)(33646002)(105586002)(2950100001)(87936001)(5008740100001)(106466001)(229853001)(53416004);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR12MB0855;H:atltwp01.amd.com;FPR:;SPF:None;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0855;2:W8oH37ijwa1KwQ5JKCCmSg/olhGYLxGn5mJqXrFVllO9f1W4MatDP/9+ITrr2nidkc9HrOe5EsXYlr59PxDpPZopQ663eG2jCY3/YOrOXZXtuCU5sRODOwLh12pYa6mwqClv2PJ6n6kCY3o2rAX/UA==;3:JQweH0hNdp1lECYH/nSs4Ffp5k+A9AHX4gHZd5DBF3npHu03DBggfVUhhnWKSMwO8UtTkO0Q5UmjERxEEXS9fpfrJ3NoYZedCVP4XFJqjZTHC+dTlzFKgPB/YC0T4uSQwTZ6EPQhk4eW0IHx4+0uH/Oe2aW3HYCkh9fJdv4YYbLfMqngc+FVIEUS4p0roefEahZ+nmQ0FFTZKNgXtmS6KmU1x+/bceXj6T6c+mb5dmI=;25:HF2VTacFv0gNWcAtrR20wSsB+/OI/Sp8d3jzF/7e9rNqZg1WoHExiRnb0nVx05LqgeZlpABXS0KdOuNUkib5rys6ORftGPk4ksWhgwRxn8xKQjHysGNI2F3UEEKHAa0kh638o2hQXVbewCNc+rLSbOZacOpNcIjNbFOuEMtOUN9uvhUk6EeW1pFtL63+nsleeu7dKSRqYy935q/GgNg9+RRr4WLt6ifvO+dqYNKzQhMiEC13RGJnBsSEUFcPRdzm X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR12MB0855; X-MS-Office365-Filtering-Correlation-Id: 6deb15a3-c8d6-493e-61c4-08d31c8d9767 X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0855;20:XZPMyXiDLwdS5mi+znBRlw+4g3EcCazbMghY6ngQX9XMtRTKV1MC2FGFM5+K304ou2P2mJeaLxkgugDBw/+WC7HBDKV3GRtg4YZ7MK6Ify3KG7SKELl4aPSbvL+2MIvcSH5NbhRetbBj9A/UA19NNZgdB54T3vcEuOD6qaOfbSHPKGdL4X1M32a8Fur2pv3tzr9osgSkMo++gJowfjiw4P7qaTM3R7Pc7kCYd5ZJr0nHdOUo7hF4HGAchoDzui8mSsXRISz7DhYvSwf5p4UdA0s7c85O9WRFgqZ5Ald4wE4FsI8uOl1mQOOWf1L8OjEyaJjcBORYBedwDq9A55YMnU+vNjZGNCtbnA60qNuk2PoYjsSphZMjeUgCylN84sCmU+ZrwTaOmaZozY1Jtr3HLjPEI3xdaBtfSlGExwTu1PeWK/Jy8mcZ0wOv0fd7qIiW8h1C+T4DAJ/Oou5P6R6qL9ktTMSs1ewJ6bkUiAM+XPC4YF0O7Cei/kMZszEEKAZ7 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)(13018025)(5005006)(13015025)(13017025)(10201501046)(3002001);SRVR:CY1PR12MB0855;BCL:0;PCL:0;RULEID:;SRVR:CY1PR12MB0855; X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0855;4:7z9JeGcuZaoqHHZTebdrzvsBL4Ao09j/aP8+Dkt3qbABJZGmqluIPPkoNw+mwrH96I28kTaSziGUP7oIwYi1/IoVuCrbXwgMKNO+Ih7/LZpeClHIkOGrJNSmyQ/dAv16y7rYgLZZKgfypUo5LjvweHC+BpZZjEw9HiQdGjo3g5bMOlgYPyPclMyEn/fB9JjxBi+k1GcPq7wbse7BneRkNY6HgkW3XryzxDhxCGRfiH2gjEQkotauG9HcBN3T7WsL4mGrhZBPDzO1XzPHaDmpt45RL0NiuQ1vnxGBiPhLHZrceeEA+2SR1NYdCVnnh79LEmY3VxPAgPjtq79O0xqcOnO19PGLyxxh0vlXJ2cyARlpu6lXLnLehv9IZqB4uC0I2Niv534hZy8rRVnPLZZViZfyHZCcNso6kNYGMwNuHdbT0pbSUsDSS5HI/pPhVKd445yXCrLuFbQfUN675rMmrghhCxyHqZ3yJlwBnKz3rxQ= X-Forefront-PRVS: 08213D42D3 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY1PR12MB0855;23:4UqW6idALrhzjhVjOe1M68/UqClXaTXIxBLDsc6xs?= =?us-ascii?Q?yYuF28R7MSXM9fIXkQO6FGq/H6y3M/t4YpV3zDzxCeEedkkcGL9X3jnpae2s?= =?us-ascii?Q?dTs8VfscnGdb4nrmicT+Umx/xI6WejN+47UfO5ZOtbnTW3KgUBeFfKQmff+C?= =?us-ascii?Q?bb/skF0vKtEpHlgjwUNBxkVmQG3VMxJhGGlsisyMdhM4H07ARIeOcW5MRsuv?= =?us-ascii?Q?xpxJXa4UpkHQLPcxF24+kMJ8rFvB/PUfNoCfAFmFEAjV1vHui5dktjPvO0QF?= =?us-ascii?Q?2LEWnh9C1sNP0fUuy3pkFbOz4J2s1CcovmY+tiFsX+KPrYAhLSf6hX8ui9uq?= =?us-ascii?Q?zm+GO0ptk14+UxDACmIEIis8qXeWAyhgQx/HtbU7czQiywlXc5Pfk43P+Os+?= =?us-ascii?Q?fpwtKzrjwU6HlzWmL9jx5gBT2tQUTuHC5t1EeLi+3rsDCwPFJ5Vu+MX/TKBg?= =?us-ascii?Q?S8yEndD7t1vRDFGJVJYgvu5nk7Zb1+o46OE4K9uM+jb/1tR7sYBfnBRsRZz9?= =?us-ascii?Q?J1li7nidll7DDRuPI9fLG8mmAlE+Yqc+LdY4iwz0ieO/dtBOft5PlUPGYWFp?= =?us-ascii?Q?iR3DQrhPH922vFLA7jFJ/0pn9lPKvz/cxvcJPoTw7x6SNn2eMgLd4x0gp4JL?= =?us-ascii?Q?ziKsVMDrhGEmInWqSYHcpFWcSrjgp4Z9n7ypm3bZoeE26zxoGr/Yp+x/eRsT?= =?us-ascii?Q?BG/2Ab9fh9t8H7kKShDHT5WMYyGABBaQNTueQ1TssHWWmPcR1IW6dXOUrjGC?= =?us-ascii?Q?dMxZTPu7nWh1Am1jVmaP0SuvOGvQXqTlevN9Pn5wWUr6MNut8NBqAI952HST?= =?us-ascii?Q?hYu+Hz1j6I68RTwBvVEqlhXYZ39bPH92H5phFSA2iXhToBQYiYugZX1Lv6AI?= =?us-ascii?Q?NqkitaF5nRpjR/K5NtXKehrTu2V9bN3NpbZ8PzUV86BRWi/ldtkx+W4BAaSy?= =?us-ascii?Q?AV6OUWSEwYAZTKcCwBrFuMsnDCjxUKSFNjBrgIEl5OqQl9VuVAf5sUaqzP3x?= =?us-ascii?Q?xXwlDDdYTE+JpjfqCXgR9lW?= X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0855;5:h1AqNf51afTrcSawlx8532Nk1jjGrJv8ilMiPjqF++NvPme+OPaISbwy4IQ9qWpbgVlDd+z37UzXQvFjWHV0ImEpIDOl74k+hPrMnAt1jqYMx65KbIfLKEhPJwzAS1DGfPDyakNGsRrWRKDp3UZMTQ==;24:5itLWcF46a4p8MOeIvMgHn/ub9jxT2DzGBfX1aWGp1Wwa8282PskErBi5ncRdNds118Xb+LtfmAnlGu60/Md2o+3DDsrvhpjC1e1IK5QqXI=;20:ateDx0facdiK5BIm+P6rrd6+6Pqq8kdzPDo5hAeAxTn9+3+9ZsMJq9YRsHoJX4RHOJe6+PsgVyMuINGITOluaAQE3wS7qeEyGrR2XK0/9PrPwS54xKewfSaRC18mnbEfuC7dxgoLYMNyF6c4ODeE0IljtkT/cTIBjh/hYHzsBsb6OKdXK4Sk56LLnSyiKEyOcHm0eu0KGb4CitCCODEvk8ueY9P3WA2O6mp8dxLWqQHWsPEq8SkfmUdrtI9BfrQ6 SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jan 2016 02:51:23.3430 (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: CY1PR12MB0855 X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0741;2:mNDG4g0ATnEFMRIAD0BrRixyqY/QIXXjFJrj++aZhQCdIRHo1VyoTirzqNPjE9yJpaCKtea/uns4PryT6KDch4ersMcVPEdjWjabTfyD3oWXWY1MjR7jbWDoPVY4SAcFZ18EV01wyz4voJnOtykS+g==;23:ZE5+HJmWyPvFJrhZJHmxi0en3JbFTyui9wuF9c6NGRmGY4xloJ2cYUKrcWEvpsq0msmXMuSIm3GzdYET8OFh/i8qLxM6R6J+4VkzGj6BgMvEAPdEmyGoCzhRjc2MNu1lx1Zwz2MyoX77st91doghsPCFqAo+K76qaCPpUOW/CG+XR0MvZBh4qW0Su7MZC7lZ X-OriginatorOrg: amd.com Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org AMD CPU family 15h model 0x60 introduces accumulated power mechanism. It is used to report the processor power consumption and indicated by CPUID Fn8000_0007_EDX[12]. Signed-off-by: Huang Rui --- arch/x86/include/asm/cpufeature.h | 2 +- arch/x86/kernel/cpu/amd.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h index f7ba9fb..0adce8f 100644 --- a/arch/x86/include/asm/cpufeature.h +++ b/arch/x86/include/asm/cpufeature.h @@ -85,7 +85,7 @@ #define X86_FEATURE_P4 ( 3*32+ 7) /* "" P4 */ #define X86_FEATURE_CONSTANT_TSC ( 3*32+ 8) /* TSC ticks at a constant rate */ #define X86_FEATURE_UP ( 3*32+ 9) /* smp kernel running on up */ -/* free, was #define X86_FEATURE_FXSAVE_LEAK ( 3*32+10) * "" FXSAVE leaks FOP/FIP/FOP */ +#define X86_FEATURE_ACC_POWER ( 3*32+10) /* AMD Accumulated Power Mechanism */ #define X86_FEATURE_ARCH_PERFMON ( 3*32+11) /* Intel Architectural PerfMon */ #define X86_FEATURE_PEBS ( 3*32+12) /* Precise-Event Based Sampling */ #define X86_FEATURE_BTS ( 3*32+13) /* Branch Trace Store */ diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index d6e320f..97d4ce2 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -559,6 +559,10 @@ static void early_init_amd(struct cpuinfo_x86 *c) set_sched_clock_stable(); } + /* Bit 12 of 8000_0007 edx is accumulated power mechanism. */ + if (c->x86_power & BIT(12)) + set_cpu_cap(c, X86_FEATURE_ACC_POWER); + #ifdef CONFIG_X86_64 set_cpu_cap(c, X86_FEATURE_SYSCALL32); #else -- 1.9.1