motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-09-06 08:51:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

arm: xlnx-zynqmp: Connect CPU Timers to GIC

Browse source 
Connect the GPIO outputs from the individual CPUs for the timers to the
GIC.

Tested-by: Alistair Francis <alistair.francis@xilinx.com>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Message-id: a7866a4f0c903c91fa3034210b4d2879aa4bfcb9.1431381507.git.peter.crosthwaite@xilinx.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Crosthwaite 2015-05-14 19:23:04 -07:00 • committed by Peter Maydell
parent 7729e1f4b3
commit bf4cb10966
1 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

17
hw/arm/xlnx-zynqmp.c
View file

@ -16,10 +16,14 @@
*/ */
#include "hw/arm/xlnx-zynqmp.h" #include "hw/arm/xlnx-zynqmp.h"
#include "hw/intc/arm_gic_common.h"
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
#define GIC_NUM_SPI_INTR 160 #define GIC_NUM_SPI_INTR 160
#define ARM_PHYS_TIMER_PPI 30
#define ARM_VIRT_TIMER_PPI 27
#define GIC_BASE_ADDR 0xf9000000 #define GIC_BASE_ADDR 0xf9000000
#define GIC_DIST_ADDR 0xf9010000 #define GIC_DIST_ADDR 0xf9010000
#define GIC_CPU_ADDR 0xf9020000 #define GIC_CPU_ADDR 0xf9020000
@ -34,6 +38,11 @@ static const XlnxZynqMPGICRegion xlnx_zynqmp_gic_regions[] = {
{ .region_index = 1, .address = GIC_CPU_ADDR, }, { .region_index = 1, .address = GIC_CPU_ADDR, },
}; };
static inline int arm_gic_ppi_index(int cpu_nr, int ppi_index)
{
return GIC_NUM_SPI_INTR + cpu_nr * GIC_INTERNAL + ppi_index;
}
static void xlnx_zynqmp_init(Object *obj) static void xlnx_zynqmp_init(Object *obj)
{ {
XlnxZynqMPState *s = XLNX_ZYNQMP(obj); XlnxZynqMPState *s = XLNX_ZYNQMP(obj);
@ -86,6 +95,8 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)
} }
for (i = 0; i < XLNX_ZYNQMP_NUM_CPUS; i++) { for (i = 0; i < XLNX_ZYNQMP_NUM_CPUS; i++) {
qemu_irq irq;
object_property_set_int(OBJECT(&s->cpu[i]), QEMU_PSCI_CONDUIT_SMC, object_property_set_int(OBJECT(&s->cpu[i]), QEMU_PSCI_CONDUIT_SMC,
"psci-conduit", &error_abort); "psci-conduit", &error_abort);
if (i > 0) { if (i > 0) {
@ -109,6 +120,12 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)
sysbus_connect_irq(SYS_BUS_DEVICE(&s->gic), i, sysbus_connect_irq(SYS_BUS_DEVICE(&s->gic), i,
qdev_get_gpio_in(DEVICE(&s->cpu[i]), ARM_CPU_IRQ)); qdev_get_gpio_in(DEVICE(&s->cpu[i]), ARM_CPU_IRQ));
irq = qdev_get_gpio_in(DEVICE(&s->gic),
arm_gic_ppi_index(i, ARM_PHYS_TIMER_PPI));
qdev_connect_gpio_out(DEVICE(&s->cpu[i]), 0, irq);
irq = qdev_get_gpio_in(DEVICE(&s->gic),
arm_gic_ppi_index(i, ARM_VIRT_TIMER_PPI));
qdev_connect_gpio_out(DEVICE(&s->cpu[i]), 1, irq);
} }
} }