From patchwork Wed Mar 19 23:36:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 331924 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 271CD2C009A for ; Thu, 20 Mar 2014 10:50:12 +1100 (EST) Received: from localhost ([::1]:44300 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQQ48-0001XQ-50 for incoming@patchwork.ozlabs.org; Wed, 19 Mar 2014 19:38:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41258) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQQ2E-0007D9-Hq for qemu-devel@nongnu.org; Wed, 19 Mar 2014 19:36:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WQQ28-0005ny-9p for qemu-devel@nongnu.org; Wed, 19 Mar 2014 19:36:34 -0400 Received: from mout.web.de ([212.227.15.4]:60778) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQQ1u-0005ku-UW; Wed, 19 Mar 2014 19:36:15 -0400 Received: from envy.de ([84.148.52.217]) by smtp.web.de (mrweb001) with ESMTPSA (Nemesis) id 0MXHt7-1Wf2zo40u5-00WIQa; Thu, 20 Mar 2014 00:36:14 +0100 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Thu, 20 Mar 2014 00:36:02 +0100 Message-Id: <1395272166-687-4-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1395272166-687-1-git-send-email-andreas.faerber@web.de> References: <1395272166-687-1-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 X-Provags-ID: V03:K0:aaLH2sRSYgCbweYZ44a2+hPDdW9QMBwHF3IMmxV6jyueNAUSzNJ alXppf3th2SNwC7wu7Thj7g2DoDwFgT7RKBaaOtuFb5qysGe8Eac/xotSKU5HrG5o8O04eT X3jtGd8y5ESfLjF9ALdYY4a5QOFwu3PVcLGpshrO8QiCrJSXXLc3DUxABzvay2pjzFNOcLo C8ACmSg2AtlOKQZM6NKkw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 212.227.15.4 Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= , =?UTF-8?q?Andreas=20F=C3=A4rber?= , qemu-ppc@nongnu.org Subject: [Qemu-devel] [PULL for-2.0 3/7] raven: Set a correct PCI I/O memory region X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Hervé Poussineau 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é Poussineau Signed-off-by: Andreas Färber --- 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 629735e..6463b6d 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 addr, uint8_t buf[4]; addr = 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); if (size == 1) { return buf[0]; @@ -165,7 +166,7 @@ static void raven_io_write(void *opaque, hwaddr addr, g_assert_not_reached(); } - address_space_write(&s->pci_io_as, addr, buf, size); + address_space_write(&s->pci_io_as, addr + 0x80000000, buf, size); } static const MemoryRegionOps raven_io_ops = { @@ -215,13 +216,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); @@ -239,18 +238,20 @@ 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); 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"); /* CPU address space */ + memory_region_add_subregion(address_space_mem, 0x80000000, &s->pci_io); 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), 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, sizeof(s->pci_dev), TYPE_RAVEN_PCI_DEVICE);