From nobody Wed Nov 5 15:55:26 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.zoho.com; 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 149709972310379.13905979458264; Sat, 10 Jun 2017 06:02:03 -0700 (PDT) Received: from localhost ([::1]:58488 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJg1g-0000cS-Su for importer@patchew.org; Sat, 10 Jun 2017 09:02:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46396) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJg0K-0008JK-Lp for qemu-devel@nongnu.org; Sat, 10 Jun 2017 09:00:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dJg0H-0002cs-UP for qemu-devel@nongnu.org; Sat, 10 Jun 2017 09:00:36 -0400 Received: from chuckie.co.uk ([82.165.15.123]:33405 helo=s16892447.onlinehome-server.info) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dJg0H-0002cc-Mo for qemu-devel@nongnu.org; Sat, 10 Jun 2017 09:00:33 -0400 Received: from host109-151-159-193.range109-151.btcentralplus.com ([109.151.159.193] helo=kentang.home) by s16892447.onlinehome-server.info with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1dJg0D-0003ug-QL; Sat, 10 Jun 2017 14:00:30 +0100 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, atar4qemu@gmail.com Date: Sat, 10 Jun 2017 14:00:15 +0100 Message-Id: <1497099616-2615-3-git-send-email-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1497099616-2615-1-git-send-email-mark.cave-ayland@ilande.co.uk> References: <1497099616-2615-1-git-send-email-mark.cave-ayland@ilande.co.uk> X-SA-Exim-Connect-IP: 109.151.159.193 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk X-SA-Exim-Version: 4.2.1 (built Sun, 08 Jan 2012 02:45:44 +0000) X-SA-Exim-Scanned: Yes (on s16892447.onlinehome-server.info) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 82.165.15.123 Subject: [Qemu-devel] [PATCH 2/3] sun4u: expose fw_cfg on ebus PCI IO address space 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" To allow future changes to the sun4u PCI topology. Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/sparc64/sun4u.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 98ee6f5..19e64be 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -224,13 +224,11 @@ static void isa_irq_handler(void *opaque, int n, int = level) =20 /* EBUS (Eight bit bus) bridge */ static ISABus * -pci_ebus_init(PCIBus *bus, int devfn, qemu_irq *irqs) +pci_ebus_init(PCIDevice *pci_dev, qemu_irq *irqs) { qemu_irq *isa_irq; - PCIDevice *pci_dev; ISABus *isa_bus; =20 - pci_dev =3D pci_create_simple(bus, devfn, "ebus"); isa_bus =3D ISA_BUS(qdev_get_child_bus(DEVICE(pci_dev), "isa.0")); isa_irq =3D qemu_allocate_irqs(isa_irq_handler, irqs, 16); isa_bus_irqs(isa_bus, isa_irq); @@ -429,6 +427,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem, unsigned int i; uint64_t initrd_addr, initrd_size, kernel_addr, kernel_size, kernel_en= try; PCIBus *pci_bus, *pci_bus2, *pci_bus3; + PCIDevice *ebus; ISABus *isa_bus; SysBusDevice *s; qemu_irq *ivec_irqs, *pbm_irqs; @@ -452,7 +451,8 @@ static void sun4uv_init(MemoryRegion *address_space_mem, pci_vga_init(pci_bus); =20 // XXX Should be pci_bus3 - isa_bus =3D pci_ebus_init(pci_bus, -1, pbm_irqs); + ebus =3D pci_create_simple(pci_bus, -1, "ebus"); + isa_bus =3D pci_ebus_init(ebus, pbm_irqs); =20 i =3D 0; if (hwdef->console_serial_base) { @@ -517,7 +517,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem, qdev_prop_set_bit(dev, "dma_enabled", false); qdev_init_nofail(dev); s =3D SYS_BUS_DEVICE(dev); - memory_region_add_subregion(get_system_io(), BIOS_CFG_IOPORT, + memory_region_add_subregion(pci_address_space_io(ebus), BIOS_CFG_IOPOR= T, sysbus_mmio_get_region(s, 0)); =20 fw_cfg =3D FW_CFG(dev); --=20 1.7.10.4