x86/microcode/AMD: Have __apply_microcode_amd() return bool

commit 78e0aadbd4c6807a06a9d25bc190fe515d3f3c42 upstream

This is the natural thing to do anyway.

No functional changes.

Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c
index 81aa7fc0eb30093793fe341a861fc47f3eb520c9..bb7219099360f82d329a5a78858691dbf1acd2e3 100644 (file)
--- a/arch/x86/kernel/cpu/microcode/amd.c
+++ b/arch/x86/kernel/cpu/microcode/amd.c
@@ -486,7 +486,7 @@ static void scan_containers(u8 *ucode, size_t size, struct cont_desc *desc)
        }
 }
 
-static int __apply_microcode_amd(struct microcode_amd *mc, unsigned int psize)
+static bool __apply_microcode_amd(struct microcode_amd *mc, unsigned int psize)
 {
        unsigned long p_addr = (unsigned long)&mc->hdr.data_code;
        u32 rev, dummy;
@@ -510,9 +510,9 @@ static int __apply_microcode_amd(struct microcode_amd *mc, unsigned int psize)
        native_rdmsr(MSR_AMD64_PATCH_LEVEL, rev, dummy);
 
        if (rev != mc->hdr.patch_id)
-               return -1;
+               return false;
 
-       return 0;
+       return true;
 }
 
 /*
@@ -546,7 +546,7 @@ static bool early_apply_microcode(u32 old_rev, void *ucode, size_t size)
        if (old_rev > mc->hdr.patch_id)
                return ret;
 
-       return !__apply_microcode_amd(mc, desc.psize);
+       return __apply_microcode_amd(mc, desc.psize);
 }
 
 static bool get_builtin_microcode(struct cpio_data *cp)
@@ -765,7 +765,7 @@ void reload_ucode_amd(unsigned int cpu)
        rdmsr(MSR_AMD64_PATCH_LEVEL, rev, dummy);
 
        if (rev < mc->hdr.patch_id) {
-               if (!__apply_microcode_amd(mc, p->size))
+               if (__apply_microcode_amd(mc, p->size))
                        pr_info_once("reload revision: 0x%08x\n", mc->hdr.patch_id);
        }
 }
@@ -818,7 +818,7 @@ static enum ucode_state apply_microcode_amd(int cpu)
                goto out;
        }
 
-       if (__apply_microcode_amd(mc_amd, p->size)) {
+       if (!__apply_microcode_amd(mc_amd, p->size)) {
                pr_err("CPU%d: update failed for patch_level=0x%08x\n",
                        cpu, mc_amd->hdr.patch_id);
                return UCODE_ERROR;