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

!7470 x86/cpufeatures: Fix dependencies for GFNI, VAES, and VPCLMULQDQ 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yang Yingliang <yangyingliang@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/K7P3Z2MWBHHSNBS4FK3KUXQXHW76MWWH/ 
 
https://gitee.com/openeuler/kernel/issues/I9NZ3E 
 
Link:https://gitee.com/openeuler/kernel/pulls/7470

 

Reviewed-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents bbb0b1d1 d5757901

arch/x86/kernel/cpu/cpuid-deps.c

+3 −3
Original line number Diff line number Diff line
@@ -39,7 +39,10 @@ static const struct cpuid_dep cpuid_deps[] = { 
	{ X86_FEATURE_F16C,		X86_FEATURE_XMM2,     },

	{ X86_FEATURE_AES,		X86_FEATURE_XMM2      },

	{ X86_FEATURE_SHA_NI,		X86_FEATURE_XMM2      },

	{ X86_FEATURE_GFNI,		X86_FEATURE_XMM2      },

	{ X86_FEATURE_FMA,		X86_FEATURE_AVX       },

	{ X86_FEATURE_VAES,		X86_FEATURE_AVX       },

	{ X86_FEATURE_VPCLMULQDQ,	X86_FEATURE_AVX       },

	{ X86_FEATURE_AVX2,		X86_FEATURE_AVX,      },

	{ X86_FEATURE_AVX512F,		X86_FEATURE_AVX,      },

	{ X86_FEATURE_AVX512IFMA,	X86_FEATURE_AVX512F   },
@@ -51,9 +54,6 @@ static const struct cpuid_dep cpuid_deps[] = { 
	{ X86_FEATURE_AVX512VL,		X86_FEATURE_AVX512F   },

	{ X86_FEATURE_AVX512VBMI,	X86_FEATURE_AVX512F   },

	{ X86_FEATURE_AVX512_VBMI2,	X86_FEATURE_AVX512VL  },

	{ X86_FEATURE_GFNI,		X86_FEATURE_AVX512VL  },

	{ X86_FEATURE_VAES,		X86_FEATURE_AVX512VL  },

	{ X86_FEATURE_VPCLMULQDQ,	X86_FEATURE_AVX512VL  },

	{ X86_FEATURE_AVX512_VNNI,	X86_FEATURE_AVX512VL  },

	{ X86_FEATURE_AVX512_BITALG,	X86_FEATURE_AVX512VL  },

	{ X86_FEATURE_AVX512_4VNNIW,	X86_FEATURE_AVX512F   },