[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/8] sparc32_dma: split esp and le into separate DMA
From: |
Mark Cave-Ayland |
Subject: |
[Qemu-devel] [PATCH 2/8] sparc32_dma: split esp and le into separate DMA devices |
Date: |
Mon, 9 Oct 2017 22:06:57 +0100 |
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 <address@hidden>
---
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;
};
+#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 = 0,
GPIO_DMA,
@@ -285,19 +301,8 @@ static void sparc32_dma_device_init(Object *obj)
qdev_init_gpio_out(dev, s->gpio, 2);
}
-static void sparc32_dma_device_realize(DeviceState *dev, Error **errp)
-{
- DMADeviceState *s = SPARC32_DMA_DEVICE(dev);
- int reg_size;
-
- reg_size = 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[] = {
DEFINE_PROP_PTR("iommu_opaque", DMADeviceState, iommu),
- DEFINE_PROP_UINT32("is_ledma", DMADeviceState, is_ledma, 0),
DEFINE_PROP_END_OF_LIST(),
};
@@ -308,7 +313,6 @@ static void sparc32_dma_device_class_init(ObjectClass
*klass, void *data)
dc->reset = sparc32_dma_device_reset;
dc->vmsd = &vmstate_sparc32_dma_device;
dc->props = sparc32_dma_device_properties;
- dc->realize = sparc32_dma_device_realize;
/* Reason: pointer property "iommu_opaque" */
dc->user_creatable = false;
}
@@ -316,14 +320,49 @@ static void sparc32_dma_device_class_init(ObjectClass
*klass, void *data)
static const TypeInfo sparc32_dma_device_info = {
.name = TYPE_SPARC32_DMA_DEVICE,
.parent = TYPE_SYS_BUS_DEVICE,
+ .abstract = true,
.instance_size = sizeof(DMADeviceState),
.instance_init = sparc32_dma_device_init,
.class_init = sparc32_dma_device_class_init,
};
+static void sparc32_espdma_device_init(Object *obj)
+{
+ DMADeviceState *s = SPARC32_DMA_DEVICE(obj);
+
+ memory_region_init_io(&s->iomem, OBJECT(s), &dma_mem_ops, s,
+ "espdma", DMA_SIZE);
+ s->is_ledma = 0;
+}
+
+static const TypeInfo sparc32_espdma_device_info = {
+ .name = TYPE_SPARC32_ESPDMA_DEVICE,
+ .parent = TYPE_SPARC32_DMA_DEVICE,
+ .instance_size = sizeof(ESPDMADeviceState),
+ .instance_init = sparc32_espdma_device_init,
+};
+
+static void sparc32_ledma_device_init(Object *obj)
+{
+ DMADeviceState *s = SPARC32_DMA_DEVICE(obj);
+
+ memory_region_init_io(&s->iomem, OBJECT(s), &dma_mem_ops, s,
+ "ledma", DMA_ETH_SIZE);
+ s->is_ledma = 1;
+}
+
+static const TypeInfo sparc32_ledma_device_info = {
+ .name = TYPE_SPARC32_LEDMA_DEVICE,
+ .parent = TYPE_SPARC32_DMA_DEVICE,
+ .instance_size = sizeof(LEDMADeviceState),
+ .instance_init = 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);
}
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
parent_irq,
DeviceState *dev;
SysBusDevice *s;
- dev = qdev_create(NULL, "sparc32-dma-device");
+ dev = 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 = SYS_BUS_DEVICE(dev);
sysbus_connect_irq(s, 0, parent_irq);
--
1.7.10.4
- [Qemu-devel] [PATCH 0/8] sun4m : sparc32_dma tidy-ups, Mark Cave-Ayland, 2017/10/09
- [Qemu-devel] [PATCH 2/8] sparc32_dma: split esp and le into separate DMA devices,
Mark Cave-Ayland <=
- [Qemu-devel] [PATCH 3/8] sparc32_dma: move type declarations from sparc32_dma.c to sparc32_dma.h, Mark Cave-Ayland, 2017/10/09
- [Qemu-devel] [PATCH 4/8] sun4m: move DMA device wiring from sparc32_dma_init() to sun4m_hw_init(), Mark Cave-Ayland, 2017/10/09
- [Qemu-devel] [PATCH 1/8] sparc32_dma: rename SPARC32_DMA type to SPARC32_DMA_DEVICE, Mark Cave-Ayland, 2017/10/09
- [Qemu-devel] [PATCH 7/8] sparc32_dma: introduce new SPARC32_DMA type container object, Mark Cave-Ayland, 2017/10/09
- [Qemu-devel] [PATCH 8/8] sparc32_dma: remove is_ledma hack and replace with memory region alias, Mark Cave-Ayland, 2017/10/09
- [Qemu-devel] [PATCH 6/8] sparc32_dma: use object link instead of qdev property to pass IOMMU reference, Mark Cave-Ayland, 2017/10/09
- [Qemu-devel] [PATCH 5/8] sun4m_iommu: move TYPE_SUN4M_IOMMU declaration to sun4m.h, Mark Cave-Ayland, 2017/10/09
- Re: [Qemu-devel] [PATCH 0/8] sun4m : sparc32_dma tidy-ups, no-reply, 2017/10/09
- Re: [Qemu-devel] [PATCH 0/8] sun4m : sparc32_dma tidy-ups, Artyom Tarasenko, 2017/10/10