From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756201AbbJ1TDH (ORCPT ); Wed, 28 Oct 2015 15:03:07 -0400 Received: from mail-bl2on0054.outbound.protection.outlook.com ([65.55.169.54]:4896 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756099AbbJ1TDD (ORCPT ); Wed, 28 Oct 2015 15:03:03 -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: 0NWY28X-07-3HK-02 X-M-MSG: From: Aravind Gopalakrishnan To: , , , , , CC: , , , , , , , , Wan Zongshun , "Aravind Gopalakrishnan" Subject: [PATCH V2 2/2] x86/cpufeature: Add CLZERO feature Date: Wed, 28 Oct 2015 14:03:30 -0500 Message-ID: <1446059010-28010-3-git-send-email-Aravind.Gopalakrishnan@amd.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1446059010-28010-1-git-send-email-Aravind.Gopalakrishnan@amd.com> References: <1446059010-28010-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)(50226001)(77096005)(92566002)(5007970100001)(19580395003)(5001770100001)(2201001)(86362001)(97736004)(87936001)(53416004)(5003940100001)(2950100001)(19580405001)(106466001)(189998001)(76176999)(5008740100001)(5003600100002)(47776003)(50986999)(105586002)(48376002)(229853001)(101416001)(36756003)(50466002);DIR:OUT;SFP:1101;SCL:1;SRVR:BLUPR12MB0706;H:atltwp01.amd.com;FPR:;SPF:None;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BLUPR12MB0706;2:AHZvxFqic/5tiefHB8VEvkbb84AdQOOIDavKmN5hF4LDV1bw5l7O5NyEmKIZkqRnT+bUuMevKqJuxVt5Z2a1HoQ40H/Bq4OpGf6OAeERVYipGi/Gvo3BuwgdoJVotNqcS8PJ1si6lfC+byXOty8T/CGx5fanKYTHmyy+1CFfRE0=;3:REM/nWTtGQBtx4b2QqwI03P6sg8+wxDh+PMM4hiqg4yJN6/skzzpD5spBusLRIPv+SFMvNSCabm8EdlChcKG/cwQSPrgWht8cwMJrl8hBT4Y5KmSgz7rbt+WN0X4qnNRBT5Xng2GDHAAAJxIQP7+prp7THCHp+a5SWV5PHZ2ukUhxgrYidATIZ6QhewPlOrGmeiz0MiJm+LKEAU1X28jmEkKlrpTU5tW7EAi1BWYWhwC879Evdvwz2MCAaJFELfR;25:T++WXKzc+6rxH0lv6A1whisQgZ4xRxMNdbiN/BpQvLx1epnYQGFe23SH8Jrgwkuu5lXlPAi4g7fU2pp3hir7qdRVhaYVYecvQuvXRcZPTaR2l3P0fcNrnvQR1h4fvj1J08/b21YEAOkgcfmzKEMBcrT0JJU/wTZc/JK3PTwiyIYXxP+YzCtW2SU5mLcg3qR6zqZpdxUmHTh+wpdd/FH9bDtLoWtcfziKRomyDMGKMoxn871Lxo5LjvDIrOPgSqqvPRfrrRS5xUOW6ME/idVkeg== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR12MB0706; X-Microsoft-Exchange-Diagnostics: 1;BLUPR12MB0706;20:7GwsMqM99hreatkpRoR5873foC80Tz2TFs16kBES0QJBhkjbjazY1iLg6vlqmYdCZKplfVPawi5Wfj2w53hZPJ4XqVOjioxDNha2AvEQp1MVc3Ks+Rtjp+xeXqs1Xa1lsvcdavyRAUdCXC6xSesAIZkFQNggYQwNAz2PwgOa2YBT/mWSQvVwLkR20SrktoVWJjyrnvlK+vIgdXTYuOrxkIKVAeRWFIu4lMwlrmsoQi759iIuWltCHt0TVXqFT4P7kqNTN3/sp1WJH+j0o2viZNk78UhLFZLPZ6Y5sJoLzHe0YsWTVNw4ZRsIcCehbZ7NtoYvaZiuvfHiQLiclt5wrwUj/RK8vKnrIiCrCVi0e6McRZAcqzhwMfYYJLrfWz5zeMowynx8pGw6zVvPFXiQFTnxXIn7lqbWI3t2qfuciLUIrhnHdE4PRYAoiiqHgWHo26WpkZidPM5+P9gKR8PsfHNfOSCOuD1dj18BM4sD6PVUTcApX6FH+skblJWdqAR0;4:x80KWk4g8M4L5HQY9ofkU0TYOh9bzTnrydBj5R5DmcSP7rI97FCVgaLN2oa/TVoBHsycYMFd4Ar/WAoHeNJlIVrtrZb7mhmI+byio47O1itA7ttL71+W6n1Kc0xFR0co8QgvEzwrI6AcsmEMEWaAE32vzyA5vwdBg6Vu5PEOsqgPUYr3QKiEZavS1xMd5UWIZnJQ/J+Q6jBiG4OTuW8/zn77oJJycOATsNAbQim6dloKPn7ZPju8MywOyKVryiWBM1LW7Ly0GCdeVhLl8tTqspez5tzpv99eWBywg8rn3aPKk0n5+raGQ/gSNdVpsdeMiRqoiN7J/icwtKqs1YfVxtvD9RtXGptTKeZ/XVbCRpZeqrFtXnglaeOQbzkl5N3dG11/0M1hw0NEp8IZdzZpOg== 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)(10201501046)(3002001)(102215026);SRVR:BLUPR12MB0706;BCL:0;PCL:0;RULEID:;SRVR:BLUPR12MB0706; X-Forefront-PRVS: 0743E8D0A6 X-Microsoft-Exchange-Diagnostics: 1;BLUPR12MB0706;23:po/eaxmeYEGBLhhOXfsAwJPLlSyzYITEcnx8NlqeWxuco1G4H+qFX2c9zdT67PL4K+S5vuD8mK2nguBVhbfIJUqZx9sm0J7m6ROsLmmKmc8b++aj2Xd4SFA+yngnobmczeCbx2fBX24d+VSP/HFycAmqOBY1nVYMD7ZNYjmziySBgd6GJStG8czeImabVmdyGFotGB45ksqqfd2ocveCv92tBTCHKj8PROjoKLL+blC1+E+izVzAOG6Gm5lZ6gjhYbrPsdUmd+Ogyy/b4IgyPm4XbG6FYJA1KyLk5oz+fNYdn8ee5JNStsh+FU/X6VYReabDryAQZpju4psPxASW1/8WyFMzjoFUurf7qNy/hR7y77s0cnw57CZCB63bdH4YLv7TImN3RXsOaBp5Gre9vL2UQmGCKvgmf40F9GBrkD6jwDlSNOU/94tE8Lgt8THiHHX2cZlDHveuU4wUhrP7mNX6/xdX50O1rQCSAXCCsRLpn0mUKRZU1Fs1pNA+V+ha1aQOSEoHQG7CmGZH+1Yb3vNu6OI7WIDnjRqVY0wsx5zp7H8OomTVXd4WiFqmGa85DVIEu+DKf+s7b4zthWgG2eTL89Khorh4dTHtrFZUixj27ZlwraKR3Cc4eutOixaIJBESsZeBWudwMwMJiXgCIVaGGsy9HJvMZEjG1QDuNj1DlVcG44M3u9lz/ESzpr4JRyVBwExsj6g5kpfwvzD0s16wwp8QXt7o2mnLBx/+KtKxJD6Z9qfFb6WjfpI2hPi7iN9sqSjhla6mAwcnsxwLx6F7FhYJGtfcOG8b6e/NcB9ouTYX3JR/sXIJAdhCYunGHnwpn4dL7Lf6CxIBHYRrIeCrnIt2jlK/tItiBAalWluoOkIqB8jJ1MITIo0SiybpYZ4e+5hIe+J2cfiKAfo7ZA== X-Microsoft-Exchange-Diagnostics: 1;BLUPR12MB0706;5:jGqExLe+gG7smpP9+r/1A5xJ7QdbQtn0mFjrlL1pGZ5ijzgCkDPbmi5wZS4AxI4HHS6wr7H34HN1Z4ZPtLWj6UcNyVLRvs6QBDUKyviPjwfDpSDh2SWSTSjmQMakqhpHDGL9/Md3EQedCD6q3NF3Qw==;24:KYBEsy1Slfvt1OdySRtqOSNaKOE9SbNQ0SrE8sgPxUdoFYCJnW4ZVGBQcDGKwjRjKssAL05YrpOHjmI3bk35ey+e1i9KWwckPHMuiohKOb8=;20:9apJgyXRFetgavPxlXfevYSHUzQC+YMklQqhFT2QFk1FXdea1pnh9l/WNy68FjdAz1BscZhIeLYxSoirgwf+xiqQeGvb/o86Y+RRL6rMxZujCi5UsGaiuRxwKORATomIh0ndc3SJ5tkBqcGda3fs/taIftPHoZng0JgbxEoz6S138JvRaQmfhZVOULdpBS2gdWGdkeuLM7GBcvllKCQtbcwT3NaBci8GkNXdY1TcPt+zkVNTpWDqU1+01qyRBjTa SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2015 19:02:58.4575 (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: BLUPR12MB0706 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wan Zongshun 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 [Wrap code in patch form, fix comments] 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..e4f8010 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-defined CPU features, 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