Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c26edf2 authored by Borislav Petkov (AMD)'s avatar Borislav Petkov (AMD) Committed by Greg Kroah-Hartman
Browse files

x86/microcode/amd: Remove load_microcode_amd()'s bsp parameter 



commit 2355370cd941cbb20882cc3f34460f9f2b8f9a18 upstream.

It is always the BSP.

No functional changes.

Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20230130161709.11615-2-bp@alien8.de


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a0415b79

arch/x86/kernel/cpu/microcode/amd.c

+5 −12
Original line number Diff line number Diff line
@@ -548,8 +548,7 @@ void load_ucode_amd_ap(unsigned int cpuid_1_eax) 
	apply_microcode_early_amd(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)

{
@@ -567,7 +566,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;
@@ -845,8 +844,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;
@@ -870,10 +868,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, p->size, PATCH_MAX_SIZE));
@@ -901,12 +895,11 @@ 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 (!refresh_fw || !bsp)

	if (!refresh_fw)

		return UCODE_OK;



	if (c->x86 >= 0x15)
@@ -921,7 +914,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);