| Message ID | 1396012026-5997-8-git-send-email-thomas.petazzoni@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 03/28/14 06:07, Thomas Petazzoni wrote: > diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig > index 8634222..e88d951 100644 > --- a/arch/arm/mach-mvebu/Kconfig > +++ b/arch/arm/mach-mvebu/Kconfig > @@ -45,6 +45,8 @@ config MACH_ARMADA_375 > select ARMADA_375_CLK > select CPU_V7 > select HAVE_ARM_SCU > + select HAVE_ARM_TWD This should have "if SMP" appended to it (same for HAVE_ARM_SCU). > > diff --git a/arch/arm/mach-mvebu/board-v7.c b/arch/arm/mach-mvebu/board-v7.c > index 6260cb8..9ded4b9 100644 > --- a/arch/arm/mach-mvebu/board-v7.c > +++ b/arch/arm/mach-mvebu/board-v7.c > @@ -146,6 +146,7 @@ static const char * const armada_375_dt_compat[] = { > }; > > DT_MACHINE_START(ARMADA_375_DT, "Marvell Armada 375 (Device Tree)") > + .smp = smp_ops(mvebu_cortex_a9_smp_ops), > .init_time = mvebu_timer_and_clk_init, > .restart = mvebu_restart, > .dt_compat = armada_375_dt_compat, > @@ -158,6 +159,7 @@ static const char * const armada_38x_dt_compat[] = { > }; > > DT_MACHINE_START(ARMADA_38X_DT, "Marvell Armada 380/385 (Device Tree)") > + .smp = smp_ops(mvebu_cortex_a9_smp_ops), > .init_time = mvebu_timer_and_clk_init, > .restart = mvebu_restart, > .dt_compat = armada_38x_dt_compat, You may want to look into using the enable-method property in devicetree so that you don't have to set the smp ops here. The patch to support that is sitting in -next as 6c3ff8b11a16 (ARM: Introduce CPU_METHOD_OF_DECLARE() for cpu hotplug/smp, 2013-10-30). > diff --git a/arch/arm/mach-mvebu/headsmp-a9.S b/arch/arm/mach-mvebu/headsmp-a9.S > new file mode 100644 > index 0000000..78e66c9 > --- /dev/null > +++ b/arch/arm/mach-mvebu/headsmp-a9.S > @@ -0,0 +1,22 @@ > +/* > + * SMP support: Entry point for secondary CPUs of Marvell EBU > + * Cortex-A9 based SOCs (Armada 375 and Armada 38x). > + * > + * Copyright (C) 2014 Marvell > + * > + * Gregory CLEMENT <gregory.clement@free-electrons.com> > + * Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > + * > + * This file is licensed under the terms of the GNU General Public > + * License version 2. This program is licensed "as is" without any > + * warranty of any kind, whether express or implied. > + */ > + > +#include <linux/linkage.h> > +#include <linux/init.h> > + > + __CPUINIT __CPUINIT is dead. Don't use it. > +ENTRY(mvebu_cortex_a9_secondary_startup) > + bl v7_invalidate_l1 > + b secondary_startup > +ENDPROC(mvebu_cortex_a9_secondary_startup) >
Dear Stephen Boyd, On Fri, 28 Mar 2014 11:13:21 -0700, Stephen Boyd wrote: > On 03/28/14 06:07, Thomas Petazzoni wrote: > > diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig > > index 8634222..e88d951 100644 > > --- a/arch/arm/mach-mvebu/Kconfig > > +++ b/arch/arm/mach-mvebu/Kconfig > > @@ -45,6 +45,8 @@ config MACH_ARMADA_375 > > select ARMADA_375_CLK > > select CPU_V7 > > select HAVE_ARM_SCU > > + select HAVE_ARM_TWD > > This should have "if SMP" appended to it (same for HAVE_ARM_SCU). Thanks, will do. The HAVE_ARM_SCU addition is part of a separate series, the Armada 375/38x coherency series, so I'll fix it in there. > > diff --git a/arch/arm/mach-mvebu/board-v7.c b/arch/arm/mach-mvebu/board-v7.c > > index 6260cb8..9ded4b9 100644 > > --- a/arch/arm/mach-mvebu/board-v7.c > > +++ b/arch/arm/mach-mvebu/board-v7.c > > @@ -146,6 +146,7 @@ static const char * const armada_375_dt_compat[] = { > > }; > > > > DT_MACHINE_START(ARMADA_375_DT, "Marvell Armada 375 (Device Tree)") > > + .smp = smp_ops(mvebu_cortex_a9_smp_ops), > > .init_time = mvebu_timer_and_clk_init, > > .restart = mvebu_restart, > > .dt_compat = armada_375_dt_compat, > > @@ -158,6 +159,7 @@ static const char * const armada_38x_dt_compat[] = { > > }; > > > > DT_MACHINE_START(ARMADA_38X_DT, "Marvell Armada 380/385 (Device Tree)") > > + .smp = smp_ops(mvebu_cortex_a9_smp_ops), > > .init_time = mvebu_timer_and_clk_init, > > .restart = mvebu_restart, > > .dt_compat = armada_38x_dt_compat, > > You may want to look into using the enable-method property in devicetree > so that you don't have to set the smp ops here. The patch to support > that is sitting in -next as 6c3ff8b11a16 (ARM: Introduce > CPU_METHOD_OF_DECLARE() for cpu hotplug/smp, 2013-10-30). Hm, ok, I'll have a look into that. > > diff --git a/arch/arm/mach-mvebu/headsmp-a9.S b/arch/arm/mach-mvebu/headsmp-a9.S > > new file mode 100644 > > index 0000000..78e66c9 > > --- /dev/null > > +++ b/arch/arm/mach-mvebu/headsmp-a9.S > > @@ -0,0 +1,22 @@ > > +/* > > + * SMP support: Entry point for secondary CPUs of Marvell EBU > > + * Cortex-A9 based SOCs (Armada 375 and Armada 38x). > > + * > > + * Copyright (C) 2014 Marvell > > + * > > + * Gregory CLEMENT <gregory.clement@free-electrons.com> > > + * Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > > + * > > + * This file is licensed under the terms of the GNU General Public > > + * License version 2. This program is licensed "as is" without any > > + * warranty of any kind, whether express or implied. > > + */ > > + > > +#include <linux/linkage.h> > > +#include <linux/init.h> > > + > > + __CPUINIT > > __CPUINIT is dead. Don't use it. Sure, will fix, thanks. Thomas
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 8634222..e88d951 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -45,6 +45,8 @@ config MACH_ARMADA_375 select ARMADA_375_CLK select CPU_V7 select HAVE_ARM_SCU + select HAVE_ARM_TWD + select HAVE_SMP select MACH_MVEBU_V7 select NEON select PINCTRL_ARMADA_375 @@ -60,6 +62,8 @@ config MACH_ARMADA_38X select ARMADA_38X_CLK select CPU_V7 select HAVE_ARM_SCU + select HAVE_ARM_TWD + select HAVE_SMP select MACH_MVEBU_V7 select NEON select PINCTRL_ARMADA_38X diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile index 0e0eab5..18d623f 100644 --- a/arch/arm/mach-mvebu/Makefile +++ b/arch/arm/mach-mvebu/Makefile @@ -6,5 +6,5 @@ AFLAGS_coherency_ll.o := -Wa,-march=armv7-a obj-y += system-controller.o mvebu-soc-id.o cpu-reset.o obj-$(CONFIG_MACH_MVEBU_V7) += board-v7.o obj-$(CONFIG_ARCH_MVEBU) += coherency.o coherency_ll.o pmsu.o -obj-$(CONFIG_SMP) += platsmp.o headsmp.o +obj-$(CONFIG_SMP) += platsmp.o headsmp.o platsmp-a9.o headsmp-a9.o obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o diff --git a/arch/arm/mach-mvebu/board-v7.c b/arch/arm/mach-mvebu/board-v7.c index 6260cb8..9ded4b9 100644 --- a/arch/arm/mach-mvebu/board-v7.c +++ b/arch/arm/mach-mvebu/board-v7.c @@ -146,6 +146,7 @@ static const char * const armada_375_dt_compat[] = { }; DT_MACHINE_START(ARMADA_375_DT, "Marvell Armada 375 (Device Tree)") + .smp = smp_ops(mvebu_cortex_a9_smp_ops), .init_time = mvebu_timer_and_clk_init, .restart = mvebu_restart, .dt_compat = armada_375_dt_compat, @@ -158,6 +159,7 @@ static const char * const armada_38x_dt_compat[] = { }; DT_MACHINE_START(ARMADA_38X_DT, "Marvell Armada 380/385 (Device Tree)") + .smp = smp_ops(mvebu_cortex_a9_smp_ops), .init_time = mvebu_timer_and_clk_init, .restart = mvebu_restart, .dt_compat = armada_38x_dt_compat, diff --git a/arch/arm/mach-mvebu/common.h b/arch/arm/mach-mvebu/common.h index b67fb7a..c05de82 100644 --- a/arch/arm/mach-mvebu/common.h +++ b/arch/arm/mach-mvebu/common.h @@ -24,4 +24,8 @@ void mvebu_system_controller_set_cpu_boot_addr(void *boot_addr); void armada_xp_cpu_die(unsigned int cpu); +#ifdef CONFIG_SMP +extern struct smp_operations mvebu_cortex_a9_smp_ops; +#endif + #endif diff --git a/arch/arm/mach-mvebu/headsmp-a9.S b/arch/arm/mach-mvebu/headsmp-a9.S new file mode 100644 index 0000000..78e66c9 --- /dev/null +++ b/arch/arm/mach-mvebu/headsmp-a9.S @@ -0,0 +1,22 @@ +/* + * SMP support: Entry point for secondary CPUs of Marvell EBU + * Cortex-A9 based SOCs (Armada 375 and Armada 38x). + * + * Copyright (C) 2014 Marvell + * + * Gregory CLEMENT <gregory.clement@free-electrons.com> + * Thomas Petazzoni <thomas.petazzoni@free-electrons.com> + * + * This file is licensed under the terms of the GNU General Public + * License version 2. This program is licensed "as is" without any + * warranty of any kind, whether express or implied. + */ + +#include <linux/linkage.h> +#include <linux/init.h> + + __CPUINIT +ENTRY(mvebu_cortex_a9_secondary_startup) + bl v7_invalidate_l1 + b secondary_startup +ENDPROC(mvebu_cortex_a9_secondary_startup) diff --git a/arch/arm/mach-mvebu/platsmp-a9.c b/arch/arm/mach-mvebu/platsmp-a9.c new file mode 100644 index 0000000..f29eb95 --- /dev/null +++ b/arch/arm/mach-mvebu/platsmp-a9.c @@ -0,0 +1,63 @@ +/* + * Symmetric Multi Processing (SMP) support for Marvell EBU Cortex-A9 + * based SOCs (Armada 375/38x). + * + * Copyright (C) 2014 Marvell + * + * Gregory CLEMENT <gregory.clement@free-electrons.com> + * Thomas Petazzoni <thomas.petazzoni@free-electrons.com> + * + * This file is licensed under the terms of the GNU General Public + * License version 2. This program is licensed "as is" without any + * warranty of any kind, whether express or implied. + */ + +#include <linux/init.h> +#include <linux/io.h> +#include <linux/of.h> +#include <linux/smp.h> +#include <asm/smp_scu.h> +#include <asm/smp_plat.h> +#include "common.h" +#include "pmsu.h" + +extern void mvebu_cortex_a9_secondary_startup(void); + +static int __cpuinit mvebu_cortex_a9_boot_secondary(unsigned int cpu, + struct task_struct *idle) +{ + int ret, hw_cpu; + + pr_info("Booting CPU %d\n", cpu); + + /* + * Write the address of secondary startup into the system-wide + * flags register. The boot monitor waits until it receives a + * soft interrupt, and then the secondary CPU branches to this + * address. + */ + hw_cpu = cpu_logical_map(cpu); + + if (of_machine_is_compatible("marvell,armada375")) + mvebu_system_controller_set_cpu_boot_addr(mvebu_cortex_a9_secondary_startup); + else + mvebu_pmsu_set_cpu_boot_addr(hw_cpu, + mvebu_cortex_a9_secondary_startup); + + smp_wmb(); + ret = mvebu_cpu_reset_deassert(hw_cpu); + if (ret) { + pr_err("Could not start the secondary CPU: %d\n", ret); + return ret; + } + arch_send_wakeup_ipi_mask(cpumask_of(cpu)); + + return 0; +} + +struct smp_operations mvebu_cortex_a9_smp_ops __initdata = { + .smp_boot_secondary = mvebu_cortex_a9_boot_secondary, +#ifdef CONFIG_HOTPLUG_CPU + .cpu_die = armada_xp_cpu_die, +#endif +};