From patchwork Thu Jan 24 06:27:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Pitre X-Patchwork-Id: 2029221 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id F3A733FDC3 for ; Thu, 24 Jan 2013 06:32:11 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TyGJw-0004d4-SY; Thu, 24 Jan 2013 06:29:57 +0000 Received: from relais.videotron.ca ([24.201.245.36]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TyGIE-0003pv-Gf for linux-arm-kernel@lists.infradead.org; Thu, 24 Jan 2013 06:28:16 +0000 Received: from yoda.home ([24.202.213.203]) by VL-VM-MR002.ip.videotron.ca (Oracle Communications Messaging Exchange Server 7u4-22.01 64bit (built Apr 21 2011)) with ESMTP id <0MH400JZV9YSTA80@VL-VM-MR002.ip.videotron.ca> for linux-arm-kernel@lists.infradead.org; Thu, 24 Jan 2013 01:28:04 -0500 (EST) Received: from xanadu.home (xanadu.home [192.168.2.2]) by yoda.home (Postfix) with ESMTP id 78D642DA00F9 for ; Thu, 24 Jan 2013 01:28:04 -0500 (EST) From: Nicolas Pitre To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 07/16] ARM: b.L: generic SMP secondary bringup and hotplug support Date: Thu, 24 Jan 2013 01:27:50 -0500 Message-id: <1359008879-9015-8-git-send-email-nicolas.pitre@linaro.org> X-Mailer: git-send-email 1.8.0 In-reply-to: <1359008879-9015-1-git-send-email-nicolas.pitre@linaro.org> References: <1359008879-9015-1-git-send-email-nicolas.pitre@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130124_012810_674157_018B686D X-CRM114-Status: GOOD ( 16.27 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [24.201.245.36 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Now that the b.L power API is in place, we can use it for SMP secondary bringup and CPU hotplug in a generic fashion. Signed-off-by: Nicolas Pitre --- arch/arm/common/Makefile | 2 +- arch/arm/common/bL_platsmp.c | 79 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 arch/arm/common/bL_platsmp.c diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile index aa797237a7..d1eaae8eb7 100644 --- a/arch/arm/common/Makefile +++ b/arch/arm/common/Makefile @@ -13,4 +13,4 @@ obj-$(CONFIG_SHARP_PARAM) += sharpsl_param.o obj-$(CONFIG_SHARP_SCOOP) += scoop.o obj-$(CONFIG_PCI_HOST_ITE8152) += it8152.o obj-$(CONFIG_ARM_TIMER_SP804) += timer-sp.o -obj-$(CONFIG_BIG_LITTLE) += bL_head.o bL_entry.o vlock.o +obj-$(CONFIG_BIG_LITTLE) += bL_head.o bL_entry.o bL_platsmp.o vlock.o diff --git a/arch/arm/common/bL_platsmp.c b/arch/arm/common/bL_platsmp.c new file mode 100644 index 0000000000..e28dd50640 --- /dev/null +++ b/arch/arm/common/bL_platsmp.c @@ -0,0 +1,79 @@ +/* + * linux/arch/arm/mach-vexpress/bL_platsmp.c + * + * Created by: Nicolas Pitre, November 2012 + * Copyright: (C) 2012-2013 Linaro Limited + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * Code to handle secondary CPU bringup and hotplug for the bL power API. + */ + +#include +#include + +#include +#include +#include + +static void __init simple_smp_init_cpus(void) +{ + set_smp_cross_call(gic_raise_softirq); +} + +static int __cpuinit bL_boot_secondary(unsigned int cpu, struct task_struct *idle) +{ + unsigned int pcpu, pcluster, ret; + extern void secondary_startup(void); + + pcpu = cpu_logical_map(cpu) & 0xff; + pcluster = (cpu_logical_map(cpu) >> 8) & 0xff; + pr_debug("%s: logical CPU %d is physical CPU %d cluster %d\n", + __func__, cpu, pcpu, pcluster); + + bL_set_entry_vector(pcpu, pcluster, NULL); + ret = bL_cpu_power_up(pcpu, pcluster); + if (ret) + return ret; + bL_set_entry_vector(pcpu, pcluster, secondary_startup); + gic_raise_softirq(cpumask_of(cpu), 0); + dsb_sev(); + return 0; +} + +static void __cpuinit bL_secondary_init(unsigned int cpu) +{ + bL_cpu_powered_up(); + gic_secondary_init(0); +} + +#ifdef CONFIG_HOTPLUG_CPU + +static int bL_cpu_disable(unsigned int cpu) +{ + /* + * We assume all CPUs may be shut down. + * This would be the hook to use for eventual Secure + * OS migration requests. + */ + return 0; +} + +static void __ref bL_cpu_die(unsigned int cpu) +{ + bL_cpu_power_down(); +} + +#endif + +struct smp_operations __initdata bL_smp_ops = { + .smp_init_cpus = simple_smp_init_cpus, + .smp_boot_secondary = bL_boot_secondary, + .smp_secondary_init = bL_secondary_init, +#ifdef CONFIG_HOTPLUG_CPU + .cpu_disable = bL_cpu_disable, + .cpu_die = bL_cpu_die, +#endif +};