2015-05-12 14:16:31

by Antoine Tenart

Subject: [PATCH] ARM: berlin: add CPU hotplug support

Adds CPU hotplug support for Berlin SoCs (currently BG2 and BG2Q). The
CPUs are put in WFI after disabling the coherency.

Signed-off-by: Antoine Tenart <[email protected]>
---
arch/arm/mach-berlin/platsmp.c | 13 +++++++++++++
1 file changed, 13 insertions(+)

diff --git a/arch/arm/mach-berlin/platsmp.c b/arch/arm/mach-berlin/platsmp.c
index 702e7982015a..d9c62057be76 100644
--- a/arch/arm/mach-berlin/platsmp.c
+++ b/arch/arm/mach-berlin/platsmp.c
@@ -14,6 +14,7 @@
#include <linux/of_address.h>

#include <asm/cacheflush.h>
+#include <asm/cp15.h>
#include <asm/smp_plat.h>
#include <asm/smp_scu.h>

@@ -92,8 +93,20 @@ unmap_scu:
iounmap(scu_base);
}

+#ifdef CONFIG_HOTPLUG_CPU
+static void berlin_cpu_die(unsigned int cpu)
+{
+ v7_exit_coherency_flush(louis);
+ while (1)
+ cpu_do_idle();
+}
+#endif
+
static struct smp_operations berlin_smp_ops __initdata = {
.smp_prepare_cpus = berlin_smp_prepare_cpus,
.smp_boot_secondary = berlin_boot_secondary,
+#ifdef CONFIG_HOTPLUG_CPU
+ .cpu_die = berlin_cpu_die,
+#endif
};
CPU_METHOD_OF_DECLARE(berlin_smp, "marvell,berlin-smp", &berlin_smp_ops);
--
2.4.0

2015-05-12 15:03:52

by Mark Rutland

Subject: Re: [PATCH] ARM: berlin: add CPU hotplug support

On Tue, May 12, 2015 at 03:16:26PM +0100, Antoine Tenart wrote:
> Adds CPU hotplug support for Berlin SoCs (currently BG2 and BG2Q). The
> CPUs are put in WFI after disabling the coherency.

This is _not_ CPU hotplug (given the CPUs are still sat on kernel text,
and could be woken at any point), so this is simply broken anywhere it
really matters (e.g. kexec).

So NAK, as the same style of pseudo-hotplug has received repeatedly in
the past for other platforms.

Thanks,
Mark.

>
> Signed-off-by: Antoine Tenart <[email protected]>
> ---
> arch/arm/mach-berlin/platsmp.c | 13 +++++++++++++
> 1 file changed, 13 insertions(+)
>
> diff --git a/arch/arm/mach-berlin/platsmp.c b/arch/arm/mach-berlin/platsmp.c
> index 702e7982015a..d9c62057be76 100644
> --- a/arch/arm/mach-berlin/platsmp.c
> +++ b/arch/arm/mach-berlin/platsmp.c
> @@ -14,6 +14,7 @@
> #include <linux/of_address.h>
>
> #include <asm/cacheflush.h>
> +#include <asm/cp15.h>
> #include <asm/smp_plat.h>
> #include <asm/smp_scu.h>
>
> @@ -92,8 +93,20 @@ unmap_scu:
> iounmap(scu_base);
> }
>
> +#ifdef CONFIG_HOTPLUG_CPU
> +static void berlin_cpu_die(unsigned int cpu)
> +{
> + v7_exit_coherency_flush(louis);
> + while (1)
> + cpu_do_idle();
> +}
> +#endif
> +
> static struct smp_operations berlin_smp_ops __initdata = {
> .smp_prepare_cpus = berlin_smp_prepare_cpus,
> .smp_boot_secondary = berlin_boot_secondary,
> +#ifdef CONFIG_HOTPLUG_CPU
> + .cpu_die = berlin_cpu_die,
> +#endif
> };
> CPU_METHOD_OF_DECLARE(berlin_smp, "marvell,berlin-smp", &berlin_smp_ops);
> --
> 2.4.0
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>

