From patchwork Wed Feb 12 23:25:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 319840 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 066F82C00AE for ; Thu, 13 Feb 2014 10:26:52 +1100 (EST) Received: from localhost ([::1]:42038 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDjCb-0005PV-Ij for incoming@patchwork.ozlabs.org; Wed, 12 Feb 2014 18:26:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41553) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDjBn-0004mM-6U for qemu-devel@nongnu.org; Wed, 12 Feb 2014 18:26:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WDjBg-0002Fx-1J for qemu-devel@nongnu.org; Wed, 12 Feb 2014 18:25:59 -0500 Received: from mail-qa0-f47.google.com ([209.85.216.47]:38147) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDjBf-0002Fp-Ky for qemu-devel@nongnu.org; Wed, 12 Feb 2014 18:25:51 -0500 Received: by mail-qa0-f47.google.com with SMTP id j5so14769559qaq.6 for ; Wed, 12 Feb 2014 15:25:51 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=8o8nyggmYSdXAuPcA2OVgomouNby/aMsQSPUC++vDls=; b=JcacDj2LhJbUThjlzmA608pyCbaOcsRq4bJtZ9VNPH3BvxmyHUOrAKLvpSck8IilTz HrTonEilroKzE4aK8CBiIGXljhaheqLvTD7ZUOa6cQAMEZyGCMyQBqDqFcWLZgeVzDq4 42Qs89eA/QMO3pgeKWvuNYWkJBG0SdzzHjCt3kjNf5bmxjbY/m0SG/JIilGvHD7t07hg F30CTzmj9VJtii5TzqYKFHMwCzb/C1Vp5N0CgeDuhN5oIZkjJXXCgqIS5NtKqeO1G5VO FrypGg6KqxOC6vYNrOkZyacSvT5TUM1+m+FW+M+7fcO1FJLfb8PDURwgAndwfdr7QAhQ YRow== X-Gm-Message-State: ALoCoQmit2eXnr8blj2KneD96O4d0JeP61s5C3R0nO+IpHxZbKDF504EkM/46kvgT+dfkRbJp/2D X-Received: by 10.224.129.138 with SMTP id o10mr72544740qas.13.1392247551275; Wed, 12 Feb 2014 15:25:51 -0800 (PST) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id i38sm36259619qge.1.2014.02.12.15.25.50 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 12 Feb 2014 15:25:50 -0800 (PST) From: Peter Crosthwaite To: qemu-devel@nongnu.org, edgar.iglesias@gmail.com Date: Wed, 12 Feb 2014 15:25:18 -0800 Message-Id: X-Mailer: git-send-email 1.8.5.4 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.216.47 Cc: agraf@suse.de Subject: [Qemu-devel] [PATCH microblaze/ppc v2 5/8] xilinx: Inline usages of xilinx_timer_create() 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 Inline these usages. Converts these init to at least a semi-recent QOM styling. Signed-off-by: Peter Crosthwaite --- hw/microblaze/petalogix_ml605_mmu.c | 7 ++++++- hw/microblaze/petalogix_s3adsp1800_mmu.c | 9 ++++++++- hw/ppc/virtex_ml507.c | 7 ++++++- include/hw/xilinx.h | 15 --------------- 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c index 0dee46c..39f91dd 100644 --- a/hw/microblaze/petalogix_ml605_mmu.c +++ b/hw/microblaze/petalogix_ml605_mmu.c @@ -134,7 +134,12 @@ petalogix_ml605_init(QEMUMachineInitArgs *args) DEVICE_LITTLE_ENDIAN); /* 2 timers at irq 2 @ 100 Mhz. */ - xilinx_timer_create(TIMER_BASEADDR, irq[2], 0, 100 * 1000000); + dev = qdev_create(NULL, "xlnx.xps-timer"); + qdev_prop_set_uint32(dev, "one-timer-only", 0); + qdev_prop_set_uint32(dev, "clock-frequency", 100 * 1000000); + qdev_init_nofail(dev); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, TIMER_BASEADDR); + sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq[TIMER_IRQ]); /* axi ethernet and dma initialization. */ qemu_check_nic_model(&nd_table[0], "xlnx.axi-ethernet"); diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c index cb8e334..a85dbb7 100644 --- a/hw/microblaze/petalogix_s3adsp1800_mmu.c +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c @@ -110,8 +110,15 @@ petalogix_s3adsp1800_init(QEMUMachineInitArgs *args) sysbus_create_simple("xlnx.xps-uartlite", UARTLITE_BASEADDR, irq[UARTLITE_IRQ]); + /* 2 timers at irq 2 @ 62 Mhz. */ - xilinx_timer_create(TIMER_BASEADDR, irq[0], 0, 62 * 1000000); + dev = qdev_create(NULL, "xlnx.xps-timer"); + qdev_prop_set_uint32(dev, "one-timer-only", 0); + qdev_prop_set_uint32(dev, "clock-frequency", 62 * 1000000); + qdev_init_nofail(dev); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, TIMER_BASEADDR); + sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq[TIMER_IRQ]); + xilinx_ethlite_create(&nd_table[0], ETHLITE_BASEADDR, irq[1], 0, 0); microblaze_load_kernel(cpu, ddr_base, ram_size, diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index 1e2f532..4dffb96 100644 --- a/hw/ppc/virtex_ml507.c +++ b/hw/ppc/virtex_ml507.c @@ -231,7 +231,12 @@ static void virtex_init(QEMUMachineInitArgs *args) 115200, serial_hds[0], DEVICE_LITTLE_ENDIAN); /* 2 timers at irq 2 @ 62 Mhz. */ - xilinx_timer_create(0x83c00000, irq[3], 0, 62 * 1000000); + dev = qdev_create(NULL, "xlnx.xps-timer"); + qdev_prop_set_uint32(dev, "one-timer-only", 0); + qdev_prop_set_uint32(dev, "clock-frequency", 62 * 1000000); + qdev_init_nofail(dev); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, TIMER_BASEADDR); + sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq[TIMER_IRQ]); if (kernel_filename) { uint64_t entry, low, high; diff --git a/include/hw/xilinx.h b/include/hw/xilinx.h index 02400cd..a454cee 100644 --- a/include/hw/xilinx.h +++ b/include/hw/xilinx.h @@ -7,21 +7,6 @@ #include "hw/stream.h" #include "net/net.h" -/* OPB Timer/Counter. */ -static inline DeviceState * -xilinx_timer_create(hwaddr base, qemu_irq irq, int oto, int freq) -{ - DeviceState *dev; - - dev = qdev_create(NULL, "xlnx.xps-timer"); - qdev_prop_set_uint32(dev, "one-timer-only", oto); - qdev_prop_set_uint32(dev, "clock-frequency", freq); - qdev_init_nofail(dev); - sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); - sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq); - return dev; -} - /* XPS Ethernet Lite MAC. */ static inline DeviceState * xilinx_ethlite_create(NICInfo *nd, hwaddr base, qemu_irq irq,