Commit 8f722f67 authored by Jan Henrik Weinstock's avatar Jan Henrik Weinstock Committed by Stafford Horne

openrisc: Use devicetree to determine present cpus

Use the device tree to determine the present cpus instead of assuming
all CONFIG_NRCPUS are actually present in the system.
Signed-off-by: default avatarJan Henrik Weinstock <jan.weinstock@rwth-aachen.de>
[shorne: Squashed 2 email commits and added summary from email]
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarStafford Horne <shorne@gmail.com>
parent 22613521
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/sched/mm.h> #include <linux/sched/mm.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/of.h>
#include <asm/cpuinfo.h> #include <asm/cpuinfo.h>
#include <asm/mmu_context.h> #include <asm/mmu_context.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
...@@ -60,22 +61,32 @@ void __init smp_prepare_boot_cpu(void) ...@@ -60,22 +61,32 @@ void __init smp_prepare_boot_cpu(void)
void __init smp_init_cpus(void) void __init smp_init_cpus(void)
{ {
int i; struct device_node *cpu;
u32 cpu_id;
for (i = 0; i < NR_CPUS; i++) for_each_of_cpu_node(cpu) {
set_cpu_possible(i, true); if (of_property_read_u32(cpu, "reg", &cpu_id)) {
pr_warn("%s missing reg property", cpu->full_name);
continue;
}
if (cpu_id < NR_CPUS)
set_cpu_possible(cpu_id, true);
}
} }
void __init smp_prepare_cpus(unsigned int max_cpus) void __init smp_prepare_cpus(unsigned int max_cpus)
{ {
int i; unsigned int cpu;
/* /*
* Initialise the present map, which describes the set of CPUs * Initialise the present map, which describes the set of CPUs
* actually populated at the present time. * actually populated at the present time.
*/ */
for (i = 0; i < max_cpus; i++) for_each_possible_cpu(cpu) {
set_cpu_present(i, true); if (cpu < max_cpus)
set_cpu_present(cpu, true);
}
} }
void __init smp_cpus_done(unsigned int max_cpus) void __init smp_cpus_done(unsigned int max_cpus)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment