From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48910) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPfcB-00089w-6D for qemu-devel@nongnu.org; Mon, 17 Mar 2014 18:02:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WPfc5-0004BM-LV for qemu-devel@nongnu.org; Mon, 17 Mar 2014 18:02:35 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Mon, 17 Mar 2014 23:00:22 +0100 Message-Id: <1395093625-17470-5-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 4/7] raven: set a correct PCI 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 memory region is 0x3f000000 bytes starting at 0xc0000000. However, keep compatibility with Open Hack'Ware expectations by adding a hack for Open Hack'Ware display. Signed-off-by: Herv=C3=A9 Poussineau --- hw/pci-host/prep.c | 9 ++++++--- hw/ppc/prep.c | 9 +++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index 87c109b..45615bd 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -57,6 +57,7 @@ typedef struct PRePPCIState { AddressSpace pci_io_as; MemoryRegion pci_io; MemoryRegion pci_io_non_contiguous; + MemoryRegion pci_memory; MemoryRegion pci_intack; RavenPCIState pci_dev; =20 @@ -203,8 +204,6 @@ static void raven_pcihost_realizefn(DeviceState *d, E= rror **errp) MemoryRegion *address_space_mem =3D get_system_memory(); int i; =20 - isa_mem_base =3D 0xc0000000; - for (i =3D 0; i < PCI_NUM_PINS; i++) { sysbus_init_irq(dev, &s->irq[i]); } @@ -242,14 +241,18 @@ static void raven_pcihost_initfn(Object *obj) 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); + /* Open Hack'Ware hack: real size should be only 0x3f000000 bytes */ + memory_region_init(&s->pci_memory, obj, "pci-memory", + 0x3f000000 + 0xc0000000ULL); 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); + memory_region_add_subregion(address_space_mem, 0xc0000000, &s->pci_m= emory); pci_bus_new_inplace(&s->pci_bus, sizeof(s->pci_bus), DEVICE(obj), NU= LL, - address_space_mem, &s->pci_io, 0, TYPE_PCI_BUS); + &s->pci_memory, &s->pci_io, 0, TYPE_PCI_BUS); =20 h->bus =3D &s->pci_bus; =20 diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 035b5b2..e243651 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -381,6 +381,7 @@ static void ppc_prep_init(QEMUMachineInitArgs *args) #endif int linux_boot, i, nb_nics1; MemoryRegion *ram =3D g_new(MemoryRegion, 1); + MemoryRegion *vga =3D g_new(MemoryRegion, 1); uint32_t kernel_base, initrd_base; long kernel_size, initrd_size; DeviceState *dev; @@ -506,6 +507,14 @@ static void ppc_prep_init(QEMUMachineInitArgs *args) =20 /* init basic PC hardware */ pci_vga_init(pci_bus); + /* Open Hack'Ware hack: PCI BAR#0 is programmed to 0xf0000000. + * While bios will access framebuffer at 0xf0000000, real physical + * address is 0xf0000000 + 0xc0000000 (PCI memory base). + * Alias the wrong memory accesses to the right place. + */ + memory_region_init_alias(vga, NULL, "vga-alias", pci_address_space(p= ci), + 0xf0000000, 0x1000000); + memory_region_add_subregion_overlap(sysmem, 0xf0000000, vga, 10); =20 nb_nics1 =3D nb_nics; if (nb_nics1 > NE2000_NB_MAX) --=20 1.7.10.4