On Fri, May 01, 2015 at 06:50:27PM +0100, Peter Maydell wrote:
> From: Fabian Aggeler <aggel...@ethz.ch>
>
> Create the outbound FIQ lines from the GIC to the CPUs; these are
> used if the GIC has security extensions or grouping support.
>
> Signed-off-by: Fabian Aggeler <aggel...@ethz.ch>
> Signed-off-by: Greg Bellows <greg.bell...@linaro.org>
> Message-id: 1429113742-8371-2-git-send-email-greg.bell...@linaro.org
> [PMM: added FIQ lines to kvm-arm-gic so its interface is the same;
> tweaked commit message]
> Signed-off-by: Peter Maydell <peter.mayd...@linaro.org>
Reviewed-by: Edgar E. Iglesias <edgar.igles...@xilinx.com>
> ---
> hw/intc/arm_gic.c | 3 +++
> hw/intc/arm_gic_kvm.c | 5 ++++-
> include/hw/intc/arm_gic_common.h | 1 +
> 3 files changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c
> index a04c822..e9fb8b9 100644
> --- a/hw/intc/arm_gic.c
> +++ b/hw/intc/arm_gic.c
> @@ -790,6 +790,9 @@ void gic_init_irqs_and_distributor(GICState *s)
> for (i = 0; i < NUM_CPU(s); i++) {
> sysbus_init_irq(sbd, &s->parent_irq[i]);
> }
> + for (i = 0; i < NUM_CPU(s); i++) {
> + sysbus_init_irq(sbd, &s->parent_fiq[i]);
> + }
> memory_region_init_io(&s->iomem, OBJECT(s), &gic_dist_ops, s,
> "gic_dist", 0x1000);
> }
> diff --git a/hw/intc/arm_gic_kvm.c b/hw/intc/arm_gic_kvm.c
> index e1952ad..5aedae1 100644
> --- a/hw/intc/arm_gic_kvm.c
> +++ b/hw/intc/arm_gic_kvm.c
> @@ -554,12 +554,15 @@ static void kvm_arm_gic_realize(DeviceState *dev, Error
> **errp)
> */
> i += (GIC_INTERNAL * s->num_cpu);
> qdev_init_gpio_in(dev, kvm_arm_gic_set_irq, i);
> - /* We never use our outbound IRQ lines but provide them so that
> + /* We never use our outbound IRQ/FIQ lines but provide them so that
> * we maintain the same interface as the non-KVM GIC.
> */
> for (i = 0; i < s->num_cpu; i++) {
> sysbus_init_irq(sbd, &s->parent_irq[i]);
> }
> + for (i = 0; i < s->num_cpu; i++) {
> + sysbus_init_irq(sbd, &s->parent_fiq[i]);
> + }
>
> /* Try to create the device via the device control API */
> s->dev_fd = -1;
> diff --git a/include/hw/intc/arm_gic_common.h
> b/include/hw/intc/arm_gic_common.h
> index f6887ed..01c6f24 100644
> --- a/include/hw/intc/arm_gic_common.h
> +++ b/include/hw/intc/arm_gic_common.h
> @@ -50,6 +50,7 @@ typedef struct GICState {
> /*< public >*/
>
> qemu_irq parent_irq[GIC_NCPU];
> + qemu_irq parent_fiq[GIC_NCPU];
> bool enabled;
> bool cpu_enabled[GIC_NCPU];
>
> --
> 1.9.1
>
