x86/microcode/AMD: Get rid of global this_equiv_id

We have a container which we update/prepare each time before applying a
microcode patch instead of using a global.

Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20170120202955.4091-10-bp@alien8.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c
index 9fb398e64b0aa036c8c49d3ae3c6cf814651f1f0..4cbfe70cf458e89b85d3a9698eb1ebfe84567de5 100644 (file)
--- a/arch/x86/kernel/cpu/microcode/amd.c
+++ b/arch/x86/kernel/cpu/microcode/amd.c
@@ -56,7 +56,6 @@ static struct cont_desc {
 
 static u32 ucode_new_rev;
 static u8 amd_ucode_patch[PATCH_MAX_SIZE];
-static u16 this_equiv_id;
 
 /*
  * Microcode patch container file is prepended to the initrd in cpio
@@ -228,8 +227,6 @@ apply_microcode_early_amd(u32 cpuid_1_eax, void *ucode, size_t size,
        if (!desc.eq_id)
                return ret;
 
-       this_equiv_id = desc.eq_id;
-
        mc = desc.mc;
        if (!mc)
                return ret;
@@ -375,7 +372,7 @@ reget:
        if (!eq_id)
                return;
 
-       if (eq_id == this_equiv_id) {
+       if (eq_id == cont.eq_id) {
                mc = (struct microcode_amd *)amd_ucode_patch;
 
                if (mc && rev < mc->hdr.patch_id) {