Commit 2355370c authored by Borislav Petkov (AMD)'s avatar Borislav Petkov (AMD)
Browse files

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



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
parent 25d0dc4b

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

+4 −15
Original line number Diff line number Diff line
@@ -553,8 +553,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)

{
@@ -572,7 +571,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;
@@ -851,8 +850,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;
@@ -876,10 +874,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));
@@ -906,14 +900,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);
@@ -926,7 +915,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);