[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <09cccdaaf4683cc962db83b0ea7523ee99381f1b.1529424596.git.mail@maciej.szmigiero.name>
Date: Tue, 19 Jun 2018 20:47:38 +0200
From: "Maciej S. Szmigiero" <mail@...iej.szmigiero.name>
To: Borislav Petkov <bp@...en8.de>
Cc: Thomas Gleixner <tglx@...utronix.de>,
Ingo Molnar <mingo@...hat.com>,
"H. Peter Anvin" <hpa@...or.com>, x86@...nel.org,
linux-kernel@...r.kernel.org
Subject: [PATCH v7 8/9] x86/microcode/AMD: Convert CPU equivalence table variable into a struct
Convert pointer to CPU equivalence table global static variable into a
struct descriptor in preparation for tracking also the size of this table.
Signed-off-by: Maciej S. Szmigiero <mail@...iej.szmigiero.name>
---
arch/x86/kernel/cpu/microcode/amd.c | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c
index 9807e27f8fde..10aabd9d3121 100644
--- a/arch/x86/kernel/cpu/microcode/amd.c
+++ b/arch/x86/kernel/cpu/microcode/amd.c
@@ -38,7 +38,9 @@
#include <asm/cpu.h>
#include <asm/msr.h>
-static struct equiv_cpu_entry *equiv_cpu_table;
+static struct equiv_cpu_table {
+ struct equiv_cpu_entry *table;
+} equiv_table;
/*
* This points to the current valid container of microcode patches which we will
@@ -581,18 +583,18 @@ void reload_ucode_amd(void)
static u16 __find_equiv_id(unsigned int cpu)
{
struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
- return find_equiv_id(equiv_cpu_table, uci->cpu_sig.sig);
+ return find_equiv_id(equiv_table.table, uci->cpu_sig.sig);
}
static u32 find_cpu_family_by_equiv_cpu(u16 equiv_cpu)
{
int i = 0;
- BUG_ON(!equiv_cpu_table);
+ BUG_ON(!equiv_table.table);
- while (equiv_cpu_table[i].equiv_cpu != 0) {
- if (equiv_cpu == equiv_cpu_table[i].equiv_cpu)
- return equiv_cpu_table[i].installed_cpu;
+ while (equiv_table.table[i].equiv_cpu != 0) {
+ if (equiv_cpu == equiv_table.table[i].equiv_cpu)
+ return equiv_table.table[i].installed_cpu;
i++;
}
return 0;
@@ -731,21 +733,21 @@ static unsigned int install_equiv_cpu_table(const u8 *buf, size_t buf_size)
hdr = (const u32 *)buf;
equiv_tbl_len = hdr[2];
- equiv_cpu_table = vmalloc(equiv_tbl_len);
- if (!equiv_cpu_table) {
+ equiv_table.table = vmalloc(equiv_tbl_len);
+ if (!equiv_table.table) {
pr_err("failed to allocate equivalent CPU table\n");
return 0;
}
- memcpy(equiv_cpu_table, buf + CONTAINER_HDR_SZ, equiv_tbl_len);
+ memcpy(equiv_table.table, buf + CONTAINER_HDR_SZ, equiv_tbl_len);
return equiv_tbl_len;
}
static void free_equiv_cpu_table(void)
{
- vfree(equiv_cpu_table);
- equiv_cpu_table = NULL;
+ vfree(equiv_table.table);
+ equiv_table.table = NULL;
}
static void cleanup(void)
Powered by blists - more mailing lists