arm64: SMP: enable PSCI boot method

Wire the PSCI implementation into the SMP secondary startup
code.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

diff --git a/arch/arm64/include/asm/smp.h b/arch/arm64/include/asm/smp.h
index b1f68c19d170301bf16e135437346e279422b3a0..4b8023c5d14619d23b329cd169b226f412a0e6c3 100644 (file)
--- a/arch/arm64/include/asm/smp.h
+++ b/arch/arm64/include/asm/smp.h
@@ -75,5 +75,6 @@ struct smp_enable_ops {
 };
 
 extern const struct smp_enable_ops smp_spin_table_ops;
+extern const struct smp_enable_ops smp_psci_ops;
 
 #endif /* ifndef __ASM_SMP_H */

diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile
index 75a90c15b30bbc8cdc47dbb786fd75f23ac8b8c4..7b4b564961d48c4be4fa0df2e1e7ad49c7a57224 100644 (file)
--- a/arch/arm64/kernel/Makefile
+++ b/arch/arm64/kernel/Makefile
@@ -14,7 +14,7 @@ arm64-obj-y           := cputable.o debug-monitors.o entry.o irq.o fpsimd.o   \
 arm64-obj-$(CONFIG_COMPAT)             += sys32.o kuser32.o signal32.o         \
                                           sys_compat.o
 arm64-obj-$(CONFIG_MODULES)            += arm64ksyms.o module.o
-arm64-obj-$(CONFIG_SMP)                        += smp.o smp_spin_table.o
+arm64-obj-$(CONFIG_SMP)                        += smp.o smp_spin_table.o smp_psci.o
 arm64-obj-$(CONFIG_HW_PERF_EVENTS)     += perf_event.o
 arm64-obj-$(CONFIG_HAVE_HW_BREAKPOINT)+= hw_breakpoint.o
 arm64-obj-$(CONFIG_EARLY_PRINTK)       += early_printk.o

diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index 7776922945afef77e0c47d9a7e893fc4f86c176d..bdd34597254bb7a5f08d91b6e09df1f86adfcbb6 100644 (file)
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -236,6 +236,7 @@ static void (*smp_cross_call)(const struct cpumask *, unsigned int);
 
 static const struct smp_enable_ops *enable_ops[] __initconst = {
        &smp_spin_table_ops,
+       &smp_psci_ops,
        NULL,
 };
 

diff --git a/arch/arm64/kernel/smp_psci.c b/arch/arm64/kernel/smp_psci.c
new file mode 100644 (file)
index 0000000..1120916
--- /dev/null
+++ b/arch/arm64/kernel/smp_psci.c
@@ -0,0 +1,52 @@
+/*
+ * PSCI SMP initialisation
+ *
+ * Copyright (C) 2013 ARM Ltd.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/init.h>
+#include <linux/of.h>
+#include <linux/smp.h>
+
+#include <asm/psci.h>
+
+static int __init smp_psci_init_cpu(struct device_node *dn, int cpu)
+{
+       return 0;
+}
+
+static int __init smp_psci_prepare_cpu(int cpu)
+{
+       int err;
+
+       if (!psci_ops.cpu_on) {
+               pr_err("psci: no cpu_on method, not booting CPU%d\n", cpu);
+               return -ENODEV;
+       }
+
+       err = psci_ops.cpu_on(cpu, __pa(secondary_holding_pen));
+       if (err) {
+               pr_err("psci: failed to boot CPU%d (%d)\n", cpu, err);
+               return err;
+       }
+
+       return 0;
+}
+
+const struct smp_enable_ops smp_psci_ops __initconst = {
+       .name           = "psci",
+       .init_cpu       = smp_psci_init_cpu,
+       .prepare_cpu    = smp_psci_prepare_cpu,
+};