hw/arm/highbank: Connect VIRQ and VFIQ
Connect the VIRQ and VFIQ lines from the GIC to the CPU; these exist always for both CPU and GIC whether the virtualization extensions are enabled or not, so we can just unconditionally connect them. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Luc Michel <luc.michel@greensocs.com> Message-id: 20180821132811.17675-5-peter.maydell@linaro.org
This commit is contained in:
parent
33383e9bbb
commit
582c8f75a2
|
@ -243,6 +243,8 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id)
|
||||||
int n;
|
int n;
|
||||||
qemu_irq cpu_irq[4];
|
qemu_irq cpu_irq[4];
|
||||||
qemu_irq cpu_fiq[4];
|
qemu_irq cpu_fiq[4];
|
||||||
|
qemu_irq cpu_virq[4];
|
||||||
|
qemu_irq cpu_vfiq[4];
|
||||||
MemoryRegion *sysram;
|
MemoryRegion *sysram;
|
||||||
MemoryRegion *dram;
|
MemoryRegion *dram;
|
||||||
MemoryRegion *sysmem;
|
MemoryRegion *sysmem;
|
||||||
|
@ -282,6 +284,8 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id)
|
||||||
object_property_set_bool(cpuobj, true, "realized", &error_fatal);
|
object_property_set_bool(cpuobj, true, "realized", &error_fatal);
|
||||||
cpu_irq[n] = qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_IRQ);
|
cpu_irq[n] = qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_IRQ);
|
||||||
cpu_fiq[n] = qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_FIQ);
|
cpu_fiq[n] = qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_FIQ);
|
||||||
|
cpu_virq[n] = qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_VIRQ);
|
||||||
|
cpu_vfiq[n] = qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_VFIQ);
|
||||||
}
|
}
|
||||||
|
|
||||||
sysmem = get_system_memory();
|
sysmem = get_system_memory();
|
||||||
|
@ -329,6 +333,8 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id)
|
||||||
for (n = 0; n < smp_cpus; n++) {
|
for (n = 0; n < smp_cpus; n++) {
|
||||||
sysbus_connect_irq(busdev, n, cpu_irq[n]);
|
sysbus_connect_irq(busdev, n, cpu_irq[n]);
|
||||||
sysbus_connect_irq(busdev, n + smp_cpus, cpu_fiq[n]);
|
sysbus_connect_irq(busdev, n + smp_cpus, cpu_fiq[n]);
|
||||||
|
sysbus_connect_irq(busdev, n + 2 * smp_cpus, cpu_virq[n]);
|
||||||
|
sysbus_connect_irq(busdev, n + 3 * smp_cpus, cpu_vfiq[n]);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (n = 0; n < 128; n++) {
|
for (n = 0; n < 128; n++) {
|
||||||
|
|
Loading…
Reference in a new issue