From patchwork Mon Jul 7 07:08:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 33132 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f200.google.com (mail-ie0-f200.google.com [209.85.223.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C3ABE20C88 for ; Mon, 7 Jul 2014 07:12:05 +0000 (UTC) Received: by mail-ie0-f200.google.com with SMTP id at1sf4665975iec.11 for ; Mon, 07 Jul 2014 00:12:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=uCsVZvsadVSKZJ44m+aputbG9qCAEnlKelVJ65zLaGI=; b=hKalom4Zroo+SAs7DnZiqDQKJ4W6bZDUJ2eaoP+2BnJSYZIYPKHB/NQ+CKRhhPgGMm WivQZmlzpcagjFlaFoIpiZngHIDx79cSIv4fqs+EHZffI+TY8ZWBTGh65l0dWGMrxFUi TOZk8a8Xk5a81Jw8hjbXYMKrpVWrLedMQdPE8jRjlCSfOVrjb2J2HRx9dVR5jbpSHjvi U9kx4bhdeXkQCmVHwfe+EhYCjygl2olwEvH3cUJ173bwUPUafr8co997MQDVioXKzRLo nEHxs9jUg5XAIxiOUyesYRIB/hxB61IkY92AN5nQ/g8NjP6ExA5NoxctVLZ15cgjI7Gn WPLQ== X-Gm-Message-State: ALoCoQnhIMETt+hY1i5l1z/lhZvM7gni1WYNz6KaFQbJceTVaJf8fYQ+B1XSFDQWC18WtTjJJ4ph X-Received: by 10.50.41.3 with SMTP id b3mr11451720igl.0.1404717125315; Mon, 07 Jul 2014 00:12:05 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.19.16 with SMTP id 16ls1577033qgg.57.gmail; Mon, 07 Jul 2014 00:12:05 -0700 (PDT) X-Received: by 10.220.183.4 with SMTP id ce4mr20891vcb.54.1404717125215; Mon, 07 Jul 2014 00:12:05 -0700 (PDT) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by mx.google.com with ESMTPS id q19si18475157vea.10.2014.07.07.00.12.05 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 07 Jul 2014 00:12:05 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.175 as permitted sender) client-ip=209.85.128.175; Received: by mail-ve0-f175.google.com with SMTP id jx11so3593463veb.20 for ; Mon, 07 Jul 2014 00:12:05 -0700 (PDT) X-Received: by 10.58.65.40 with SMTP id u8mr47212ves.53.1404717125142; Mon, 07 Jul 2014 00:12:05 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp644880vcb; Mon, 7 Jul 2014 00:12:04 -0700 (PDT) X-Received: by 10.194.121.6 with SMTP id lg6mr1136955wjb.116.1404717124133; Mon, 07 Jul 2014 00:12:04 -0700 (PDT) Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by mx.google.com with ESMTPS id pi9si34347624wjb.81.2014.07.07.00.12.03 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 07 Jul 2014 00:12:04 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 74.125.82.50 as permitted sender) client-ip=74.125.82.50; Received: by mail-wg0-f50.google.com with SMTP id x13so2814987wgg.21 for ; Mon, 07 Jul 2014 00:12:03 -0700 (PDT) X-Received: by 10.194.2.45 with SMTP id 13mr955659wjr.127.1404717123586; Mon, 07 Jul 2014 00:12:03 -0700 (PDT) Received: from midway01-04-00.lavalab ([88.98.47.97]) by mx.google.com with ESMTPSA id fb15sm111830218wid.23.2014.07.07.00.12.02 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 07 Jul 2014 00:12:03 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, christoffer.dall@linaro.org, qemu-devel@nongnu.org, kim.phillips@freescale.com, a.rigo@virtualopensystems.com Cc: eric.auger@linaro.org, kvmarm@lists.cs.columbia.edu, alex.williamson@redhat.com, agraf@suse.de, peter.maydell@linaro.org, stuart.yoder@freescale.com, a.motakis@virtualopensystems.com, patches@linaro.org Subject: [PATCH 4/7] hw/arm/virt: Support dynamically spawned sysbus devices Date: Mon, 7 Jul 2014 08:08:09 +0100 Message-Id: <1404716892-15600-5-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1404716892-15600-1-git-send-email-eric.auger@linaro.org> References: <1404716892-15600-1-git-send-email-eric.auger@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: eric.auger@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.175 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Allows sysbus devices to be instantiated from command line by using -device option --- Inspired from what Alex Graf did in ppc e500 https://lists.gnu.org/archive/html/qemu-ppc/2014-07/msg00012.html Signed-off-by: Alexander Graf Signed-off-by: Eric Auger --- hw/arm/virt.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 57 insertions(+), 1 deletion(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index eeecdbf..3a21db4 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -40,6 +40,8 @@ #include "exec/address-spaces.h" #include "qemu/bitops.h" #include "qemu/error-report.h" +#include "hw/misc/platform_devices.h" +#include "hw/vfio/vfio-platform.h" #define NUM_VIRTIO_TRANSPORTS 32 @@ -57,6 +59,14 @@ #define GIC_FDT_IRQ_PPI_CPU_START 8 #define GIC_FDT_IRQ_PPI_CPU_WIDTH 8 +#define MACHVIRT_PLATFORM_BASE 0xa004000 +#define MACHVIRT_PLATFORM_HOLE (128ULL * 1024 * 1024) /* 128 MB */ +#define MACHVIRT_PLATFORM_PAGE_SHIFT 12 +#define MACHVIRT_PLATFORM_HOLE_PAGES (MACHVIRT_PLATFORM_HOLE >> \ + MACHVIRT_PLATFORM_PAGE_SHIFT) +#define MACHVIRT_PLATFORM_FIRST_IRQ 48 +#define MACHVIRT_PLATFORM_NUM_IRQS 20 + enum { VIRT_FLASH, VIRT_MEM, @@ -66,6 +76,7 @@ enum { VIRT_UART, VIRT_MMIO, VIRT_RTC, + VIRT_PLATFORM, }; typedef struct MemMapEntry { @@ -108,6 +119,7 @@ static const MemMapEntry a15memmap[] = { [VIRT_MMIO] = { 0xa000000, 0x200 }, /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */ /* 0x10000000 .. 0x40000000 reserved for PCI */ + [VIRT_PLATFORM] = {MACHVIRT_PLATFORM_BASE , MACHVIRT_PLATFORM_HOLE}, [VIRT_MEM] = { 0x40000000, 30ULL * 1024 * 1024 * 1024 }, }; @@ -115,6 +127,15 @@ static const int a15irqmap[] = { [VIRT_UART] = 1, [VIRT_RTC] = 2, [VIRT_MMIO] = 16, /* ...to 16 + NUM_VIRTIO_TRANSPORTS - 1 */ + [VIRT_PLATFORM] = MACHVIRT_PLATFORM_FIRST_IRQ, +}; + +static PlatformParams machvirt_params = { + .has_platform_bus = true, + .platform_bus_base = MACHVIRT_PLATFORM_BASE, + .platform_bus_size = MACHVIRT_PLATFORM_HOLE, + .platform_bus_first_irq = MACHVIRT_PLATFORM_FIRST_IRQ, + .platform_bus_num_irqs = MACHVIRT_PLATFORM_NUM_IRQS }; static VirtBoardInfo machines[] = { @@ -437,6 +458,18 @@ static void create_virtio_devices(const VirtBoardInfo *vbi, qemu_irq *pic) fdt_add_virtio_nodes(vbi); } +static void machvirt_prep_device_tree(VirtBoardInfo *vbi) +{ + create_fdt(vbi); + fdt_add_timer_nodes(vbi); + fdt_add_cpu_nodes(vbi); + fdt_add_psci_node(vbi); + fdt_add_gic_node(vbi); + fdt_add_uart_node(vbi); + fdt_add_rtc_node(vbi); + fdt_add_virtio_nodes(vbi); +} + static void *machvirt_dtb(const struct arm_boot_info *binfo, int *fdt_size) { const VirtBoardInfo *board = (const VirtBoardInfo *)binfo; @@ -445,14 +478,27 @@ static void *machvirt_dtb(const struct arm_boot_info *binfo, int *fdt_size) return board->fdt; } +static void machvirt_reset_device_tree(void *opaque) +{ + VirtBoardInfo *board = (VirtBoardInfo *)opaque; + struct arm_boot_info *info = &board->bootinfo; + hwaddr dtb_start = QEMU_ALIGN_UP(info->initrd_start + info->initrd_size, + 4096); + machvirt_prep_device_tree(board); + platform_bus_create_devtree(&machvirt_params, board->fdt, "/intc"); + + load_dtb(dtb_start, info); +} + static void machvirt_init(MachineState *machine) { - qemu_irq pic[NUM_IRQS]; + qemu_irq *pic = g_new(qemu_irq, NUM_IRQS); MemoryRegion *sysmem = get_system_memory(); int n; MemoryRegion *ram = g_new(MemoryRegion, 1); const char *cpu_model = machine->cpu_model; VirtBoardInfo *vbi; + PlatformBusNotifier *notifier; if (!cpu_model) { cpu_model = "cortex-a15"; @@ -526,6 +572,13 @@ static void machvirt_init(MachineState *machine) */ create_virtio_devices(vbi, pic); + notifier = g_new(PlatformBusNotifier, 1); + notifier->notifier.notify = platform_bus_init_notify; + notifier->address_space_mem = sysmem; + notifier->mpic = pic; + notifier->params = machvirt_params; + qemu_add_machine_init_done_notifier(¬ifier->notifier); + vbi->bootinfo.ram_size = machine->ram_size; vbi->bootinfo.kernel_filename = machine->kernel_filename; vbi->bootinfo.kernel_cmdline = machine->kernel_cmdline; @@ -535,6 +588,8 @@ static void machvirt_init(MachineState *machine) vbi->bootinfo.loader_start = vbi->memmap[VIRT_MEM].base; vbi->bootinfo.get_dtb = machvirt_dtb; arm_load_kernel(ARM_CPU(first_cpu), &vbi->bootinfo); + + qemu_register_reset(machvirt_reset_device_tree, vbi); } static QEMUMachine machvirt_a15_machine = { @@ -542,6 +597,7 @@ static QEMUMachine machvirt_a15_machine = { .desc = "ARM Virtual Machine", .init = machvirt_init, .max_cpus = 4, + .has_dynamic_sysbus = true, }; static void machvirt_machine_init(void)