[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH target-arm v6 05/14] arm: xlnx-zynqmp: Connect C
From: |
Edgar E. Iglesias |
Subject: |
Re: [Qemu-devel] [PATCH target-arm v6 05/14] arm: xlnx-zynqmp: Connect CPU Timers to GIC |
Date: |
Tue, 5 May 2015 13:18:46 +1000 |
User-agent: |
Mutt/1.5.21 (2010-09-15) |
On Fri, Apr 24, 2015 at 01:28:44PM -0700, Peter Crosthwaite wrote:
> Connect the GPIO outputs from the individual CPUs for the timers to the
> GIC.
>
> Tested-by: Alistair Francis <address@hidden>
> Signed-off-by: Peter Crosthwaite <address@hidden>
Reviewed-by: Edgar E. Iglesias <address@hidden>
> ---
> changed since v4:
> Use macro for GIC_INTERNAL
>
> hw/arm/xlnx-zynqmp.c | 17 +++++++++++++++++
> 1 file changed, 17 insertions(+)
>
> diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c
> index e9fe473..7c69725 100644
> --- a/hw/arm/xlnx-zynqmp.c
> +++ b/hw/arm/xlnx-zynqmp.c
> @@ -16,13 +16,22 @@
> */
>
> #include "hw/arm/xlnx-zynqmp.h"
> +#include "hw/intc/arm_gic_common.h"
>
> #define GIC_NUM_SPI_INTR 128
>
> +#define ARM_PHYS_TIMER_PPI 30
> +#define ARM_VIRT_TIMER_PPI 27
> +
> #define GIC_BASE_ADDR 0xf9000000
> #define GIC_DIST_ADDR 0xf9010000
> #define GIC_CPU_ADDR 0xf9020000
>
> +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)
> {
> XlnxZynqMPState *s = XLNX_ZYNQMP(obj);
> @@ -57,6 +66,8 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error
> **errp)
> sysbus_mmio_map(SYS_BUS_DEVICE(&s->gic), 1, GIC_CPU_ADDR);
>
> for (i = 0; i < XLNX_ZYNQMP_NUM_CPUS; i++) {
> + qemu_irq irq;
> +
> object_property_set_int(OBJECT(&s->cpu[i]), QEMU_PSCI_CONDUIT_SMC,
> "psci-conduit", &error_abort);
> if (i > 0) {
> @@ -80,6 +91,12 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error
> **errp)
>
> sysbus_connect_irq(SYS_BUS_DEVICE(&s->gic), i,
> 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);
> }
> }
>
> --
> 2.3.6.3.g2cc70ee
>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [Qemu-devel] [PATCH target-arm v6 05/14] arm: xlnx-zynqmp: Connect CPU Timers to GIC,
Edgar E. Iglesias <=