2015-05-12 23:23:36

by Russell King - ARM Linux

Subject: Re: [PATCH] ARM: berlin: add CPU hotplug support

On Tue, May 12, 2015 at 04:16:26PM +0200, Antoine Tenart wrote:
> Adds CPU hotplug support for Berlin SoCs (currently BG2 and BG2Q). The
> CPUs are put in WFI after disabling the coherency.
>
> Signed-off-by: Antoine Tenart <[email protected]>
> ---
> arch/arm/mach-berlin/platsmp.c | 13 +++++++++++++
> 1 file changed, 13 insertions(+)
>
> diff --git a/arch/arm/mach-berlin/platsmp.c b/arch/arm/mach-berlin/platsmp.c
> index 702e7982015a..d9c62057be76 100644
> --- a/arch/arm/mach-berlin/platsmp.c
> +++ b/arch/arm/mach-berlin/platsmp.c
> @@ -14,6 +14,7 @@
> #include <linux/of_address.h>
>
> #include <asm/cacheflush.h>
> +#include <asm/cp15.h>

I don't see anything being added by this patch which would need this
include.

> #include <asm/smp_plat.h>
> #include <asm/smp_scu.h>
>
> @@ -92,8 +93,20 @@ unmap_scu:
> iounmap(scu_base);
> }
>
> +#ifdef CONFIG_HOTPLUG_CPU
> +static void berlin_cpu_die(unsigned int cpu)
> +{
> + v7_exit_coherency_flush(louis);
> + while (1)
> + cpu_do_idle();
> +}
> +#endif
> +
> static struct smp_operations berlin_smp_ops __initdata = {
> .smp_prepare_cpus = berlin_smp_prepare_cpus,
> .smp_boot_secondary = berlin_boot_secondary,
> +#ifdef CONFIG_HOTPLUG_CPU
> + .cpu_die = berlin_cpu_die,
> +#endif
> };
> CPU_METHOD_OF_DECLARE(berlin_smp, "marvell,berlin-smp", &berlin_smp_ops);
> --
> 2.4.0
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

--
FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up
according to speedtest.net.

2015-05-13 07:35:26

by Antoine Tenart

Subject: Re: [PATCH] ARM: berlin: add CPU hotplug support

On Wed, May 13, 2015 at 12:23:22AM +0100, Russell King - ARM Linux wrote:
> On Tue, May 12, 2015 at 04:16:26PM +0200, Antoine Tenart wrote:
> > Adds CPU hotplug support for Berlin SoCs (currently BG2 and BG2Q). The
> > CPUs are put in WFI after disabling the coherency.
> >
> > Signed-off-by: Antoine Tenart <[email protected]>
> > ---
> > arch/arm/mach-berlin/platsmp.c | 13 +++++++++++++
> > 1 file changed, 13 insertions(+)
> >
> > diff --git a/arch/arm/mach-berlin/platsmp.c b/arch/arm/mach-berlin/platsmp.c
> > index 702e7982015a..d9c62057be76 100644
> > --- a/arch/arm/mach-berlin/platsmp.c
> > +++ b/arch/arm/mach-berlin/platsmp.c
> > @@ -14,6 +14,7 @@
> > #include <linux/of_address.h>
> >
> > #include <asm/cacheflush.h>
> > +#include <asm/cp15.h>
>
> I don't see anything being added by this patch which would need this
> include.

v7_exit_coherency_flush(..) needs CR_C to be defined, which is done in
asm/cp15.h. Is there a better way to get this defined here?

> >
> > +#ifdef CONFIG_HOTPLUG_CPU
> > +static void berlin_cpu_die(unsigned int cpu)
> > +{
> > + v7_exit_coherency_flush(louis);
> > + while (1)
> > + cpu_do_idle();
> > +}
> > +#endif
> > +

Antoine

--
Antoine T?nart, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com