aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-02-11 12:21:51 -0500
committerOlof Johansson <olof@lixom.net>2013-02-11 12:22:09 -0500
commit28e783aacba4b27793ed8032925d90ae5e0dd7ac (patch)
treef2de00a55f97eda33c58251c7f46a793ad691d85
parent5f48a29f1721736930b7817b430039c1d348dd05 (diff)
parent4de3abb348d7a5bd6ddbfc26c34e0ee549874249 (diff)
Merge branch 'for-arm-soc/virt/mach' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into next/virt
From Will Deacon, this lays the foundation for a basic virtualzed machine type. * 'for-arm-soc/virt/mach' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux: ARM: mach-virt: add SMP support using PSCI ARM: Dummy Virtual Machine platform support Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--arch/arm/Kconfig2
-rw-r--r--arch/arm/Makefile1
-rw-r--r--arch/arm/mach-virt/Kconfig10
-rw-r--r--arch/arm/mach-virt/Makefile6
-rw-r--r--arch/arm/mach-virt/platsmp.c58
-rw-r--r--arch/arm/mach-virt/virt.c58
6 files changed, 135 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 7a106612cb0c..441eda19b86f 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1128,6 +1128,8 @@ source "arch/arm/mach-versatile/Kconfig"
1128source "arch/arm/mach-vexpress/Kconfig" 1128source "arch/arm/mach-vexpress/Kconfig"
1129source "arch/arm/plat-versatile/Kconfig" 1129source "arch/arm/plat-versatile/Kconfig"
1130 1130
1131source "arch/arm/mach-virt/Kconfig"
1132
1131source "arch/arm/mach-vt8500/Kconfig" 1133source "arch/arm/mach-vt8500/Kconfig"
1132 1134
1133source "arch/arm/mach-w90x900/Kconfig" 1135source "arch/arm/mach-w90x900/Kconfig"
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 4bcd2d6b0535..3b82b36eec3f 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -194,6 +194,7 @@ machine-$(CONFIG_ARCH_SOCFPGA) += socfpga
194machine-$(CONFIG_ARCH_SPEAR13XX) += spear13xx 194machine-$(CONFIG_ARCH_SPEAR13XX) += spear13xx
195machine-$(CONFIG_ARCH_SPEAR3XX) += spear3xx 195machine-$(CONFIG_ARCH_SPEAR3XX) += spear3xx
196machine-$(CONFIG_MACH_SPEAR600) += spear6xx 196machine-$(CONFIG_MACH_SPEAR600) += spear6xx
197machine-$(CONFIG_ARCH_VIRT) += virt
197machine-$(CONFIG_ARCH_ZYNQ) += zynq 198machine-$(CONFIG_ARCH_ZYNQ) += zynq
198machine-$(CONFIG_ARCH_SUNXI) += sunxi 199machine-$(CONFIG_ARCH_SUNXI) += sunxi
199 200
diff --git a/arch/arm/mach-virt/Kconfig b/arch/arm/mach-virt/Kconfig
new file mode 100644
index 000000000000..8958f0d896bc
--- /dev/null
+++ b/arch/arm/mach-virt/Kconfig
@@ -0,0 +1,10 @@
1config ARCH_VIRT
2 bool "Dummy Virtual Machine" if ARCH_MULTI_V7
3 select ARCH_WANT_OPTIONAL_GPIOLIB
4 select ARM_GIC
5 select ARM_ARCH_TIMER
6 select ARM_PSCI
7 select HAVE_SMP
8 select CPU_V7
9 select SPARSE_IRQ
10 select USE_OF
diff --git a/arch/arm/mach-virt/Makefile b/arch/arm/mach-virt/Makefile
new file mode 100644
index 000000000000..042afc1f8c44
--- /dev/null
+++ b/arch/arm/mach-virt/Makefile
@@ -0,0 +1,6 @@
1#
2# Makefile for the linux kernel.
3#
4
5obj-y := virt.o
6obj-$(CONFIG_SMP) += platsmp.o
diff --git a/arch/arm/mach-virt/platsmp.c b/arch/arm/mach-virt/platsmp.c
new file mode 100644
index 000000000000..8badaabe70a1
--- /dev/null
+++ b/arch/arm/mach-virt/platsmp.c
@@ -0,0 +1,58 @@
1/*
2 * Dummy Virtual Machine - does what it says on the tin.
3 *
4 * Copyright (C) 2012 ARM Ltd
5 * Author: Will Deacon <will.deacon@arm.com>
6 *
7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License version 2 as
9 * published by the Free Software Foundation.
10 *
11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details.
15 *
16 * You should have received a copy of the GNU General Public License
17 * along with this program. If not, see <http://www.gnu.org/licenses/>.
18 */
19
20#include <linux/init.h>
21#include <linux/smp.h>
22#include <linux/of.h>
23
24#include <linux/irqchip/arm-gic.h>
25
26#include <asm/psci.h>
27#include <asm/smp_plat.h>
28
29extern void secondary_startup(void);
30
31static void __init virt_smp_init_cpus(void)
32{
33}
34
35static void __init virt_smp_prepare_cpus(unsigned int max_cpus)
36{
37}
38
39static int __cpuinit virt_boot_secondary(unsigned int cpu,
40 struct task_struct *idle)
41{
42 if (psci_ops.cpu_on)
43 return psci_ops.cpu_on(cpu_logical_map(cpu),
44 __pa(secondary_startup));
45 return -ENODEV;
46}
47
48static void __cpuinit virt_secondary_init(unsigned int cpu)
49{
50 gic_secondary_init(0);
51}
52
53struct smp_operations __initdata virt_smp_ops = {
54 .smp_init_cpus = virt_smp_init_cpus,
55 .smp_prepare_cpus = virt_smp_prepare_cpus,
56 .smp_secondary_init = virt_secondary_init,
57 .smp_boot_secondary = virt_boot_secondary,
58};
diff --git a/arch/arm/mach-virt/virt.c b/arch/arm/mach-virt/virt.c
new file mode 100644
index 000000000000..f6ed9cfeb287
--- /dev/null
+++ b/arch/arm/mach-virt/virt.c
@@ -0,0 +1,58 @@
1/*
2 * Dummy Virtual Machine - does what it says on the tin.
3 *
4 * Copyright (C) 2012 ARM Ltd
5 * Authors: Will Deacon <will.deacon@arm.com>,
6 * Marc Zyngier <marc.zyngier@arm.com>
7 *
8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License version 2 as
10 * published by the Free Software Foundation.
11 *
12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details.
16 *
17 * You should have received a copy of the GNU General Public License
18 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 */
20
21#include <linux/irqchip.h>
22#include <linux/of_irq.h>
23#include <linux/of_platform.h>
24#include <linux/smp.h>
25
26#include <asm/arch_timer.h>
27#include <asm/mach/arch.h>
28#include <asm/mach/time.h>
29
30static void __init virt_init(void)
31{
32 of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
33}
34
35static void __init virt_timer_init(void)
36{
37 WARN_ON(arch_timer_of_register() != 0);
38 WARN_ON(arch_timer_sched_clock_init() != 0);
39}
40
41static const char *virt_dt_match[] = {
42 "linux,dummy-virt",
43 NULL
44};
45
46static struct sys_timer virt_timer = {
47 .init = virt_timer_init,
48};
49
50extern struct smp_operations virt_smp_ops;
51
52DT_MACHINE_START(VIRT, "Dummy Virtual Machine")
53 .init_irq = irqchip_init,
54 .timer = &virt_timer,
55 .init_machine = virt_init,
56 .smp = smp_ops(virt_smp_ops),
57 .dt_compat = virt_dt_match,
58MACHINE_END