From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752967AbbJWQNl (ORCPT ); Fri, 23 Oct 2015 12:13:41 -0400 Received: from mail-by2on0061.outbound.protection.outlook.com ([207.46.100.61]:2744 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752656AbbJWQNZ (ORCPT ); Fri, 23 Oct 2015 12:13:25 -0400 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: 0NWOL28-07-AUU-02 X-M-MSG: From: Aravind Gopalakrishnan To: , , , , , CC: , , , , , , , , , Wan Zongshun , Aravind Gopalakrishnan Subject: [PATCH 2/2] x86/cpufeature: Add CLZERO feature Date: Fri, 23 Oct 2015 06:18:33 -0500 Message-ID: <1445599113-8792-3-git-send-email-Aravind.Gopalakrishnan@amd.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1445599113-8792-1-git-send-email-Aravind.Gopalakrishnan@amd.com> References: <1445599113-8792-1-git-send-email-Aravind.Gopalakrishnan@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)(189002)(199003)(53416004)(47776003)(50986999)(87936001)(50466002)(2201001)(48376002)(189998001)(101416001)(5007970100001)(2950100001)(5003600100002)(5008740100001)(76176999)(77096005)(105586002)(5003940100001)(92566002)(229853001)(5001770100001)(11100500001)(86362001)(50226001)(19580395003)(106466001)(97736004)(36756003)(19580405001);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR12MB0853;H:atltwp01.amd.com;FPR:;SPF:None;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0853;2:0uefEiULbDyAfZHYK0FfexqkbdSoNHJJfYIq+LfUnrfoRHHdpntdoMAAP1TABpl5HlZZA8gKDERzf9BB6gpjqUo3ilvNCMRizw/vitJCCJInbghvyvx74fMjPj6seLiMaMeL8XJDid4W6nigv4A0vEDUipha/mKiQnvUiPCERCk=;3:un/Yq/qd0+vjx6onPmwn3q8FtH8xEPSp7N9uP/TNnbhfZCgE2Wi0VLK8G5OPYLsUiDK5oklmRcSbsnehfj1CYiTvvhpLC8pmb0Lw0fwYuebfi2piUCZH9gVuksX+PhjWCdepGzIwAtOAMtgumGFbQDwbuP5Xt8VfGt8EU+9K7RevydI4GAkXSaXV9LQdC/EwgZXuJp1teKOuZAn0WBJBY5c+VRPB7eP6IaaTr3LacSAw2P3jVd5WwBKVnxUT3d/2;25:dy6vaWuxxI53B/cAuPtlHM0gGvMKAKxpaSp+eP0gmhIwIrOzyPSImThqvr7aXaLAP1blJUOrxW/LlkTyIeBHZwmCqhpTFPgNqn1g5NLq69Psb17stkzlDNkuRRI1E0Q6QWiKpfDkBhz4MU3ib7z18OqXc+nfLzo3vSgu6XT+FYZEMW2npvegAttEUYOloAZ0FHMvKOj5gGD9bQAPMvtgqjdYmnjEkxKmWcPkXm8mDxYm6JMhWjwott9IALRpO6swALhhkd+S2fx/PSY1iC/XpQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR12MB0853; X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0853;20:2DyXU3aDvRxMiwruk756+xcgCXftH1E+HNcg4LpBpC20lrzOPNwcvooy9EzcTbIki+S0cGuJWd2FWkHsMT0ohAwRAYs9OIOBuG3TiGy5zNi0c657V+I5vxzyQYPy3irI77Sqj0Cg8krEUrdya0Bq7u0sZfqHitUFNIEi58jgvIPtoZweBADP2xjzQ9EWnnKIE9ClAmI7UYfyihPfvpIxOzf5L6AjB8SNpf2ue4J8DbfzaXZhgBDNPjUTGIkie2asq2tZf7dOFsgZyRyw2lxc3hUVLQoCxNqFcINS848mhupZl+6rNKwx4dPBr6hebTi111RTt/XJ1WuNzeFpEhzhEKON8sHAwTcTxB3ONPoAZibb0gZiMDUO3HR/XGAVOskWU4zqTAMvcpGnAMcb4E8RIteTY8rpMQJbrFS0sXJrC63uzx38gRoCKfZCUSx/Y2CvdGV72T47/e4TtbKaWgn4xMLqm++HI0MHyBnUlU+WFjwWZ9n9sRfDQIKZwn4T9UdU;4:nI8DR8PYyfjYOXPchkRwz9lMBGE+6nKJTlDFPxwdzcKRjhNEvMQj3HD0hX6jNDIaTgNljcuCf4gCJ6zNh6Je/iWiNw9okuH+0JFmxpysjmwqYwJaGlh3CdqbBPq3iXzIBH0IcfZR90NKxo5xM/83Yhs1a67rHc8DjL6RcMEc9+gzZWfJqhuXu9AMHKQqiIQgYMD/hdmSBi36VNocpQRHSA9cUUPsP9p6aJgfaqtrQqHxJEIHd3wChHU8HTcWwetrAE1CbFUlLTCmu+WUcBEqv2i+MzU7ha5bZbDThq7DLiKxc64xQMeIC8ywu2ax8ypzsW9bIxDTyic6emf3fxzFjKrEkgpDUP5w6nlkjXnFJbgBiHetEpoa7Q/eMHbfnZM7 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)(5005006)(520078)(3002001)(102215026);SRVR:CY1PR12MB0853;BCL:0;PCL:0;RULEID:;SRVR:CY1PR12MB0853; X-Forefront-PRVS: 0738AF4208 X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0853;23:ZhfpPWYGiLOUqJz/ZaqvjJAyjtuzYxpioWbVDaLx4Ta19qE4vV6O9wCOS0E9pFKfmQlVJk/Pv3TfiFmSbccic7RHn3g+ElxS/HxK+nMByZkQn6nttTDbKKP6wAYxfVDd6ihVbd2nigz8UgatfLO5526JX8v0QqN26sGfm6EvtCp9tmC7EFpIUgHlN4HuqU5YMzeci2AD20wJKna1WVhkSbL7sXAYi/ny+r8s8yFbDjw57nzbZoLYOFasEsddcjAdqqaXUrhJQy/w26uD2jj1pb2caVgjEUGdZqPuC3tNdpvCTXbSWsRGl1kuC/u18m3bLeYdvDaYgXA12qLWo+jF8iZuGOEnIiNL0i1KVdOWtXPL5v/f6Sn/XVNLLHyhlnXw/Ug5oE/0msy/zPml3Cqinm1Kd3Gaiir5KEu1JlUvz794a/5bTNuuW/p0Z7mwojuFE7SwcXBJnhfCMGKZDvpqdeTmhudmTAl/tzI2p2jmzPbcmyeMVl+DwrUEumEMFRGP7z04oo6uPcPHqYotPA9yb5rHXQoDhTznM3HYSmRIyna+sZqopP4PGcJ2m1DHYUzRk4l0kJ1mdXE6FTxoRgAP33Aiv40b2nGnGBMVrBu702OMdSOiblasdpBg/7Ueg3GVYc7ED8IxB4VuJ6gE6cQv5EBc3KYfuRoP1OWORTKwX097EjRrTZo/KQctyUosAtc1GzKXxX0+nkyZ4bGm1KOj5t+WlSO2JyGTfqzwVQxa2vM2WVj6hZJMY/hbjUHpHuIkPfi7eH3IcKXecYnYgRfD/UZdzP/hOZrTQrZCjzP2BAGwYWXUxpINU/QI7ztBhVY+vy6kZqqT8QJQk+t504zuVZRZzmGtLap5aM2R3dznF/P4EhpAYL2JIUo7e2Z4hbc17jqTnVYMmo9nHqeBUmdjQiApW2XXK+qSvbd6RqBnMQifFDz4003hB3eOd92TnRb8 X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0853;5:8D3i2dN+PKC6zkQmmfmoFL5VB2rXSHzlTiQRYk/VVyzhqaC8qWoNEcmDEKDQxuoLH/7Vct0mo7Bv4R+1vJIpnDAp5WI9T/2oclNVpnswXhpvDNBRrmJK+S0hH1mWRY5J48DebcnOO9rafb3kdfGeYQ==;24:rJL1qGOGs4C+yvBtG7ebd4ZRh/NW7MBIZuAgC/RHRhvVKnl8yOcwSD8Md1Q0OIjhNrFg7aWorXRjSruc5Wrtbu8FIVe09fcpYt5e9kCf7IE=;20:KCpUkHsEh8ELFIC/bBB7+lyT+Kt8y1sowpmGDrZlgnDPGoB0/ZUTNBfpCQxk6xvIx91gmVJNcHuIE82HUqwBGV3kZIxV/Tscv+Jg9hoTBFhn1OeybBZ18SDtcoqUdJoPRcc/W2RT0StWdT1B4p7KaGf4oYuwr9BcTUBcwIKUAn+kcD+gX6hJQgwOj+P0dggYB+CvbKzuFKCDNtI2XkDkioEyoY7gzK7ouIdybeUTGSwtz7BJzBQGtqv0M/Bu0ALC SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Oct 2015 16:13:22.0398 (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: CY1PR12MB0853 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org CLZERO instruction introduced in AMD Fam17h processors zero's out a 64 byte cache line specified in RAX. Add the bit here to allow /proc/cpuinfo to list the feature Signed-off-by: Wan Zongshun Signed-off-by: Aravind Gopalakrishnan --- arch/x86/include/asm/cpufeature.h | 5 ++++- arch/x86/kernel/cpu/common.c | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h index 9727b3b..82d7c25 100644 --- a/arch/x86/include/asm/cpufeature.h +++ b/arch/x86/include/asm/cpufeature.h @@ -12,7 +12,7 @@ #include #endif -#define NCAPINTS 13 /* N 32-bit words worth of info */ +#define NCAPINTS 14 /* N 32-bit words worth of info */ #define NBUGINTS 1 /* N 32-bit bug flags */ /* @@ -255,6 +255,9 @@ /* Intel-defined CPU QoS Sub-leaf, CPUID level 0x0000000F:1 (edx), word 12 */ #define X86_FEATURE_CQM_OCCUP_LLC (12*32+ 0) /* LLC occupancy monitoring if 1 */ +/* AMD extended feature extension, CPUID level 0x80000008 (ebx), word 13 */ +#define X86_FEATURE_CLZERO (13*32+0) /* CLZERO instruction */ + /* * BUG word(s) */ diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index de22ea7..4ddd780 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -670,6 +670,7 @@ void get_cpu_cap(struct cpuinfo_x86 *c) c->x86_virt_bits = (eax >> 8) & 0xff; c->x86_phys_bits = eax & 0xff; + c->x86_capability[13] = cpuid_ebx(0x80000008); } #ifdef CONFIG_X86_32 else if (cpu_has(c, X86_FEATURE_PAE) || cpu_has(c, X86_FEATURE_PSE36)) -- 2.6.1