forked from rpms/kernel
89 lines
3.3 KiB
Diff
89 lines
3.3 KiB
Diff
|
From f93ce31159692d4be33e05f6a63361c7b9a29292 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Borislav Petkov <bp@suse.de>
|
||
|
|
Date: Wed, 19 Oct 2022 19:16:20 +0200
|
||
|
|
Subject: [PATCH 18/36] x86/microcode: Kill refresh_fw
|
||
|
|
|
||
|
|
request_microcode_fw() can always request firmware now so drop this
|
||
|
|
superfluous argument.
|
||
|
|
|
||
|
|
Signed-off-by: Borislav Petkov <bp@suse.de>
|
||
|
|
Reviewed-by: Ashok Raj <ashok.raj@intel.com>
|
||
|
|
Link: https://lore.kernel.org/r/20221028142638.28498-4-bp@alien8.de
|
||
|
|
(cherry picked from commit a61ac80ae52ea349416472cd52005f9988537208)
|
||
|
|
Signed-off-by: Mridula Shastry <mridula.c.shastry@oracle.com>
|
||
|
|
Reviewed-by: Todd Vierling <todd.vierling@oracle.com>
|
||
|
|
---
|
||
|
|
arch/x86/include/asm/microcode.h | 3 +--
|
||
|
|
arch/x86/kernel/cpu/microcode/amd.c | 5 ++---
|
||
|
|
arch/x86/kernel/cpu/microcode/core.c | 2 +-
|
||
|
|
arch/x86/kernel/cpu/microcode/intel.c | 3 +--
|
||
|
|
4 files changed, 5 insertions(+), 8 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h
|
||
|
|
index 215ea340e7f9..af1ba544c800 100644
|
||
|
|
--- a/arch/x86/include/asm/microcode.h
|
||
|
|
+++ b/arch/x86/include/asm/microcode.h
|
||
|
|
@@ -32,8 +32,7 @@ enum ucode_state {
|
||
|
|
};
|
||
|
|
|
||
|
|
struct microcode_ops {
|
||
|
|
- enum ucode_state (*request_microcode_fw) (int cpu, struct device *,
|
||
|
|
- bool refresh_fw);
|
||
|
|
+ enum ucode_state (*request_microcode_fw) (int cpu, struct device *);
|
||
|
|
|
||
|
|
void (*microcode_fini_cpu) (int cpu);
|
||
|
|
|
||
|
|
diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c
|
||
|
|
index 9d15b7e5a13e..381addff7fc8 100644
|
||
|
|
--- a/arch/x86/kernel/cpu/microcode/amd.c
|
||
|
|
+++ b/arch/x86/kernel/cpu/microcode/amd.c
|
||
|
|
@@ -895,8 +895,7 @@ load_microcode_amd(bool save, u8 family, const u8 *data, size_t size)
|
||
|
|
*
|
||
|
|
* These might be larger than 2K.
|
||
|
|
*/
|
||
|
|
-static enum ucode_state request_microcode_amd(int cpu, struct device *device,
|
||
|
|
- bool refresh_fw)
|
||
|
|
+static enum ucode_state request_microcode_amd(int cpu, struct device *device)
|
||
|
|
{
|
||
|
|
char fw_name[36] = "amd-ucode/microcode_amd.bin";
|
||
|
|
struct cpuinfo_x86 *c = &cpu_data(cpu);
|
||
|
|
@@ -905,7 +904,7 @@ static enum ucode_state request_microcode_amd(int cpu, struct device *device,
|
||
|
|
const struct firmware *fw;
|
||
|
|
|
||
|
|
/* reload ucode container only on the boot cpu */
|
||
|
|
- if (!refresh_fw || !bsp)
|
||
|
|
+ if (!bsp)
|
||
|
|
return UCODE_OK;
|
||
|
|
|
||
|
|
if (c->x86 >= 0x15)
|
||
|
|
diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
|
||
|
|
index fb383088bede..3d4c2c1aae11 100644
|
||
|
|
--- a/arch/x86/kernel/cpu/microcode/core.c
|
||
|
|
+++ b/arch/x86/kernel/cpu/microcode/core.c
|
||
|
|
@@ -506,7 +506,7 @@ static ssize_t reload_store(struct device *dev,
|
||
|
|
if (ret)
|
||
|
|
goto put;
|
||
|
|
|
||
|
|
- tmp_ret = microcode_ops->request_microcode_fw(bsp, µcode_pdev->dev, true);
|
||
|
|
+ tmp_ret = microcode_ops->request_microcode_fw(bsp, µcode_pdev->dev);
|
||
|
|
if (tmp_ret != UCODE_NEW)
|
||
|
|
goto put;
|
||
|
|
|
||
|
|
diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
|
||
|
|
index 6fa667192bd9..818d5fa8ca20 100644
|
||
|
|
--- a/arch/x86/kernel/cpu/microcode/intel.c
|
||
|
|
+++ b/arch/x86/kernel/cpu/microcode/intel.c
|
||
|
|
@@ -921,8 +921,7 @@ static bool is_blacklisted(unsigned int cpu)
|
||
|
|
return false;
|
||
|
|
}
|
||
|
|
|
||
|
|
-static enum ucode_state request_microcode_fw(int cpu, struct device *device,
|
||
|
|
- bool refresh_fw)
|
||
|
|
+static enum ucode_state request_microcode_fw(int cpu, struct device *device)
|
||
|
|
{
|
||
|
|
struct cpuinfo_x86 *c = &cpu_data(cpu);
|
||
|
|
const struct firmware *firmware;
|
||
|
|
--
|
||
|
|
2.39.3
|
||
|
|
|