x86: Fix amd_check_microcode() declaration
PATCH 1/1 x86: Fix amd_check_microcode() declaration
From: Arnd Bergmann <[email protected]>
The newly added amd_check_microcode() function has two conflicting definitions if CONFIG_CPU_SUP_AMD is enabled and CONFIG_MICROCODE_AMD is disabled. Since the header with the stub definition is not included in cpu/amd.c, this only causes a -Wmissing-prototype warning with W=1
arch/x86/kernel/cpu/amd.c:1289:6: error: no previous prototype for 'amd_check_microcode' [-Werror=missing-prototypes]
Adding the missing #include shows the other problem:
arch/x86/kernel/cpu/amd.c:1290:6: error: redefinition of 'amd_check_microcode' arch/x86/include/asm/microcode_amd.h:58:20: note: previous definition of 'amd_check_microcode' with type 'void(void)'
Change the stub function to use the matching #ifdef check for the amd cpu support instead of the microcode and include the header to avoid both and make it behave consistently.
--- arch/x86/include/asm/microcode_amd.h | 7 ++++++- arch/x86/kernel/cpu/amd.c | 1 + 2 files changed, 7 insertions(+), 1 deletion(-)
arch/x86/include/asm/microcode_amd.h +6 -1
@@ -48,13 +48,18 @@ extern void __init load_ucode_amd_bsp(unsigned int family);extern void load_ucode_amd_ap (unsigned int family);extern int __init save_microcode_in_initrd_amd (unsigned int family);void reload_ucode_amd (unsigned int cpu); -extern void amd_check_microcode (void );#else static inline void __init load_ucode_amd_bsp (unsigned int family) {}static inline void load_ucode_amd_ap (unsigned int family) {}static inline int __init save_microcode_in_initrd_amd (unsigned int family) {return -EINVAL ; }static inline void reload_ucode_amd (unsigned int cpu) {} +#endif + +#ifdef CONFIG_CPU_SUP_AMD +extern void amd_check_microcode (void ); +#else static inline void amd_check_microcode (void ) {}#endif +#endif /* _ASM_X86_MICROCODE_AMD_H */
arch/x86/kernel/cpu/amd.c +1 -0
@@ -15,6 +15,7 @@#include <asm/cpu.h> #include <asm/spec-ctrl.h> #include <asm/smp.h> +#include <asm/microcode_amd.h> #include <asm/numa.h> #include <asm/pci-direct.h> #include <asm/delay.h>
Signature · 1 line
2.39.2
Borislav Petkov
maintainerQuoted 6 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The newly added
amd_check_microcode()function has two conflicting definitions ifCONFIG_CPU_SUP_AMDis enabled andCONFIG_MICROCODE_AMDis disabled. Since the header with the stub definition is not included incpu/amd.c, this only causes a -Wmissing-prototype warning with W=1
Can we please promote -Wmissing-prototype to default or is it too noisy yet?
Quoted 14 lines
arch/x86/include/asm/microcode_amd.h +0
-1@@ -48,13 +48,18 @@ extern void __init load_ucode_amd_bsp(unsigned int family);extern void load_ucode_amd_ap (unsigned int family);extern int __init save_microcode_in_initrd_amd (unsigned int family);void reload_ucode_amd (unsigned int cpu); -extern void amd_check_microcode (void );#else static inline void __init load_ucode_amd_bsp (unsigned int family) {}static inline void load_ucode_amd_ap (unsigned int family) {}static inline int __init save_microcode_in_initrd_amd (unsigned int family) {return -EINVAL ; }
arch/x86/include/asm/microcode_amd.h extern void __init load_ucode_amd_bsp(unsigned int family); · line 65
Quoted 10 lines
arch/x86/include/asm/microcode_amd.h +6
-0static inline void reload_ucode_amd (unsigned int cpu) {} +#endif + +#ifdef CONFIG_CPU_SUP_AMD +extern void amd_check_microcode (void ); +#else static inline void amd_check_microcode (void ) {}#endif +#endif /* _ASM_X86_MICROCODE_AMD_H */
Considering how cpu/amd.c provides the function implementation, that header gunk should not be in microcode_amd.h but in ...asm/processor.h, I'd say.
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteQuoted 10 lines · Borislav Petkov
Quoted 6 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The newly added
amd_check_microcode()function has two conflicting definitions ifCONFIG_CPU_SUP_AMDis enabled andCONFIG_MICROCODE_AMDis disabled. Since the header with the stub definition is not included incpu/amd.c, this only causes a -Wmissing-prototype warning with W=1Can we please promote -Wmissing-prototype to default or is it too noisy yet?
I'm working on it, currently missing just 15 patches (down from 70 in 6.3) before all randconfigs on x86 and arm are clean.
Quoted 5 lines
Quoted 4 lines
arch/x86/include/asm/microcode_amd.h +0
-0
Quoted 11 lines
arch/x86/include/asm/microcode_amd.h extern void __init load_ucode_amd_bsp(unsigned int family); · line 65
Quoted 7 lines
arch/x86/include/asm/microcode_amd.h +4
-0+#ifdef CONFIG_CPU_SUP_AMD +extern void amd_check_microcode (void ); +#else static inline void amd_check_microcode (void ) {}#endif +#endif /* _ASM_X86_MICROCODE_AMD_H */ Considering how
cpu/amd.cprovides the function implementation, that header gunk should not be inmicrocode_amd.hbut in...asm/processor.h, I'd say.
Ok, I'll send a v2 with that changed.
Arnd