x86: microcode: avoid -Wformat warning with clang-15
Subsystems (2)
PATCH 1/1 x86: microcode: avoid -Wformat warning with clang-15
From: Arnd Bergmann <[email protected]>
Older versions of clang show a warning for amd.c after a fix for a gcc warning:
arch/x86/kernel/cpu/microcode/amd.c:478:47: error: format specifies type 'unsigned char' but the argument has type 'u16' (aka 'unsigned short') [-Werror,-Wformat]
"amd-ucode/microcode_amd_fam%02hhxh.bin", family);
~~~~~~ ^~~~~~
%02hxIn clang-16 and higher, this warning is disabled by default, but clang-15 is still supported, and it's trivial to avoid by adapting the types according to the range of the passed data and the format string.
--- arch/x86/kernel/cpu/microcode/amd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/cpu/microcode/amd.c +1 -1
@@ -465,7 +465,7 @@ static bool early_apply_microcode(u32 cpuid_1_eax, u32 old_rev, void *ucode, sizreturn !__apply_microcode_amd (mc); } -static bool get_builtin_microcode (struct cpio_data *cp,unsigned int family) +static bool get_builtin_microcode (struct cpio_data *cp,u8 family) {char fw_name[36 ] ="amd-ucode/microcode_amd.bin" ;struct firmware fw;
Signature · 1 line
2.39.2
[tip: x86/microcode] x86/microcode/AMD: Avoid -Wformat warning with clang-15
The following commit has been merged into the x86/microcode branch of tip:
The following commit has been merged into the x86/microcode branch of tip:
Commit-ID: 9e11fc78e2df7a2649764413029441a0c897fb11 Gitweb: https://git.kernel.org/tip/9e11fc78e2df7a2649764413029441a0c897fb11 Author: Arnd Bergmann <[email protected]> AuthorDate: Fri, 05 Apr 2024 22:49:07 +02:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Fri, 05 Apr 2024 23:26:18 +02:00
x86/microcode/AMD: Avoid -Wformat warning with clang-15
Older versions of clang show a warning for amd.c after a fix for a gcc warning:
arch/x86/kernel/cpu/microcode/amd.c:478:47: error: format specifies type \
'unsigned char' but the argument has type 'u16' (aka 'unsigned short') [-Werror,-Wformat]
"amd-ucode/microcode_amd_fam%02hhxh.bin", family);
~~~~~~ ^~~~~~
%02hxIn clang-16 and higher, this warning is disabled by default, but clang-15 is still supported, and it's trivial to avoid by adapting the types according to the range of the passed data and the format string.
[ bp: Massage commit message. ]
--- arch/x86/kernel/cpu/microcode/amd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/cpu/microcode/amd.c +1 -1
@@ -465,7 +465,7 @@ static bool early_apply_microcode(u32 cpuid_1_eax, u32 old_rev, void *ucode, sizreturn !__apply_microcode_amd (mc); } -static bool get_builtin_microcode (struct cpio_data *cp,unsigned int family) +static bool get_builtin_microcode (struct cpio_data *cp,u8 family) {char fw_name[36 ] ="amd-ucode/microcode_amd.bin" ;struct firmware fw;
Quoted 11 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Older versions of clang show a warning for
amd.cafter a fix for a gcc warning:
arch/x86/kernel/cpu/microcode/amd.c:478:47: error: format specifies type 'unsigned char' but the argument has type 'u16' (aka 'unsigned short') [-Werror,-Wformat]"amd-ucode/microcode_amd_fam%02hhxh.bin", family); ~~~~~~ ^~~~~~ %02hx
Quoted 6 lines
In clang-16 and higher, this warning is disabled by default, but clang-15 is still supported, and it's trivial to avoid by adapting the types according to the range of the passed data and the format string.
Fixes 2e9064faccd1 ("x86/microcode/amd: Fix snprintf() format string warning in W=1 build")Signed-off-by Arnd Bergmann <[email protected]>
Yeah the family only needs a byte so this is OK.
Quoted 20 lines
--- arch/x86/kernel/cpu/microcode/amd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/x86/kernel/cpu/microcode/amd.c +1
-2@@ -465,7 +465,7 @@ static bool early_apply_microcode(u32 cpuid_1_eax, u32 old_rev, void *ucode, sizreturn !__apply_microcode_amd (mc); } -static bool get_builtin_microcode (struct cpio_data *cp,unsigned int family) +static bool get_builtin_microcode (struct cpio_data *cp,u8 family) {char fw_name[36 ] ="amd-ucode/microcode_amd.bin" ;struct firmware fw; --2.39.2