From nobody Mon Oct 27 13:48:45 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=fail(p=none dis=none) header.from=eik.bme.hu Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761233275257817.707454159004; Thu, 23 Oct 2025 08:27:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBxDJ-00062G-Gh; Thu, 23 Oct 2025 11:26:53 -0400 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 1vBxD5-0005tJ-DK; Thu, 23 Oct 2025 11:26:39 -0400 Received: from zero.eik.bme.hu ([2001:738:2001:2001::2001]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vBxD3-0001Bc-Or; Thu, 23 Oct 2025 11:26:39 -0400 Received: from localhost (localhost [127.0.0.1]) by zero.eik.bme.hu (Postfix) with ESMTP id 43602597303; Thu, 23 Oct 2025 17:26:36 +0200 (CEST) Received: from zero.eik.bme.hu ([127.0.0.1]) by localhost (zero.eik.bme.hu [127.0.0.1]) (amavis, port 10028) with ESMTP id L0gScHJYoF7g; Thu, 23 Oct 2025 17:26:34 +0200 (CEST) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 430A7597302; Thu, 23 Oct 2025 17:26:34 +0200 (CEST) X-Virus-Scanned: amavis at eik.bme.hu Message-ID: In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH v5 13/13] hw/ppc/prep: Add reset method to prep-systemio MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Artyom Tarasenko , Nicholas Piggin , Markus Armbruster , Harsh Prateek Bora , Mark Cave-Ayland Date: Thu, 23 Oct 2025 17:26:34 +0200 (CEST) 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=2001:738:2001:2001::2001; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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-ZM-MESSAGEID: 1761233280105154100 Content-Type: text/plain; charset="utf-8" The initial state needs to be reset so it's not enough to set it once at realize. Add a reset method to fix device reset state. Signed-off-by: BALATON Zoltan --- hw/pci-host/raven.c | 1 - hw/ppc/prep_systemio.c | 13 ++++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c index 7ebca8186b..fd45acb7eb 100644 --- a/hw/pci-host/raven.c +++ b/hw/pci-host/raven.c @@ -173,7 +173,6 @@ static void raven_pcihost_realize(DeviceState *d, Error= **errp) memory_region_init_io(&s->pci_discontiguous_io, o, &raven_io_ops, &s->pci_io, "pci-discontiguous-io", 8 * MiB); - memory_region_set_enabled(&s->pci_discontiguous_io, false); memory_region_init(&s->pci_memory, o, "pci-memory", 0x3f000000); =20 sysbus_init_mmio(dev, &s->pci_io); diff --git a/hw/ppc/prep_systemio.c b/hw/ppc/prep_systemio.c index 6ef9b91317..13b8fdb56b 100644 --- a/hw/ppc/prep_systemio.c +++ b/hw/ppc/prep_systemio.c @@ -252,6 +252,15 @@ static const MemoryRegionOps ppc_parity_error_ops =3D { }, }; =20 +static void prep_systemio_reset(DeviceState *dev) +{ + PrepSystemIoState *s =3D PREP_SYSTEMIO(dev); + + s->iomap_type =3D PORT0850_IOMAP_NONCONTIGUOUS; + memory_region_set_enabled(s->discontiguous_io, + !(s->iomap_type & PORT0850_IOMAP_NONCONTIGUO= US)); +} + static void prep_systemio_realize(DeviceState *dev, Error **errp) { ISADevice *isa =3D ISA_DEVICE(dev); @@ -259,9 +268,6 @@ static void prep_systemio_realize(DeviceState *dev, Err= or **errp) PowerPCCPU *cpu; =20 assert(s->discontiguous_io); - s->iomap_type =3D PORT0850_IOMAP_NONCONTIGUOUS; - memory_region_set_enabled(s->discontiguous_io, - !(s->iomap_type & PORT0850_IOMAP_NONCONTIGUO= US)); cpu =3D POWERPC_CPU(first_cpu); s->softreset_irq =3D qdev_get_gpio_in(DEVICE(cpu), PPC6xx_INPUT_HRESET= ); =20 @@ -301,6 +307,7 @@ static void prep_systemio_class_initfn(ObjectClass *kla= ss, const void *data) dc->vmsd =3D &vmstate_prep_systemio; /* Reason: PReP specific device, needs to be wired via properties */ dc->user_creatable =3D false; + device_class_set_legacy_reset(dc, prep_systemio_reset); device_class_set_props(dc, prep_systemio_properties); } =20 --=20 2.41.3