From nobody Sat Oct 25 08:57:49 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; dkim=fail; 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 1520285302882733.6947143261732; Mon, 5 Mar 2018 13:28:22 -0800 (PST) Received: from localhost ([::1]:51636 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1esxef-0003Ol-Vm for importer@patchew.org; Mon, 05 Mar 2018 16:28:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49402) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1esxWX-0004SW-9k for qemu-devel@nongnu.org; Mon, 05 Mar 2018 16:19:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1esxWV-0001bm-CB for qemu-devel@nongnu.org; Mon, 05 Mar 2018 16:19:57 -0500 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:32815) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1esxWV-0001bH-1l; Mon, 05 Mar 2018 16:19:55 -0500 Received: by mail-wm0-x241.google.com with SMTP id s206so15056023wme.0; Mon, 05 Mar 2018 13:19:54 -0800 (PST) Received: from x1.local (ABayonne-654-1-79-224.w86-222.abo.wanadoo.fr. [86.222.222.224]) by smtp.gmail.com with ESMTPSA id g96sm12904808wrd.73.2018.03.05.13.19.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Mar 2018 13:19:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=E6CmwAbuixBoaMoC9st/HQkAu0Y77Oi5FRt9Y0DZMao=; b=dtx+61EJJM3yuYIQnJ/NY/BelM+0LnQBoUSvasz3p9j2mhIH07j0+5hU6udBcDQtWJ 81QbeaqIEPx7k48B93BN7Lx8np6BLcg8xP56IhBrYCLi/MkO/TYxDrYotHgQei/bchqV tsffbXW5Nc8YElkBVQXUQ1W9vnjrvpo9ffpeu2ofUSR559j6/QKsyQ+oMc0xB7k+UeYr dfzKNux2uNFENS9/gL/4+Y5e/DDPzcxrhNkndfqOJpCVLLu+lwNbp8sPgmR5n/WE+KRV ieSmssOl89K3nZQwDd2gZ9XRgkIVAQzD2wFWQgw5oG4VncwLVfngXh8ZM0YGlfbsumFW IIvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=E6CmwAbuixBoaMoC9st/HQkAu0Y77Oi5FRt9Y0DZMao=; b=n315wvIQxuX6UK7uY10gw5X+L7DCwtwVaIKLF9UqHjd6+MM1myk29tRie57hD6KyXq 0snJxlX2jVSCcOYqIx+lr80bfinwDnr2L80Mvv/FzOCyQEXaf1DAJOOu1xJSh+m7vIzH zKIMjmTeCSkfcPhiTkRRNGSZNQtjYbKL1nmUvD+RGVE4JYVjSJ/KWIFDmDojHHa/SIRs MzjKSO6oHrMUqCOL9IL5yWcb9/7fYahOzqo3rfHrgnAnir2nOFqlE+LLgb+rtMYGpVHG t7/7vaqgx6UNQlm5RJeqp1pJzmKoT8ayTdRhDixWnAC5ITVZPmbT1z57m56HgP4TOaRZ g5oQ== X-Gm-Message-State: AElRT7HK4cljH0aBhf8zsUpIgFlamRU/EM6lt0q5cUvfqgRXtkDgDqSf rBs8hlAwwFi8y9uipXN/oM4= X-Google-Smtp-Source: AG47ELutCVqKX0PMvvI2E+tNMLnWk9cHrMHIf0XVysvl8nVj8hTkwh4AuNlOoVyJ/mFnFMwDli38fQ== X-Received: by 10.28.230.147 with SMTP id e19mr10133619wmi.2.1520284793848; Mon, 05 Mar 2018 13:19:53 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: "Michael S . Tsirkin" , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Marcel Apfelbaum , Aurelien Jarno , Mark Cave-Ayland , Alexey Kardashevskiy , Thomas Huth Date: Mon, 5 Mar 2018 18:19:16 -0300 Message-Id: <20180305211928.466-11-f4bug@amsat.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180305211928.466-1-f4bug@amsat.org> References: <20180305211928.466-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [RFC PATCH v2 10/22] hw/isa/superio: Factor out the serial code from pc87312.c 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: Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, "open list:PReP" , Guan Xuetao , Yongbok Kim , Artyom Tarasenko , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/isa/pc87312.h | 4 ---- include/hw/isa/superio.h | 2 ++ hw/isa/isa-superio.c | 39 +++++++++++++++++++++++++++++++++++++++ hw/isa/pc87312.c | 43 ++++++++++++------------------------------- hw/isa/trace-events | 2 +- 5 files changed, 54 insertions(+), 36 deletions(-) diff --git a/include/hw/isa/pc87312.h b/include/hw/isa/pc87312.h index bcc4578479..1480615a2c 100644 --- a/include/hw/isa/pc87312.h +++ b/include/hw/isa/pc87312.h @@ -39,10 +39,6 @@ typedef struct PC87312State { uint16_t iobase; uint8_t config; /* initial configuration */ =20 - struct { - ISADevice *dev; - } uart[2]; - struct { ISADevice *dev; } fdc; diff --git a/include/hw/isa/superio.h b/include/hw/isa/superio.h index e9879cfde1..0b516721c3 100644 --- a/include/hw/isa/superio.h +++ b/include/hw/isa/superio.h @@ -28,6 +28,7 @@ typedef struct ISASuperIODevice { /*< public >*/ =20 ISADevice *parallel[MAX_PARALLEL_PORTS]; + ISADevice *serial[MAX_SERIAL_PORTS]; } ISASuperIODevice; =20 typedef struct ISASuperIOFuncs { @@ -45,6 +46,7 @@ typedef struct ISASuperIOClass { DeviceRealize parent_realize; =20 ISASuperIOFuncs parallel; + ISASuperIOFuncs serial; } ISASuperIOClass; =20 #endif /* HW_ISA_SUPERIO_H */ diff --git a/hw/isa/isa-superio.c b/hw/isa/isa-superio.c index 4e0b1af633..bd4671655e 100644 --- a/hw/isa/isa-superio.c +++ b/hw/isa/isa-superio.c @@ -14,6 +14,7 @@ #include "sysemu/sysemu.h" #include "chardev/char.h" #include "hw/isa/superio.h" +#include "hw/char/serial.h" #include "trace.h" =20 static void isa_superio_realize(DeviceState *dev, Error **errp) @@ -64,6 +65,44 @@ static void isa_superio_realize(DeviceState *dev, Error = **errp) g_free(name); } } + + /* Serial */ + for (i =3D 0; i < k->serial.count; i++) { + if (i >=3D ARRAY_SIZE(sio->serial)) { + warn_report("superio: ignoring %ld serial controllers", + k->serial.count - ARRAY_SIZE(sio->serial)); + break; + } + if (!k->serial.is_enabled || k->serial.is_enabled(sio, i)) { + name =3D g_strdup_printf("discarding-serial%d", i); + /* FIXME use a qdev chardev prop instead of serial_hds[] */ + chr =3D serial_hds[i]; + if (chr =3D=3D NULL || chr->be) { + chr =3D qemu_chr_new(name, "null"); + } + isa =3D isa_create(bus, TYPE_ISA_SERIAL); + d =3D DEVICE(isa); + qdev_prop_set_uint32(d, "index", i); + if (k->serial.get_iobase) { + qdev_prop_set_uint32(d, "iobase", + k->serial.get_iobase(sio, i)); + } + if (k->serial.get_irq) { + qdev_prop_set_uint32(d, "irq", k->serial.get_irq(sio, i)); + } + qdev_prop_set_chr(d, "chardev", chr); + qdev_init_nofail(d); + sio->serial[i] =3D isa; + trace_superio_create_serial(i, + k->serial.get_iobase ? + k->serial.get_iobase(sio, i) : -1, + k->serial.get_irq ? + k->serial.get_irq(sio, i) : -1); + object_property_add_child(OBJECT(dev), name, + OBJECT(sio->serial[0]), NULL); + g_free(name); + } + } } =20 static void isa_superio_class_init(ObjectClass *oc, void *data) diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c index 1c15715c69..c2837bca43 100644 --- a/hw/isa/pc87312.c +++ b/hw/isa/pc87312.c @@ -29,8 +29,6 @@ #include "qemu/error-report.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" -#include "sysemu/sysemu.h" -#include "chardev/char.h" #include "trace.h" =20 =20 @@ -100,8 +98,9 @@ static const uint16_t uart_base[2][4] =3D { { 0x2e8, 0x238, 0x2e0, 0x228 } }; =20 -static inline uint16_t get_uart_iobase(PC87312State *s, int i) +static uint16_t get_uart_iobase(ISASuperIODevice *sio, uint8_t i) { + PC87312State *s =3D PC87312(sio); int idx; idx =3D (s->regs[REG_FAR] >> (2 * i + 2)) & 0x3; if (idx =3D=3D 0) { @@ -113,15 +112,17 @@ static inline uint16_t get_uart_iobase(PC87312State *= s, int i) } } =20 -static inline unsigned int get_uart_irq(PC87312State *s, int i) +static unsigned int get_uart_irq(ISASuperIODevice *sio, uint8_t i) { + PC87312State *s =3D PC87312(sio); int idx; idx =3D (s->regs[REG_FAR] >> (2 * i + 2)) & 0x3; return (idx & 1) ? 3 : 4; } =20 -static inline bool is_uart_enabled(PC87312State *s, int i) +static bool is_uart_enabled(ISASuperIODevice *sio, uint8_t i) { + PC87312State *s =3D PC87312(sio); return s->regs[REG_FER] & (FER_UART1_EN << i); } =20 @@ -271,11 +272,8 @@ static void pc87312_realize(DeviceState *dev, Error **= errp) DeviceState *d; ISADevice *isa; ISABus *bus; - Chardev *chr; DriveInfo *drive; Error *local_err =3D NULL; - char name[5]; - int i; =20 s =3D PC87312(dev); isa =3D ISA_DEVICE(dev); @@ -289,27 +287,6 @@ static void pc87312_realize(DeviceState *dev, Error **= errp) return; } =20 - for (i =3D 0; i < 2; i++) { - if (is_uart_enabled(s, i)) { - /* FIXME use a qdev chardev prop instead of serial_hds[] */ - chr =3D serial_hds[i]; - if (chr =3D=3D NULL) { - snprintf(name, sizeof(name), "ser%d", i); - chr =3D qemu_chr_new(name, "null"); - } - isa =3D isa_create(bus, "isa-serial"); - d =3D DEVICE(isa); - qdev_prop_set_uint32(d, "index", i); - qdev_prop_set_uint32(d, "iobase", get_uart_iobase(s, i)); - qdev_prop_set_uint32(d, "irq", get_uart_irq(s, i)); - qdev_prop_set_chr(d, "chardev", chr); - qdev_init_nofail(d); - s->uart[i].dev =3D isa; - trace_pc87312_info_serial(i, get_uart_iobase(s, i), - get_uart_irq(s, i)); - } - } - if (is_fdc_enabled(s)) { isa =3D isa_create(bus, "isa-fdc"); d =3D DEVICE(isa); @@ -380,8 +357,6 @@ static void pc87312_class_init(ObjectClass *klass, void= *data) dc->reset =3D pc87312_reset; dc->vmsd =3D &vmstate_pc87312; dc->props =3D pc87312_properties; - /* Reason: Uses serial_hds[0] in realize(), so it can't be used twice = */ - dc->user_creatable =3D false; =20 sc->parallel =3D (ISASuperIOFuncs){ .count =3D 1, @@ -389,6 +364,12 @@ static void pc87312_class_init(ObjectClass *klass, voi= d *data) .get_iobase =3D get_parallel_iobase, .get_irq =3D get_parallel_irq, }; + sc->serial =3D (ISASuperIOFuncs){ + .count =3D 2, + .is_enabled =3D is_uart_enabled, + .get_iobase =3D get_uart_iobase, + .get_irq =3D get_uart_irq, + }; } =20 static const TypeInfo pc87312_type_info =3D { diff --git a/hw/isa/trace-events b/hw/isa/trace-events index 97b1949981..c78dd6c353 100644 --- a/hw/isa/trace-events +++ b/hw/isa/trace-events @@ -2,10 +2,10 @@ =20 # hw/isa/isa-superio.c superio_create_parallel(int id, uint16_t base, unsigned int irq) "id=3D%d,= base 0x%03x, irq %u" +superio_create_serial(int id, uint16_t base, unsigned int irq) "id=3D%d, b= ase 0x%03x, irq %u" =20 # hw/isa/pc87312.c pc87312_io_read(uint32_t addr, uint32_t val) "read addr=3D0x%x val=3D0x%x" pc87312_io_write(uint32_t addr, uint32_t val) "write addr=3D0x%x val=3D0x%= x" pc87312_info_floppy(uint32_t base) "base 0x%x" pc87312_info_ide(uint32_t base) "base 0x%x" -pc87312_info_serial(int n, uint32_t base, uint32_t irq) "id=3D%d, base 0x%= x, irq %u" --=20 2.16.2