[PATCH] x86/microcode: Don't duplicate code to update ucode cpu info and cpu info

[Filippo Sironi]

... on late microcode loading when handling a CPU that's already been
updated and a CPU that's yet to be updated.

Signed-off-by: Filippo Sironi <sir...@amazon.de>
---
 arch/x86/kernel/cpu/microcode/amd.c   | 15 +++++++++------
 arch/x86/kernel/cpu/microcode/intel.c | 10 ++++++----
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/arch/x86/kernel/cpu/microcode/amd.c 
b/arch/x86/kernel/cpu/microcode/amd.c
index 0624957aa068..77758e10f16f 100644
--- a/arch/x86/kernel/cpu/microcode/amd.c
+++ b/arch/x86/kernel/cpu/microcode/amd.c
@@ -505,6 +505,7 @@ static enum ucode_state apply_microcode_amd(int cpu)
        struct ucode_cpu_info *uci;
        struct ucode_patch *p;
        u32 rev, dummy;
+       enum ucode_state ret;
 
        BUG_ON(raw_smp_processor_id() != cpu);
 
@@ -521,9 +522,8 @@ static enum ucode_state apply_microcode_amd(int cpu)
 
        /* need to apply patch? */
        if (rev >= mc_amd->hdr.patch_id) {
-               c->microcode = rev;
-               uci->cpu_sig.rev = rev;
-               return UCODE_OK;
+               ret = UCODE_OK;
+               goto out;
        }
 
        if (__apply_microcode_amd(mc_amd)) {
@@ -534,10 +534,13 @@ static enum ucode_state apply_microcode_amd(int cpu)
        pr_info("CPU%d: new patch_level=0x%08x\n", cpu,
                mc_amd->hdr.patch_id);
 
-       uci->cpu_sig.rev = mc_amd->hdr.patch_id;
-       c->microcode = mc_amd->hdr.patch_id;
+       ret = UCODE_UPDATED;
+       rev = mc_amd->hdr.patch_id;
+out:
+       uci->cpu_sig.rev = rev;
+       c->microcode = rev;
 
-       return UCODE_UPDATED;
+       return ret;
 }
 
 static int install_equiv_cpu_table(const u8 *buf)
diff --git a/arch/x86/kernel/cpu/microcode/intel.c 
b/arch/x86/kernel/cpu/microcode/intel.c
index 97ccf4c3b45b..4bc869e829eb 100644
--- a/arch/x86/kernel/cpu/microcode/intel.c
+++ b/arch/x86/kernel/cpu/microcode/intel.c
@@ -797,6 +797,7 @@ static enum ucode_state apply_microcode_intel(int cpu)
        struct microcode_intel *mc;
        static int prev_rev;
        u32 rev;
+       enum ucode_state ret;
 
        /* We should bind the task to the CPU */
        if (WARN_ON(raw_smp_processor_id() != cpu))
@@ -817,9 +818,8 @@ static enum ucode_state apply_microcode_intel(int cpu)
         */
        rev = intel_get_microcode_revision();
        if (rev >= mc->hdr.rev) {
-               uci->cpu_sig.rev = rev;
-               c->microcode = rev;
-               return UCODE_OK;
+               ret = UCODE_OK;
+               goto out;
        }
 
        /*
@@ -848,10 +848,12 @@ static enum ucode_state apply_microcode_intel(int cpu)
                prev_rev = rev;
        }
 
+       ret = UCODE_UPDATED;
+out:
        uci->cpu_sig.rev = rev;
        c->microcode = rev;
 
-       return UCODE_UPDATED;
+       return ret;
 }
 
 static enum ucode_state generic_load_microcode(int cpu, void *data, size_t 
size,
-- 
2.7.4