From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752810AbcAGC31 (ORCPT ); Wed, 6 Jan 2016 21:29:27 -0500 Received: from mail-bn1bon0065.outbound.protection.outlook.com ([157.56.111.65]:24160 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752699AbcAGC3U (ORCPT ); Wed, 6 Jan 2016 21:29:20 -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: 0O0K9KO-08-4ZY-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 3/4] x86/cpufeature: add AMD Accumulated Power Mechanism feature flag Date: Thu, 7 Jan 2016 10:26:13 +0800 Message-ID: <1452133574-3407-4-git-send-email-ray.huang@amd.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1452133574-3407-1-git-send-email-ray.huang@amd.com> References: <1452133574-3407-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.222;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(428002)(189002)(199003)(53416004)(101416001)(33646002)(105586002)(47776003)(229853001)(5003940100001)(5003600100002)(106466001)(2906002)(19580405001)(1220700001)(586003)(19580395003)(50986999)(92566002)(50226001)(36756003)(2950100001)(87936001)(48376002)(4326007)(76176999)(5008740100001)(189998001)(50466002)(86362001)(77096005)(1096002)(97736004)(5001770100001);DIR:OUT;SFP:1101;SCL:1;SRVR:SN1PR12MB0862;H:atltwp02.amd.com;FPR:;SPF:None;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0862;2:e7xyQzq6t4dkSmUIlPRPZGL3ni8/tqvIxeD5fyqIsiWCej+sa7THCJ5KUdMfPHRMJ98Fap48+r8+ip9KK9ybiad0kDzDN2Pba99/317so87KnAoLUcI1HpddmqYtZp2689i7tjGnzsP0k6A/XbaohQ==;3:fFHH4j6EMyCGDjgiqpsrudvsw1aWA09h5r9my/PFDHELcVWrE9KHNigqZYsA9Ogb9IZ3gFWLhc8NN5P7jjdJAXdercEYJWnAAUNYVcdfwzV1U0kbM7zaE2jNonx94IskBHGUKOr0Se2ZLlAW4EMEZCHPCmeosqEDnZxsi904OTjU9MnOKRw3211OtB4397kuJF69LXYumvhs9lmS2O4NrbHLZMUI7emyGyJuFzBFkgQ=;25:sskI/5MHQMSlKE6jqzUAaXRBvxQTu2BNy0JjMnS/ysCxv6PpZ4Ps+FGryeeS5HZENERnfY2aJmL6RdbNwoT0FLdvCMOE1hmTwIL5PQYvf8HwG90GOwqwoiSTWDxc5ywiIo03qCb3sLGA7SChAqfwwhUCDvFIakQMUV3z4n0T6m74CBFjTB0v/eB4Igd5ce5Jv4UcYjhmB0/XQu8WstV+oA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN1PR12MB0862; X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0862;20:xpwoJEQwOmPWba+m6IPYqGJDrGVSeZeeHC5FQZqpdnpMmjMOkI1XZZSOLBZWFHieT1nLvVhP8UfBWC7uIShCEeIF6gCs4Niq2N2An3+tC73mEw94VaOyJpGz5/sBBxKXubP8dY2jlvFqTpfjJMGGjZeZJdfPKBMB8npP9658xEiNLq5B8Du+qs+H/NJTpXw4xyNGHnAKFC1DuDCXrhO4xCu8H7bnIq3XKYT9UyPST85IlEFWmv3M0tsW5RA0on+PNSoxRVThSX5pdj03m8EWIAb4itJHASumeAZtY8MCxvlsN1zPZxw2sx3QxSoOZ+vrRlDeO4+yYownTPPeTOqOOILTv3Ua0QUF0+IGkuuV2JlEqGUFaBeOZwRLBSAZrLmFUP9rwBSknbVDr6y/JfH9TiLlvavr6J8OUQfjj9yOTlg6zpQFgNzG1mE2OYT2no18Vkv6FLfMwpn2QOmIYln/ECKtKd/Twwv/bm6mauEAh2dUYLdwR31ymBA49jJkNHTA;4:hpDSf/rkXXpoMwdmRkX944MiXarlltxciEUtxPB1NoQa3zeLSdk+RmHyRBLkXDwJe+W337bO1vkXxqIwnLyi+0xkj2i/vx5zsNsv+dJvRee0IpCxtlJJrz/O2viVX0dryv4/uUkokJhAA06uE86LjtEtlEs/fxeY8Yqn2+vZPKdq0xF0T0Yf8UpsgV4s6Y73ond9yTxJUQiMk3N8tArwlMUxyb5uy88YYDRf0EpQC3gfRcYStv8472mCsYB7IOXzNSf2dpe0XheQbmL7/8s8RGibeWtAsowc+IkvgiNI95tEqKaLR43HqTL7XVmapEpv13E9U+BV5SEj/f7ZqXX4Sp+is2c2SPV9a0q6jRwE6T1Z7cS21ATQbWhc1/QKo4eixvzNtLkN5l/vkzY9+ZHgtSvKkcHObXAOuBl6TEGCLbU= 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)(520078)(5005006)(3002001)(10201501046);SRVR:SN1PR12MB0862;BCL:0;PCL:0;RULEID:;SRVR:SN1PR12MB0862; X-Forefront-PRVS: 0814A2C7A3 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;SN1PR12MB0862;23:wHzMxch6tMGLaqMqOHG0tP+tK55s295iay5zOF+xL?= =?us-ascii?Q?Xo8kGt7YOeTb7SBoHMdxvdQWCY1Sx68odJ1gpji7fyzcHqKY1ODOVJ4eenwy?= =?us-ascii?Q?xLpxwM52Cnau6JTpVFhYa41WQGibCGafO+Mre0fRS1TeXRYIEo70qE+5ZtEy?= =?us-ascii?Q?sGuPosu+inW2MEwCQaYhDeOdrUsIUp/CKB7D+IOWW4ir/6P3v+IFcsNpdDkO?= =?us-ascii?Q?/Uj0cmcs8Vstnuk7SsayqXEhqb6LiRse3PwyUxtctCajre7zOUwJWB2m9/dh?= =?us-ascii?Q?sjDF8CF4fpKOloe+egPldqxrGRY+xw8732YqFcB+l4LDHU8yaXfrLoZrxLRu?= =?us-ascii?Q?VhXqL9owpLLQ4v+z8VIM3UCv2Nxbn6ATQfxKwaReuTqTqDbqobyBxbMbiR+9?= =?us-ascii?Q?TvLCvfjBNgICesvTRm6nDIDANeY/hdR9T6MZVLdTQlkKobg3PlXzCOytxsXg?= =?us-ascii?Q?hdm8aCWhhmztLVGUAfGSnokTBqQdoOUXhQTL6aiIJwNprf0vxlYcMtrmeTlL?= =?us-ascii?Q?LycE+J0Brbcqzhht4kGBxk3B9ZmgqjUIIkDpD1do4RaXgCvA+QStVkkYYJlJ?= =?us-ascii?Q?DflAYozc9uiScwcR6iChO6JxSIVzUnlZ/PKfLNiSdHo5lsUM4Q9m+d1XEDrW?= =?us-ascii?Q?S1gyTEwaUYhc/uL5P2+uh/D0vH5wPCjpyA5QKxCTRPwkMm4riQB6astgBtFg?= =?us-ascii?Q?HpkH4qsgm7gFimgL8B5+ntWBncrzqtu1C1Bt0N+Yw/r/yb0HBYVTAsfS7pyR?= =?us-ascii?Q?Mgl+/i63uQUsSW+K9qt2gLJFQUWbuFGsE6IMLDSUZWh3QiDKQA7v9KMu0Wjg?= =?us-ascii?Q?B3mtx79nViogvhoD0+sfzPYqD8tBe+oyEaU6s+HlHX9eyOryVC2dAWYCaPiJ?= =?us-ascii?Q?FkduEsMA57UJS7A+Xi4SogT8rcLBsYviyIwQiGd/sGEbH43KwMY/TFcPyXMO?= =?us-ascii?Q?VruvBS7+mIXpyXfsRiQNDVemtKDGOMjEp1drqdPTg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0862;5:GwH9Ozga7mH8SUatbWZn/lN5RHkcXD2/Ir1yxAJavIzpXORhQxq0WmuEwbzhxbpTZRCQAkB6A1lFHV4ysEx1FjNQamwoD19JM53DAfzvQUcTsREgWYOroqO0oyEum/XEa9xgWlgoloI6nALGH7hl6A==;24:1YGSpjJaG5dfrFI6EaltutwXcPr6n9H0uLHSrewNOCKFcAX1H2pXZQmNFgDDFPaDT6i1P0ALOVt173Jo+CUwlJ0W7g1p+tXRPyvx+jMo8BQ=;20:ckLI0jTny/mPbSXXLrsbI+lC/g8vFmalSndkwAvemzBno3B8fox3ax4ky34SCPMrImYvTmVpCQCTwXYEWJXJEas4L+mMbvMPv9LtQCuSWRhX4jgG2vhK7eJz98qjhxf+kasdpKw+P+/JR+Zl0sO0yEk/ciiJf6NmnY29ESmo9kb7WgysVIHaFUH4tz+LXbB6Co3svNZKgyMFciDg3YRx54WOdyNnzTKDXuo/SfikSA53+tfyjX+MTzDQ/dkJ1S1p SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jan 2016 02:29:15.1885 (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: SN1PR12MB0862 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