Commit baacd328 authored by Aichun Shi's avatar Aichun Shi
Browse files

Revert "x86/microcode: Do some minor fixups" 

Intel inclusion
category: feature
feature: Backport Intel In Field Scan(IFS) multi-blob images support
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I6L337


CVE: N/A
Reference: N/A

Intel-SIG: Revert commit 7e92c727 ("x86/microcode: Do some minor
fixups")

-------------------------------------

This reverts commit 7e92c727.

This revert is to recover old microcode interface /dev/cpu/microcode.

Signed-off-by: default avatarAichun Shi <aichun.shi@intel.com>
parent 4ea418b3

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

+6 −5
Original line number Diff line number Diff line
@@ -585,8 +585,6 @@ static int mc_cpu_starting(unsigned int cpu) 
{

	enum ucode_state err = microcode_ops->apply_microcode(cpu);



	pr_debug("%s: CPU%d, err: %d\n", __func__, cpu, err);



	return err == UCODE_ERROR;

}
@@ -609,7 +607,7 @@ static int mc_cpu_down_prep(unsigned int cpu) 


	/* Suspend is in progress, only remove the interface */

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

	pr_debug("%s: CPU%d\n", __func__, cpu);

	pr_debug("CPU%d removed\n", cpu);



	return 0;

}
@@ -658,11 +656,14 @@ int __init microcode_init(void) 
	if (!microcode_ops)

		return -ENODEV;



	microcode_pdev = platform_device_register_simple("microcode", -1, NULL, 0);

	microcode_pdev = platform_device_register_simple("microcode", -1,

							 NULL, 0);

	if (IS_ERR(microcode_pdev))

		return PTR_ERR(microcode_pdev);



	error = sysfs_create_group(&cpu_subsys.dev_root->kobj, &cpu_root_microcode_group);

	error = sysfs_create_group(&cpu_subsys.dev_root->kobj,

				   &cpu_root_microcode_group);



	if (error) {

		pr_err("Error creating microcode group!\n");

		goto out_pdev;