nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

drivers: base: Allow parts of GENERIC_CPU_DEVICES to be overridden

Browse source 
Architectures often have extra per-cpu work that needs doing
before a CPU is registered, often to determine if a CPU is
hotpluggable.

To allow the ACPI architectures to use GENERIC_CPU_DEVICES, move
the cpu_register() call into arch_register_cpu(), which is made __weak
so architectures with extra work can override it.
This aligns with the way x86, ia64 and loongarch register hotplug CPUs
when they become present.

Signed-off-by: James Morse <james.morse@arm.com>
Reviewed-by: Shaoqin Huang <shahuang@redhat.com>
Reviewed-by: Gavin Shan <gshan@redhat.com>
Signed-off-by: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/E1r5R3B-00Csz6-Uh@rmk-PC.armlinux.org.uk
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
James Morse 2023-11-21 13:44:25 +00:00 committed by Greg Kroah-Hartman
parent b0c69e1214
commit 0949dd96df
2 changed files with 14 additions and 4 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/base/cpu.c
View file

@ -525,19 +525,25 @@ bool cpu_is_hotpluggable(unsigned int cpu)
EXPORT_SYMBOL_GPL(cpu_is_hotpluggable); EXPORT_SYMBOL_GPL(cpu_is_hotpluggable);
#ifdef CONFIG_GENERIC_CPU_DEVICES #ifdef CONFIG_GENERIC_CPU_DEVICES
static DEFINE_PER_CPU(struct cpu, cpu_devices); DEFINE_PER_CPU(struct cpu, cpu_devices);
int __weak arch_register_cpu(int cpu)
{
return register_cpu(&per_cpu(cpu_devices, cpu), cpu);
}
#endif #endif
static void __init cpu_dev_register_generic(void) static void __init cpu_dev_register_generic(void)
{ {
#ifdef CONFIG_GENERIC_CPU_DEVICES
int i; int i;
if (!IS_ENABLED(CONFIG_GENERIC_CPU_DEVICES))
return;
for_each_present_cpu(i) { for_each_present_cpu(i) {
if (register_cpu(&per_cpu(cpu_devices, i), i)) if (arch_register_cpu(i))
panic("Failed to register CPU device"); panic("Failed to register CPU device");
} }
#endif
} }
#ifdef CONFIG_GENERIC_CPU_VULNERABILITIES #ifdef CONFIG_GENERIC_CPU_VULNERABILITIES

4
include/linux/cpu.h
View file

@ -88,6 +88,10 @@ extern ssize_t arch_cpu_probe(const char *, size_t);
extern ssize_t arch_cpu_release(const char *, size_t); extern ssize_t arch_cpu_release(const char *, size_t);
#endif #endif
#ifdef CONFIG_GENERIC_CPU_DEVICES
DECLARE_PER_CPU(struct cpu, cpu_devices);
#endif
/* /*
* These states are not related to the core CPU hotplug mechanism. They are * These states are not related to the core CPU hotplug mechanism. They are
* used by various (sub)architectures to track internal state * used by various (sub)architectures to track internal state