From nobody Wed Nov 19 20:13:57 2025 Delivered-To: importer@patchew.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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1702824262; cv=none; d=zohomail.com; s=zohoarc; b=A6x6cdn3zkeAUPgepFINn631N4ElKOpOITAS+jP5FBkbtIKcdml1UUeH3jbLO0OhaNMngKbCWn4f4rqQtevIWcRAnm6WH7GWmDXZ5eQ9vOhkXyNFt+oz/Sxqehh7CswQD6kjdwXFYZ/WWBXTYOW1eFUK+ZW0SP8xh4t7Ie6XG4U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1702824262; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=7GVPhWXMW8MR93OghNnij2RsOVoa+Oia2EB8rT0v4yc=; b=MFt8l4aD7enZdVXaYDwavjQl6qDPO1YVhpYQQo6w762Do7lpDEx+WiCLRm+eEfG7OfQjwBeqWwDs9edREHd2BVjMsMMylAtm28cTceI9scxb+b/jbhXdjkiMFrZvPYEc5OGBqhW9OPulhw/LxZAJP1G0OhwyCKINZVTumidxbTQ= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 170282426290498.78749592750194; Sun, 17 Dec 2023 06:44:22 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rEsLo-0005gL-1a; Sun, 17 Dec 2023 09:42:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rEsLi-0005dr-6K; Sun, 17 Dec 2023 09:42:35 -0500 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rEsLf-0003PM-MU; Sun, 17 Dec 2023 09:42:33 -0500 Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-54bf9a54fe3so2648271a12.3; Sun, 17 Dec 2023 06:42:29 -0800 (PST) Received: from archlinux.. (dynamic-077-011-162-117.77.11.pool.telefonica.de. [77.11.162.117]) by smtp.gmail.com with ESMTPSA id vv6-20020a170907a68600b00a1dff479037sm12996632ejc.127.2023.12.17.06.42.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Dec 2023 06:42:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702824148; x=1703428948; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7GVPhWXMW8MR93OghNnij2RsOVoa+Oia2EB8rT0v4yc=; b=gGvpumVkeb/1LbbN07Fztf8hSDpV93LeiEaWcITTt9VpAhp2OW5qZ6dChKUZb3F28j W2P8C7d7ghCsGj8yjiIzStL+kn0FK7Xd/SofBwIo1sDzBS5H36XHGHYXAWzwfPT73cOH EwSABAo0tICyVr7YKj+KFeNtXGOCq6QOGzRWLqMeF5glxriMvkXu5gp3gb9HszR0Ig86 vfxXJpHRPxTduKghYfZxPUB20fZTon16DcbmcheYLtxYX66s4GSGmBKL9wjEOlsYgxJ8 h+BiTpnuL2DwIk5FVL5SfQikzbwcgPdqyyddLxGY1j4eSLfNwNRBVKei9EiX67vBiTQe YlEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702824148; x=1703428948; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7GVPhWXMW8MR93OghNnij2RsOVoa+Oia2EB8rT0v4yc=; b=b0jY1QW8LcHDB+Ly66ScGrGOQTl8Js3dUICwp41oXYgIfTfAfCIJWwpb67ehW7c/hn Cq+dkcB/gY6bAwRSg58Pg/8lnDFE1qgO2oBIwCfOwn61kTLybZ/KaDU7fB+GyOK2OABJ Nnqi+Qe53oI0HuEVStr8bGm85sGHEh9PislvGCsKUMnihsSK2S3m08WkM93i4Umm4s0x fRpsOdTdLTGJG6C0WMA6VVoYReZgD9RWf9KGSGWMsLqRXZ7B+3Y8SFHtKgHwrmWDsG35 4fUG3E5jEyXb60PKueF7IRPw9po3ifIdiT2bINnEM/G2Dm1Ol7Y+PafgvHoDNBg6IGHk jnqA== X-Gm-Message-State: AOJu0YyXkKBnQIxxjX3VPW5bsrOtOzY5JS/wVXMuqT1yscxXOZ9NbAL8 9jj1aCsYTLZx78+y1uYP3tOw8iGPkUY= X-Google-Smtp-Source: AGHT+IFRAgNlWKtd865+MVAmfj3sUYDVHoP7HEFdoI3M411Vob8r2ts+n73iAOpnY3fyAWlfGt/W8w== X-Received: by 2002:a17:906:5345:b0:a23:4f2e:f7b with SMTP id j5-20020a170906534500b00a234f2e0f7bmr222521ejo.56.1702824148559; Sun, 17 Dec 2023 06:42:28 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: John Snow , qemu-block@nongnu.org, Thomas Huth , Aleksandar Rikalo , David Hildenbrand , Jiaxun Yang , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Mark Cave-Ayland , Kevin Wolf , Peter Xu , BALATON Zoltan , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Fabiano Rosas , Paolo Bonzini , Sergio Lopez , Richard Henderson , Eduardo Habkost , Hanna Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Nicholas Piggin , Juan Quintela , =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Barrat?= , qemu-ppc@nongnu.org, "Michael S. Tsirkin" , Leonardo Bras , Artyom Tarasenko , Marcel Apfelbaum , Bernhard Beschow Subject: [PATCH 12/12] hw/isa/vt82c686: Implement relocation of SuperI/O functions Date: Sun, 17 Dec 2023 15:41:48 +0100 Message-ID: <20231217144148.15511-13-shentey@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231217144148.15511-1-shentey@gmail.com> References: <20231217144148.15511-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::52a; envelope-from=shentey@gmail.com; helo=mail-ed1-x52a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1702824263506100001 Content-Type: text/plain; charset="utf-8" The VIA south bridges are able to relocate and enable or disable their Supe= rI/O functions. So far this is hardcoded such that all functions are always enab= led and are located at fixed addresses. Some PC BIOSes seem to probe for I/O occupancy before activating such a fun= ction and issue an error in case of a conflict. Since the functions are enabled on reset, conflicts are always detected. Prevent that by implementing relocati= on of the SuperI/O functions. Note that the reset I/O region of VT8231's serial port changes from 0x2f8/enabled to 0x3f8/disabled. The ROM of the Pegasos II machine can hand= le it since it enables and relocates the I/O region accordingly. Signed-off-by: Bernhard Beschow --- hw/isa/vt82c686.c | 140 ++++++++++++++++++++++++++++++++++++---------- hw/ppc/pegasos2.c | 15 +++++ 2 files changed, 124 insertions(+), 31 deletions(-) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 9c2333a277..8fbc016755 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -15,6 +15,9 @@ =20 #include "qemu/osdep.h" #include "hw/isa/vt82c686.h" +#include "hw/block/fdc-isa.h" +#include "hw/char/parallel-isa.h" +#include "hw/char/serial-isa.h" #include "hw/pci/pci.h" #include "hw/qdev-properties.h" #include "hw/ide/pci.h" @@ -343,6 +346,46 @@ static const TypeInfo via_superio_info =3D { =20 #define TYPE_VT82C686B_SUPERIO "vt82c686b-superio" =20 +static void vt82c686b_superio_update(ViaSuperIOState *s) +{ + FDCtrlISABus *fd =3D ISA_FDC(s->superio.floppy); + ISASerialState *ss1 =3D ISA_SERIAL(s->superio.serial[0]); + ISASerialState *ss2 =3D ISA_SERIAL(s->superio.serial[1]); + ISAParallelState *ps =3D ISA_PARALLEL(s->superio.parallel[0]); + + portio_list_set_enabled(&ps->state.portio_list, (s->regs[0xe2] & 0x3) = !=3D 3); + memory_region_set_enabled(&ss1->state.io, s->regs[0xe2] & BIT(2)); + memory_region_set_enabled(&ss2->state.io, s->regs[0xe2] & BIT(3)); + portio_list_set_enabled(&fd->state.portio_list, s->regs[0xe2] & BIT(4)= ); + + fd->iobase =3D (s->regs[0xe3] & 0xfc) << 2; + portio_list_set_address(&fd->state.portio_list, fd->iobase); + + ps->iobase =3D s->regs[0xe6] << 2; + portio_list_set_address(&ps->state.portio_list, ps->iobase); + + ss1->iobase =3D (s->regs[0xe7] & 0xfe) << 2; + memory_region_set_address(&ss1->state.io, ss1->iobase); + + ss2->iobase =3D (s->regs[0xe8] & 0xfe) << 2; + memory_region_set_address(&ss2->state.io, ss2->iobase); +} + +static int vmstate_vt82c686b_superio_post_load(void *opaque, int version_i= d) +{ + ViaSuperIOState *s =3D opaque; + + vt82c686b_superio_update(s); + + return 0; +} + +static const VMStateDescription vmstate_vt82c686b_superio =3D { + .name =3D "vt82c686b_superio", + .version_id =3D 1, + .post_load =3D vmstate_vt82c686b_superio_post_load, +}; + static void vt82c686b_superio_cfg_write(void *opaque, hwaddr addr, uint64_t data, unsigned size) { @@ -368,7 +411,11 @@ static void vt82c686b_superio_cfg_write(void *opaque, = hwaddr addr, case 0xfd ... 0xff: /* ignore write to read only registers */ return; - /* case 0xe6 ... 0xe8: Should set base port of parallel and serial */ + case 0xe2 ... 0xe3: + case 0xe6 ... 0xe8: + sc->regs[idx] =3D data; + vt82c686b_superio_update(sc); + return; default: qemu_log_mask(LOG_UNIMP, "via_superio_cfg: unimplemented register 0x%x\n", id= x); @@ -393,25 +440,24 @@ static void vt82c686b_superio_reset(DeviceState *dev) =20 memset(s->regs, 0, sizeof(s->regs)); /* Device ID */ - vt82c686b_superio_cfg_write(s, 0, 0xe0, 1); - vt82c686b_superio_cfg_write(s, 1, 0x3c, 1); - /* Function select - all disabled */ - vt82c686b_superio_cfg_write(s, 0, 0xe2, 1); - vt82c686b_superio_cfg_write(s, 1, 0x03, 1); + s->regs[0xe0] =3D 0x3c; + /* + * Function select - only serial enabled + * Fuloong 2e's rescue-yl prints to the serial console w/o enabling it= . This + * suggests that the serial ports are enabled by default, so override = the + * datasheet. + */ + s->regs[0xe2] =3D 0x0f; /* Floppy ctrl base addr 0x3f0-7 */ - vt82c686b_superio_cfg_write(s, 0, 0xe3, 1); - vt82c686b_superio_cfg_write(s, 1, 0xfc, 1); + s->regs[0xe3] =3D 0xfc; /* Parallel port base addr 0x378-f */ - vt82c686b_superio_cfg_write(s, 0, 0xe6, 1); - vt82c686b_superio_cfg_write(s, 1, 0xde, 1); + s->regs[0xe6] =3D 0xde; /* Serial port 1 base addr 0x3f8-f */ - vt82c686b_superio_cfg_write(s, 0, 0xe7, 1); - vt82c686b_superio_cfg_write(s, 1, 0xfe, 1); + s->regs[0xe7] =3D 0xfe; /* Serial port 2 base addr 0x2f8-f */ - vt82c686b_superio_cfg_write(s, 0, 0xe8, 1); - vt82c686b_superio_cfg_write(s, 1, 0xbe, 1); + s->regs[0xe8] =3D 0xbe; =20 - vt82c686b_superio_cfg_write(s, 0, 0, 1); + vt82c686b_superio_update(s); } =20 static void vt82c686b_superio_init(Object *obj) @@ -429,6 +475,7 @@ static void vt82c686b_superio_class_init(ObjectClass *k= lass, void *data) sc->parallel.count =3D 1; sc->ide.count =3D 0; /* emulated by via-ide */ sc->floppy.count =3D 1; + dc->vmsd =3D &vmstate_vt82c686b_superio; } =20 static const TypeInfo vt82c686b_superio_info =3D { @@ -443,6 +490,41 @@ static const TypeInfo vt82c686b_superio_info =3D { =20 #define TYPE_VT8231_SUPERIO "vt8231-superio" =20 +static void vt8231_superio_update(ViaSuperIOState *s) +{ + FDCtrlISABus *fd =3D ISA_FDC(s->superio.floppy); + ISASerialState *ss =3D ISA_SERIAL(s->superio.serial[0]); + ISAParallelState *ps =3D ISA_PARALLEL(s->superio.parallel[0]); + + portio_list_set_enabled(&ps->state.portio_list, (s->regs[0xf2] & 0x3) = !=3D 3); + memory_region_set_enabled(&ss->state.io, s->regs[0xf2] & BIT(2)); + portio_list_set_enabled(&fd->state.portio_list, s->regs[0xf2] & BIT(4)= ); + + ss->iobase =3D (s->regs[0xf4] & 0xfe) << 2; + memory_region_set_address(&ss->state.io, ss->iobase); + + ps->iobase =3D s->regs[0xf6] << 2; + portio_list_set_address(&ps->state.portio_list, ps->iobase); + + fd->iobase =3D (s->regs[0xf7] & 0xfc) << 2; + portio_list_set_address(&fd->state.portio_list, fd->iobase); +} + +static int vmstate_vt8231_superio_post_load(void *opaque, int version_id) +{ + ViaSuperIOState *s =3D opaque; + + vt8231_superio_update(s); + + return 0; +} + +static const VMStateDescription vmstate_vt8231_superio =3D { + .name =3D "vt8231_superio", + .version_id =3D 1, + .post_load =3D vmstate_vt8231_superio_post_load, +}; + static void vt8231_superio_cfg_write(void *opaque, hwaddr addr, uint64_t data, unsigned size) { @@ -465,6 +547,12 @@ static void vt8231_superio_cfg_write(void *opaque, hwa= ddr addr, case 0xfd: /* ignore write to read only registers */ return; + case 0xf2: + case 0xf4: + case 0xf6 ... 0xf7: + sc->regs[idx] =3D data; + vt8231_superio_update(sc); + return; default: qemu_log_mask(LOG_UNIMP, "via_superio_cfg: unimplemented register 0x%x\n", id= x); @@ -493,19 +581,15 @@ static void vt8231_superio_reset(DeviceState *dev) /* Device revision */ s->regs[0xf1] =3D 0x01; /* Function select - all disabled */ - vt8231_superio_cfg_write(s, 0, 0xf2, 1); - vt8231_superio_cfg_write(s, 1, 0x03, 1); + s->regs[0xf2] =3D 0x03; /* Serial port base addr */ - vt8231_superio_cfg_write(s, 0, 0xf4, 1); - vt8231_superio_cfg_write(s, 1, 0xfe, 1); + s->regs[0xf4] =3D 0xfe; /* Parallel port base addr */ - vt8231_superio_cfg_write(s, 0, 0xf6, 1); - vt8231_superio_cfg_write(s, 1, 0xde, 1); + s->regs[0xf6] =3D 0xde; /* Floppy ctrl base addr */ - vt8231_superio_cfg_write(s, 0, 0xf7, 1); - vt8231_superio_cfg_write(s, 1, 0xfc, 1); + s->regs[0xf7] =3D 0xfc; =20 - vt8231_superio_cfg_write(s, 0, 0, 1); + vt8231_superio_update(s); } =20 static void vt8231_superio_init(Object *obj) @@ -513,12 +597,6 @@ static void vt8231_superio_init(Object *obj) VIA_SUPERIO(obj)->io_ops =3D &vt8231_superio_cfg_ops; } =20 -static uint16_t vt8231_superio_serial_iobase(ISASuperIODevice *sio, - uint8_t index) -{ - return 0x2f8; /* FIXME: This should be settable via registers f2-f= 4 */ -} - static void vt8231_superio_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -526,10 +604,10 @@ static void vt8231_superio_class_init(ObjectClass *kl= ass, void *data) =20 dc->reset =3D vt8231_superio_reset; sc->serial.count =3D 1; - sc->serial.get_iobase =3D vt8231_superio_serial_iobase; sc->parallel.count =3D 1; sc->ide.count =3D 0; /* emulated by via-ide */ sc->floppy.count =3D 1; + dc->vmsd =3D &vmstate_vt8231_superio; } =20 static const TypeInfo vt8231_superio_info =3D { diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c index 3203a4a728..0a40ebd542 100644 --- a/hw/ppc/pegasos2.c +++ b/hw/ppc/pegasos2.c @@ -285,6 +285,15 @@ static void pegasos2_pci_config_write(Pegasos2MachineS= tate *pm, int bus, pegasos2_mv_reg_write(pm, pcicfg + 4, len, val); } =20 +static void pegasos2_superio_write(Pegasos2MachineState *pm, uint32_t addr, + uint32_t val) +{ + AddressSpace *as =3D CPU(pm->cpu)->as; + + stb_phys(as, PCI1_IO_BASE + 0x3f0, addr); + stb_phys(as, PCI1_IO_BASE + 0x3f1, val); +} + static void pegasos2_machine_reset(MachineState *machine, ShutdownCause re= ason) { Pegasos2MachineState *pm =3D PEGASOS2_MACHINE(machine); @@ -310,6 +319,12 @@ static void pegasos2_machine_reset(MachineState *machi= ne, ShutdownCause reason) =20 pegasos2_pci_config_write(pm, 1, (PCI_DEVFN(12, 0) << 8) | PCI_INTERRUPT_LINE, 2, 0x9); + pegasos2_pci_config_write(pm, 1, (PCI_DEVFN(12, 0) << 8) | + 0x50, 1, 0x6); + pegasos2_superio_write(pm, 0xf4, 0xbe); + pegasos2_superio_write(pm, 0xf6, 0xef); + pegasos2_superio_write(pm, 0xf7, 0xfc); + pegasos2_superio_write(pm, 0xf2, 0x14); pegasos2_pci_config_write(pm, 1, (PCI_DEVFN(12, 0) << 8) | 0x50, 1, 0x2); pegasos2_pci_config_write(pm, 1, (PCI_DEVFN(12, 0) << 8) | --=20 2.43.0