[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCHv3 02/13] sparc32_dma: split esp and le into sepa
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [Qemu-devel] [PATCHv3 02/13] sparc32_dma: split esp and le into separate DMA devices |
Date: |
Thu, 19 Oct 2017 01:33:15 -0300 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 |
On 10/14/2017 03:38 PM, Mark Cave-Ayland wrote:
> 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..e4ff4a8 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-mmio", 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-mmio", 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");
TYPE_SPARC32_LEDMA_DEVICE and TYPE_SPARC32_ESPDMA_DEVICE?
> 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);
>
[Qemu-devel] [PATCHv3 13/13] sparc32_dma: add len to esp/le DMA memory tracing, Mark Cave-Ayland, 2017/10/14
[Qemu-devel] [PATCHv3 12/13] sparc32_dma: remove is_ledma hack and replace with memory region alias, Mark Cave-Ayland, 2017/10/14
[Qemu-devel] [PATCHv3 11/13] sparc32_dma: introduce new SPARC32_DMA type container object, Mark Cave-Ayland, 2017/10/14
[Qemu-devel] [PATCHv3 10/13] sparc32_dma: make lance device child of ledma device, Mark Cave-Ayland, 2017/10/14
Re: [Qemu-devel] [PATCHv3 00/13] sun4m: sparc32_dma tidy-ups, no-reply, 2017/10/14
Re: [Qemu-devel] [PATCHv3 00/13] sun4m: sparc32_dma tidy-ups, Artyom Tarasenko, 2017/10/18