The following commit has been merged into the x86/microcode branch of tip:
Commit-ID: 2e6ff4052d89ff9eeaddece14ba88c40bf8b2721
Gitweb: https://git.kernel.org/tip/2e6ff4052d89ff9eeaddece14ba88c40bf8b2721
Author: Borislav Petkov <bp@xxxxxxx>
AuthorDate: Wed, 19 Oct 2022 19:20:47 +02:00
Committer: Borislav Petkov <bp@xxxxxxx>
CommitterDate: Wed, 02 Nov 2022 16:45:46 +01:00
x86/microcode: Do some minor fixups
Improve debugging printks and fixup formatting.
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Reviewed-by: Ashok Raj <ashok.raj@xxxxxxxxx>
Link: https://lore.kernel.org/r/20221028142638.28498-5-bp@xxxxxxxxx
---
arch/x86/kernel/cpu/microcode/core.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
index 7c41e01..ffb249c 100644
--- a/arch/x86/kernel/cpu/microcode/core.c
+++ b/arch/x86/kernel/cpu/microcode/core.c
@@ -568,6 +568,8 @@ 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;
}
@@ -590,7 +592,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("CPU%d removed\n", cpu);
+ pr_debug("%s: CPU%d\n", __func__, cpu);
return 0;
}
@@ -639,14 +641,11 @@ static 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;
|