Unverified Commit b51e7650 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15326 [OLK-6.6]Hygon: Rename Hygon SM{3,4} feature macro to X86_FEATURE_HYGON_SM{3,4} 

Merge Pull Request from: @hanliyang 
 
issue:
https://gitee.com/open_euler/dashboard?issue_id=IBQV7I

The upstream commit a0423af92cb3 ("x86: KVM: Advertise CPUIDs for new
instructions in Clearwater Forest") has introduced the macros
X86_FEATURE_SM3 and X86_FEATURE_SM4, which conflict with the
non-upstreamed commit 4b0253be ("x86/cpufeatures: Add
CPUID_8C86_0000_EDX CPUID leaf"). 
 
Link:https://gitee.com/openeuler/kernel/pulls/15326

 

Reviewed-by: default avatarJason Zeng <jason.zeng@intel.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 910e553b 892e509f

arch/x86/include/asm/cpufeatures.h

+2 −2
Original line number Diff line number Diff line
@@ -492,8 +492,8 @@ 
#define X86_FEATURE_CLEAR_BHB_LOOP_ON_VMEXIT (21*32+ 4) /* "" Clear branch history at vmexit using SW loop */



/* HYGON-defined CPU features, CPUID level 0x8c860000:0 (EDX), word 29 */

#define X86_FEATURE_SM3			(29*32 + 1) /* SM3 instructions */

#define X86_FEATURE_SM4			(29*32 + 2) /* SM4 instructions */

#define X86_FEATURE_HYGON_SM3		(29*32 + 1) /* "sm3" SM3 instructions */

#define X86_FEATURE_HYGON_SM4		(29*32 + 2) /* "sm4" SM4 instructions */



/* VIA/Cyrix/Centaur/Zhaoxin-defined CPU features, CPUID level 0xC0000006, word 21 */

#define X86_FEATURE_ZXPAUSE		(30*32 + 0) /* Zhaoxin ZXPAUSE */