Skip to content

Commit eb50ccb

Browse files
bp3tk0vgregkh
authored andcommitted
x86/microcode/AMD: Have __apply_microcode_amd() return bool
commit 78e0aad 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>
1 parent 41f1230 commit eb50ccb

File tree

1 file changed

+6
-6
lines changed
  • arch/x86/kernel/cpu/microcode

1 file changed

+6
-6
lines changed

arch/x86/kernel/cpu/microcode/amd.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ static void scan_containers(u8 *ucode, size_t size, struct cont_desc *desc)
484484
}
485485
}
486486

487-
static int __apply_microcode_amd(struct microcode_amd *mc, unsigned int psize)
487+
static bool __apply_microcode_amd(struct microcode_amd *mc, unsigned int psize)
488488
{
489489
unsigned long p_addr = (unsigned long)&mc->hdr.data_code;
490490
u32 rev, dummy;
@@ -508,9 +508,9 @@ static int __apply_microcode_amd(struct microcode_amd *mc, unsigned int psize)
508508
native_rdmsr(MSR_AMD64_PATCH_LEVEL, rev, dummy);
509509

510510
if (rev != mc->hdr.patch_id)
511-
return -1;
511+
return false;
512512

513-
return 0;
513+
return true;
514514
}
515515

516516
/*
@@ -544,7 +544,7 @@ static bool early_apply_microcode(u32 old_rev, void *ucode, size_t size)
544544
if (old_rev > mc->hdr.patch_id)
545545
return ret;
546546

547-
return !__apply_microcode_amd(mc, desc.psize);
547+
return __apply_microcode_amd(mc, desc.psize);
548548
}
549549

550550
static bool get_builtin_microcode(struct cpio_data *cp)
@@ -763,7 +763,7 @@ void reload_ucode_amd(unsigned int cpu)
763763
rdmsr(MSR_AMD64_PATCH_LEVEL, rev, dummy);
764764

765765
if (rev < mc->hdr.patch_id) {
766-
if (!__apply_microcode_amd(mc, p->size))
766+
if (__apply_microcode_amd(mc, p->size))
767767
pr_info_once("reload revision: 0x%08x\n", mc->hdr.patch_id);
768768
}
769769
}
@@ -816,7 +816,7 @@ static enum ucode_state apply_microcode_amd(int cpu)
816816
goto out;
817817
}
818818

819-
if (__apply_microcode_amd(mc_amd, p->size)) {
819+
if (!__apply_microcode_amd(mc_amd, p->size)) {
820820
pr_err("CPU%d: update failed for patch_level=0x%08x\n",
821821
cpu, mc_amd->hdr.patch_id);
822822
return UCODE_ERROR;

0 commit comments

Comments
 (0)