From nobody Tue Feb 10 05:39:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576850520; cv=none; d=zohomail.com; s=zohoarc; b=nJWk7+HE0jRPRbdG595jvDVnfPcC8Xe0dKEAFa/1oHjfvzshbJuFXPb7NkJKxy/V+sPeQLCBk2GZry/PiQ3aVXPnPy7Jys6pH1GsELk1LQNJ+sEZXhmKAbKIDOQVgF3UUw2iitfGlBoFJeRm6lgVCVQsRaIMyxjNM4Y+ErRvGTA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576850520; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ErEusLMkFXXYvU1bgrkOZYaAHQWrglTdAbdT6UhLbQQ=; b=itst2ueVifQf2TmhwDK+PbVE2Ku+y+VOKcHYEHaT9/R1BkCAYPhOk1TeO6s5WfIx9VL0GuDQ4/twvNPQsQieUfA61pEDJ5qSS6FI7p4CeHt6UWTZBYqEC7tDq2nTIuxDHvT6xHMMW6IEznz8hpLlcHqUGjpSTgFeBWF/ZxJjluY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576850520219322.085748020114; Fri, 20 Dec 2019 06:02:00 -0800 (PST) Received: from localhost ([::1]:56372 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iiIqs-00016D-No for importer@patchew.org; Fri, 20 Dec 2019 09:01:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44959) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iiIe9-0005VO-SX for qemu-devel@nongnu.org; Fri, 20 Dec 2019 08:48:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iiIe8-0003f6-ES for qemu-devel@nongnu.org; Fri, 20 Dec 2019 08:48:49 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:58111 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iiIe7-0003ci-V6 for qemu-devel@nongnu.org; Fri, 20 Dec 2019 08:48:48 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-267-9e0Dv2GDP16b0inkhVBBVQ-1; Fri, 20 Dec 2019 08:48:44 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 32C54107ACCC; Fri, 20 Dec 2019 13:48:43 +0000 (UTC) Received: from localhost (ovpn-112-54.ams2.redhat.com [10.36.112.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id E340F5C54A; Fri, 20 Dec 2019 13:48:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576849727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ErEusLMkFXXYvU1bgrkOZYaAHQWrglTdAbdT6UhLbQQ=; b=KvmFeFan7nO0EfNU/rWsip8xt46AcPvm65XtdTuSXvCSptGSCwTibmMM0TdPuwzs8+4iWT L7YQvZAgql2JPjR109s5GiHAHCHfMgR4OkyeaJKAkb66b7xi7gXm2Ya1L4hJdU6rdb9SGZ Ndy13iJQnvznG37J1BiDDl92m8fsA40= From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Subject: [PATCH v5 16/37] serial: make SerialIO a sysbus device Date: Fri, 20 Dec 2019 17:45:40 +0400 Message-Id: <20191220134601.571905-17-marcandre.lureau@redhat.com> In-Reply-To: <20191220134601.571905-1-marcandre.lureau@redhat.com> References: <20191220134601.571905-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: 9e0Dv2GDP16b0inkhVBBVQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Make serial IO a proper sysbus device, similar to serial MM. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/char/serial.c | 64 +++++++++++++++++++++++++++++++++------- include/hw/char/serial.h | 13 ++++++-- 2 files changed, 64 insertions(+), 13 deletions(-) diff --git a/hw/char/serial.c b/hw/char/serial.c index 4899c0454a..84b4267ce6 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -985,22 +985,63 @@ const MemoryRegionOps serial_io_ops =3D { .endianness =3D DEVICE_LITTLE_ENDIAN, }; =20 -SerialState *serial_init(int base, qemu_irq irq, int baudbase, - Chardev *chr, MemoryRegion *system_io) +static void serial_io_realize(DeviceState *dev, Error **errp) { - DeviceState *dev =3D DEVICE(object_new(TYPE_SERIAL)); - SerialState *s =3D SERIAL(dev); + SerialIO *sio =3D SERIAL_IO(dev); + SerialState *s =3D &sio->serial; + Error *local_err =3D NULL; =20 - s->irq =3D irq; - qdev_prop_set_uint32(dev, "baudbase", baudbase); - qdev_prop_set_chr(dev, "chardev", chr); - qdev_set_legacy_instance_id(dev, base, 2); - qdev_init_nofail(dev); + object_property_set_bool(OBJECT(s), true, "realized", &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } =20 memory_region_init_io(&s->io, NULL, &serial_io_ops, s, "serial", 8); - memory_region_add_subregion(system_io, base, &s->io); + sysbus_init_irq(SYS_BUS_DEVICE(sio), &s->irq); +} + +static void serial_io_class_init(ObjectClass *klass, void* data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + + dc->realize =3D serial_io_realize; + /* No dc->vmsd: class has no migratable state */ +} + +static void serial_io_instance_init(Object *o) +{ + SerialIO *sio =3D SERIAL_IO(o); + + object_initialize_child(o, "serial", &sio->serial, sizeof(sio->serial), + TYPE_SERIAL, &error_abort, NULL); + + qdev_alias_all_properties(DEVICE(&sio->serial), o); +} + + +static const TypeInfo serial_io_info =3D { + .name =3D TYPE_SERIAL_IO, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_size =3D sizeof(SerialIO), + .instance_init =3D serial_io_instance_init, + .class_init =3D serial_io_class_init, +}; + +SerialIO *serial_init(int base, qemu_irq irq, int baudbase, + Chardev *chr, MemoryRegion *system_io) +{ + SerialIO *sio =3D SERIAL_IO(qdev_create(NULL, TYPE_SERIAL_IO)); + + qdev_prop_set_uint32(DEVICE(sio), "baudbase", baudbase); + qdev_prop_set_chr(DEVICE(sio), "chardev", chr); + qdev_set_legacy_instance_id(DEVICE(sio), base, 2); + qdev_init_nofail(DEVICE(sio)); + + sysbus_connect_irq(SYS_BUS_DEVICE(sio), 0, irq); + memory_region_add_subregion(system_io, base, &sio->serial.io); =20 - return s; + return sio; } =20 static Property serial_properties[] =3D { @@ -1149,6 +1190,7 @@ static const TypeInfo serial_mm_info =3D { static void serial_register_types(void) { type_register_static(&serial_info); + type_register_static(&serial_io_info); type_register_static(&serial_mm_info); } =20 diff --git a/include/hw/char/serial.h b/include/hw/char/serial.h index d586924937..d356ba838c 100644 --- a/include/hw/char/serial.h +++ b/include/hw/char/serial.h @@ -88,6 +88,12 @@ typedef struct SerialMM { uint8_t endianness; } SerialMM; =20 +typedef struct SerialIO { + SysBusDevice parent; + + SerialState serial; +} SerialIO; + extern const VMStateDescription vmstate_serial; extern const MemoryRegionOps serial_io_ops; =20 @@ -99,8 +105,11 @@ void serial_set_frequency(SerialState *s, uint32_t freq= uency); #define TYPE_SERIAL_MM "serial-mm" #define SERIAL_MM(s) OBJECT_CHECK(SerialMM, (s), TYPE_SERIAL_MM) =20 -SerialState *serial_init(int base, qemu_irq irq, int baudbase, - Chardev *chr, MemoryRegion *system_io); +#define TYPE_SERIAL_IO "serial-io" +#define SERIAL_IO(s) OBJECT_CHECK(SerialIO, (s), TYPE_SERIAL_IO) + +SerialIO *serial_init(int base, qemu_irq irq, int baudbase, + Chardev *chr, MemoryRegion *system_io); SerialMM *serial_mm_init(MemoryRegion *address_space, hwaddr base, int regshift, qemu_irq irq, int baudbase, --=20 2.24.0.308.g228f53135a