Re: [PATCH 3/4] serial-mcb: Add serial via MEN chameleon bus

[Alistair Francis]

On Wed, Mar 29, 2023 at 11:09 PM Johannes Thumshirn <jth@kernel.org> wrote:
>
> Add MEN z125 UART over MEN Chameleon Bus emulation.
>
> Signed-off-by: Johannes Thumshirn <jth@kernel.org>

Acked-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
>  hw/char/Kconfig      |   6 +++
>  hw/char/meson.build  |   1 +
>  hw/char/serial-mcb.c | 115 +++++++++++++++++++++++++++++++++++++++++++
>  3 files changed, 122 insertions(+)
>  create mode 100644 hw/char/serial-mcb.c
>
> diff --git a/hw/char/Kconfig b/hw/char/Kconfig
> index 6b6cf2fc1d..9e8ebf1d3d 100644
> --- a/hw/char/Kconfig
> +++ b/hw/char/Kconfig
> @@ -71,3 +71,9 @@ config GOLDFISH_TTY
>
>  config SHAKTI_UART
>      bool
> +
> +config SERIAL_MCB
> +    bool
> +    default y if MCB
> +    depends on MCB
> +    select SERIAL
> diff --git a/hw/char/meson.build b/hw/char/meson.build
> index e02c60dd54..d5893a142d 100644
> --- a/hw/char/meson.build
> +++ b/hw/char/meson.build
> @@ -20,6 +20,7 @@ softmmu_ss.add(when: 'CONFIG_SHAKTI_UART', if_true: 
> files('shakti_uart.c'))
>  softmmu_ss.add(when: 'CONFIG_VIRTIO_SERIAL', if_true: 
> files('virtio-console.c'))
>  softmmu_ss.add(when: 'CONFIG_XEN_BUS', if_true: files('xen_console.c'))
>  softmmu_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_uartlite.c'))
> +softmmu_ss.add(when: 'CONFIG_SERIAL_MCB', if_true: files('serial-mcb.c'))
>
>  softmmu_ss.add(when: 'CONFIG_AVR_USART', if_true: files('avr_usart.c'))
>  softmmu_ss.add(when: 'CONFIG_COLDFIRE', if_true: files('mcf_uart.c'))
> diff --git a/hw/char/serial-mcb.c b/hw/char/serial-mcb.c
> new file mode 100644
> index 0000000000..7ca8a248ac
> --- /dev/null
> +++ b/hw/char/serial-mcb.c
> @@ -0,0 +1,115 @@
> +/*
> + * QEMU MEN 16z125 UART over MCB emulation
> + *
> + * Copyright (C) 2023 Johannes Thumshirn <jth@kernel.org>
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2.  See
> + * the COPYING file in the top-level directory.
> + */
> +
> +#include "qemu/osdep.h"
> +#include "qapi/error.h"
> +#include "qemu/module.h"
> +#include "hw/char/serial.h"
> +#include "hw/mcb/mcb.h"
> +#include "hw/irq.h"
> +#include "hw/qdev-properties.h"
> +#include "hw/qdev-properties-system.h"
> +#include "migration/vmstate.h"
> +
> +struct MCBSerialState {
> +    MCBDevice dev;
> +    SerialState state;
> +};
> +
> +#define TYPE_MCB_SERIAL "mcb-serial"
> +OBJECT_DECLARE_SIMPLE_TYPE(MCBSerialState, MCB_SERIAL)
> +
> +static void serial_mcb_realize(DeviceState *dev, Error **errp)
> +{
> +    MCBDevice *mdev = MCB_DEVICE(dev);
> +    MCBSerialState *mss = DO_UPCAST(MCBSerialState, dev, mdev);
> +    MCBus *bus = MCB_BUS(qdev_get_parent_bus(DEVICE(dev)));
> +    SerialState *s = &mss->state;
> +
> +    mdev->gdd = mcb_new_chameleon_descriptor(bus, 125, mdev->rev,
> +                                             mdev->var, 0x10);
> +    if (!mdev->gdd) {
> +        return;
> +    }
> +
> +    s->baudbase = 115200;
> +    if (!qdev_realize(DEVICE(s), NULL, errp)) {
> +        return;
> +    }
> +
> +    s->irq = mcb_allocate_irq(&mss->dev);
> +    memory_region_init_io(&s->io, OBJECT(mss), &serial_io_ops, s, "serial", 
> 8);
> +    memory_region_add_subregion(&bus->mmio_region, mdev->gdd->offset, 
> &s->io);
> +}
> +
> +static void serial_mcb_unrealize(DeviceState *dev)
> +{
> +    MCBDevice *mdev = MCB_DEVICE(dev);
> +    MCBSerialState *mss = DO_UPCAST(MCBSerialState, dev, mdev);
> +    SerialState *s = &mss->state;
> +
> +    qdev_unrealize(DEVICE(s));
> +    qemu_free_irq(s->irq);
> +    g_free(&mdev->gdd);
> +}
> +
> +static const VMStateDescription vmstate_mcb_serial = {
> +    .name = "mcb-serial",
> +    .version_id = 1,
> +    .minimum_version_id = 1,
> +    .fields = (VMStateField[]) {
> +        VMSTATE_MCB_DEVICE(dev, MCBSerialState),
> +        VMSTATE_STRUCT(state, MCBSerialState, 0, vmstate_serial, 
> SerialState),
> +        VMSTATE_END_OF_LIST()
> +    }
> +};
> +
> +static Property serial_mcb_properties[] = {
> +    DEFINE_PROP_UINT8("rev", MCBSerialState, dev.rev, 0),
> +    DEFINE_PROP_UINT8("var", MCBSerialState, dev.var, 0),
> +    DEFINE_PROP_END_OF_LIST(),
> +};
> +
> +static void serial_mcb_class_initfn(ObjectClass *klass, void *data)
> +{
> +    DeviceClass *dc = DEVICE_CLASS(klass);
> +    MCBDeviceClass *mc = MCB_DEVICE_CLASS(klass);
> +
> +    mc->realize = serial_mcb_realize;
> +    mc->unrealize = serial_mcb_unrealize;
> +
> +    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
> +    dc->desc = "MEN 16z125 UART over MCB";
> +    dc->vmsd = &vmstate_mcb_serial;
> +    device_class_set_props(dc, serial_mcb_properties);
> +}
> +
> +static void serial_mcb_init(Object *o)
> +{
> +    MCBSerialState *mss = MCB_SERIAL(o);
> +
> +    object_initialize_child(o, "serial", &mss->state, TYPE_SERIAL);
> +
> +    qdev_alias_all_properties(DEVICE(&mss->state), o);
> +}
> +
> +static const TypeInfo serial_mcb_info = {
> +    .name = "mcb-serial",
> +    .parent = TYPE_MCB_DEVICE,
> +    .instance_size = sizeof(MCBSerialState),
> +    .instance_init = serial_mcb_init,
> +    .class_init = serial_mcb_class_initfn,
> +};
> +
> +static void serial_mcb_register_types(void)
> +{
> +    type_register_static(&serial_mcb_info);
> +}
> +
> +type_init(serial_mcb_register_types);
> --
> 2.39.2
>
>