* [PATCH v2 0/2] [for arm-soc] mach-tango updates
@ 2016-06-21 9:28 Marc Gonzalez
2016-06-21 9:31 ` [PATCH v2 1/2] ARM: tango: add HOTPLUG_CPU support Marc Gonzalez
2016-06-21 9:32 ` [PATCH v2 2/2] Update ARM/TANGO section Marc Gonzalez
0 siblings, 2 replies; 4+ messages in thread
From: Marc Gonzalez @ 2016-06-21 9:28 UTC (permalink / raw)
To: linux-arm-kernel
Hello arm-soc maintainers,
Could you please merge the following patches?
o HOTPLUG support would be for 4.8
o Ideally, the MAINTAINERS update would be for the next 4.7 release candidate.
Marc Gonzalez (2):
ARM: tango: add HOTPLUG_CPU support
Update ARM/TANGO section
MAINTAINERS | 3 +--
arch/arm/mach-tango/platsmp.c | 17 +++++++++++++++++
arch/arm/mach-tango/smc.h | 4 +++-
3 files changed, 21 insertions(+), 3 deletions(-)
Regards.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2 1/2] ARM: tango: add HOTPLUG_CPU support
2016-06-21 9:28 [PATCH v2 0/2] [for arm-soc] mach-tango updates Marc Gonzalez
@ 2016-06-21 9:31 ` Marc Gonzalez
2016-06-27 15:16 ` Marc Gonzalez
2016-06-21 9:32 ` [PATCH v2 2/2] Update ARM/TANGO section Marc Gonzalez
1 sibling, 1 reply; 4+ messages in thread
From: Marc Gonzalez @ 2016-06-21 9:31 UTC (permalink / raw)
To: linux-arm-kernel
cpu_die() and cpu_kill() are implemented in firmware.
Signed-off-by: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
---
arch/arm/mach-tango/platsmp.c | 17 +++++++++++++++++
arch/arm/mach-tango/smc.h | 4 +++-
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-tango/platsmp.c b/arch/arm/mach-tango/platsmp.c
index a21f55e000d2..ff495f6b6f40 100644
--- a/arch/arm/mach-tango/platsmp.c
+++ b/arch/arm/mach-tango/platsmp.c
@@ -9,8 +9,25 @@ static int tango_boot_secondary(unsigned int cpu, struct task_struct *idle)
return 0;
}
+#ifdef CONFIG_HOTPLUG_CPU
+static int tango_cpu_kill(unsigned int cpu)
+{
+ return tango_aux_core_kill(cpu);
+}
+
+static void tango_cpu_die(unsigned int cpu)
+{
+ tango_aux_core_die(cpu);
+}
+#else
+#define tango_cpu_kill NULL
+#define tango_cpu_die NULL
+#endif
+
static const struct smp_operations tango_smp_ops __initconst = {
.smp_boot_secondary = tango_boot_secondary,
+ .cpu_kill = tango_cpu_kill,
+ .cpu_die = tango_cpu_die,
};
CPU_METHOD_OF_DECLARE(tango4_smp, "sigma,tango4-smp", &tango_smp_ops);
diff --git a/arch/arm/mach-tango/smc.h b/arch/arm/mach-tango/smc.h
index 7a4af35cc390..3d31f984f44c 100644
--- a/arch/arm/mach-tango/smc.h
+++ b/arch/arm/mach-tango/smc.h
@@ -2,4 +2,6 @@ extern int tango_smc(unsigned int val, unsigned int service);
#define tango_set_l2_control(val) tango_smc(val, 0x102)
#define tango_start_aux_core(val) tango_smc(val, 0x104)
-#define tango_set_aux_boot_addr(val) tango_smc((unsigned int)val, 0x105)
+#define tango_set_aux_boot_addr(val) tango_smc(val, 0x105)
+#define tango_aux_core_die(val) tango_smc(val, 0x121)
+#define tango_aux_core_kill(val) tango_smc(val, 0x122)
--
2.8.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2 2/2] Update ARM/TANGO section
2016-06-21 9:28 [PATCH v2 0/2] [for arm-soc] mach-tango updates Marc Gonzalez
2016-06-21 9:31 ` [PATCH v2 1/2] ARM: tango: add HOTPLUG_CPU support Marc Gonzalez
@ 2016-06-21 9:32 ` Marc Gonzalez
1 sibling, 0 replies; 4+ messages in thread
From: Marc Gonzalez @ 2016-06-21 9:32 UTC (permalink / raw)
To: linux-arm-kernel
Use regex pattern to match tango-specific files.
Signed-off-by: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
---
MAINTAINERS | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index d174e34982b5..f3d920749bd6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1748,8 +1748,7 @@ ARM/TANGO ARCHITECTURE
M: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
L: linux-arm-kernel at lists.infradead.org
S: Maintained
-F: arch/arm/mach-tango/
-F: arch/arm/boot/dts/tango*
+N: tango
ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
M: Lennert Buytenhek <kernel@wantstofly.org>
--
2.8.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2 1/2] ARM: tango: add HOTPLUG_CPU support
2016-06-21 9:31 ` [PATCH v2 1/2] ARM: tango: add HOTPLUG_CPU support Marc Gonzalez
@ 2016-06-27 15:16 ` Marc Gonzalez
0 siblings, 0 replies; 4+ messages in thread
From: Marc Gonzalez @ 2016-06-27 15:16 UTC (permalink / raw)
To: linux-arm-kernel
On 21/06/2016 11:31, Marc Gonzalez wrote:
> cpu_die() and cpu_kill() are implemented in firmware.
>
> Signed-off-by: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
> ---
> arch/arm/mach-tango/platsmp.c | 17 +++++++++++++++++
> arch/arm/mach-tango/smc.h | 4 +++-
> 2 files changed, 20 insertions(+), 1 deletion(-)
There's a bug in my patch. I'll send an update.
Regards.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-06-27 15:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-21 9:28 [PATCH v2 0/2] [for arm-soc] mach-tango updates Marc Gonzalez
2016-06-21 9:31 ` [PATCH v2 1/2] ARM: tango: add HOTPLUG_CPU support Marc Gonzalez
2016-06-27 15:16 ` Marc Gonzalez
2016-06-21 9:32 ` [PATCH v2 2/2] Update ARM/TANGO section Marc Gonzalez
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.