From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40095) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VH6AG-0007Mj-D9 for qemu-devel@nongnu.org; Wed, 04 Sep 2013 02:02:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VH6AA-0003hx-Qw for qemu-devel@nongnu.org; Wed, 04 Sep 2013 02:02:04 -0400 Sender: Paolo Bonzini Message-ID: <5226CCD4.2030204@redhat.com> Date: Wed, 04 Sep 2013 08:01:56 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1378247351-8446-1-git-send-email-hpoussin@reactos.org> <1378247351-8446-6-git-send-email-hpoussin@reactos.org> In-Reply-To: <1378247351-8446-6-git-send-email-hpoussin@reactos.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: Re: [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: =?UTF-8?B?SGVydsOpIFBvdXNzaW5lYXU=?= Cc: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= , qemu-ppc@nongnu.org, qemu-devel@nongnu.org Il 04/09/2013 00:29, Hervé Poussineau ha scritto: > PCI I/O region is 0x3f800000 bytes starting at 0x80000000. > Do not use global QEMU I/O region, which is only 64KB. You can make the global QEMU I/O region larger, that's not a problem. Not using address_space_io is fine as well, but it's a separate change and I doubt it is a good idea to do it for a single target; if you do it for all non-x86 PCI bridges, and move the initialization of address_space_io to target-i386, that's a different story of course. Paolo > Signed-off-by: Hervé 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 { > > 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) > > 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); > > 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); > > memory_region_init_io(&h->mmcfg, OBJECT(s), &PPC_PCIIO_ops, s, "pciio", 0x00400000); > memory_region_add_subregion(address_space_mem, 0x80800000, &h->mmcfg); > @@ -160,11 +159,15 @@ static void raven_pcihost_initfn(Object *obj) > PCIHostState *h = PCI_HOST_BRIDGE(obj); > PREPPCIState *s = RAVEN_PCI_HOST_BRIDGE(obj); > MemoryRegion *address_space_mem = get_system_memory(); > - MemoryRegion *address_space_io = get_system_io(); > DeviceState *pci_dev; > > + memory_region_init(&s->pci_io, obj, "pci-io", 0x3f800000); > + > + /* CPU address space */ > + memory_region_add_subregion(address_space_mem, 0x80000000, &s->pci_io); > 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 = &s->pci_bus; > > object_initialize(&s->pci_dev, TYPE_RAVEN_PCI_DEVICE); >