Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Jan Henrik Weinstock <jan.weinstock@rwth-aachen.de>
To:     <geert@linux-m68k.org>, <jonas@southpole.se>,
        <stefan.kristiansson@saunalahti.fi>, <shorne@gmail.com>,
        <openrisc@lists.librecores.org>, <linux-kernel@vger.kernel.org>
CC:     Jan Henrik Weinstock <jan.weinstock@rwth-aachen.de>
Subject: Re: [PATCH] Use devicetree to determine present cpus
Date:   Mon, 8 Feb 2021 15:27:16 +0100
MIME-Version: 1.0
Content-Type: text/plain
Message-ID: <84102952-2468-4616-b28c-cb5941de7e12@rwthex-s2-a.rwth-ad.de>
Precedence: bulk

Signed-off-by: Jan Henrik Weinstock <jan.weinstock@rwth-aachen.de>
---

Re-send patch with git sendmail

 arch/openrisc/kernel/smp.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/arch/openrisc/kernel/smp.c b/arch/openrisc/kernel/smp.c
index 29c82ef2e..75be7e34f 100644
--- a/arch/openrisc/kernel/smp.c
+++ b/arch/openrisc/kernel/smp.c
@@ -16,6 +16,7 @@
 #include <linux/sched.h>
 #include <linux/sched/mm.h>
 #include <linux/irq.h>
+#include <linux/of.h>
 #include <asm/cpuinfo.h>
 #include <asm/mmu_context.h>
 #include <asm/tlbflush.h>
@@ -68,14 +69,25 @@ void __init smp_init_cpus(void)
 
 void __init smp_prepare_cpus(unsigned int max_cpus)
 {
-	int i;
+	u32 cpu_id;
+	struct device_node *cpu, *cpus;
 
 	/*
 	 * Initialise the present map, which describes the set of CPUs
 	 * actually populated at the present time.
 	 */
-	for (i = 0; i < max_cpus; i++)
-		set_cpu_present(i, true);
+	cpus = of_find_node_by_path("/cpus");
+	for_each_child_of_node(cpus, cpu) {
+		if (of_property_read_u32(cpu, "reg", &cpu_id)) {
+			pr_warn("%s missing reg property", cpu->full_name);
+			continue;
+		}
+
+		if (cpu_id >= max_cpus)
+			continue;
+
+		set_cpu_present(cpu_id, true);
+	}
 }
 
 void __init smp_cpus_done(unsigned int max_cpus)
-- 
2.17.1