From 668250da10270a6163599739e8cc4f8eeccf7d9f Mon Sep 17 00:00:00 2001
From: Marc Zyngier <marc.zyngier@arm.com>
Date: Wed, 2 Jan 2013 15:34:50 +0000
Subject: [PATCH] --- yaml --- r: 351198 b: refs/heads/master c:
 0459ca9b7a9f86d0523e008b79c1fcf1afbd3635 h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/arch/arm64/include/asm/smp.h |  1 +
 trunk/arch/arm64/kernel/Makefile   |  2 +-
 trunk/arch/arm64/kernel/smp.c      |  1 +
 trunk/arch/arm64/kernel/smp_psci.c | 52 ++++++++++++++++++++++++++++++
 5 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 trunk/arch/arm64/kernel/smp_psci.c

diff --git a/[refs] b/[refs]
index 27ed799649d9..edb546842a63 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e790f1deb26a2e23f05dee0b9a5d4f764c3d7ea7
+refs/heads/master: 0459ca9b7a9f86d0523e008b79c1fcf1afbd3635
diff --git a/trunk/arch/arm64/include/asm/smp.h b/trunk/arch/arm64/include/asm/smp.h
index b1f68c19d170..4b8023c5d146 100644
--- a/trunk/arch/arm64/include/asm/smp.h
+++ b/trunk/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/trunk/arch/arm64/kernel/Makefile b/trunk/arch/arm64/kernel/Makefile
index 75a90c15b30b..7b4b564961d4 100644
--- a/trunk/arch/arm64/kernel/Makefile
+++ b/trunk/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/trunk/arch/arm64/kernel/smp.c b/trunk/arch/arm64/kernel/smp.c
index 7776922945af..bdd34597254b 100644
--- a/trunk/arch/arm64/kernel/smp.c
+++ b/trunk/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/trunk/arch/arm64/kernel/smp_psci.c b/trunk/arch/arm64/kernel/smp_psci.c
new file mode 100644
index 000000000000..112091684c22
--- /dev/null
+++ b/trunk/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,
+};