Patch "x86/microcode/AMD: Avoid -Wformat warning with clang-15" has been added to the 6.8-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    x86/microcode/AMD: Avoid -Wformat warning with clang-15

to the 6.8-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     x86-microcode-amd-avoid-wformat-warning-with-clang-1.patch
and it can be found in the queue-6.8 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 18af4cfb9b0f0d055df67243f1c381370742d0ca
Author: Arnd Bergmann <arnd@xxxxxxxx>
Date:   Fri Apr 5 22:49:07 2024 +0200

    x86/microcode/AMD: Avoid -Wformat warning with clang-15
    
    [ Upstream commit 9e11fc78e2df7a2649764413029441a0c897fb11 ]
    
    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);
                                                           ~~~~~~        ^~~~~~
                                                           %02hx
    
    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.
    
      [ bp: Massage commit message. ]
    
    Fixes: 2e9064faccd1 ("x86/microcode/amd: Fix snprintf() format string warning in W=1 build")
    Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
    Signed-off-by: Borislav Petkov (AMD) <bp@xxxxxxxxx>
    Link: https://lore.kernel.org/r/20240405204919.1003409-1-arnd@xxxxxxxxxx
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c
index 13b45b9c806da..620f0af713ca2 100644
--- a/arch/x86/kernel/cpu/microcode/amd.c
+++ b/arch/x86/kernel/cpu/microcode/amd.c
@@ -465,7 +465,7 @@ static bool early_apply_microcode(u32 cpuid_1_eax, u32 old_rev, void *ucode, siz
 	return !__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;