From patchwork Fri Sep 30 13:29:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 117139 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F1B09B6F81 for ; Fri, 30 Sep 2011 23:29:29 +1000 (EST) Received: from localhost ([::1]:41963 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R9d9U-0004ic-M6 for incoming@patchwork.ozlabs.org; Fri, 30 Sep 2011 09:29:20 -0400 Received: from eggs.gnu.org ([140.186.70.92]:52265) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R9d9P-0004iW-76 for qemu-devel@nongnu.org; Fri, 30 Sep 2011 09:29:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R9d9O-0002Qp-0h for qemu-devel@nongnu.org; Fri, 30 Sep 2011 09:29:15 -0400 Received: from cantor2.suse.de ([195.135.220.15]:41653 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R9d9N-0002Qe-SK; Fri, 30 Sep 2011 09:29:13 -0400 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id E88188EE5B; Fri, 30 Sep 2011 15:29:12 +0200 (CEST) From: Alexander Graf To: qemu-devel@nongnu.org Date: Fri, 30 Sep 2011 15:29:12 +0200 Message-Id: <1317389352-7163-1-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 195.135.220.15 Cc: Blue Swirl , qemu-ppc@nongnu.org Subject: [Qemu-devel] [PATCH 1/1] PPC: Drop initial ESCC mapping 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 We are mapping ESCC to a static (incorrect) address on machine init. This overlaps with our vram, rendering the screen barely usable. Since openBIOS is clever enough to map ESCC to where it needs to be, we can just drop that invalid map and everyone's happy. Signed-off-by: Alexander Graf --- hw/ppc_newworld.c | 2 +- hw/ppc_oldworld.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c index bcdc0a3..b9a50db 100644 --- a/hw/ppc_newworld.c +++ b/hw/ppc_newworld.c @@ -326,7 +326,7 @@ static void ppc_core99_init (ram_addr_t ram_size, /* init basic PC hardware */ pci_vga_init(pci_bus); - escc_mem = escc_init(0x80013000, pic[0x25], pic[0x24], + escc_mem = escc_init(0, pic[0x25], pic[0x24], serial_hds[0], serial_hds[1], ESCC_CLOCK, 4); memory_region_init_alias(escc_bar, "escc-bar", escc_mem, 0, memory_region_size(escc_mem)); diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c index 5c17944..ebcaafa 100644 --- a/hw/ppc_oldworld.c +++ b/hw/ppc_oldworld.c @@ -238,7 +238,7 @@ static void ppc_heathrow_init (ram_addr_t ram_size, get_system_io()); pci_vga_init(pci_bus); - escc_mem = escc_init(0x80013000, pic[0x0f], pic[0x10], serial_hds[0], + escc_mem = escc_init(0, pic[0x0f], pic[0x10], serial_hds[0], serial_hds[1], ESCC_CLOCK, 4); memory_region_init_alias(escc_bar, "escc-bar", escc_mem, 0, memory_region_size(escc_mem));