UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86/microcode: Convert to hotplug state machine 

Install the callbacks via the state machine. 
CPU_UP_CANCELED_FROZEN() is not preserved: It is only there to free memory in an
error case because it is assumed if the CPU does show up on resume it won't be
seen ever again. As per Borislav:
|IOW, you don't need mc_cpu_dead().

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: rt@linutronix.de
Link: http://lkml.kernel.org/r/20160907164523.46a2xnffha4bv63g@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Sebastian Andrzej Siewior 2016-09-07 18:45:23 +02:00 committed by Thomas Gleixner
parent 515332336b
commit 29bd7fbc07
1 changed files with 17 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
arch/x86/kernel/cpu/microcode/core.c
View File

@ -558,55 +558,36 @@ static struct syscore_ops mc_syscore_ops = {
.resume = mc_bp_resume, .resume = mc_bp_resume,
}; };
static int static int mc_cpu_online(unsigned int cpu)
mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
{ {
unsigned int cpu = (unsigned long)hcpu;
struct device *dev; struct device *dev;
dev = get_cpu_device(cpu); dev = get_cpu_device(cpu);
microcode_update_cpu(cpu);
pr_debug("CPU%d added\n", cpu);
switch (action & ~CPU_TASKS_FROZEN) { if (sysfs_create_group(&dev->kobj, &mc_attr_group))
case CPU_ONLINE: pr_err("Failed to create group for CPU%d\n", cpu);
microcode_update_cpu(cpu); return 0;
pr_debug("CPU%d added\n", cpu); }
/*
* "break" is missing on purpose here because we want to fall
* through in order to create the sysfs group.
*/
case CPU_DOWN_FAILED: static int mc_cpu_down_prep(unsigned int cpu)
if (sysfs_create_group(&dev->kobj, &mc_attr_group)) {
pr_err("Failed to create group for CPU%d\n", cpu); struct device *dev;
break;
case CPU_DOWN_PREPARE:
/* Suspend is in progress, only remove the interface */
sysfs_remove_group(&dev->kobj, &mc_attr_group);
pr_debug("CPU%d removed\n", cpu);
break;
dev = get_cpu_device(cpu);
/* Suspend is in progress, only remove the interface */
sysfs_remove_group(&dev->kobj, &mc_attr_group);
pr_debug("CPU%d removed\n", cpu);
/* /*
* case CPU_DEAD:
*
* When a CPU goes offline, don't free up or invalidate the copy of * When a CPU goes offline, don't free up or invalidate the copy of
* the microcode in kernel memory, so that we can reuse it when the * the microcode in kernel memory, so that we can reuse it when the
* CPU comes back online without unnecessarily requesting the userspace * CPU comes back online without unnecessarily requesting the userspace
* for it again. * for it again.
*/ */
} return 0;
/* The CPU refused to come up during a system resume */
if (action == CPU_UP_CANCELED_FROZEN)
microcode_fini_cpu(cpu);
return NOTIFY_OK;
} }
static struct notifier_block mc_cpu_notifier = {
.notifier_call = mc_cpu_callback,
};
static struct attribute *cpu_root_microcode_attrs[] = { static struct attribute *cpu_root_microcode_attrs[] = {
&dev_attr_reload.attr, &dev_attr_reload.attr,
NULL NULL
@ -665,7 +646,8 @@ int __init microcode_init(void)
goto out_ucode_group; goto out_ucode_group;
register_syscore_ops(&mc_syscore_ops); register_syscore_ops(&mc_syscore_ops);
register_hotcpu_notifier(&mc_cpu_notifier); cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, "x86/microcode:online",
mc_cpu_online, mc_cpu_down_prep);
pr_info("Microcode Update Driver: v" MICROCODE_VERSION pr_info("Microcode Update Driver: v" MICROCODE_VERSION
" <tigran@aivazian.fsnet.co.uk>, Peter Oruba\n"); " <tigran@aivazian.fsnet.co.uk>, Peter Oruba\n");