93 lines
3.1 KiB
Diff
93 lines
3.1 KiB
Diff
From cb425451860828e0ac0516f58a37b131f0476b3c Mon Sep 17 00:00:00 2001
|
|
From: "Borislav Petkov (AMD)" <bp@alien8.de>
|
|
Date: Tue, 17 Jan 2023 23:59:24 +0100
|
|
Subject: [PATCH 19/36] x86/microcode/amd: Remove load_microcode_amd()'s bsp
|
|
parameter
|
|
|
|
It is always the BSP.
|
|
|
|
No functional changes.
|
|
|
|
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
|
|
Link: https://lore.kernel.org/r/20230130161709.11615-2-bp@alien8.de
|
|
(cherry picked from commit 2355370cd941cbb20882cc3f34460f9f2b8f9a18)
|
|
|
|
CVE: CVE-2023-20593
|
|
Signed-off-by: Mridula Shastry <mridula.c.shastry@oracle.com>
|
|
Reviewed-by: Todd Vierling <todd.vierling@oracle.com>
|
|
---
|
|
arch/x86/kernel/cpu/microcode/amd.c | 19 ++++---------------
|
|
1 file changed, 4 insertions(+), 15 deletions(-)
|
|
|
|
diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c
|
|
index 381addff7fc8..68643a68fa11 100644
|
|
--- a/arch/x86/kernel/cpu/microcode/amd.c
|
|
+++ b/arch/x86/kernel/cpu/microcode/amd.c
|
|
@@ -547,8 +547,7 @@ void load_ucode_amd_ap(unsigned int cpuid_1_eax)
|
|
early_apply_microcode(cpuid_1_eax, cp.data, cp.size, false);
|
|
}
|
|
|
|
-static enum ucode_state
|
|
-load_microcode_amd(bool save, u8 family, const u8 *data, size_t size);
|
|
+static enum ucode_state load_microcode_amd(u8 family, const u8 *data, size_t size);
|
|
|
|
int __init save_microcode_in_initrd_amd(unsigned int cpuid_1_eax)
|
|
{
|
|
@@ -566,7 +565,7 @@ int __init save_microcode_in_initrd_amd(unsigned int cpuid_1_eax)
|
|
if (!desc.mc)
|
|
return -EINVAL;
|
|
|
|
- ret = load_microcode_amd(true, x86_family(cpuid_1_eax), desc.data, desc.size);
|
|
+ ret = load_microcode_amd(x86_family(cpuid_1_eax), desc.data, desc.size);
|
|
if (ret > UCODE_UPDATED)
|
|
return -EINVAL;
|
|
|
|
@@ -844,8 +843,7 @@ static enum ucode_state __load_microcode_amd(u8 family, const u8 *data,
|
|
return UCODE_OK;
|
|
}
|
|
|
|
-static enum ucode_state
|
|
-load_microcode_amd(bool save, u8 family, const u8 *data, size_t size)
|
|
+static enum ucode_state load_microcode_amd(u8 family, const u8 *data, size_t size)
|
|
{
|
|
struct ucode_patch *p;
|
|
enum ucode_state ret;
|
|
@@ -869,10 +867,6 @@ load_microcode_amd(bool save, u8 family, const u8 *data, size_t size)
|
|
ret = UCODE_NEW;
|
|
}
|
|
|
|
- /* save BSP's matching patch for early load */
|
|
- if (!save)
|
|
- return ret;
|
|
-
|
|
memset(amd_ucode_patch, 0, PATCH_MAX_SIZE);
|
|
memcpy(amd_ucode_patch, p->data, min_t(u32, ksize(p->data), PATCH_MAX_SIZE));
|
|
|
|
@@ -899,14 +893,9 @@ 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);
|
|
- bool bsp = c->cpu_index == boot_cpu_data.cpu_index;
|
|
enum ucode_state ret = UCODE_NFOUND;
|
|
const struct firmware *fw;
|
|
|
|
- /* reload ucode container only on the boot cpu */
|
|
- if (!bsp)
|
|
- return UCODE_OK;
|
|
-
|
|
if (c->x86 >= 0x15)
|
|
snprintf(fw_name, sizeof(fw_name), "amd-ucode/microcode_amd_fam%.2xh.bin", c->x86);
|
|
|
|
@@ -919,7 +908,7 @@ static enum ucode_state request_microcode_amd(int cpu, struct device *device)
|
|
if (!verify_container(fw->data, fw->size, false))
|
|
goto fw_release;
|
|
|
|
- ret = load_microcode_amd(bsp, c->x86, fw->data, fw->size);
|
|
+ ret = load_microcode_amd(c->x86, fw->data, fw->size);
|
|
|
|
fw_release:
|
|
release_firmware(fw);
|
|
--
|
|
2.39.3
|
|
|