提交 7e92c727 编写于 作者: B Borislav Petkov 提交者: Aichun Shi

x86/microcode: Do some minor fixups

mainline inclusion
from mainline-v6.2-rc1
commit 2e6ff405
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: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/
commit/?id=2e6ff405

Intel-SIG: commit 2e6ff405 ("x86/microcode: Do some minor fixups")

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

x86/microcode: Do some minor fixups

Improve debugging printks and fixup formatting.
Signed-off-by: NBorislav Petkov <bp@suse.de>
Reviewed-by: NAshok Raj <ashok.raj@intel.com>
Link: https://lore.kernel.org/r/20221028142638.28498-5-bp@alien8.deSigned-off-by: NAichun Shi <aichun.shi@intel.com>
上级 8b0c0efc
...@@ -585,6 +585,8 @@ static int mc_cpu_starting(unsigned int cpu) ...@@ -585,6 +585,8 @@ static int mc_cpu_starting(unsigned int cpu)
{ {
enum ucode_state err = microcode_ops->apply_microcode(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; return err == UCODE_ERROR;
} }
...@@ -607,7 +609,7 @@ static int mc_cpu_down_prep(unsigned int cpu) ...@@ -607,7 +609,7 @@ static int mc_cpu_down_prep(unsigned int cpu)
/* Suspend is in progress, only remove the interface */ /* Suspend is in progress, only remove the interface */
sysfs_remove_group(&dev->kobj, &mc_attr_group); sysfs_remove_group(&dev->kobj, &mc_attr_group);
pr_debug("CPU%d removed\n", cpu); pr_debug("%s: CPU%d\n", __func__, cpu);
return 0; return 0;
} }
...@@ -656,14 +658,11 @@ int __init microcode_init(void) ...@@ -656,14 +658,11 @@ int __init microcode_init(void)
if (!microcode_ops) 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);
if (IS_ERR(microcode_pdev)) if (IS_ERR(microcode_pdev))
return PTR_ERR(microcode_pdev); return PTR_ERR(microcode_pdev);
error = sysfs_create_group(&cpu_subsys.dev_root->kobj, error = sysfs_create_group(&cpu_subsys.dev_root->kobj, &cpu_root_microcode_group);
&cpu_root_microcode_group);
if (error) { if (error) {
pr_err("Error creating microcode group!\n"); pr_err("Error creating microcode group!\n");
goto out_pdev; goto out_pdev;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册