aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-05-11 14:28:54 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-05-11 14:28:54 +0100
commit49855cdaed78f66f501df6e18b8b3b7012cea2eb (patch)
treee13ecf73f016bc9d9b971fa1c907004665387ce4
parent0a1588acca25b151a3847395a981160bf9354ef9 (diff)
downloadqemu-arm-49855cdaed78f66f501df6e18b8b3b7012cea2eb.tar.gz
hw/arm/highbank.c: Wire FIQ between CPU <> GICpull-target-arm-20150511
Connect FIQ output of the GIC CPU interfaces to the CPUs. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Message-id: 1430502643-25909-18-git-send-email-peter.maydell@linaro.org
-rw-r--r--hw/arm/highbank.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c
index b2d048b911..f8353a7874 100644
--- a/hw/arm/highbank.c
+++ b/hw/arm/highbank.c
@@ -217,6 +217,7 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id)
qemu_irq pic[128];
int n;
qemu_irq cpu_irq[4];
+ qemu_irq cpu_fiq[4];
MemoryRegion *sysram;
MemoryRegion *dram;
MemoryRegion *sysmem;
@@ -269,6 +270,7 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id)
exit(1);
}
cpu_irq[n] = qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_IRQ);
+ cpu_fiq[n] = qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_FIQ);
}
sysmem = get_system_memory();
@@ -313,6 +315,7 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id)
sysbus_mmio_map(busdev, 0, MPCORE_PERIPHBASE);
for (n = 0; n < smp_cpus; n++) {
sysbus_connect_irq(busdev, n, cpu_irq[n]);
+ sysbus_connect_irq(busdev, n + smp_cpus, cpu_fiq[n]);
}
for (n = 0; n < 128; n++) {