From patchwork Tue Sep 9 07:54:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 37045 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f197.google.com (mail-ie0-f197.google.com [209.85.223.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DD68520491 for ; Tue, 9 Sep 2014 07:54:58 +0000 (UTC) Received: by mail-ie0-f197.google.com with SMTP id rp18sf81331692iec.0 for ; Tue, 09 Sep 2014 00:54:58 -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=eFl6VifACT6LxvrD9oQ5QDcwJPZ9ylGCWqr9oMzw18E=; b=FEGqdD5VgooCiz2lN3Ktw7pS4Mh+MQtZYwVLZ+31cfQnvqVvbPaDxAVHcSy9OvoJGK tfNgMztlmZg/Jpv1JgThaVt89ECFiOc6Gx8djdkfvcAXrhgKZemT8XHpqo9dbBEUPSbr T2ZqWKb0gjrjdhUuY7Na2raYgoDIKvLkBxMjyjEf3bWSSTg77izBSHwb8EoRGaU4ZsBx 99zdlzGq4jrfiQj7+Ob+MkyvTf7zh5qhZt/cxuunCLP9KLlDeK3ZyfDgp5zy5LbyR+Ay OThZZrBV7Cuz9563p3R0bJEen2D4shpjlVMc5/5bsMlpBOcWwJP7ev9HSokFOGVnp/Ob rJqg== X-Gm-Message-State: ALoCoQmBL5hgkJe9Pc2A1Wr7UlYLejM9pFUJ664OWUboDkzyb0yuWP3ctkpYL6UNBlLlGxvAGcCA X-Received: by 10.50.49.33 with SMTP id r1mr15915374ign.3.1410249298551; Tue, 09 Sep 2014 00:54:58 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.107.182 with SMTP id h51ls2154447qgf.80.gmail; Tue, 09 Sep 2014 00:54:58 -0700 (PDT) X-Received: by 10.52.129.165 with SMTP id nx5mr23617916vdb.25.1410249298452; Tue, 09 Sep 2014 00:54:58 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id v10si618342vcl.87.2014.09.09.00.54.58 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Sep 2014 00:54:58 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.180 as permitted sender) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id lf12so16774042vcb.11 for ; Tue, 09 Sep 2014 00:54:58 -0700 (PDT) X-Received: by 10.52.162.74 with SMTP id xy10mr3855117vdb.51.1410249298352; Tue, 09 Sep 2014 00:54:58 -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.45.67 with SMTP id uj3csp246183vcb; Tue, 9 Sep 2014 00:54:57 -0700 (PDT) X-Received: by 10.180.107.100 with SMTP id hb4mr27807139wib.59.1410249297249; Tue, 09 Sep 2014 00:54:57 -0700 (PDT) Received: from mail-we0-f171.google.com (mail-we0-f171.google.com [74.125.82.171]) by mx.google.com with ESMTPS id a9si16129123wjs.147.2014.09.09.00.54.56 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Sep 2014 00:54:57 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 74.125.82.171 as permitted sender) client-ip=74.125.82.171; Received: by mail-we0-f171.google.com with SMTP id p10so261464wes.30 for ; Tue, 09 Sep 2014 00:54:56 -0700 (PDT) X-Received: by 10.180.72.239 with SMTP id g15mr2901712wiv.47.1410249296839; Tue, 09 Sep 2014 00:54:56 -0700 (PDT) Received: from midway01-04-00.lavalab ([88.98.47.97]) by mx.google.com with ESMTPSA id xt6sm13873858wjc.14.2014.09.09.00.54.55 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Sep 2014 00:54:56 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, christoffer.dall@linaro.org, qemu-devel@nongnu.org, a.rigo@virtualopensystems.com, kim.phillips@freescale.com, marc.zyngier@arm.com, manish.jaggi@caviumnetworks.com, joel.schopp@amd.com, agraf@suse.de, peter.maydell@linaro.org, pbonzini@redhat.com, afaerber@suse.de Cc: eric.auger@linaro.org, kvmarm@lists.cs.columbia.edu, patches@linaro.org, will.deacon@arm.com, Bharat.Bhushan@freescale.com, stuart.yoder@freescale.com, a.motakis@virtualopensystems.com, alex.williamson@redhat.com Subject: [PATCH v3 6/6] hw/arm/virt: Support dynamically spawned sysbus devices Date: Tue, 9 Sep 2014 08:54:33 +0100 Message-Id: <1410249273-6063-7-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1410249273-6063-1-git-send-email-eric.auger@linaro.org> References: <1410249273-6063-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.220.180 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 Signed-off-by: Alexander Graf Signed-off-by: Eric Auger --- v2 -> v3 - renaming of arm_platform_bus_create_devtree and arm_load_dtb - add copyright in hw/arm/dyn_sysbus_devtree.c v1 -> v2: - remove useless vfio-platform.h include file - s/MACHVIRT_PLATFORM_HOLE/MACHVIRT_PLATFORM_SIZE - use dyn_sysbus_binding and dyn_sysbus_devtree - dynamic sysbus platform buse size shrinked to 4MB and moved between RTC and MMIO v1: Inspired from what Alex Graf did in ppc e500 https://lists.gnu.org/archive/html/qemu-ppc/2014-07/msg00012.html --- hw/arm/dyn_sysbus_devtree.c | 26 +++++++++++++++++++ hw/arm/virt.c | 62 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 86 insertions(+), 2 deletions(-) diff --git a/hw/arm/dyn_sysbus_devtree.c b/hw/arm/dyn_sysbus_devtree.c index 6375024..61e5b5f 100644 --- a/hw/arm/dyn_sysbus_devtree.c +++ b/hw/arm/dyn_sysbus_devtree.c @@ -1,7 +1,30 @@ +/* + * ARM Platform Bus device tree generation helpers + * + * Copyright (c) 2014 Linaro Limited + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2 or later, as published by the Free Software Foundation. + * + * This program is distributed in the hope 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 . + * + */ + #include "hw/arm/dyn_sysbus_devtree.h" #include "qemu/error-report.h" #include "sysemu/device_tree.h" +/** + * arm_sysbus_device_create_devtree - create the node of devices + * attached to the platform bus + */ static int arm_sysbus_device_create_devtree(Object *obj, void *opaque) { PlatformDevtreeData *data = opaque; @@ -27,6 +50,9 @@ static int arm_sysbus_device_create_devtree(Object *obj, void *opaque) return 0; } +/** + * arm_platform_bus_create_devtree - create the platform bus node + */ void arm_platform_bus_create_devtree(DynSysbusParams *params, void *fdt, const char *intc) { diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 9085b88..16acf44 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/dyn_sysbus_binding.h" +#include "hw/arm/dyn_sysbus_devtree.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 0x9400000 +#define MACHVIRT_PLATFORM_SIZE (4ULL * 1024 * 1024) /* 4 MB */ +#define MACHVIRT_PLATFORM_PAGE_SHIFT 12 +#define MACHVIRT_PLATFORM_SIZE_PAGES (MACHVIRT_PLATFORM_SIZE >> \ + 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 { @@ -105,16 +116,27 @@ static const MemMapEntry a15memmap[] = { [VIRT_GIC_CPU] = { 0x08010000, 0x00010000 }, [VIRT_UART] = { 0x09000000, 0x00001000 }, [VIRT_RTC] = { 0x09010000, 0x00001000 }, + [VIRT_PLATFORM] = {MACHVIRT_PLATFORM_BASE , MACHVIRT_PLATFORM_SIZE}, [VIRT_MMIO] = { 0x0a000000, 0x00000200 }, /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */ /* 0x10000000 .. 0x40000000 reserved for PCI */ - [VIRT_MEM] = { 0x40000000, 30ULL * 1024 * 1024 * 1024 }, + [VIRT_MEM] = { 0x40000000, 30ULL * 1024 * 1024 * 1024 }, }; 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 DynSysbusParams dyn_sysbus_platform_params = { + .has_platform_bus = true, + .platform_bus_base = MACHVIRT_PLATFORM_BASE, + .platform_bus_size = MACHVIRT_PLATFORM_SIZE, + .platform_bus_first_irq = MACHVIRT_PLATFORM_FIRST_IRQ, + .platform_bus_num_irqs = MACHVIRT_PLATFORM_NUM_IRQS, + .page_shift = MACHVIRT_PLATFORM_PAGE_SHIFT, }; static VirtBoardInfo machines[] = { @@ -458,6 +480,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; @@ -466,14 +500,28 @@ 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); + arm_platform_bus_create_devtree(&dyn_sysbus_platform_params, + board->fdt, "/intc"); + + arm_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; + DynSysbusNotifier *notifier; if (!cpu_model) { cpu_model = "cortex-a15"; @@ -547,6 +595,13 @@ static void machvirt_init(MachineState *machine) */ create_virtio_devices(vbi, pic); + notifier = g_new(DynSysbusNotifier, 1); + notifier->notifier.notify = platform_bus_init_notify; + notifier->address_space_mem = sysmem; + notifier->mpic = pic; + notifier->params = dyn_sysbus_platform_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; @@ -556,6 +611,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 = { @@ -563,6 +620,7 @@ static QEMUMachine machvirt_a15_machine = { .desc = "ARM Virtual Machine", .init = machvirt_init, .max_cpus = 8, + .has_dynamic_sysbus = true, }; static void machvirt_machine_init(void)