From patchwork Tue Sep 9 07:54:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 387201 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id DB2041400D6 for ; Tue, 9 Sep 2014 17:58:06 +1000 (EST) Received: from localhost ([::1]:48048 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XRGJR-0006Uv-3C for incoming@patchwork.ozlabs.org; Tue, 09 Sep 2014 03:58:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49102) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XRGGT-0001bq-Ib for qemu-devel@nongnu.org; Tue, 09 Sep 2014 03:55:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XRGGN-00077I-Fo for qemu-devel@nongnu.org; Tue, 09 Sep 2014 03:55:01 -0400 Received: from mail-wi0-f171.google.com ([209.85.212.171]:49720) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XRGGN-000775-4w for qemu-devel@nongnu.org; Tue, 09 Sep 2014 03:54:55 -0400 Received: by mail-wi0-f171.google.com with SMTP id hi2so3927121wib.4 for ; Tue, 09 Sep 2014 00:54:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Ewmg8wPm+HVhr3juxGkiM4oNdDfZqpMhSjy4ETDTQ4Y=; b=RA5feBEfktahiTvg7qkr7KxokW1L7JmunHisXh2TzT93/GyA8luocP4tCFF7UyI8TZ PKT+QzKhX7uMlVX6eSlg0+euhjmZ8ql8JNxsmQs+WJLi2ZK8erTsJY0U/5WH97USmdfV Zt289CpBVXmCpy/yOGQNVoeaQAcZsu3ZBAEEHivFXhr8Orf7F3f43f6El7SzcNKFwUrQ EBY+rA/nR14GrwxJ7mHPNo0FhfEVlJ0tnghGLcyxSYiI9K9/SudufkjY8LDKL0sAYsOz +iu6g9amZrXrRHgWr2LMviGSEW1xc6naTyal/jNnzndEAXSyvHArpRWW+icgTFHe3/Jy HttQ== X-Gm-Message-State: ALoCoQkwqvHebXaLqCRyjDehjf382qxQ39sNfA015NUgTXhSysXWbueEA/HE0zRt2CxAcPeUND3d X-Received: by 10.180.94.161 with SMTP id dd1mr28820160wib.22.1410249294452; Tue, 09 Sep 2014 00:54:54 -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.53 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Sep 2014 00:54:53 -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 Date: Tue, 9 Sep 2014 08:54:32 +0100 Message-Id: <1410249273-6063-6-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-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.212.171 Cc: patches@linaro.org, eric.auger@linaro.org, will.deacon@arm.com, stuart.yoder@freescale.com, Bharat.Bhushan@freescale.com, alex.williamson@redhat.com, a.motakis@virtualopensystems.com, kvmarm@lists.cs.columbia.edu Subject: [Qemu-devel] [PATCH v3 5/6] hw/arm/virt: new add_fdt_*_node functions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Create new functions: - add_fdt_uart_node - add_fdt_rtc_node - add_fdt_virtio_nodes They will be used for dynamic sysbus instantiation. Signed-off-by: Eric Auger --- v2 -> v3: reword title to avoid content violation --- hw/arm/virt.c | 67 +++++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 23 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index d6fffc7..9085b88 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -351,18 +351,15 @@ static void create_gic(const VirtBoardInfo *vbi, qemu_irq *pic) fdt_add_gic_node(vbi); } -static void create_uart(const VirtBoardInfo *vbi, qemu_irq *pic) +static void fdt_add_uart_node(const VirtBoardInfo *vbi) { - char *nodename; hwaddr base = vbi->memmap[VIRT_UART].base; hwaddr size = vbi->memmap[VIRT_UART].size; int irq = vbi->irqmap[VIRT_UART]; const char compat[] = "arm,pl011\0arm,primecell"; const char clocknames[] = "uartclk\0apb_pclk"; + char *nodename = g_strdup_printf("/pl011@%" PRIx64, base); - sysbus_create_simple("pl011", base, pic[irq]); - - nodename = g_strdup_printf("/pl011@%" PRIx64, base); qemu_fdt_add_subnode(vbi->fdt, nodename); /* Note that we can't use setprop_string because of the embedded NUL */ qemu_fdt_setprop(vbi->fdt, nodename, "compatible", @@ -379,17 +376,23 @@ static void create_uart(const VirtBoardInfo *vbi, qemu_irq *pic) g_free(nodename); } -static void create_rtc(const VirtBoardInfo *vbi, qemu_irq *pic) +static void create_uart(const VirtBoardInfo *vbi, qemu_irq *pic) +{ + hwaddr base = vbi->memmap[VIRT_UART].base; + int irq = vbi->irqmap[VIRT_UART]; + + sysbus_create_simple("pl011", base, pic[irq]); + fdt_add_uart_node(vbi); +} + +static void fdt_add_rtc_node(const VirtBoardInfo *vbi) { - char *nodename; hwaddr base = vbi->memmap[VIRT_RTC].base; hwaddr size = vbi->memmap[VIRT_RTC].size; int irq = vbi->irqmap[VIRT_RTC]; const char compat[] = "arm,pl031\0arm,primecell"; + char *nodename = g_strdup_printf("/pl031@%" PRIx64, base); - sysbus_create_simple("pl031", base, pic[irq]); - - nodename = g_strdup_printf("/pl031@%" PRIx64, base); qemu_fdt_add_subnode(vbi->fdt, nodename); qemu_fdt_setprop(vbi->fdt, nodename, "compatible", compat, sizeof(compat)); qemu_fdt_setprop_sized_cells(vbi->fdt, nodename, "reg", @@ -402,22 +405,20 @@ static void create_rtc(const VirtBoardInfo *vbi, qemu_irq *pic) g_free(nodename); } -static void create_virtio_devices(const VirtBoardInfo *vbi, qemu_irq *pic) +static void create_rtc(const VirtBoardInfo *vbi, qemu_irq *pic) { - int i; - hwaddr size = vbi->memmap[VIRT_MMIO].size; + hwaddr base = vbi->memmap[VIRT_RTC].base; + int irq = vbi->irqmap[VIRT_RTC]; - /* Note that we have to create the transports in forwards order - * so that command line devices are inserted lowest address first, - * and then add dtb nodes in reverse order so that they appear in - * the finished device tree lowest address first. - */ - for (i = 0; i < NUM_VIRTIO_TRANSPORTS; i++) { - int irq = vbi->irqmap[VIRT_MMIO] + i; - hwaddr base = vbi->memmap[VIRT_MMIO].base + i * size; + sysbus_create_simple("pl031", base, pic[irq]); - sysbus_create_simple("virtio-mmio", base, pic[irq]); - } + fdt_add_rtc_node(vbi); +} + +static void fdt_add_virtio_nodes(const VirtBoardInfo *vbi) +{ + int i; + hwaddr size = vbi->memmap[VIRT_MMIO].size; for (i = NUM_VIRTIO_TRANSPORTS - 1; i >= 0; i--) { char *nodename; @@ -437,6 +438,26 @@ static void create_virtio_devices(const VirtBoardInfo *vbi, qemu_irq *pic) } } +static void create_virtio_devices(const VirtBoardInfo *vbi, qemu_irq *pic) +{ + int i; + hwaddr size = vbi->memmap[VIRT_MMIO].size; + + /* Note that we have to create the transports in forwards order + * so that command line devices are inserted lowest address first, + * and then add dtb nodes in reverse order so that they appear in + * the finished device tree lowest address first. + */ + for (i = 0; i < NUM_VIRTIO_TRANSPORTS; i++) { + int irq = vbi->irqmap[VIRT_MMIO] + i; + hwaddr base = vbi->memmap[VIRT_MMIO].base + i * size; + + sysbus_create_simple("virtio-mmio", base, pic[irq]); + } + + fdt_add_virtio_nodes(vbi); +} + static void *machvirt_dtb(const struct arm_boot_info *binfo, int *fdt_size) { const VirtBoardInfo *board = (const VirtBoardInfo *)binfo;