From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51430) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WV66L-0006F1-3h for qemu-devel@nongnu.org; Tue, 01 Apr 2014 17:20:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WV66F-0007rD-82 for qemu-devel@nongnu.org; Tue, 01 Apr 2014 17:20:09 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Tue, 1 Apr 2014 23:19:15 +0200 Message-Id: <1396387156-5817-2-git-send-email-hpoussin@reactos.org> In-Reply-To: <1396387156-5817-1-git-send-email-hpoussin@reactos.org> References: <1396387156-5817-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 for-2.0 1/2] prep: remove PCI memory hack related to OpenHack'Ware 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 Signed-off-by: Herv=C3=A9 Poussineau --- hw/pci-host/prep.c | 4 +--- hw/ppc/prep.c | 9 --------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index d3e746c..56234e5 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -256,9 +256,7 @@ 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); + memory_region_init(&s->pci_memory, obj, "pci-memory", 0x3f000000); address_space_init(&s->pci_io_as, &s->pci_io, "raven-io"); =20 /* CPU address space */ diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index e243651..035b5b2 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -381,7 +381,6 @@ 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; @@ -507,14 +506,6 @@ 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