From nobody Tue Feb 10 13:37:32 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1507583389658276.7160612783348; Mon, 9 Oct 2017 14:09:49 -0700 (PDT) Received: from localhost ([::1]:59804 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1fIr-0005PS-IG for importer@patchew.org; Mon, 09 Oct 2017 17:09:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56663) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1fGu-0004Fp-PD for qemu-devel@nongnu.org; Mon, 09 Oct 2017 17:07:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1fGr-0006c0-Gn for qemu-devel@nongnu.org; Mon, 09 Oct 2017 17:07:32 -0400 Received: from chuckie.co.uk ([82.165.15.123]:40545 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 1e1fGr-0006ZR-96 for qemu-devel@nongnu.org; Mon, 09 Oct 2017 17:07:29 -0400 Received: from host109-153-37-179.range109-153.btcentralplus.com ([109.153.37.179] helo=kentang.home) by s16892447.onlinehome-server.info with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1e1fGo-0003wf-Ot; Mon, 09 Oct 2017 22:07:28 +0100 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, atar4qemu@gmail.com Date: Mon, 9 Oct 2017 22:06:57 +0100 Message-Id: <1507583223-14819-3-git-send-email-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1507583223-14819-1-git-send-email-mark.cave-ayland@ilande.co.uk> References: <1507583223-14819-1-git-send-email-mark.cave-ayland@ilande.co.uk> X-SA-Exim-Connect-IP: 109.153.37.179 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] [PATCH 2/8] sparc32_dma: split esp and le into separate DMA devices 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: , 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" Due to slight differences in behaviour accessing the registers for the esp and le devices, create two separate SPARC32_DMA_DEVICE types and update the sun4m machine to use. Note that by using different device types we already know the size of the register block and the value of is_ledma at init time, allowing us to drop the SPARC32_DMA_DEVICE realize function and the is_ledma device property. Signed-off-by: Mark Cave-Ayland --- hw/dma/sparc32_dma.c | 63 ++++++++++++++++++++++++++++++++++++++++------= ---- hw/sparc/sun4m.c | 3 +-- 2 files changed, 52 insertions(+), 14 deletions(-) diff --git a/hw/dma/sparc32_dma.c b/hw/dma/sparc32_dma.c index a8d31c1..fbbfe57 100644 --- a/hw/dma/sparc32_dma.c +++ b/hw/dma/sparc32_dma.c @@ -78,6 +78,22 @@ struct DMADeviceState { uint32_t is_ledma; }; =20 +#define TYPE_SPARC32_ESPDMA_DEVICE "sparc32-espdma" +#define SPARC32_ESPDMA_DEVICE(obj) OBJECT_CHECK(ESPDMADeviceState, (obj), \ + TYPE_SPARC32_ESPDMA_DEVICE) + +typedef struct ESPDMADeviceState { + DMADeviceState parent_obj; +} ESPDMADeviceState; + +#define TYPE_SPARC32_LEDMA_DEVICE "sparc32-ledma" +#define SPARC32_LEDMA_DEVICE(obj) OBJECT_CHECK(LEDMADeviceState, (obj), \ + TYPE_SPARC32_LEDMA_DEVICE) + +typedef struct LEDMADeviceState { + DMADeviceState parent_obj; +} LEDMADeviceState; + enum { GPIO_RESET =3D 0, GPIO_DMA, @@ -285,19 +301,8 @@ static void sparc32_dma_device_init(Object *obj) qdev_init_gpio_out(dev, s->gpio, 2); } =20 -static void sparc32_dma_device_realize(DeviceState *dev, Error **errp) -{ - DMADeviceState *s =3D SPARC32_DMA_DEVICE(dev); - int reg_size; - - reg_size =3D s->is_ledma ? DMA_ETH_SIZE : DMA_SIZE; - memory_region_init_io(&s->iomem, OBJECT(dev), &dma_mem_ops, s, - "dma", reg_size); -} - static Property sparc32_dma_device_properties[] =3D { DEFINE_PROP_PTR("iommu_opaque", DMADeviceState, iommu), - DEFINE_PROP_UINT32("is_ledma", DMADeviceState, is_ledma, 0), DEFINE_PROP_END_OF_LIST(), }; =20 @@ -308,7 +313,6 @@ static void sparc32_dma_device_class_init(ObjectClass *= klass, void *data) dc->reset =3D sparc32_dma_device_reset; dc->vmsd =3D &vmstate_sparc32_dma_device; dc->props =3D sparc32_dma_device_properties; - dc->realize =3D sparc32_dma_device_realize; /* Reason: pointer property "iommu_opaque" */ dc->user_creatable =3D false; } @@ -316,14 +320,49 @@ static void sparc32_dma_device_class_init(ObjectClass= *klass, void *data) static const TypeInfo sparc32_dma_device_info =3D { .name =3D TYPE_SPARC32_DMA_DEVICE, .parent =3D TYPE_SYS_BUS_DEVICE, + .abstract =3D true, .instance_size =3D sizeof(DMADeviceState), .instance_init =3D sparc32_dma_device_init, .class_init =3D sparc32_dma_device_class_init, }; =20 +static void sparc32_espdma_device_init(Object *obj) +{ + DMADeviceState *s =3D SPARC32_DMA_DEVICE(obj); + + memory_region_init_io(&s->iomem, OBJECT(s), &dma_mem_ops, s, + "espdma", DMA_SIZE); + s->is_ledma =3D 0; +} + +static const TypeInfo sparc32_espdma_device_info =3D { + .name =3D TYPE_SPARC32_ESPDMA_DEVICE, + .parent =3D TYPE_SPARC32_DMA_DEVICE, + .instance_size =3D sizeof(ESPDMADeviceState), + .instance_init =3D sparc32_espdma_device_init, +}; + +static void sparc32_ledma_device_init(Object *obj) +{ + DMADeviceState *s =3D SPARC32_DMA_DEVICE(obj); + + memory_region_init_io(&s->iomem, OBJECT(s), &dma_mem_ops, s, + "ledma", DMA_ETH_SIZE); + s->is_ledma =3D 1; +} + +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, +}; + 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); } =20 type_init(sparc32_dma_register_types) diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 82c553c..88a9752 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -313,9 +313,8 @@ static void *sparc32_dma_init(hwaddr daddr, qemu_irq pa= rent_irq, DeviceState *dev; SysBusDevice *s; =20 - dev =3D qdev_create(NULL, "sparc32-dma-device"); + dev =3D qdev_create(NULL, is_ledma ? "sparc32-ledma" : "sparc32-espdma= "); qdev_prop_set_ptr(dev, "iommu_opaque", iommu); - qdev_prop_set_uint32(dev, "is_ledma", is_ledma); qdev_init_nofail(dev); s =3D SYS_BUS_DEVICE(dev); sysbus_connect_irq(s, 0, parent_irq); --=20 1.7.10.4