Default Jailhouse configuration, add new jailhouse versions

Added variable JH_CONFIG that is used to point to current jailhouse
hypervisor configuration. Added recipes for jailhouse version 0.7
and a _git recipe that tracks HEAD on master.

11 files changed, 81 insertions, 243 deletions

diff --git a/recipes-jailhouse/jailhouse/files/0001-ldflags-for-tools.patch b/recipes-jailhouse/jailhouse/files/0001-ldflags-for-tools.patch
deleted file mode 100644
index 47b79ed..0000000
--- a/recipes-jailhouse/jailhouse/files/0001-ldflags-for-tools.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tools/Makefile b/tools/Makefile
-index 4d91e7a..ecc5503 100644
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -19,7 +19,7 @@ LINUXINCLUDE := -I$(src)/../driver
- KBUILD_CFLAGS := -g -O3 -DLIBEXECDIR=\"$(libexecdir)\" \
-        -Wall -Wextra -Wmissing-declarations -Wmissing-prototypes -Werror \
-        -DJAILHOUSE_VERSION=\"$(shell cat $(src)/../VERSION)\" $(EXTRA_CFLAGS)
--LDFLAGS :=
-+LDFLAGS := $(EXTRA_LDLAGS)
- 
- BINARIES := jailhouse
- HELPERS := \
diff --git a/recipes-jailhouse/jailhouse/files/jailhouse-config-bpi.h b/recipes-jailhouse/jailhouse/files/jailhouse-config-bpi.h
deleted file mode 100644
index 91f651c..0000000
--- a/recipes-jailhouse/jailhouse/files/jailhouse-config-bpi.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#define CONFIG_ARM_GIC_V2               1
-#define CONFIG_MACH_SUN7I               1
-
-/* Enable error tracing,
- * c.f. https://github.com/siemens/jailhouse/blob/master/FAQ.md
- * (Redefine macro:
- *  jailhouse/hypervisor/include/jailhouse/printk.h:trace_error(code)).
- */
-#define CONFIG_TRACE_ERROR
diff --git a/recipes-jailhouse/jailhouse/files/plamics-bpi-root.c b/recipes-jailhouse/jailhouse/files/plamics-bpi-root.c
deleted file mode 100644
index 3d7b79f..0000000
--- a/recipes-jailhouse/jailhouse/files/plamics-bpi-root.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Jailhouse, a Linux-based partitioning hypervisor
- *
- * Test configuration for Banana Pi board (A20 dual-core Cortex-A7, 1G RAM)
- *
- * Copyright (c) Siemens AG, 2014
- *
- * Authors:
- *  Jan Kiszka <jan.kiszka@siemens.com>
- *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
- */
-
-#include <jailhouse/types.h>
-#include <jailhouse/cell-config.h>
-
-#define ARRAY_SIZE(a) sizeof(a) / sizeof(a[0])
-
-struct {
-        struct jailhouse_system header;
-        __u64 cpus[1];
-        struct jailhouse_memory mem_regions[18];
-        struct jailhouse_irqchip irqchips[1];
-        struct jailhouse_pci_device pci_devices[1];
-} __attribute__((packed)) config = {
-        .header = {
-                .signature = JAILHOUSE_SYSTEM_SIGNATURE,
-                .revision = JAILHOUSE_CONFIG_REVISION,
-                .hypervisor_memory = {
-                        .phys_start = 0x7c000000,
-                        .size = 0x4000000,
-                },
-                .debug_console = {
-                        .address = 0x01c28000,
-                        .size = 0x1000,
-                        /* .clock_reg = 0x01c2006c, */
-                        /* .gate_nr = 16 */
-                        /* .divider = 0x0d, */
-                        .flags = JAILHOUSE_CON_TYPE_8250 |
-                                 JAILHOUSE_CON_FLAG_MMIO,
-                },
-                .platform_info = {
-                        .pci_mmconfig_base = 0x2000000,
-                        .pci_mmconfig_end_bus = 0,
-                        .pci_is_virtual = 1,
-                        .arm = {
-                                .gicd_base = 0x01c81000,
-                                .gicc_base = 0x01c82000,
-                                .gich_base = 0x01c84000,
-                                .gicv_base = 0x01c86000,
-                                .maintenance_irq = 25,
-                        },
-                },
-                .root_cell = {
-                        .name = "Banana-Pi",
-
-                        .cpu_set_size = sizeof(config.cpus),
-                        .num_memory_regions = ARRAY_SIZE(config.mem_regions),
-                        .num_irqchips = ARRAY_SIZE(config.irqchips),
-                        .num_pci_devices = ARRAY_SIZE(config.pci_devices),
-
-                        .vpci_irq_base = 108,
-                },
-        },
-
-        .cpus = {
-                0x3,
-        },
-
-        .mem_regions = {
-                /* SPI */ {
-                        .phys_start = 0x01c05000,
-                        .virt_start = 0x01c05000,
-                        .size = 0x00001000,
-                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-                                JAILHOUSE_MEM_IO,
-                },
-                /* MMC */ {
-                        .phys_start = 0x01c0f000,
-                        .virt_start = 0x01c0f000,
-                        .size = 0x00001000,
-                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-                                JAILHOUSE_MEM_IO,
-                },
-                /* USB + PMU1 */ {
-                        .phys_start = 0x01c14000,
-                        .virt_start = 0x01c14000,
-                        .size = 0x00001000,
-                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-                                JAILHOUSE_MEM_IO,
-                },
-                /* SATA */ {
-                        .phys_start = 0x01c18000,
-                        .virt_start = 0x01c18000,
-                        .size = 0x00001000,
-                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-                                JAILHOUSE_MEM_IO,
-                },
-                /* USB + PMU2 */ {
-                        .phys_start = 0x01c1c000,
-                        .virt_start = 0x01c1c000,
-                        .size = 0x00001000,
-                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-                                JAILHOUSE_MEM_IO,
-                },
-                /* CCU */ {
-                        .phys_start = 0x01c20000,
-                        .virt_start = 0x01c20000,
-                        .size = 0x400,
-                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-                                JAILHOUSE_MEM_IO | JAILHOUSE_MEM_IO_32,
-                },
-                /* Ints */ {
-                        .phys_start = 0x01c20400,
-                        .virt_start = 0x01c20400,
-                        .size = 0x400,
-                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-                                JAILHOUSE_MEM_IO | JAILHOUSE_MEM_IO_32,
-                },
-                /* GPIO: ports A-G */ {
-                        .phys_start = 0x01c20800,
-                        .virt_start = 0x01c20800,
-                        .size = 0xfc,
-                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-                                JAILHOUSE_MEM_IO | JAILHOUSE_MEM_IO_32,
-                },
-                /* GPIO: port H */ {
-                        .phys_start = 0x01c208fc,
-                        .virt_start = 0x01c208fc,
-                        .size = 0x24,
-                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-                                JAILHOUSE_MEM_IO | JAILHOUSE_MEM_IO_32,
-                },
-                /* GPIO: port I */ {
-                        .phys_start = 0x01c20920,
-                        .virt_start = 0x01c20920,
-                        .size = 0x24,
-                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-                                JAILHOUSE_MEM_IO | JAILHOUSE_MEM_IO_32,
-                },
-                /* GPIO: intr config */ {
-                        .phys_start = 0x01c20a00,
-                        .virt_start = 0x01c20a00,
-                        .size = 0x1c,
-                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-                                JAILHOUSE_MEM_IO | JAILHOUSE_MEM_IO_32,
-                },
-                /* Timer */ {
-                        .phys_start = 0x01c20c00,
-                        .virt_start = 0x01c20c00,
-                        .size = 0x400,
-                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-                                JAILHOUSE_MEM_IO | JAILHOUSE_MEM_IO_32,
-                },
-                /* UART0-3 */ {
-                        .phys_start = 0x01c28000,
-                        .virt_start = 0x01c28000,
-                        .size = 0x1000,
-                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-                                JAILHOUSE_MEM_IO,
-                },
-                /* GMAC */ {
-                        .phys_start = 0x01c50000,
-                        .virt_start = 0x01c50000,
-                        .size = 0x00010000,
-                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-                                JAILHOUSE_MEM_IO,
-                },
-                /* HSTIMER */ {
-                        .phys_start = 0x01c60000,
-                        .virt_start = 0x01c60000,
-                        .size = 0x00001000,
-                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-                                JAILHOUSE_MEM_IO,
-                },
-                /* RAM */ {
-                        .phys_start = 0x40000000,
-                        .virt_start = 0x40000000,
-                        .size = 0x3bf00000,
-                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-                                JAILHOUSE_MEM_EXECUTE,
-                },
-                /* IVSHMEM shared memory region */ {
-                        .phys_start = 0x7bf00000,
-                        .virt_start = 0x7bf00000,
-                        .size = 0x100000,
-                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE,
-                },
-                /* Framebuffer */ {
-                        .phys_start = 0x7f700000,
-                        .virt_start = 0x7f700000,
-                        .size = 9<<20,
-                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-                                JAILHOUSE_MEM_IO,
-                },
-        },
-
-        .irqchips = {
-                /* GIC */ {
-                        .address = 0x01c81000,
-                        .pin_base = 32,
-                        .pin_bitmap = {
-                                0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff
-                        },
-                },
-        },
-
-        .pci_devices = {
-                {
-                        .type = JAILHOUSE_PCI_TYPE_IVSHMEM,
-                        .bdf = 0x00,
-                        .bar_mask = {
-                                0xffffff00, 0xffffffff, 0x00000000,
-                                0x00000000, 0x00000000, 0x00000000,
-                        },
-                        .shmem_region = 16,
-                        .shmem_protocol = JAILHOUSE_SHMEM_PROTO_UNDEFINED,
-                },
-        },
-};
diff --git a/recipes-jailhouse/jailhouse/files/0002-no-ldflags-in-tools.patch b/recipes-jailhouse/jailhouse/jailhouse-0.6/0002-no-ldflags-in-tools.patch
index e94f69d..e94f69d 100644
--- a/recipes-jailhouse/jailhouse/files/0002-no-ldflags-in-tools.patch
+++ b/recipes-jailhouse/jailhouse/jailhouse-0.6/0002-no-ldflags-in-tools.patch
diff --git a/recipes-jailhouse/jailhouse/files/0003-workaround-if-changed-problem-in-tools-makefile.patch b/recipes-jailhouse/jailhouse/jailhouse-0.6/0003-workaround-if-changed-problem-in-tools-makefile.patch
index 7d02b55..7d02b55 100644
--- a/recipes-jailhouse/jailhouse/files/0003-workaround-if-changed-problem-in-tools-makefile.patch
+++ b/recipes-jailhouse/jailhouse/jailhouse-0.6/0003-workaround-if-changed-problem-in-tools-makefile.patch
diff --git a/recipes-jailhouse/jailhouse/files/0004-no-kbuild-of-tools.patch b/recipes-jailhouse/jailhouse/jailhouse-0.6/0004-no-kbuild-of-tools.patch
index 4e0f337..4e0f337 100644
--- a/recipes-jailhouse/jailhouse/files/0004-no-kbuild-of-tools.patch
+++ b/recipes-jailhouse/jailhouse/jailhouse-0.6/0004-no-kbuild-of-tools.patch
diff --git a/recipes-jailhouse/jailhouse/jailhouse-0.7/0004-no-kbuild-of-tools.patch b/recipes-jailhouse/jailhouse/jailhouse-0.7/0004-no-kbuild-of-tools.patch
new file mode 100644
index 0000000..30d3b6d
--- /dev/null
+++ b/recipes-jailhouse/jailhouse/jailhouse-0.7/0004-no-kbuild-of-tools.patch
@@ -0,0 +1,13 @@
+Index: git/Kbuild
+===================================================================
+--- git.orig/Kbuild
++++ git/Kbuild
+@@ -53,7 +53,7 @@ $(obj)/driver $(obj)/hypervisor: $(GEN_V
+ 
+ endif
+ 
+-subdir-y := driver hypervisor configs inmates tools
++subdir-y := driver hypervisor configs inmates
+ 
+ subdir-ccflags-y := -Werror
+ 
diff --git a/recipes-jailhouse/jailhouse/jailhouse-0.7/0005-tools-makefile.patch b/recipes-jailhouse/jailhouse/jailhouse-0.7/0005-tools-makefile.patch
new file mode 100644
index 0000000..ea041a9
--- /dev/null
+++ b/recipes-jailhouse/jailhouse/jailhouse-0.7/0005-tools-makefile.patch
@@ -0,0 +1,36 @@
+Index: git/tools/Makefile
+===================================================================
+--- git.orig/tools/Makefile
++++ git/tools/Makefile
+@@ -19,7 +19,7 @@ LINUXINCLUDE := -I$(src)/../driver
+ KBUILD_CFLAGS := -g -O3 -DLIBEXECDIR=\"$(libexecdir)\" \
+        -Wall -Wextra -Wmissing-declarations -Wmissing-prototypes -Werror \
+        -DJAILHOUSE_VERSION=\"$(shell cat $(src)/../VERSION)\" $(EXTRA_CFLAGS)
+-LDFLAGS :=
++
+ GCOV_PROFILE := n
+ 
+ BINARIES := jailhouse
+@@ -57,7 +57,7 @@ endef
+ targets += jailhouse.o
+ 
+ $(obj)/jailhouse: $(obj)/jailhouse.o
+-       $(call if_changed,ld)
++       $(LD) $(LDFLAGS) -o $@ $^
+ 
+ CFLAGS_jailhouse-gcov-extract.o        := -I$(src)/../hypervisor/include \
+        -I$(src)/../hypervisor/arch/$(SRCARCH)/include
+@@ -68,10 +68,11 @@ targets += jailhouse-gcov-extract.o
+ always += jailhouse-gcov-extract
+ 
+ $(obj)/jailhouse-gcov-extract: $(obj)/jailhouse-gcov-extract.o
+-       $(call if_changed,ld)
++       $(LD) $(LDFLAGS) -o $@ $^
+ 
+ $(obj)/jailhouse-config-collect: $(src)/jailhouse-config-create $(src)/jailhouse-config-collect.tmpl
+-       $(call if_changed,gen_collect)
++       $< -g $@; \
++       chmod +x $@
+ 
+ install-bin: $(BINARIES) $(DESTDIR)$(sbindir)
+        $(INSTALL_PROGRAM) $^
diff --git a/recipes-jailhouse/jailhouse/jailhouse.inc b/recipes-jailhouse/jailhouse/jailhouse.inc
index fb6b021..2b13832 100644
--- a/recipes-jailhouse/jailhouse/jailhouse.inc
+++ b/recipes-jailhouse/jailhouse/jailhouse.inc
@@ -17,11 +17,18 @@ S ="${WORKDIR}/git"
 require jailhouse-defs.inc
 inherit module pythonnative bash-completion
 
+JH_CONFIG ?= "${S}/ci/jailhouse-config-x86.h"
+JH_CONFIG_x86 ?= "${S}/ci/jailhouse-config-x86.h"
+JH_CONFIG_x86-64 ?= "${S}/ci/jailhouse-config-x86.h"
+JH_CONFIG_arm ?= "${S}/ci/jailhouse-config-banana-pi.h"
+
 do_configure() {
    if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ]; 
    then
       cp "${STAGING_DIR_HOST}/${CELLCONF_DIR}/"*.c ${S}/configs/
    fi
+
+   cp -av ${JH_CONFIG} ${S}/hypervisor/include/jailhouse/config.h
 }
 
 USER_SPACE_CFLAGS = '${CFLAGS} -DLIBEXECDIR=\\\"${libexecdir}\\\" \
diff --git a/recipes-jailhouse/jailhouse/jailhouse_0.7.bb b/recipes-jailhouse/jailhouse/jailhouse_0.7.bb
new file mode 100644
index 0000000..dcc6af5
--- /dev/null
+++ b/recipes-jailhouse/jailhouse/jailhouse_0.7.bb
@@ -0,0 +1,11 @@
+require jailhouse.inc
+
+SRC_URI = "git://github.com/siemens/jailhouse.git;protocol=git \
+          file://0004-no-kbuild-of-tools.patch \
+          file://0005-tools-makefile.patch \
+        "
+
+SRCREV = "5c13b6409b6088ab717e8af444e11839868302eb"
+
+CELLS = ""
+
diff --git a/recipes-jailhouse/jailhouse/jailhouse_git.bb b/recipes-jailhouse/jailhouse/jailhouse_git.bb
new file mode 100644
index 0000000..ec7c0e1
--- /dev/null
+++ b/recipes-jailhouse/jailhouse/jailhouse_git.bb
@@ -0,0 +1,14 @@
+require jailhouse.inc
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-0.7:"
+
+SRC_URI = "git://github.com/siemens/jailhouse.git;protocol=git \
+          file://0004-no-kbuild-of-tools.patch \
+          file://0005-tools-makefile.patch \
+        "
+
+SRCREV = "${AUTOREV}"
+PV = "0.7-git${SRCPV}"
+
+CELLS = ""
+