[PATCH 08/13] x86/microcode/AMD: Get rid of global this_equiv_id

From: Borislav Petkov
Date: Tue Jan 17 2017 - 12:41:45 EST


From: Borislav Petkov <bp@xxxxxxx>

We have a container which we update/prepare each time before applying a
patch.

Signed-off-by: Borislav Petkov <bp@xxxxxxx>
---
arch/x86/kernel/cpu/microcode/amd.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c
index 35c01243dec6..e5cb7e73cb3b 100644
--- a/arch/x86/kernel/cpu/microcode/amd.c
+++ b/arch/x86/kernel/cpu/microcode/amd.c
@@ -56,7 +56,6 @@ 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
@@ -237,8 +236,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;
@@ -384,7 +381,7 @@ void load_ucode_amd_ap(unsigned int cpuid_1_eax)
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) {
--
2.11.0