MIPS: SGI-IP27: do boot CPU init later

Thomas Bogendoerfer · paulburton · commit 2c8656204742 · 2019-02-19T12:46:03.000-08:00
To make use of per_cpu variables in interrupt code per_cpu_init() must
be done after setup_per_cpu_areas(). This is achieved by calling it
in smp_prepare_boot_cpu() via a new smp_ops method.

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/include/asm/smp-ops.h b/arch/mips/include/asm/smp-ops.h
@@ -29,6 +29,7 @@ struct plat_smp_ops {
 	int (*boot_secondary)(int cpu, struct task_struct *idle);
 	void (*smp_setup)(void);
 	void (*prepare_cpus)(unsigned int max_cpus);
+	void (*prepare_boot_cpu)(void);
 #ifdef CONFIG_HOTPLUG_CPU
 	int (*cpu_disable)(void);
 	void (*cpu_die)(unsigned int cpu);
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
@@ -444,6 +444,8 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 /* preload SMP state for boot cpu */
 void smp_prepare_boot_cpu(void)
 {
+	if (mp_ops->prepare_boot_cpu)
+		mp_ops->prepare_boot_cpu();
 	set_cpu_possible(0, true);
 	set_cpu_online(0, true);
 }
diff --git a/arch/mips/sgi-ip27/ip27-init.c b/arch/mips/sgi-ip27/ip27-init.c
@@ -212,7 +212,6 @@ void __init plat_mem_setup(void)
 #endif
 
 	ioc3_eth_init();
-	per_cpu_init();
 
 	set_io_port_base(IO_BASE);
 }
diff --git a/arch/mips/sgi-ip27/ip27-smp.c b/arch/mips/sgi-ip27/ip27-smp.c
@@ -177,7 +177,7 @@ static void ip27_send_ipi_mask(const struct cpumask *mask, unsigned int action)
 		ip27_send_ipi_single(i, action);
 }
 
-static void ip27_init_secondary(void)
+static void ip27_init_cpu(void)
 {
 	per_cpu_init();
 }
@@ -235,9 +235,10 @@ static void __init ip27_prepare_cpus(unsigned int max_cpus)
 const struct plat_smp_ops ip27_smp_ops = {
 	.send_ipi_single	= ip27_send_ipi_single,
 	.send_ipi_mask		= ip27_send_ipi_mask,
-	.init_secondary		= ip27_init_secondary,
+	.init_secondary		= ip27_init_cpu,
 	.smp_finish		= ip27_smp_finish,
 	.boot_secondary		= ip27_boot_secondary,
 	.smp_setup		= ip27_smp_setup,
 	.prepare_cpus		= ip27_prepare_cpus,
+	.prepare_boot_cpu	= ip27_init_cpu,
 };

Original file line number	Diff line number	Diff line change
`@@ -444,6 +444,8 @@ void __init smp_prepare_cpus(unsigned int max_cpus)`
`444`	`444`	`/* preload SMP state for boot cpu */`
`445`	`445`	`void smp_prepare_boot_cpu(void)`
`446`	`446`	`{`
	`447`	`+ if (mp_ops->prepare_boot_cpu)`
	`448`	`+ mp_ops->prepare_boot_cpu();`
`447`	`449`	`set_cpu_possible(0, true);`
`448`	`450`	`set_cpu_online(0, true);`
`449`	`451`	`}`
Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,6 @@ void __init plat_mem_setup(void)`
`212`	`212`	`#endif`
`213`	`213`
`214`	`214`	`ioc3_eth_init();`
`215`		`- per_cpu_init();`
`216`	`215`
`217`	`216`	`set_io_port_base(IO_BASE);`
`218`	`217`	`}`
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ static void ip27_send_ipi_mask(const struct cpumask *mask, unsigned int action)`
`177`	`177`	`ip27_send_ipi_single(i, action);`
`178`	`178`	`}`
`179`	`179`
`180`		`-static void ip27_init_secondary(void)`
	`180`	`+static void ip27_init_cpu(void)`
`181`	`181`	`{`
`182`	`182`	`per_cpu_init();`
`183`	`183`	`}`
`@@ -235,9 +235,10 @@ static void __init ip27_prepare_cpus(unsigned int max_cpus)`
`235`	`235`	`const struct plat_smp_ops ip27_smp_ops = {`
`236`	`236`	`.send_ipi_single = ip27_send_ipi_single,`
`237`	`237`	`.send_ipi_mask = ip27_send_ipi_mask,`
`238`		`- .init_secondary = ip27_init_secondary,`
	`238`	`+ .init_secondary = ip27_init_cpu,`
`239`	`239`	`.smp_finish = ip27_smp_finish,`
`240`	`240`	`.boot_secondary = ip27_boot_secondary,`
`241`	`241`	`.smp_setup = ip27_smp_setup,`
`242`	`242`	`.prepare_cpus = ip27_prepare_cpus,`
	`243`	`+ .prepare_boot_cpu = ip27_init_cpu,`
`243`	`244`	`};`