/*
* Jailhouse, a Linux-based partitioning hypervisor
*
- * Test configuration for QEMU VM, 1 GB RAM, 64 MB hypervisor (-8 K ACPI)
- * Command line:
- * qemu-system-x86_64 /path/to/image -m 1G -enable-kvm -smp 4 \
- * -virtfs local,path=/local/path,security_model=passthrough,mount_tag=host \
- * -cpu kvm64,-kvm_pv_eoi,-kvm_steal_time,-kvm_asyncpf,-kvmclock,+vmx,+x2apic
+ * Test configuration for QEMU Q35 VM, 1 GB RAM, 4 cores,
+ * 6 MB hypervisor, 60 MB inmates (-4K shared mem device)
*
- * Copyright (c) Siemens AG, 2013
+ * Copyright (c) Siemens AG, 2013-2015
*
* 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.
+ *
+ * QEMU command line for Intel-based setups:
+ * qemu-system-x86_64 -machine q35 -m 1G -enable-kvm -smp 4 \
+ * -drive file=/path/to/image,id=disk,if=none -device ide-hd,drive=disk \
+ * -virtfs local,path=/local/path,security_model=passthrough,mount_tag=host \
+ * -cpu kvm64,-kvm_pv_eoi,-kvm_steal_time,-kvm_asyncpf,-kvmclock,+vmx,+x2apic
+ *
+ * QEMU command line for AMD-based setups:
+ * qemu-system-x86_64 /path/to/image -m 1G -enable-kvm -smp 4 \
+ * -virtfs local,path=/local/path,security_model=passthrough,mount_tag=host \
+ * -cpu host,-kvm_pv_eoi,-kvm_steal_time,-kvm_asyncpf,-kvmclock,+svm,+x2apic
+ *
+ * Guest kernel command line appendix: memmap=66M$0x3b000000
*/
#include <linux/types.h>
#include <jailhouse/cell-config.h>
-#define ALIGN __attribute__((aligned(1)))
#define ARRAY_SIZE(a) sizeof(a) / sizeof(a[0])
struct {
- struct jailhouse_system ALIGN header;
- __u64 ALIGN cpus[1];
- struct jailhouse_memory ALIGN mem_regions[5];
- __u8 ALIGN pio_bitmap[0x2000];
-} ALIGN config = {
+ struct jailhouse_system header;
+ __u64 cpus[1];
+ struct jailhouse_memory mem_regions[14];
+ struct jailhouse_irqchip irqchips[1];
+ __u8 pio_bitmap[0x2000];
+ struct jailhouse_pci_device pci_devices[11];
+ struct jailhouse_pci_capability pci_caps[4];
+} __attribute__((packed)) config = {
.header = {
+ .signature = JAILHOUSE_SYSTEM_SIGNATURE,
.hypervisor_memory = {
- .phys_start = 0x3c000000,
- .size = 0x4000000 - 0x2000,
+ .phys_start = 0x3b000000,
+ .size = 0x600000,
},
- .config_memory = {
- .phys_start = 0x3fffe000,
- .size = 0x2000,
+ .debug_console = {
+ .phys_start = 0x3f8,
},
- .system = {
- .name = "QEMU Linux VM",
+ .platform_info.x86 = {
+ .mmconfig_base = 0xb0000000,
+ .mmconfig_end_bus = 0xff,
+ .pm_timer_address = 0x608,
+ .iommu_units = {
+ {
+ .base = 0xfed90000,
+ .size = 0x1000,
+ },
+ },
+ },
+ .interrupt_limit = 256,
+ .root_cell = {
+ .name = "QEMU-VM",
.cpu_set_size = sizeof(config.cpus),
.num_memory_regions = ARRAY_SIZE(config.mem_regions),
- .num_irq_lines = 0,
+ .num_irqchips = ARRAY_SIZE(config.irqchips),
.pio_bitmap_size = ARRAY_SIZE(config.pio_bitmap),
- .num_pci_devices = 0,
+ .num_pci_devices = ARRAY_SIZE(config.pci_devices),
+ .num_pci_caps = ARRAY_SIZE(config.pci_caps),
},
},
/* RAM */ {
.phys_start = 0x0,
.virt_start = 0x0,
- .size = 0x3c000000,
+ .size = 0x3b000000,
+ .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
+ JAILHOUSE_MEM_EXECUTE | JAILHOUSE_MEM_DMA,
+ },
+ /* RAM (inmates) */ {
+ .phys_start = 0x3b600000,
+ .virt_start = 0x3b600000,
+ .size = 0x3bff000,
+ .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
+ JAILHOUSE_MEM_EXECUTE | JAILHOUSE_MEM_DMA,
+ },
+ /* RAM */ {
+ .phys_start = 0x3f200000,
+ .virt_start = 0x3f200000,
+ .size = 0xddf000,
.flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
JAILHOUSE_MEM_EXECUTE | JAILHOUSE_MEM_DMA,
},
/* ACPI */ {
- .phys_start = 0x3fffe000,
- .virt_start = 0x3fffe000,
- .size = 0x2000,
+ .phys_start = 0x3ffdf000,
+ .virt_start = 0x3ffdf000,
+ .size = 0x30000,
.flags = JAILHOUSE_MEM_READ,
},
- /* PCI */ {
- .phys_start = 0x40000000,
- .virt_start = 0x40000000,
- .size = 0xbec00000,
+ /* MemRegion: fd000000-fdffffff : vesafb */
+ {
+ .phys_start = 0xfd000000,
+ .virt_start = 0xfd000000,
+ .size = 0x1000000,
.flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE,
},
- /* yeah, that's not really safe... */
- /* IOAPIC */ {
- .phys_start = 0xfec00000,
- .virt_start = 0xfec00000,
+ /* MemRegion: feb80000-febbffff : 0000:00:02.0 */
+ {
+ .phys_start = 0xfeb80000,
+ .virt_start = 0xfeb80000,
+ .size = 0x40000,
+ .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE,
+ },
+ /* MemRegion: febc0000-febdffff : e1000 */
+ {
+ .phys_start = 0xfebc0000,
+ .virt_start = 0xfebc0000,
+ .size = 0x20000,
+ .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE,
+ },
+ /* MemRegion: febe0000-febeffff : 0000:00:01.0 */
+ {
+ .phys_start = 0xfebe0000,
+ .virt_start = 0xfebe0000,
+ .size = 0x10000,
+ .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE,
+ },
+ /* MemRegion: febf0000-febf3fff : ICH HD audio */
+ {
+ .phys_start = 0xfebf0000,
+ .virt_start = 0xfebf0000,
+ .size = 0x4000,
+ .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE,
+ },
+ /* MemRegion: febf4000-febf4fff : 0000:00:01.0 */
+ {
+ .phys_start = 0xfebf4000,
+ .virt_start = 0xfebf4000,
.size = 0x1000,
.flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE,
},
- /* the same here until we catch MSIs via interrupt remapping */
- /* HPET */ {
+ /* MemRegion: febf5000-febf5fff : ahci */
+ {
+ .phys_start = 0xfebf5000,
+ .virt_start = 0xfebf5000,
+ .size = 0x1000,
+ .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE,
+ },
+ /* MemRegion: febf6000-febf6fff : virtio-9p */
+ {
+ .phys_start = 0xfebf6000,
+ .virt_start = 0xfebf6000,
+ .size = 0x1000,
+ .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE,
+ },
+
+ /* MemRegion: fed00000-fed003ff : PNP0103:00 */
+ {
.phys_start = 0xfed00000,
.virt_start = 0xfed00000,
.size = 0x1000,
.flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE,
},
+ /* IVSHMEM shared memory region */
+ {
+ .phys_start = 0x3f1ff000,
+ .virt_start = 0x3f1ff000,
+ .size = 0x1000,
+ .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE,
+ },
+ },
+
+ .irqchips = {
+ /* IOAPIC */ {
+ .address = 0xfec00000,
+ .id = 0xff00,
+ .pin_bitmap = {
+ 0xffffff
+ },
+ },
},
.pio_bitmap = {
- [ 0/8 ... 0x1f/8] = -1,
- [ 0x20/8 ... 0x27/8] = 0xfc, /* HACK: PIC */
- [ 0x28/8 ... 0x3f/8] = -1,
+ [ 0/8 ... 0x1f/8] = 0, /* floppy DMA controller */
+ [ 0x20/8 ... 0x3f/8] = -1,
[ 0x40/8 ... 0x47/8] = 0xf0, /* PIT */
[ 0x48/8 ... 0x5f/8] = -1,
- [ 0x60/8 ... 0x67/8] = 0xec, /* HACK: 8042, PC speaker - and more */
+ [ 0x60/8 ... 0x67/8] = 0xfd, /*0xec HACK: NMI status/control */
[ 0x68/8 ... 0x6f/8] = -1,
[ 0x70/8 ... 0x77/8] = 0xfc, /* rtc */
[ 0x78/8 ... 0x7f/8] = -1,
[ 0x80/8 ... 0x87/8] = 0xfe, /* port 80 (delays) */
- [ 0x88/8 ... 0x16f/8] = -1,
- [ 0x170/8 ... 0x177/8] = 0, /* ide */
- [ 0x178/8 ... 0x1ef/8] = -1,
- [ 0x1f0/8 ... 0x1f7/8] = 0, /* ide */
- [ 0x1f8/8 ... 0x2f7/8] = -1,
+
+ [ 0x88/8 ... 0xec/8] = -1,
+ [ 0xed/8 ... 0xf5/8] = 0xfe, /*port 0xed delay experimental*/
+ [ 0xf6/8 ... 0x1c7/8] = -1,
+
+ [ 0x1c8/8 ... 0x1cf/8] = 0x3f, /* vbe */
+ [ 0x1d0/8 ... 0x1d7/8] = 0xfe, /* vbe */
+ [ 0x1d8/8 ... 0x2f7/8] = -1,
[ 0x2f8/8 ... 0x2ff/8] = 0, /* serial2 */
- [ 0x300/8 ... 0x36f/8] = -1,
- [ 0x370/8 ... 0x377/8] = 0xbf, /* ide */
- [ 0x378/8 ... 0x3af/8] = -1,
+ [ 0x300/8 ... 0x3af/8] = -1,
[ 0x3b0/8 ... 0x3df/8] = 0, /* VGA */
[ 0x3e0/8 ... 0x3ef/8] = -1,
- [ 0x3f0/8 ... 0x3f7/8] = 0xbf, /* ide */
- [ 0x3f8/8 ... 0xcf7/8] = -1,
- [ 0xcf8/8 ... 0xcff/8] = 0, /* HACK: PCI, PIIX3 RCR */
- [ 0xd00/8 ... 0x5657/8] = -1,
+ [ 0x3f0/8 ... 0x3f7/8] = 0, /* floppy */
+ [ 0x3f8/8 ... 0x3ff/8] = 0,
+ [ 0x400/8 ... 0x407/8] = 0xfb, /* invalid but accessed by X */
+ [ 0x408/8 ... 0x5657/8] = -1,
[0x5658/8 ... 0x565f/8] = 0xf0, /* vmport */
[0x5660/8 ... 0xbfff/8] = -1,
- [0xc000/8 ... 0xc03f/8] = 0, /* e1000 */
- [0xc040/8 ... 0xc07f/8] = 0, /* virtio-9p-pci */
- [0xc080/8 ... 0xc08f/8] = 0, /* piix bmdma */
- [0xc090/8 ... 0xffff/8] = -1,
+ [0xc000/8 ... 0xc0ff/8] = 0, /* PCI devices */
+ [0xc100/8 ... 0xffff/8] = -1,
+ },
+
+ .pci_devices = {
+ { /* VGA */
+ .type = JAILHOUSE_PCI_TYPE_DEVICE,
+ .domain = 0x0000,
+ .bdf = 0x0008,
+ },
+ { /* e1000 */
+ .type = JAILHOUSE_PCI_TYPE_DEVICE,
+ .domain = 0x0000,
+ .bdf = 0x0010,
+ },
+ { /* ICH HD audio */
+ .type = JAILHOUSE_PCI_TYPE_DEVICE,
+ .domain = 0x0000,
+ .bdf = 0x00d8,
+ .caps_start = 0,
+ .num_caps = 2,
+ .num_msi_vectors = 1,
+ .msi_64bits = 1,
+ },
+
+ {/*uhci_hcd 00:1d.0*/
+ .type = JAILHOUSE_PCI_TYPE_DEVICE,
+ .domain = 0x0000,
+ .bdf = 0x00e8,
+ },
+ {/*uhci_hcd 00:1d.1*/
+ .type = JAILHOUSE_PCI_TYPE_DEVICE,
+ .domain = 0x0000,
+ .bdf = 0x00e9,
+ },
+ {/*uhci_hcd 00:1d.2*/
+ .type = JAILHOUSE_PCI_TYPE_DEVICE,
+ .domain = 0x0000,
+ .bdf = 0x00ea,
+ },
+ {/*ehci_pci 00:1d.7*/
+ .type = JAILHOUSE_PCI_TYPE_DEVICE,
+ .domain = 0x0000,
+ .bdf = 0x00ef,
+ },
+
+ { /* ISA bridge */
+ .type = JAILHOUSE_PCI_TYPE_DEVICE,
+ .domain = 0x0000,
+ .bdf = 0x00f8,
+ },
+ { /* AHCI */
+ .type = JAILHOUSE_PCI_TYPE_DEVICE,
+ .domain = 0x0000,
+ .bdf = 0x00fa,
+ .caps_start = 2,
+ .num_caps = 2,
+ .num_msi_vectors = 1,
+ .msi_64bits = 1,
+ },
+ { /* SMBus */
+ .type = JAILHOUSE_PCI_TYPE_DEVICE,
+ .domain = 0x0000,
+ .bdf = 0x00fb,
+ },
+ /*{ // virtio-9p-pci /
+ .type = JAILHOUSE_PCI_TYPE_DEVICE,
+ .domain = 0x0000,
+ .bdf = 0x00ff,
+ .caps_start = 4,
+ .num_caps = 1,
+ .num_msix_vectors = 2,
+ .msix_region_size = 0x1000,
+ .msix_address = 0xfebf6000,
+ },*/
+ {
+ .type = JAILHOUSE_PCI_TYPE_IVSHMEM,
+ .domain = 0x0,
+ .bdf = (0x0f<<3),
+ .bar_mask = {
+ 0xffffff00, 0xffffffff, 0x00000000,
+ 0x00000000, 0xffffffe0, 0xffffffff,
+ },
+ .shmem_region = 12,
+ .num_msix_vectors = 1,
+ },
+
+ },
+
+ .pci_caps = {
+ { /* ICH HD audio */
+ .id = 0x5,
+ .start = 0x60,
+ .len = 14,
+ .flags = JAILHOUSE_PCICAPS_WRITE,
+ },
+ { /* non-cap registers: HDCTL, TCSEL, DCKCTL, DCKSTS */
+ .start = 0x40,
+ .len = 0x10,
+ .flags = JAILHOUSE_PCICAPS_WRITE,
+ },
+ { /* AHCI */
+ .id = 0x12,
+ .start = 0xa8,
+ .len = 2,
+ .flags = 0,
+ },
+ {
+ .id = 0x5,
+ .start = 0x80,
+ .len = 14,
+ .flags = JAILHOUSE_PCICAPS_WRITE,
+ },
+ /*{ // virtio-9p-pci //
+ .id = 0x11,
+ .start = 0x40,
+ .len = 12,
+ .flags = JAILHOUSE_PCICAPS_WRITE,
+ },*/
},
};
projects / jailhouse.git / blobdiff