From nobody Mon Feb 9 14:37:31 2026 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 1663369753099602.7876458699202; Fri, 16 Sep 2022 16:09:13 -0700 (PDT) Received: from localhost ([::1]:49456 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oZKSM-0004dg-Db for importer@patchew.org; Fri, 16 Sep 2022 19:09:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56020) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oZKQj-0001es-T2; Fri, 16 Sep 2022 19:07:29 -0400 Received: from zero.eik.bme.hu ([2001:738:2001:2001::2001]:18356) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oZKQf-0000Wn-5N; Fri, 16 Sep 2022 19:07:28 -0400 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id 9F15975A164; Sat, 17 Sep 2022 01:07:22 +0200 (CEST) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 7A75975A15D; Sat, 17 Sep 2022 01:07:22 +0200 (CEST) Message-Id: <29ab3c7737866916760f824547bd1beed0c6806b.1663368422.git.balaton@eik.bme.hu> In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH 04/10] mac_newworld: Simplify creation of Uninorth devices To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org Cc: Mark Cave-Ayland Date: Sat, 17 Sep 2022 01:07:22 +0200 (CEST) X-Spam-Probability: 8% 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" X-ZM-MESSAGEID: 1663369754505100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Avoid open coding sysbus_create_simple where not necessary and reorganise code a bit to avoid some casts to make the code more readable. Signed-off-by: BALATON Zoltan --- hw/ppc/mac_newworld.c | 50 ++++++++++++++++--------------------------- 1 file changed, 19 insertions(+), 31 deletions(-) diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index 6bc3bd19be..1038477793 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -228,13 +228,6 @@ static void ppc_core99_init(MachineState *machine) } } =20 - /* UniN init */ - dev =3D qdev_new(TYPE_UNI_NORTH); - s =3D SYS_BUS_DEVICE(dev); - sysbus_realize_and_unref(s, &error_fatal); - memory_region_add_subregion(get_system_memory(), 0xf8000000, - sysbus_mmio_get_region(s, 0)); - openpic_irqs =3D g_new0(IrqLines, machine->smp.cpus); for (i =3D 0; i < machine->smp.cpus; i++) { /* Mac99 IRQ connection between OpenPIC outputs pins @@ -275,56 +268,51 @@ static void ppc_core99_init(MachineState *machine) } } =20 + /* UniN init */ + sysbus_create_simple(TYPE_UNI_NORTH, 0xf8000000, NULL); + if (PPC_INPUT(env) =3D=3D PPC_FLAGS_INPUT_970) { + machine_arch =3D ARCH_MAC99_U3; /* 970 gets a U3 bus */ /* Uninorth AGP bus */ - dev =3D qdev_new(TYPE_U3_AGP_HOST_BRIDGE); - sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); - uninorth_pci =3D U3_AGP_HOST_BRIDGE(dev); - s =3D SYS_BUS_DEVICE(dev); + s =3D SYS_BUS_DEVICE(sysbus_create_simple(TYPE_U3_AGP_HOST_BRIDGE, + 0xf0800000, NULL)); + uninorth_pci =3D U3_AGP_HOST_BRIDGE(s); + sysbus_mmio_map(s, 1, 0xf0c00000); /* PCI hole */ memory_region_add_subregion(get_system_memory(), 0x80000000ULL, sysbus_mmio_get_region(s, 2)); /* Register 8 MB of ISA IO space */ memory_region_add_subregion(get_system_memory(), 0xf2000000, sysbus_mmio_get_region(s, 3)); - sysbus_mmio_map(s, 0, 0xf0800000); - sysbus_mmio_map(s, 1, 0xf0c00000); - - machine_arch =3D ARCH_MAC99_U3; } else { + machine_arch =3D ARCH_MAC99; /* Use values found on a real PowerMac */ /* Uninorth AGP bus */ - uninorth_agp_dev =3D qdev_new(TYPE_UNI_NORTH_AGP_HOST_BRIDGE); - s =3D SYS_BUS_DEVICE(uninorth_agp_dev); - sysbus_realize_and_unref(s, &error_fatal); - sysbus_mmio_map(s, 0, 0xf0800000); - sysbus_mmio_map(s, 1, 0xf0c00000); + uninorth_agp_dev =3D sysbus_create_simple(TYPE_UNI_NORTH_AGP_HOST_= BRIDGE, + 0xf0800000, NULL); + sysbus_mmio_map(SYS_BUS_DEVICE(uninorth_agp_dev), 1, 0xf0c00000); =20 /* Uninorth internal bus */ - uninorth_internal_dev =3D qdev_new( - TYPE_UNI_NORTH_INTERNAL_PCI_HOST_BRIDGE); - s =3D SYS_BUS_DEVICE(uninorth_internal_dev); - sysbus_realize_and_unref(s, &error_fatal); - sysbus_mmio_map(s, 0, 0xf4800000); - sysbus_mmio_map(s, 1, 0xf4c00000); + uninorth_internal_dev =3D sysbus_create_simple( + TYPE_UNI_NORTH_INTERNAL_PCI_HOST_BR= IDGE, + 0xf4800000, NULL); + sysbus_mmio_map(SYS_BUS_DEVICE(uninorth_internal_dev), 1, 0xf4c000= 00); =20 /* Uninorth main bus */ dev =3D qdev_new(TYPE_UNI_NORTH_PCI_HOST_BRIDGE); qdev_prop_set_uint32(dev, "ofw-addr", 0xf2000000); - sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); uninorth_pci =3D UNI_NORTH_PCI_HOST_BRIDGE(dev); s =3D SYS_BUS_DEVICE(dev); + sysbus_realize_and_unref(s, &error_fatal); + sysbus_mmio_map(s, 0, 0xf2800000); + sysbus_mmio_map(s, 1, 0xf2c00000); /* PCI hole */ memory_region_add_subregion(get_system_memory(), 0x80000000ULL, sysbus_mmio_get_region(s, 2)); /* Register 8 MB of ISA IO space */ memory_region_add_subregion(get_system_memory(), 0xf2000000, sysbus_mmio_get_region(s, 3)); - sysbus_mmio_map(s, 0, 0xf2800000); - sysbus_mmio_map(s, 1, 0xf2c00000); - - machine_arch =3D ARCH_MAC99; } =20 machine->usb |=3D defaults_enabled() && !machine->usb_disabled; --=20 2.30.4