From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34718) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGz5A-0007Jb-E9 for qemu-devel@nongnu.org; Tue, 03 Sep 2013 18:28:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VGz54-0005br-O4 for qemu-devel@nongnu.org; Tue, 03 Sep 2013 18:28:20 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Wed, 4 Sep 2013 00:29:05 +0200 Message-Id: <1378247351-8446-6-git-send-email-hpoussin@reactos.org> In-Reply-To: <1378247351-8446-1-git-send-email-hpoussin@reactos.org> References: <1378247351-8446-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 05/10] raven: set a correct PCI I/O memory region List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= , =?UTF-8?q?=20Andreas=20F=C3=A4rber?= , qemu-ppc@nongnu.org PCI I/O region is 0x3f800000 bytes starting at 0x80000000. Do not use global QEMU I/O region, which is only 64KB. Signed-off-by: Herv=C3=A9 Poussineau --- hw/pci-host/prep.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index 95fa2ea..af0bf2b 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -53,6 +53,7 @@ typedef struct PRePPCIState { =20 qemu_irq irq[PCI_NUM_PINS]; PCIBus pci_bus; + MemoryRegion pci_io; MemoryRegion pci_intack; RavenPCIState pci_dev; } PREPPCIState; @@ -136,13 +137,11 @@ static void raven_pcihost_realizefn(DeviceState *d,= Error **errp) =20 memory_region_init_io(&h->conf_mem, OBJECT(h), &pci_host_conf_be_ops= , s, "pci-conf-idx", 1); - sysbus_add_io(dev, 0xcf8, &h->conf_mem); - sysbus_init_ioports(&h->busdev, 0xcf8, 1); + memory_region_add_subregion(&s->pci_io, 0xcf8, &h->conf_mem); =20 memory_region_init_io(&h->data_mem, OBJECT(h), &pci_host_data_be_ops= , s, "pci-conf-data", 1); - sysbus_add_io(dev, 0xcfc, &h->data_mem); - sysbus_init_ioports(&h->busdev, 0xcfc, 1); + memory_region_add_subregion(&s->pci_io, 0xcfc, &h->data_mem); =20 memory_region_init_io(&h->mmcfg, OBJECT(s), &PPC_PCIIO_ops, s, "pcii= o", 0x00400000); memory_region_add_subregion(address_space_mem, 0x80800000, &h->mmcfg= ); @@ -160,11 +159,15 @@ static void raven_pcihost_initfn(Object *obj) PCIHostState *h =3D PCI_HOST_BRIDGE(obj); PREPPCIState *s =3D RAVEN_PCI_HOST_BRIDGE(obj); MemoryRegion *address_space_mem =3D get_system_memory(); - MemoryRegion *address_space_io =3D get_system_io(); DeviceState *pci_dev; =20 + memory_region_init(&s->pci_io, obj, "pci-io", 0x3f800000); + + /* CPU address space */ + memory_region_add_subregion(address_space_mem, 0x80000000, &s->pci_i= o); pci_bus_new_inplace(&s->pci_bus, DEVICE(obj), NULL, - address_space_mem, address_space_io, 0, TYPE_PCI= _BUS); + address_space_mem, &s->pci_io, 0, TYPE_PCI_BUS); + h->bus =3D &s->pci_bus; =20 object_initialize(&s->pci_dev, TYPE_RAVEN_PCI_DEVICE); --=20 1.7.10.4