From patchwork Mon Sep 12 10:50:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 114337 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 9BB1EB7105 for ; Mon, 12 Sep 2011 22:34:50 +1000 (EST) Received: from localhost ([::1]:37759 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R3480-0004Ot-6c for incoming@patchwork.ozlabs.org; Mon, 12 Sep 2011 06:52:40 -0400 Received: from eggs.gnu.org ([140.186.70.92]:53774) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R346o-0001tH-Ie for qemu-devel@nongnu.org; Mon, 12 Sep 2011 06:51:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R346b-0006mU-JD for qemu-devel@nongnu.org; Mon, 12 Sep 2011 06:51:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:3040) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R346b-0006li-4B for qemu-devel@nongnu.org; Mon, 12 Sep 2011 06:51:13 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p8CApCac029964 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 12 Sep 2011 06:51:12 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p8CApBvc015411 for ; Mon, 12 Sep 2011 06:51:12 -0400 Received: from s01.tlv.redhat.com (s01.tlv.redhat.com [10.35.255.8]) by cleopatra.tlv.redhat.com (Postfix) with ESMTP id BEAAA250B67; Mon, 12 Sep 2011 13:51:08 +0300 (IDT) From: Avi Kivity To: qemu-devel@nongnu.org Date: Mon, 12 Sep 2011 13:50:52 +0300 Message-Id: <1315824666-4214-15-git-send-email-avi@redhat.com> In-Reply-To: <1315824666-4214-1-git-send-email-avi@redhat.com> References: <1315824666-4214-1-git-send-email-avi@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Error: [-] ERROR: /var/run/p0f.sock: Connection refused X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 14/28] mips_malta: move i8259 initialization after piix4 initialization 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 i8259 is an ISA device; and the ISA bus is supplied by piix4. Later patches make this dependency explicit. Signed-off-by: Avi Kivity --- hw/mips_malta.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/mips_malta.c b/hw/mips_malta.c index 0110daa..172f74e 100644 --- a/hw/mips_malta.c +++ b/hw/mips_malta.c @@ -928,10 +928,6 @@ void mips_malta_init (ram_addr_t ram_size, cpu_mips_irq_init_cpu(env); cpu_mips_clock_init(env); - /* Interrupt controller */ - /* The 8259 is attached to the MIPS CPU INT0 pin, ie interrupt 2 */ - i8259 = i8259_init(env->irq[2]); - /* Northbridge */ pci_bus = gt64120_register(i8259); @@ -939,6 +935,11 @@ void mips_malta_init (ram_addr_t ram_size, ide_drive_get(hd, MAX_IDE_BUS); piix4_devfn = piix4_init(pci_bus, 80); + + /* Interrupt controller */ + /* The 8259 is attached to the MIPS CPU INT0 pin, ie interrupt 2 */ + i8259 = i8259_init(env->irq[2]); + isa_bus_irqs(i8259); pci_piix4_ide_init(pci_bus, hd, piix4_devfn + 1); usb_uhci_piix4_init(pci_bus, piix4_devfn + 2);