|
Packit |
863535 |
From 854857f5944c59a881ff607b37ed9ed41d031a3b Mon Sep 17 00:00:00 2001
|
|
Packit |
863535 |
From: Borislav Petkov <bp@suse.de>
|
|
Packit |
863535 |
Date: Wed, 28 Feb 2018 11:28:40 +0100
|
|
Packit |
863535 |
Subject: x86/microcode: Get rid of struct apply_microcode_ctx
|
|
Packit |
863535 |
|
|
Packit |
863535 |
It is a useless remnant from earlier times. Use the ucode_state enum
|
|
Packit |
863535 |
directly.
|
|
Packit |
863535 |
|
|
Packit |
863535 |
No functional change.
|
|
Packit |
863535 |
|
|
Packit |
863535 |
Signed-off-by: Borislav Petkov <bp@suse.de>
|
|
Packit |
863535 |
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
Packit |
863535 |
Tested-by: Tom Lendacky <thomas.lendacky@amd.com>
|
|
Packit |
863535 |
Tested-by: Ashok Raj <ashok.raj@intel.com>
|
|
Packit |
863535 |
Cc: Arjan Van De Ven <arjan.van.de.ven@intel.com>
|
|
Packit |
863535 |
Link: https://lkml.kernel.org/r/20180228102846.13447-2-bp@alien8.de
|
|
Packit |
863535 |
---
|
|
Packit |
863535 |
arch/x86/kernel/cpu/microcode/core.c | 19 ++++++++-----------
|
|
Packit |
863535 |
1 file changed, 8 insertions(+), 11 deletions(-)
|
|
Packit |
863535 |
|
|
Packit |
863535 |
diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
|
|
Packit |
863535 |
index aa1b9a4..6337065 100644
|
|
Packit |
863535 |
--- a/arch/x86/kernel/cpu/microcode/core.c
|
|
Packit |
863535 |
+++ b/arch/x86/kernel/cpu/microcode/core.c
|
|
Packit |
863535 |
@@ -373,26 +373,23 @@ static int collect_cpu_info(int cpu)
|
|
Packit |
863535 |
return ret;
|
|
Packit |
863535 |
}
|
|
Packit |
863535 |
|
|
Packit |
863535 |
-struct apply_microcode_ctx {
|
|
Packit |
863535 |
- enum ucode_state err;
|
|
Packit |
863535 |
-};
|
|
Packit |
863535 |
-
|
|
Packit |
863535 |
static void apply_microcode_local(void *arg)
|
|
Packit |
863535 |
{
|
|
Packit |
863535 |
- struct apply_microcode_ctx *ctx = arg;
|
|
Packit |
863535 |
+ enum ucode_state *err = arg;
|
|
Packit |
863535 |
|
|
Packit |
863535 |
- ctx->err = microcode_ops->apply_microcode(smp_processor_id());
|
|
Packit |
863535 |
+ *err = microcode_ops->apply_microcode(smp_processor_id());
|
|
Packit |
863535 |
}
|
|
Packit |
863535 |
|
|
Packit |
863535 |
static int apply_microcode_on_target(int cpu)
|
|
Packit |
863535 |
{
|
|
Packit |
863535 |
- struct apply_microcode_ctx ctx = { .err = 0 };
|
|
Packit |
863535 |
+ enum ucode_state err;
|
|
Packit |
863535 |
int ret;
|
|
Packit |
863535 |
|
|
Packit |
863535 |
- ret = smp_call_function_single(cpu, apply_microcode_local, &ctx, 1);
|
|
Packit |
863535 |
- if (!ret)
|
|
Packit |
863535 |
- ret = ctx.err;
|
|
Packit |
863535 |
-
|
|
Packit |
863535 |
+ ret = smp_call_function_single(cpu, apply_microcode_local, &err, 1);
|
|
Packit |
863535 |
+ if (!ret) {
|
|
Packit |
863535 |
+ if (err == UCODE_ERROR)
|
|
Packit |
863535 |
+ ret = 1;
|
|
Packit |
863535 |
+ }
|
|
Packit |
863535 |
return ret;
|
|
Packit |
863535 |
}
|
|
Packit |
863535 |
|
|
Packit |
863535 |
--
|
|
Packit |
863535 |
cgit v1.1
|
|
Packit |
863535 |
|