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 150894763065690.32238865626437; Wed, 25 Oct 2017 09:07:10 -0700 (PDT) Received: from localhost ([::1]:48974 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e7OCd-0005dG-LE for importer@patchew.org; Wed, 25 Oct 2017 12:06:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45456) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e7OAb-0004EC-5c 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 1e7OAZ-0004i3-Lu for qemu-devel@nongnu.org; Wed, 25 Oct 2017 12:04:41 -0400 Received: from chuckie.co.uk ([82.165.15.123]:58436 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 1e7OAZ-0004g3-CL for qemu-devel@nongnu.org; Wed, 25 Oct 2017 12:04:39 -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 1e7O68-0004vb-Bx; Wed, 25 Oct 2017 17:00:06 +0100 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, atar4qemu@gmail.com Date: Wed, 25 Oct 2017 16:59:25 +0100 Message-Id: <1508947167-5304-12-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 11/13] sparc32_dma: introduce new SPARC32_DMA type container object 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" Create a new SPARC32_DMA container object (including an appropriate contain= er memory region) and add instances of the SPARC32_ESPDMA_DEVICE and SPARC32_LEDMA_DEVICE as child objects. The benefit is that most of the gpio wiring complexity between esp/espdma and lance/ledma is now hidden within t= he SPARC32_DMA realize function. Since the sun4m IOMMU is already QOMified we can find a reference to it using object_resolve_path_type() allowing us to completely remove all ex= ternal references to the iommu pointer. Finally we rework sun4m's sparc32_dma_init() to invoke the new SPARC32_DMA = object and wire up the remaining board memory regions/IRQs. Signed-off-by: Mark Cave-Ayland Reviewed-by: Artyom Tarasenko --- hw/dma/sparc32_dma.c | 70 ++++++++++++++++++++++++++++++++++++= ++++ hw/sparc/sun4m.c | 66 ++++++++++++++++++------------------- include/hw/sparc/sparc32_dma.h | 12 +++++++ 3 files changed, 114 insertions(+), 34 deletions(-) diff --git a/hw/dma/sparc32_dma.c b/hw/dma/sparc32_dma.c index d4cff74..582b7cc 100644 --- a/hw/dma/sparc32_dma.c +++ b/hw/dma/sparc32_dma.c @@ -30,6 +30,7 @@ #include "hw/sparc/sparc32_dma.h" #include "hw/sparc/sun4m.h" #include "hw/sysbus.h" +#include "qapi/error.h" #include "trace.h" =20 /* @@ -369,11 +370,80 @@ static const TypeInfo sparc32_ledma_device_info =3D { .class_init =3D sparc32_ledma_device_class_init, }; =20 +static void sparc32_dma_realize(DeviceState *dev, Error **errp) +{ + SPARC32DMAState *s =3D SPARC32_DMA(dev); + DeviceState *espdma, *esp, *ledma, *lance; + SysBusDevice *sbd; + Object *iommu; + + iommu =3D object_resolve_path_type("", TYPE_SUN4M_IOMMU, NULL); + if (!iommu) { + error_setg(errp, "unable to locate sun4m IOMMU device"); + return; + } + + espdma =3D qdev_create(NULL, TYPE_SPARC32_ESPDMA_DEVICE); + object_property_set_link(OBJECT(espdma), iommu, "iommu", errp); + object_property_add_child(OBJECT(s), "espdma", OBJECT(espdma), errp); + qdev_init_nofail(espdma); + + esp =3D DEVICE(object_resolve_path_component(OBJECT(espdma), "esp")); + sbd =3D SYS_BUS_DEVICE(esp); + sysbus_connect_irq(sbd, 0, qdev_get_gpio_in(espdma, 0)); + qdev_connect_gpio_out(espdma, 0, qdev_get_gpio_in(esp, 0)); + qdev_connect_gpio_out(espdma, 1, qdev_get_gpio_in(esp, 1)); + + sbd =3D SYS_BUS_DEVICE(espdma); + memory_region_add_subregion(&s->dmamem, 0x0, + sysbus_mmio_get_region(sbd, 0)); + + ledma =3D qdev_create(NULL, TYPE_SPARC32_LEDMA_DEVICE); + object_property_set_link(OBJECT(ledma), iommu, "iommu", errp); + object_property_add_child(OBJECT(s), "ledma", OBJECT(ledma), errp); + qdev_init_nofail(ledma); + + lance =3D DEVICE(object_resolve_path_component(OBJECT(ledma), "lance")= ); + sbd =3D SYS_BUS_DEVICE(lance); + sysbus_connect_irq(sbd, 0, qdev_get_gpio_in(ledma, 0)); + qdev_connect_gpio_out(ledma, 0, qdev_get_gpio_in(lance, 0)); + + sbd =3D SYS_BUS_DEVICE(ledma); + memory_region_add_subregion(&s->dmamem, 0x10, + sysbus_mmio_get_region(sbd, 0)); +} + +static void sparc32_dma_init(Object *obj) +{ + SPARC32DMAState *s =3D SPARC32_DMA(obj); + SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + + memory_region_init(&s->dmamem, OBJECT(s), "dma", DMA_SIZE + DMA_ETH_SI= ZE); + sysbus_init_mmio(sbd, &s->dmamem); +} + +static void sparc32_dma_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + + dc->realize =3D sparc32_dma_realize; +} + +static const TypeInfo sparc32_dma_info =3D { + .name =3D TYPE_SPARC32_DMA, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_size =3D sizeof(SPARC32DMAState), + .instance_init =3D sparc32_dma_init, + .class_init =3D sparc32_dma_class_init, +}; + + static void sparc32_dma_register_types(void) { type_register_static(&sparc32_dma_device_info); type_register_static(&sparc32_espdma_device_info); type_register_static(&sparc32_ledma_device_info); + type_register_static(&sparc32_dma_info); } =20 type_init(sparc32_dma_register_types) diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index ae486a4..5017ae5 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -307,18 +307,36 @@ static void *iommu_init(hwaddr addr, uint32_t version= , qemu_irq irq) return s; } =20 -static void *sparc32_dma_init(hwaddr daddr, void *iommu, int is_ledma) +static void *sparc32_dma_init(hwaddr dma_base, + hwaddr esp_base, qemu_irq espdma_irq, + hwaddr le_base, qemu_irq ledma_irq) { - DeviceState *dev; - SysBusDevice *s; + DeviceState *dma; + ESPDMADeviceState *espdma; + LEDMADeviceState *ledma; + SysBusESPState *esp; + SysBusPCNetState *lance; =20 - dev =3D qdev_create(NULL, is_ledma ? "sparc32-ledma" : "sparc32-espdma= "); - object_property_set_link(OBJECT(dev), OBJECT(iommu), "iommu", &error_a= bort); - qdev_init_nofail(dev); - s =3D SYS_BUS_DEVICE(dev); - sysbus_mmio_map(s, 0, daddr); + dma =3D qdev_create(NULL, TYPE_SPARC32_DMA); + qdev_init_nofail(dma); + sysbus_mmio_map(SYS_BUS_DEVICE(dma), 0, dma_base); =20 - return s; + espdma =3D SPARC32_ESPDMA_DEVICE(object_resolve_path_component( + OBJECT(dma), "espdma")); + sysbus_connect_irq(SYS_BUS_DEVICE(espdma), 0, espdma_irq); + + esp =3D ESP_STATE(object_resolve_path_component(OBJECT(espdma), "esp")= ); + sysbus_mmio_map(SYS_BUS_DEVICE(esp), 0, esp_base); + + ledma =3D SPARC32_LEDMA_DEVICE(object_resolve_path_component( + OBJECT(dma), "ledma")); + sysbus_connect_irq(SYS_BUS_DEVICE(ledma), 0, ledma_irq); + + lance =3D SYSBUS_PCNET(object_resolve_path_component( + OBJECT(ledma), "lance")); + sysbus_mmio_map(SYS_BUS_DEVICE(lance), 0, le_base); + + return dma; } =20 static DeviceState *slavio_intctl_init(hwaddr addr, @@ -798,9 +816,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwd= ef, DeviceState *slavio_intctl; const char *cpu_model =3D machine->cpu_model; unsigned int i; - void *iommu, *nvram; - DeviceState *espdma, *esp, *ledma, *lance; - SysBusDevice *sbd; + void *nvram; qemu_irq *cpu_irqs[MAX_CPUS], slavio_irq[32], slavio_cpu_irq[MAX_CPUS]; qemu_irq fdc_tc; unsigned long kernel_size; @@ -848,8 +864,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwd= ef, afx_init(hwdef->afx_base); } =20 - iommu =3D iommu_init(hwdef->iommu_base, hwdef->iommu_version, - slavio_irq[30]); + iommu_init(hwdef->iommu_base, hwdef->iommu_version, slavio_irq[30]); =20 if (hwdef->iommu_pad_base) { /* On the real hardware (SS-5, LX) the MMU is not padded, but alia= sed. @@ -859,26 +874,9 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hw= def, empty_slot_init(hwdef->iommu_pad_base,hwdef->iommu_pad_len); } =20 - espdma =3D sparc32_dma_init(hwdef->dma_base, iommu, 0); - sbd =3D SYS_BUS_DEVICE(espdma); - sysbus_connect_irq(sbd, 0, slavio_irq[18]); - - esp =3D DEVICE(object_resolve_path_component(OBJECT(espdma), "esp")); - sbd =3D SYS_BUS_DEVICE(esp); - sysbus_mmio_map(sbd, 0, hwdef->esp_base); - sysbus_connect_irq(sbd, 0, qdev_get_gpio_in(espdma, 0)); - qdev_connect_gpio_out(espdma, 0, qdev_get_gpio_in(esp, 0)); - qdev_connect_gpio_out(espdma, 1, qdev_get_gpio_in(esp, 1)); - - ledma =3D sparc32_dma_init(hwdef->dma_base + 16ULL, iommu, 1); - sbd =3D SYS_BUS_DEVICE(ledma); - sysbus_connect_irq(sbd, 0, slavio_irq[16]); - - 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)); + sparc32_dma_init(hwdef->dma_base, + hwdef->esp_base, slavio_irq[18], + hwdef->le_base, slavio_irq[16]); =20 if (graphic_depth !=3D 8 && graphic_depth !=3D 24) { error_report("Unsupported depth: %d", graphic_depth); diff --git a/include/hw/sparc/sparc32_dma.h b/include/hw/sparc/sparc32_dma.h index 5e39d81..5deeca6 100644 --- a/include/hw/sparc/sparc32_dma.h +++ b/include/hw/sparc/sparc32_dma.h @@ -44,6 +44,18 @@ typedef struct LEDMADeviceState { SysBusPCNetState *lance; } LEDMADeviceState; =20 +#define TYPE_SPARC32_DMA "sparc32-dma" +#define SPARC32_DMA(obj) OBJECT_CHECK(SPARC32DMAState, (obj), \ + TYPE_SPARC32_DMA) + +typedef struct SPARC32DMAState { + SysBusDevice parent_obj; + + MemoryRegion dmamem; + ESPDMADeviceState *espdma; + LEDMADeviceState *ledma; +} SPARC32DMAState; + /* sparc32_dma.c */ void ledma_memory_read(void *opaque, hwaddr addr, uint8_t *buf, int len, int do_bswap); --=20 1.7.10.4