Re: [Qemu-devel] [PATCH v2 3/5] hw/gpio: Add the xlnx-pmu-iomod-gpo device

[Alistair Francis]

On Thu, Mar 1, 2018 at 9:02 AM Philippe Mathieu-Daudé <address@hidden>
wrote:

> Hi Alistair,

> On 02/28/2018 07:32 PM, Alistair Francis wrote:
> > Signed-off-by: Alistair Francis <address@hidden>
> > ---
> >
> >  include/hw/gpio/xlnx-pmu-iomod-gp.h |  52 +++++++++++++
> >  hw/gpio/xlnx-pmu-iomod-gp.c         | 150
++++++++++++++++++++++++++++++++++++
> >  hw/gpio/Makefile.objs               |   2 +
> >  3 files changed, 204 insertions(+)
> >  create mode 100644 include/hw/gpio/xlnx-pmu-iomod-gp.h
> >  create mode 100644 hw/gpio/xlnx-pmu-iomod-gp.c
> >
> > diff --git a/include/hw/gpio/xlnx-pmu-iomod-gp.h
b/include/hw/gpio/xlnx-pmu-iomod-gp.h
> > new file mode 100644
> > index 0000000000..0ee162829b
> > --- /dev/null
> > +++ b/include/hw/gpio/xlnx-pmu-iomod-gp.h
> > @@ -0,0 +1,52 @@
> > +/*
> > + * QEMU model of Xilinx I/O Module GPO
> > + *
> > + * Copyright (c) 2013 Xilinx Inc
> > + * Written by Edgar E. Iglesias <address@hidden>
> > + *
> > + * Permission is hereby granted, free of charge, to any person
obtaining a copy
> > + * of this software and associated documentation files (the
"Software"), to deal
> > + * in the Software without restriction, including without limitation
the rights
> > + * to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell
> > + * copies of the Software, and to permit persons to whom the Software
is
> > + * furnished to do so, subject to the following conditions:
> > + *
> > + * The above copyright notice and this permission notice shall be
included in
> > + * all copies or substantial portions of the Software.
> > + *
> > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR
> > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY,
> > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
SHALL
> > + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
OR OTHER
> > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM,
> > + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN
> > + * THE SOFTWARE.
> > + */
> > +
> > +#ifndef HW_XLNX_ZYNQMP_IOMOD_GPIO_H
> > +#define HW_XLNX_ZYNQMP_IOMOD_GPIO_H

> Maybe HW_XLNX_IOMOD_GPIO_H is enough (removing ZYNQMP), or
> HW_XLNX_PMU_IOMOD_GPIO_H is a better naming (using PMU).
> (comment valid for the whole file).

That opens up a possibility of future conflicts. I think the ZynqMP should
stay in there.


