From patchwork Wed Mar 19 23:36:03 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: 331922 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 E57682C00A0 for ; Thu, 20 Mar 2014 10:38:21 +1100 (EST) Received: from localhost ([::1]:44297 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQQ3v-000133-HQ for incoming@patchwork.ozlabs.org; Wed, 19 Mar 2014 19:38:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41369) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQQ2h-0008Bv-UZ for qemu-devel@nongnu.org; Wed, 19 Mar 2014 19:37:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WQQ2a-0005uA-4e for qemu-devel@nongnu.org; Wed, 19 Mar 2014 19:37:03 -0400 Received: from mout.web.de ([212.227.17.12]:50028) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQQ2Z-0005tz-RW; Wed, 19 Mar 2014 19:36:56 -0400 Received: from envy.de ([84.148.52.217]) by smtp.web.de (mrweb001) with ESMTPSA (Nemesis) id 0LuMER-1X9Pvl3Iyl-011lIA; Thu, 20 Mar 2014 00:36:15 +0100 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Thu, 20 Mar 2014 00:36:03 +0100 Message-Id: <1395272166-687-5-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:GfoxPCjapIK0qQfQ97hPdDSwpxqva1M8kusPsa4JGNnTZzf86A/ SAly4BpjooNrhxx5ro6asbzAW/4TpejCw4J8rBSFmH0Nvh+LHOZdaqH4xGf+hGZ1x4DwGaU r3dVIroIlf0DNjavUtoDxmMKtrlV3e9pJKRe6R8kC/dwhxNcEYiKz1K6DBTqdvM0uv/8zaZ 7gJHMMSHW2PjdWXomeH2w== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 212.227.17.12 Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= , =?UTF-8?q?Andreas=20F=C3=A4rber?= , qemu-ppc@nongnu.org, Alexander Graf Subject: [Qemu-devel] [PULL for-2.0 4/7] raven: Set a correct PCI 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 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é Poussineau Signed-off-by: Andreas Färber --- 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 6463b6d..7f23a11 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; @@ -204,8 +205,6 @@ static void raven_pcihost_realizefn(DeviceState *d, Error **errp) MemoryRegion *address_space_mem = get_system_memory(); int i; - isa_mem_base = 0xc0000000; - for (i = 0; i < PCI_NUM_PINS; i++) { sysbus_init_irq(dev, &s->irq[i]); } @@ -243,14 +242,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"); /* 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); + memory_region_add_subregion(address_space_mem, 0xc0000000, &s->pci_memory); pci_bus_new_inplace(&s->pci_bus, sizeof(s->pci_bus), DEVICE(obj), NULL, - address_space_mem, &s->pci_io, 0, TYPE_PCI_BUS); + &s->pci_memory, &s->pci_io, 0, TYPE_PCI_BUS); h->bus = &s->pci_bus; 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 = g_new(MemoryRegion, 1); + MemoryRegion *vga = 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) /* 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(pci), + 0xf0000000, 0x1000000); + memory_region_add_subregion_overlap(sysmem, 0xf0000000, vga, 10); nb_nics1 = nb_nics; if (nb_nics1 > NE2000_NB_MAX)