Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28e783aa authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'for-arm-soc/virt/mach' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents 5f48a29f 4de3abb3

arch/arm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -1128,6 +1128,8 @@ source "arch/arm/mach-versatile/Kconfig" 
source "arch/arm/mach-vexpress/Kconfig"

source "arch/arm/plat-versatile/Kconfig"



source "arch/arm/mach-virt/Kconfig"



source "arch/arm/mach-vt8500/Kconfig"



source "arch/arm/mach-w90x900/Kconfig"

arch/arm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ machine-$(CONFIG_ARCH_SOCFPGA) += socfpga 
machine-$(CONFIG_ARCH_SPEAR13XX)	+= spear13xx

machine-$(CONFIG_ARCH_SPEAR3XX)		+= spear3xx

machine-$(CONFIG_MACH_SPEAR600)		+= spear6xx

machine-$(CONFIG_ARCH_VIRT)		+= virt

machine-$(CONFIG_ARCH_ZYNQ)		+= zynq

machine-$(CONFIG_ARCH_SUNXI)		+= sunxi

arch/arm/mach-virt/Kconfig

0 → 100644
+10 −0
Original line number Diff line number Diff line 
config ARCH_VIRT

	bool "Dummy Virtual Machine" if ARCH_MULTI_V7

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_GIC

	select ARM_ARCH_TIMER

	select ARM_PSCI

	select HAVE_SMP

	select CPU_V7

	select SPARSE_IRQ

	select USE_OF

arch/arm/mach-virt/Makefile

0 → 100644
+6 −0
Original line number Diff line number Diff line 
#

# Makefile for the linux kernel.

#



obj-y					:= virt.o

obj-$(CONFIG_SMP)			+= platsmp.o

arch/arm/mach-virt/platsmp.c

0 → 100644
+58 −0
Original line number Diff line number Diff line 
/*

 * Dummy Virtual Machine - does what it says on the tin.

 *

 * Copyright (C) 2012 ARM Ltd

 * Author: Will Deacon <will.deacon@arm.com>

 *

 * 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/smp.h>

#include <linux/of.h>



#include <linux/irqchip/arm-gic.h>



#include <asm/psci.h>

#include <asm/smp_plat.h>



extern void secondary_startup(void);



static void __init virt_smp_init_cpus(void)

{

}



static void __init virt_smp_prepare_cpus(unsigned int max_cpus)

{

}



static int __cpuinit virt_boot_secondary(unsigned int cpu,

					 struct task_struct *idle)

{

	if (psci_ops.cpu_on)

		return psci_ops.cpu_on(cpu_logical_map(cpu),

				       __pa(secondary_startup));

	return -ENODEV;

}



static void __cpuinit virt_secondary_init(unsigned int cpu)

{

	gic_secondary_init(0);

}



struct smp_operations __initdata virt_smp_ops = {

	.smp_init_cpus		= virt_smp_init_cpus,

	.smp_prepare_cpus	= virt_smp_prepare_cpus,

	.smp_secondary_init	= virt_secondary_init,

	.smp_boot_secondary	= virt_boot_secondary,

};