MIPS: SGI-IP27: do xtalk scanning later

Thomas Bogendoerfer · paulburton · commit 9707b7e63942 · 2019-02-19T12:46:02.000-08:00
Move xtalk scanning to a later boot stage to be able using things like
kmalloc and friends.

Signed-off-by: Thomas Bogendoerfer &lt;tbogendoerfer@suse.de&gt;
Signed-off-by: Paul Burton &lt;paul.burton@mips.com&gt;
Cc: Ralf Baechle &lt;ralf@linux-mips.org&gt;
Cc: James Hogan &lt;jhogan@kernel.org&gt;
Cc: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
diff --git a/arch/mips/sgi-ip27/ip27-init.c b/arch/mips/sgi-ip27/ip27-init.c
@@ -52,8 +52,6 @@ EXPORT_SYMBOL_GPL(sn_cpu_info);
 
 extern void pcibr_setup(cnodeid_t);
 
-extern void xtalk_probe_node(cnodeid_t nid);
-
 static void per_hub_init(cnodeid_t cnode)
 {
 	struct hub_data *hub = hub_data(cnode);
@@ -71,7 +69,6 @@ static void per_hub_init(cnodeid_t cnode)
 	REMOTE_HUB_S(nasid, IIO_ICTO, 0xff);
 
 	hub_rtc_init(cnode);
-	xtalk_probe_node(cnode);
 
 #ifdef CONFIG_REPLICATE_EXHANDLERS
 	/*
diff --git a/arch/mips/sgi-ip27/ip27-xtalk.c b/arch/mips/sgi-ip27/ip27-xtalk.c
@@ -99,7 +99,7 @@ static int xbow_probe(nasid_t nasid)
 	return 0;
 }
 
-void xtalk_probe_node(cnodeid_t nid)
+static void xtalk_probe_node(cnodeid_t nid)
 {
 	volatile u64		hubreg;
 	nasid_t			nasid;
@@ -133,3 +133,14 @@ void xtalk_probe_node(cnodeid_t nid)
 		break;
 	}
 }
+
+static int __init xtalk_init(void)
+{
+	cnodeid_t cnode;
+
+	for_each_online_node(cnode)
+		xtalk_probe_node(cnode);
+
+	return 0;
+}
+arch_initcall(xtalk_init);

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ static int xbow_probe(nasid_t nasid)`
`99`	`99`	`return 0;`
`100`	`100`	`}`
`101`	`101`
`102`		`-void xtalk_probe_node(cnodeid_t nid)`
	`102`	`+static void xtalk_probe_node(cnodeid_t nid)`
`103`	`103`	`{`
`104`	`104`	`volatile u64 hubreg;`
`105`	`105`	`nasid_t nasid;`
`@@ -133,3 +133,14 @@ void xtalk_probe_node(cnodeid_t nid)`
`133`	`133`	`break;`
`134`	`134`	`}`
`135`	`135`	`}`
	`136`	`+`
	`137`	`+static int __init xtalk_init(void)`
	`138`	`+{`
	`139`	`+ cnodeid_t cnode;`
	`140`	`+`
	`141`	`+ for_each_online_node(cnode)`
	`142`	`+ xtalk_probe_node(cnode);`
	`143`	`+`
	`144`	`+ return 0;`
	`145`	`+}`
	`146`	`+arch_initcall(xtalk_init);`