From nobody Tue Feb 10 01:49:07 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508947970263603.0908042369541; Wed, 25 Oct 2017 09:12:50 -0700 (PDT) Received: from localhost ([::1]:49090 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e7OIE-0002Bj-0G for importer@patchew.org; Wed, 25 Oct 2017 12:12:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45523) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e7OAg-0004In-Ne for qemu-devel@nongnu.org; Wed, 25 Oct 2017 12:04:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e7OAc-0004m0-3B for qemu-devel@nongnu.org; Wed, 25 Oct 2017 12:04:46 -0400 Received: from chuckie.co.uk ([82.165.15.123]:58440 helo=s16892447.onlinehome-server.info) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e7OAb-0004kD-Rh for qemu-devel@nongnu.org; Wed, 25 Oct 2017 12:04:42 -0400 Received: from [62.168.35.107] (helo=kentang.lan) by s16892447.onlinehome-server.info with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1e7O66-0004vb-Qy; Wed, 25 Oct 2017 17:00:04 +0100 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, atar4qemu@gmail.com Date: Wed, 25 Oct 2017 16:59:24 +0100 Message-Id: <1508947167-5304-11-git-send-email-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1508947167-5304-1-git-send-email-mark.cave-ayland@ilande.co.uk> References: <1508947167-5304-1-git-send-email-mark.cave-ayland@ilande.co.uk> X-SA-Exim-Connect-IP: 62.168.35.107 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk X-SA-Exim-Version: 4.2.1 (built Sun, 08 Jan 2012 02:45:44 +0000) X-SA-Exim-Scanned: Yes (on s16892447.onlinehome-server.info) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 82.165.15.123 Subject: [Qemu-devel] [PATCHv4 10/13] sparc32_dma: make lance device child of ledma device X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Cave-Ayland Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_6 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This makes it possible to reference the lance device from the ledma device = as required. Signed-off-by: Mark Cave-Ayland Reviewed-by: Artyom Tarasenko --- hw/dma/sparc32_dma.c | 22 ++++++++++++++++++++++ hw/sparc/sun4m.c | 31 +++++++------------------------ include/hw/sparc/sparc32_dma.h | 3 +++ 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/hw/dma/sparc32_dma.c b/hw/dma/sparc32_dma.c index 6009b94..d4cff74 100644 --- a/hw/dma/sparc32_dma.c +++ b/hw/dma/sparc32_dma.c @@ -340,11 +340,33 @@ static void sparc32_ledma_device_init(Object *obj) s->is_ledma =3D 1; } =20 +static void sparc32_ledma_device_realize(DeviceState *dev, Error **errp) +{ + DeviceState *d; + NICInfo *nd =3D &nd_table[0]; + + qemu_check_nic_model(nd, TYPE_LANCE); + + d =3D qdev_create(NULL, TYPE_LANCE); + object_property_add_child(OBJECT(dev), "lance", OBJECT(d), errp); + qdev_set_nic_properties(d, nd); + qdev_prop_set_ptr(d, "dma", dev); + qdev_init_nofail(d); +} + +static void sparc32_ledma_device_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + + dc->realize =3D sparc32_ledma_device_realize; +} + static const TypeInfo sparc32_ledma_device_info =3D { .name =3D TYPE_SPARC32_LEDMA_DEVICE, .parent =3D TYPE_SPARC32_DMA_DEVICE, .instance_size =3D sizeof(LEDMADeviceState), .instance_init =3D sparc32_ledma_device_init, + .class_init =3D sparc32_ledma_device_class_init, }; =20 static void sparc32_dma_register_types(void) diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 4626c85..ae486a4 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -321,26 +321,6 @@ static void *sparc32_dma_init(hwaddr daddr, void *iomm= u, int is_ledma) return s; } =20 -static void lance_init(NICInfo *nd, hwaddr leaddr, - void *dma_opaque, qemu_irq irq) -{ - DeviceState *dev; - SysBusDevice *s; - qemu_irq reset; - - qemu_check_nic_model(&nd_table[0], "lance"); - - dev =3D qdev_create(NULL, "lance"); - qdev_set_nic_properties(dev, nd); - qdev_prop_set_ptr(dev, "dma", dma_opaque); - qdev_init_nofail(dev); - s =3D SYS_BUS_DEVICE(dev); - sysbus_mmio_map(s, 0, leaddr); - sysbus_connect_irq(s, 0, irq); - reset =3D qdev_get_gpio_in(dev, 0); - qdev_connect_gpio_out(dma_opaque, 0, reset); -} - static DeviceState *slavio_intctl_init(hwaddr addr, hwaddr addrg, qemu_irq **parent_irq) @@ -819,7 +799,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwd= ef, const char *cpu_model =3D machine->cpu_model; unsigned int i; void *iommu, *nvram; - DeviceState *espdma, *esp, *ledma; + DeviceState *espdma, *esp, *ledma, *lance; SysBusDevice *sbd; qemu_irq *cpu_irqs[MAX_CPUS], slavio_irq[32], slavio_cpu_irq[MAX_CPUS]; qemu_irq fdc_tc; @@ -894,6 +874,12 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hw= def, sbd =3D SYS_BUS_DEVICE(ledma); sysbus_connect_irq(sbd, 0, slavio_irq[16]); =20 + lance =3D DEVICE(object_resolve_path_component(OBJECT(ledma), "lance")= ); + sbd =3D SYS_BUS_DEVICE(lance); + sysbus_mmio_map(sbd, 0, hwdef->le_base); + sysbus_connect_irq(sbd, 0, qdev_get_gpio_in(ledma, 0)); + qdev_connect_gpio_out(ledma, 0, qdev_get_gpio_in(lance, 0)); + if (graphic_depth !=3D 8 && graphic_depth !=3D 24) { error_report("Unsupported depth: %d", graphic_depth); exit (1); @@ -945,9 +931,6 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwd= ef, empty_slot_init(hwdef->sx_base, 0x2000); } =20 - lance_init(&nd_table[0], hwdef->le_base, ledma, - qdev_get_gpio_in(ledma, 0)); - nvram =3D m48t59_init(slavio_irq[0], hwdef->nvram_base, 0, 0x2000, 196= 8, 8); =20 slavio_timer_init_all(hwdef->counter_base, slavio_irq[19], slavio_cpu_= irq, smp_cpus); diff --git a/include/hw/sparc/sparc32_dma.h b/include/hw/sparc/sparc32_dma.h index 365160f..5e39d81 100644 --- a/include/hw/sparc/sparc32_dma.h +++ b/include/hw/sparc/sparc32_dma.h @@ -3,6 +3,7 @@ =20 #include "hw/sysbus.h" #include "hw/scsi/esp.h" +#include "hw/net/lance.h" =20 #define DMA_REGS 4 =20 @@ -39,6 +40,8 @@ typedef struct ESPDMADeviceState { =20 typedef struct LEDMADeviceState { DMADeviceState parent_obj; + + SysBusPCNetState *lance; } LEDMADeviceState; =20 /* sparc32_dma.c */ --=20 1.7.10.4