From: Qiuxu Zhuo Date: Thu, 12 Dec 2024 14:01:02 +0000 (+0800) Subject: x86/mce: Remove the redundant mce_hygon_feature_init() X-Git-Tag: v6.14-rc1~196^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=053d18057e6292462f1b3f9460dd0c1e34609f67;p=thirdparty%2Fkernel%2Flinux.git x86/mce: Remove the redundant mce_hygon_feature_init() Get HYGON to directly call mce_amd_feature_init() and remove the redundant mce_hygon_feature_init(). Suggested-by: Yazen Ghannam Signed-off-by: Qiuxu Zhuo Signed-off-by: Borislav Petkov (AMD) Reviewed-by: Sohil Mehta Reviewed-by: Yazen Ghannam Link: https://lore.kernel.org/r/20241212140103.66964-7-qiuxu.zhuo@intel.com --- diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h index ea9ca7689f6b0..eb2db07ef39c8 100644 --- a/arch/x86/include/asm/mce.h +++ b/arch/x86/include/asm/mce.h @@ -386,8 +386,6 @@ static inline bool amd_mce_is_memory_error(struct mce *m) { return false; }; static inline void mce_amd_feature_init(struct cpuinfo_x86 *c) { } #endif -static inline void mce_hygon_feature_init(struct cpuinfo_x86 *c) { return mce_amd_feature_init(c); } - unsigned long copy_mc_fragile_handle_tail(char *to, char *from, unsigned len); #endif /* _ASM_X86_MCE_H */ diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c index f90cbcb31a620..0dc00c9894c7c 100644 --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c @@ -2118,13 +2118,9 @@ static void __mcheck_cpu_init_vendor(struct cpuinfo_x86 *c) mce_intel_feature_init(c); break; - case X86_VENDOR_AMD: { - mce_amd_feature_init(c); - break; - } - + case X86_VENDOR_AMD: case X86_VENDOR_HYGON: - mce_hygon_feature_init(c); + mce_amd_feature_init(c); break; case X86_VENDOR_CENTAUR: