[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 5/6] hw/arm/virt: Replace magic IRQ constants wit
From: |
Edgar E. Iglesias |
Subject: |
[Qemu-devel] [PATCH v5 5/6] hw/arm/virt: Replace magic IRQ constants with macros |
Date: |
Tue, 16 Jun 2015 11:51:54 +1000 |
From: "Edgar E. Iglesias" <address@hidden>
Replace magic constants with macros from
hw/arm/virt.h and hw/intc/arm_gic_common.h.
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Edgar E. Iglesias <address@hidden>
---
hw/arm/virt.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 1b1cc71..f822ea0 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -47,6 +47,7 @@
#include "hw/arm/virt-acpi-build.h"
#include "hw/arm/sysbus-fdt.h"
#include "hw/platform-bus.h"
+#include "hw/intc/arm_gic_common.h"
/* Number of external interrupt lines to configure the GIC with */
#define NUM_IRQS 256
@@ -395,15 +396,17 @@ static void create_gic(VirtBoardInfo *vbi, qemu_irq *pic)
*/
for (i = 0; i < smp_cpus; i++) {
DeviceState *cpudev = DEVICE(qemu_get_cpu(i));
- int ppibase = NUM_IRQS + i * 32;
+ int ppibase = NUM_IRQS + i * GIC_INTERNAL + GIC_NR_SGIS;
/* physical timer; we wire it up to the non-secure timer's ID,
* since a real A15 always has TrustZone but QEMU doesn't.
*/
qdev_connect_gpio_out(cpudev, 0,
- qdev_get_gpio_in(gicdev, ppibase + 30));
+ qdev_get_gpio_in(gicdev,
+ ppibase + ARCH_TIMER_NS_EL1_IRQ));
/* virtual timer */
qdev_connect_gpio_out(cpudev, 1,
- qdev_get_gpio_in(gicdev, ppibase + 27));
+ qdev_get_gpio_in(gicdev,
+ ppibase + ARCH_TIMER_VIRT_IRQ));
sysbus_connect_irq(gicbusdev, i, qdev_get_gpio_in(cpudev,
ARM_CPU_IRQ));
sysbus_connect_irq(gicbusdev, i + smp_cpus,
--
1.9.1
- [Qemu-devel] [PATCH v5 0/6] arm: Steps towards EL2 support round 3, Edgar E. Iglesias, 2015/06/15
- [Qemu-devel] [PATCH v5 1/6] target-arm: Add CNTVOFF_EL2, Edgar E. Iglesias, 2015/06/15
- [Qemu-devel] [PATCH v5 2/6] target-arm: Add CNTHCTL_EL2, Edgar E. Iglesias, 2015/06/15
- [Qemu-devel] [PATCH v5 3/6] target-arm: Pass timeridx as argument to various timer functions, Edgar E. Iglesias, 2015/06/15
- [Qemu-devel] [PATCH v5 4/6] target-arm: Add the Hypervisor timer, Edgar E. Iglesias, 2015/06/15
- [Qemu-devel] [PATCH v5 5/6] hw/arm/virt: Replace magic IRQ constants with macros,
Edgar E. Iglesias <=
- [Qemu-devel] [PATCH v5 6/6] hw/arm/virt: Connect the Hypervisor timer, Edgar E. Iglesias, 2015/06/15
- Re: [Qemu-devel] [PATCH v5 0/6] arm: Steps towards EL2 support round 3, Peter Maydell, 2015/06/18