From nobody Wed Nov 5 09:26:55 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) 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=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) 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 1533738646877721.9989495483367; Wed, 8 Aug 2018 07:30:46 -0700 (PDT) Received: from localhost ([::1]:44089 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnPU5-0006DU-Re for importer@patchew.org; Wed, 08 Aug 2018 10:30:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38018) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnPIr-0003J7-LL for qemu-devel@nongnu.org; Wed, 08 Aug 2018 10:19:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fnPIn-0001hf-Us for qemu-devel@nongnu.org; Wed, 08 Aug 2018 10:19:09 -0400 Received: from mx2.suse.de ([195.135.220.15]:56870 helo=mx1.suse.de) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fnPIn-0001g4-KB for qemu-devel@nongnu.org; Wed, 08 Aug 2018 10:19:05 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id EC398AE9E for ; Wed, 8 Aug 2018 14:19:03 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Johannes Thumshirn To: qemu-devel@nongnu.org Date: Wed, 8 Aug 2018 16:16:59 +0200 Message-Id: <20180808141700.21333-4-jthumshirn@suse.de> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180808141700.21333-1-jthumshirn@suse.de> References: <20180808141700.21333-1-jthumshirn@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 195.135.220.15 X-Mailman-Approved-At: Wed, 08 Aug 2018 10:28:23 -0400 Subject: [Qemu-devel] [PATCH 3/4] serial-mcb: Add serial via MEN chameleon bus 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: , Cc: Johannes Thumshirn Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add MEN z125 UART over MEN Chameleon Bus emulation. Signed-off-by: Johannes Thumshirn --- hw/char/Makefile.objs | 1 + hw/char/serial-mcb.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 98 insertions(+) create mode 100644 hw/char/serial-mcb.c diff --git a/hw/char/Makefile.objs b/hw/char/Makefile.objs index b57053129107..063f1720974d 100644 --- a/hw/char/Makefile.objs +++ b/hw/char/Makefile.objs @@ -6,6 +6,7 @@ common-obj-$(CONFIG_PL011) +=3D pl011.o common-obj-$(CONFIG_SERIAL) +=3D serial.o common-obj-$(CONFIG_SERIAL_ISA) +=3D serial-isa.o common-obj-$(CONFIG_SERIAL_PCI) +=3D serial-pci.o +common-obj-$(CONFIG_MCB) +=3D serial-mcb.o common-obj-$(CONFIG_VIRTIO_SERIAL) +=3D virtio-console.o common-obj-$(CONFIG_XILINX) +=3D xilinx_uartlite.o common-obj-$(CONFIG_XEN) +=3D xen_console.o diff --git a/hw/char/serial-mcb.c b/hw/char/serial-mcb.c new file mode 100644 index 000000000000..a1087bc369dd --- /dev/null +++ b/hw/char/serial-mcb.c @@ -0,0 +1,97 @@ +/* + * QEMU MEN 16z125 UART over MCB emulation + * + * Copyright (C) 2016 Johannes Thumshirn + * + * This code is licensed under the GNU GPL v2 or (at your opinion) any + * later version + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "hw/char/serial.h" +#include "hw/mcb/mcb.h" + +typedef struct { + MCBDevice dev; + SerialState state; +} MCBSerialState; + +static void serial_mcb_realize(DeviceState *dev, Error **errp) +{ + MCBDevice *mdev =3D MCB_DEVICE(dev); + MCBSerialState *mss =3D DO_UPCAST(MCBSerialState, dev, mdev); + MCBus *bus =3D MCB_BUS(qdev_get_parent_bus(DEVICE(dev))); + SerialState *s =3D &mss->state; + Error *err =3D 0; + + mdev->gdd =3D mcb_new_chameleon_descriptor(bus, 125, mdev->rev, + mdev->var, 0x10); + if (!mdev->gdd) { + return; + } + + s->baudbase =3D 115200; + serial_realize_core(s, &err); + if (err !=3D NULL) { + error_propagate(errp, err); + return; + } + + s->irq =3D 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, Error **errp) +{ + MCBDevice *mdev =3D MCB_DEVICE(dev); + + g_free(&mdev->gdd); +} + +static const VMStateDescription vmstate_mcb_serial =3D { + .name =3D "mcb-serial", + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_MCB_DEVICE(dev, MCBSerialState), + VMSTATE_STRUCT(state, MCBSerialState, 0, vmstate_serial, SerialSta= te), + VMSTATE_END_OF_LIST() + } +}; + +static Property serial_mcb_properties[] =3D { + DEFINE_PROP_CHR("chardev", MCBSerialState, state.chr), + 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 =3D DEVICE_CLASS(klass); + MCBDeviceClass *mc =3D MCB_DEVICE_CLASS(klass); + + mc->realize =3D serial_mcb_realize; + mc->unrealize =3D serial_mcb_unrealize; + + set_bit(DEVICE_CATEGORY_INPUT, dc->categories); + dc->desc =3D "MEN 16z125 UART over MCB"; + dc->vmsd =3D &vmstate_mcb_serial; + dc->props =3D serial_mcb_properties; +} + +static const TypeInfo serial_mcb_info =3D { + .name =3D "mcb-serial", + .parent =3D TYPE_MCB_DEVICE, + .instance_size =3D sizeof(MCBSerialState), + .class_init =3D serial_mcb_class_initfn, +}; + +static void serial_mcb_register_types(void) +{ + type_register_static(&serial_mcb_info); +} + +type_init(serial_mcb_register_types); --=20 2.16.4