From patchwork Fri Dec 18 22:37:27 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 41435 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A4198B6EF0 for ; Sat, 19 Dec 2009 09:40:30 +1100 (EST) Received: from localhost ([127.0.0.1]:40553 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NLlUp-00014w-6E for incoming@patchwork.ozlabs.org; Fri, 18 Dec 2009 17:40:27 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NLlS5-00071B-3f for qemu-devel@nongnu.org; Fri, 18 Dec 2009 17:37:37 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NLlRz-0006qD-IL for qemu-devel@nongnu.org; Fri, 18 Dec 2009 17:37:35 -0500 Received: from [199.232.76.173] (port=46140 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NLlRz-0006pq-Bl for qemu-devel@nongnu.org; Fri, 18 Dec 2009 17:37:31 -0500 Received: from cantor.suse.de ([195.135.220.2]:45951 helo=mx1.suse.de) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NLlRy-00012L-Ss for qemu-devel@nongnu.org; Fri, 18 Dec 2009 17:37:31 -0500 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 mx1.suse.de (Postfix) with ESMTP id 430C790847; Fri, 18 Dec 2009 23:37:28 +0100 (CET) From: Alexander Graf To: qemu-devel@nongnu.org Date: Fri, 18 Dec 2009 23:37:27 +0100 Message-Id: <1261175847-16915-2-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1261175847-16915-1-git-send-email-agraf@suse.de> References: <1261175847-16915-1-git-send-email-agraf@suse.de> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.4-2.6 Cc: blauwirbel@gmail.com, Aurelien Jarno Subject: [Qemu-devel] [PATCH] PPC: Use interrupts for escc X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org When using the escc with Linux, we need interrupts. So instead of creating a dummy device, let's just map them to the openpic we have anyways. This makes Linux on PPC64 with console=ttyPZ0 work. Obviously, this change needs to be reflected in openbios. Patch for that follows this one. Please update the binary then. Signed-off-by: Alexander Graf --- hw/ppc_newworld.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c index b29a7bc..a09f096 100644 --- a/hw/ppc_newworld.c +++ b/hw/ppc_newworld.c @@ -108,7 +108,6 @@ static void ppc_core99_init (ram_addr_t ram_size, MacIONVRAMState *nvr; int nvram_mem_index; int vga_bios_size, bios_size; - qemu_irq *dummy_irq; int pic_mem_index, dbdma_mem_index, cuda_mem_index, escc_mem_index; int ppc_boot_device; DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; @@ -318,10 +317,7 @@ static void ppc_core99_init (ram_addr_t ram_size, /* init basic PC hardware */ pci_vga_init(pci_bus, vga_bios_offset, vga_bios_size); - /* XXX: suppress that */ - dummy_irq = i8259_init(NULL); - - escc_mem_index = escc_init(0x80013000, dummy_irq[4], dummy_irq[5], + escc_mem_index = escc_init(0x80013000, pic[0x25], pic[0x24], serial_hds[0], serial_hds[1], ESCC_CLOCK, 4); for(i = 0; i < nb_nics; i++)