Patchwork [PULL,14/28] mips_malta: move i8259 initialization after piix4 initialization

login
register
mail settings
Submitter Avi Kivity
Date Sept. 12, 2011, 10:50 a.m.
Message ID <1315824666-4214-15-git-send-email-avi@redhat.com>
Download mbox | patch
Permalink /patch/114337/
State New
Headers show

Comments

Avi Kivity - Sept. 12, 2011, 10:50 a.m.
i8259 is an ISA device; and the ISA bus is supplied by piix4.  Later patches
make this dependency explicit.

Signed-off-by: Avi Kivity <avi@redhat.com>
---
 hw/mips_malta.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

Patch

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);