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

From	Borislav Petkov <bp@alien8.de>
Newsgroups	linux.kernel
Subject	[PATCH 08/13] x86/microcode/AMD: Get rid of global this_equiv_id
Date	2017-01-17 18:50 +0100
Message-ID	<t0G3n-1zz-9@gated-at.bofh.it> (permalink)
References	<t0FTI-1vq-27@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

From: Borislav Petkov <bp@suse.de>

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

Signed-off-by: Borislav Petkov <bp@suse.de>
---
 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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 08/13] x86/microcode/AMD: Get rid of global this_equiv_id Borislav Petkov <bp@alien8.de> - 2017-01-17 18:50 +0100
  Re: [PATCH 08/13] x86/microcode/AMD: Get rid of global  this_equiv_id Thomas Gleixner <tglx@linutronix.de> - 2017-01-17 22:20 +0100

csiph-web