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

Commit 1c2b443e authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'microcode-fix-for-3.4' of... 

Merge tag 'microcode-fix-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

 into x86/urgent

Pull from Borislav Petkov a two-patch fix from Andreas taking care of a sysfs
warning when the microcode driver is loaded on unsupported platforms.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 668ce0ac 283c1f25

arch/x86/kernel/microcode_amd.c

+7 −5
Original line number Original line Diff line number Diff line
@@ -82,11 +82,6 @@ static int collect_cpu_info_amd(int cpu, struct cpu_signature *csig) 
{

{

	struct cpuinfo_x86 *c = &cpu_data(cpu);

	struct cpuinfo_x86 *c = &cpu_data(cpu);





	if (c->x86_vendor != X86_VENDOR_AMD || c->x86 < 0x10) {

		pr_warning("CPU%d: family %d not supported\n", cpu, c->x86);

		return -1;

	}



	csig->rev = c->microcode;

	csig->rev = c->microcode;

	pr_info("CPU%d: patch_level=0x%08x\n", cpu, csig->rev);

	pr_info("CPU%d: patch_level=0x%08x\n", cpu, csig->rev);
@@ -380,6 +375,13 @@ static struct microcode_ops microcode_amd_ops = { 




struct microcode_ops * __init init_amd_microcode(void)

struct microcode_ops * __init init_amd_microcode(void)

{

{

	struct cpuinfo_x86 *c = &cpu_data(0);



	if (c->x86_vendor != X86_VENDOR_AMD || c->x86 < 0x10) {

		pr_warning("AMD CPU family 0x%x not supported\n", c->x86);

		return NULL;

	}



	patch = (void *)get_zeroed_page(GFP_KERNEL);

	patch = (void *)get_zeroed_page(GFP_KERNEL);

	if (!patch)

	if (!patch)

		return NULL;

		return NULL;

arch/x86/kernel/microcode_core.c

+4 −6
Original line number Original line Diff line number Diff line
@@ -419,10 +419,8 @@ static int mc_device_add(struct device *dev, struct subsys_interface *sif) 
	if (err)

	if (err)

		return err;

		return err;





	if (microcode_init_cpu(cpu) == UCODE_ERROR) {

	if (microcode_init_cpu(cpu) == UCODE_ERROR)

		sysfs_remove_group(&dev->kobj, &mc_attr_group);

		return -EINVAL;

		return -EINVAL;

	}





	return err;

	return err;

}

}
@@ -528,11 +526,11 @@ static int __init microcode_init(void) 
		microcode_ops = init_intel_microcode();

		microcode_ops = init_intel_microcode();

	else if (c->x86_vendor == X86_VENDOR_AMD)

	else if (c->x86_vendor == X86_VENDOR_AMD)

		microcode_ops = init_amd_microcode();

		microcode_ops = init_amd_microcode();



	else

	if (!microcode_ops) {

		pr_err("no support for this CPU vendor\n");

		pr_err("no support for this CPU vendor\n");



	if (!microcode_ops)

		return -ENODEV;

		return -ENODEV;

	}





	microcode_pdev = platform_device_register_simple("microcode", -1,

	microcode_pdev = platform_device_register_simple("microcode", -1,

							 NULL, 0);

							 NULL, 0);