> > +
> > +#include "qemu/osdep.h"
> > +
> > +#define TYPE_XLNX_ZYNQMP_IOMOD_GPIO "xlnx.pmu_iomodule_gpio"
> > +
> > +#define XLNX_ZYNQMP_IOMOD_GPIO(obj) \
> > +     OBJECT_CHECK(XlnxPMUIOGPIO, (obj), TYPE_XLNX_ZYNQMP_IOMOD_GPIO)
> > +
> > +#define XLNX_ZYNQMP_IOMOD_GPIO_R_MAX (0x00 + 1)
> > +
> > +typedef struct XlnxPMUIOGPIO {
> > +    SysBusDevice parent_obj;
> > +    MemoryRegion iomem;
> > +
> > +    uint32_t size;
> > +
> > +    /* GPO */
> > +    uint32_t init;
> > +    qemu_irq outputs[32];

> Can you add a definition such XLNX_(PMU_)IOMOD_GPIO_COUNT?

Done.


> > +
> > +    uint32_t regs[XLNX_ZYNQMP_IOMOD_GPIO_R_MAX];
> > +    RegisterInfo regs_info[XLNX_ZYNQMP_IOMOD_GPIO_R_MAX];
> > +} XlnxPMUIOGPIO;
> > +
> > +#endif /* HW_XLNX_ZYNQMP_IOMOD_GPIO_H */
> > diff --git a/hw/gpio/xlnx-pmu-iomod-gp.c b/hw/gpio/xlnx-pmu-iomod-gp.c
> > new file mode 100644
> > index 0000000000..0e45a89b44
> > --- /dev/null
> > +++ b/hw/gpio/xlnx-pmu-iomod-gp.c
> > @@ -0,0 +1,150 @@
> > +/*
> > + * QEMU model of Xilinx I/O Module GPO
> > + *
> > + * Copyright (c) 2013 Xilinx Inc
> > + * Written by Edgar E. Iglesias <address@hidden>
> > + *
> > + * Permission is hereby granted, free of charge, to any person
obtaining a copy
> > + * of this software and associated documentation files (the
"Software"), to deal
> > + * in the Software without restriction, including without limitation
the rights
> > + * to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell
> > + * copies of the Software, and to permit persons to whom the Software
is
> > + * furnished to do so, subject to the following conditions:
> > + *
> > + * The above copyright notice and this permission notice shall be
included in
> > + * all copies or substantial portions of the Software.
> > + *
> > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR
> > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY,
> > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
SHALL
> > + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
OR OTHER
> > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM,
> > + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN
> > + * THE SOFTWARE.
> > + */
> > +
> > +#include "qemu/osdep.h"
> > +#include "hw/sysbus.h"
> > +#include "hw/register.h"
> > +#include "qemu/log.h"
> > +#include "hw/gpio/xlnx-pmu-iomod-gp.h"
> > +
> > +#ifndef XLNX_ZYNQMP_IOMOD_GPIO_DEBUG
> > +#define XLNX_ZYNQMP_IOMOD_GPIO_DEBUG 0
> > +#endif
> > +
> > +REG32(GPO0, 0x00)
> > +
> > +static void xlnx_iomod_gpio_gpo0_prew(RegisterInfo *reg, uint64_t
value)
> > +{
> > +    XlnxPMUIOGPIO *s = XLNX_ZYNQMP_IOMOD_GPIO(reg->opaque);
> > +    unsigned int i;
> > +
> > +    for (i = 0; i < s->size; i++) {
> > +        bool flag = !!(value & (1 << i));
> > +        qemu_set_irq(s->outputs[i], flag);

> I thought this was available: qemu_set_irqs(s->outputs, value, s->size);

I don't see anything called that.


> Maybe shorter:

>             qemu_set_irq(s->outputs[i], extract64(flag, i, 1);

I like the variable, it makes adding debug statements easier :)

Alistair


> > +    }
> > +}
> > +
> > +static uint64_t xlnx_iomod_gpio_gpo0_postr(RegisterInfo *reg, uint64_t
value)
> > +{
> > +    return 0;
> > +}
> > +
> > +static const RegisterAccessInfo xlnx_iomod_gpio_regs_info[] = {
> > +    {   .name = "GPO0",  .addr = A_GPO0,
> > +        .post_write = xlnx_iomod_gpio_gpo0_prew,
> > +        .post_read = xlnx_iomod_gpio_gpo0_postr,
> > +    }
> > +};
> > +
> > +static void xlnx_iomod_gpio_reset(DeviceState *dev)
> > +{
> > +    XlnxPMUIOGPIO *s = XLNX_ZYNQMP_IOMOD_GPIO(dev);
> > +    int i;
> > +
> > +    for (i = 0; i < ARRAY_SIZE(s->regs_info); ++i) {
> > +        register_reset(&s->regs_info[i]);
> > +    }
> > +
> > +    xlnx_iomod_gpio_gpo0_prew(&s->regs_info[R_GPO0], s->init);
> > +}
> > +
> > +static const MemoryRegionOps xlnx_iomod_gpio_ops = {
> > +    .read = register_read_memory,
> > +    .write = register_write_memory,
> > +    .endianness = DEVICE_LITTLE_ENDIAN,
> > +    .valid = {
> > +        .min_access_size = 4,
> > +        .max_access_size = 4,
> > +    },
> > +};
> > +
> > +static void xlnx_iomod_gpio_realize(DeviceState *dev, Error **errp)
> > +{
> > +    XlnxPMUIOGPIO *s = XLNX_ZYNQMP_IOMOD_GPIO(dev);
> > +
> > +    assert(s->size <= 32);

> XLNX_(PMU_)IOMOD_GPIO_COUNT?

> > +    qdev_init_gpio_out(dev, s->outputs, s->size);
> > +}
> > +
> > +static void xlnx_iomod_gpio_init(Object *obj)
> > +{
> > +    XlnxPMUIOGPIO *s = XLNX_ZYNQMP_IOMOD_GPIO(obj);
> > +    SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
> > +    RegisterInfoArray *reg_array;
> > +
> > +    memory_region_init(&s->iomem, obj, TYPE_XLNX_ZYNQMP_IOMOD_GPIO,
> > +                       XLNX_ZYNQMP_IOMOD_GPIO_R_MAX * 4);
> > +    reg_array =
> > +        register_init_block32(DEVICE(obj), xlnx_iomod_gpio_regs_info,
> > +                              ARRAY_SIZE(xlnx_iomod_gpio_regs_info),
> > +                              s->regs_info, s->regs,
> > +                              &xlnx_iomod_gpio_ops,
> > +                              XLNX_ZYNQMP_IOMOD_GPIO_DEBUG,
> > +                              XLNX_ZYNQMP_IOMOD_GPIO_R_MAX * 4);
> > +    memory_region_add_subregion(&s->iomem,
> > +                                0x0,
> > +                                &reg_array->mem);
> > +    sysbus_init_mmio(sbd, &s->iomem);
> > +}
> > +
> > +static const VMStateDescription vmstate_xlnx_iomod_gpio = {
> > +    .name = TYPE_XLNX_ZYNQMP_IOMOD_GPIO,
> > +    .version_id = 1,
> > +    .minimum_version_id = 1,
> > +    .fields = (VMStateField[]) {
> > +        VMSTATE_END_OF_LIST(),
> > +    }
> > +};
> > +
> > +static Property xlnx_iomod_gpio_properties[] = {
> > +    DEFINE_PROP_UINT32("size", XlnxPMUIOGPIO, size, 0),
> > +    DEFINE_PROP_UINT32("gpo-init", XlnxPMUIOGPIO, init, 0),
> > +    DEFINE_PROP_END_OF_LIST(),
> > +};
> > +
> > +static void xlnx_iomod_gpio_class_init(ObjectClass *klass, void *data)
> > +{
> > +    DeviceClass *dc = DEVICE_CLASS(klass);
> > +
> > +    dc->reset = xlnx_iomod_gpio_reset;
> > +    dc->realize = xlnx_iomod_gpio_realize;
> > +    dc->props = xlnx_iomod_gpio_properties;
> > +    dc->vmsd = &vmstate_xlnx_iomod_gpio;
> > +}
> > +
> > +static const TypeInfo xlnx_iomod_gpio_info = {
> > +    .name          = TYPE_XLNX_ZYNQMP_IOMOD_GPIO,
> > +    .parent        = TYPE_SYS_BUS_DEVICE,
> > +    .instance_size = sizeof(XlnxPMUIOGPIO),
> > +    .class_init    = xlnx_iomod_gpio_class_init,
> > +    .instance_init = xlnx_iomod_gpio_init,
> > +};
> > +
> > +static void xlnx_iomod_gpio_register_types(void)
> > +{
> > +    type_register_static(&xlnx_iomod_gpio_info);
> > +}
> > +
> > +type_init(xlnx_iomod_gpio_register_types)
> > diff --git a/hw/gpio/Makefile.objs b/hw/gpio/Makefile.objs
> > index fa0a72e6d0..4cefadee85 100644
> > --- a/hw/gpio/Makefile.objs
> > +++ b/hw/gpio/Makefile.objs
> > @@ -8,3 +8,5 @@ common-obj-$(CONFIG_GPIO_KEY) += gpio_key.o
> >  obj-$(CONFIG_OMAP) += omap_gpio.o
> >  obj-$(CONFIG_IMX) += imx_gpio.o
> >  obj-$(CONFIG_RASPI) += bcm2835_gpio.o
> > +
> > +obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-pmu-iomod-gp.o
> >

> Reviewed-by: Philippe Mathieu-Daudé <address@hidden>