mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86/smp: Replace cpu_up/down() with add/remove_cpu()

Browse Source 
The core device API performs extra housekeeping bits that are missing
from directly calling cpu_up/down().

See commit a6717c01dd ("powerpc/rtas: use device model APIs and
serialization during LPM") for an example description of what might go
wrong.

This also prepares to make cpu_up/down() a private interface of the CPU
subsystem.

Signed-off-by: Qais Yousef <qais.yousef@arm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20200323135110.30522-10-qais.yousef@arm.com
This commit is contained in:
Qais Yousef
2020-03-23 13:51:02 +00:00
committed by Thomas Gleixner
parent e646ac5bb8
commit af7aa04683
3 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
arch/x86/kernel/topology.c
View File

@@ -59,39 +59,29 @@ __setup("cpu0_hotplug", enable_cpu0_hotplug);
*/ */
int _debug_hotplug_cpu(int cpu, int action) int _debug_hotplug_cpu(int cpu, int action)
{ {
struct device *dev = get_cpu_device(cpu);
int ret; int ret;
if (!cpu_is_hotpluggable(cpu)) if (!cpu_is_hotpluggable(cpu))
return -EINVAL; return -EINVAL;
lock_device_hotplug();
switch (action) { switch (action) {
case 0: case 0:
ret = cpu_down(cpu); ret = remove_cpu(cpu);
if (!ret) { if (!ret)
pr_info("DEBUG_HOTPLUG_CPU0: CPU %u is now offline\n", cpu); pr_info("DEBUG_HOTPLUG_CPU0: CPU %u is now offline\n", cpu);
dev->offline = true; else
kobject_uevent(&dev->kobj, KOBJ_OFFLINE);
} else
pr_debug("Can't offline CPU%d.\n", cpu); pr_debug("Can't offline CPU%d.\n", cpu);
break; break;
case 1: case 1:
ret = cpu_up(cpu); ret = add_cpu(cpu);
if (!ret) { if (ret)
dev->offline = false;
kobject_uevent(&dev->kobj, KOBJ_ONLINE);
} else {
pr_debug("Can't online CPU%d.\n", cpu); pr_debug("Can't online CPU%d.\n", cpu);
}
break; break;
default: default:
ret = -EINVAL; ret = -EINVAL;
} }
unlock_device_hotplug();
return ret; return ret;
} }

4
arch/x86/mm/mmio-mod.c
View File

@@ -386,7 +386,7 @@ static void enter_uniprocessor(void)
put_online_cpus(); put_online_cpus();
for_each_cpu(cpu, downed_cpus) { for_each_cpu(cpu, downed_cpus) {
err = cpu_down(cpu); err = remove_cpu(cpu);
if (!err) if (!err)
pr_info("CPU%d is down.\n", cpu); pr_info("CPU%d is down.\n", cpu);
else else
@@ -406,7 +406,7 @@ static void leave_uniprocessor(void)
return; return;
pr_notice("Re-enabling CPUs...\n"); pr_notice("Re-enabling CPUs...\n");
for_each_cpu(cpu, downed_cpus) { for_each_cpu(cpu, downed_cpus) {
err = cpu_up(cpu); err = add_cpu(cpu);
if (!err) if (!err)
pr_info("enabled CPU%d.\n", cpu); pr_info("enabled CPU%d.\n", cpu);
else else

2
arch/x86/xen/smp.c
View File

@@ -132,7 +132,7 @@ void __init xen_smp_cpus_done(unsigned int max_cpus)
if (xen_vcpu_nr(cpu) < MAX_VIRT_CPUS) if (xen_vcpu_nr(cpu) < MAX_VIRT_CPUS)
continue; continue;
rc = cpu_down(cpu); rc = remove_cpu(cpu);
if (rc == 0) { if (rc == 0) {
/* /*