From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48885) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPfc6-00084r-NP for qemu-devel@nongnu.org; Mon, 17 Mar 2014 18:02:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WPfc1-0004AN-1q for qemu-devel@nongnu.org; Mon, 17 Mar 2014 18:02:30 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Mon, 17 Mar 2014 23:00:21 +0100 Message-Id: <1395093625-17470-4-git-send-email-hpoussin@reactos.org> In-Reply-To: <1395093625-17470-1-git-send-email-hpoussin@reactos.org> References: <1395093625-17470-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 v4 3/7] 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?Andreas=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 | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index 025a7fc..87c109b 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -55,6 +55,7 @@ typedef struct PRePPCIState { qemu_irq irq[PCI_NUM_PINS]; PCIBus pci_bus; AddressSpace pci_io_as; + MemoryRegion pci_io; MemoryRegion pci_io_non_contiguous; MemoryRegion pci_intack; RavenPCIState pci_dev; @@ -134,7 +135,7 @@ static uint64_t raven_io_read(void *opaque, hwaddr ad= dr, uint8_t buf[4]; =20 addr =3D raven_io_address(s, addr); - address_space_read(&s->pci_io_as, addr, buf, size); + address_space_read(&s->pci_io_as, addr + 0x80000000, buf, size); =20 if (size =3D=3D 1) { return buf[0]; @@ -165,7 +166,7 @@ static void raven_io_write(void *opaque, hwaddr addr, assert(false); } =20 - address_space_write(&s->pci_io_as, addr, buf, size); + address_space_write(&s->pci_io_as, addr + 0x80000000, buf, size); } =20 static const MemoryRegionOps raven_io_ops =3D { @@ -214,13 +215,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= ); @@ -238,18 +237,20 @@ 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); memory_region_init_io(&s->pci_io_non_contiguous, obj, &raven_io_ops,= s, "pci-io-non-contiguous", 0x00800000); - address_space_init(&s->pci_io_as, get_system_io(), "raven-io"); + address_space_init(&s->pci_io_as, &s->pci_io, "raven-io"); =20 /* CPU address space */ + memory_region_add_subregion(address_space_mem, 0x80000000, &s->pci_i= o); memory_region_add_subregion_overlap(address_space_mem, 0x80000000, &s->pci_io_non_contiguous, 1); pci_bus_new_inplace(&s->pci_bus, sizeof(s->pci_bus), DEVICE(obj), NU= LL, - 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, sizeof(s->pci_dev), TYPE_RAVEN_PCI_DE= VICE); --=20 1.7.10.4