Message ID | 20180821132811.17675-4-peter.maydell@linaro.org |
---|---|
State | New |
Headers | show |
Series | arm: Wire up GICv2 virt support on A15/A7 boards | expand |
On 8/21/18 3:28 PM, Peter Maydell wrote: > 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> > --- > hw/arm/vexpress.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c > index 5bfe2e43487..dc47ed84c20 100644 > --- a/hw/arm/vexpress.c > +++ b/hw/arm/vexpress.c > @@ -251,6 +251,10 @@ static void init_cpus(const char *cpu_type, const char *privdev, > sysbus_connect_irq(busdev, n, qdev_get_gpio_in(cpudev, ARM_CPU_IRQ)); > sysbus_connect_irq(busdev, n + smp_cpus, > qdev_get_gpio_in(cpudev, ARM_CPU_FIQ)); > + sysbus_connect_irq(busdev, n + 2 * smp_cpus, > + qdev_get_gpio_in(cpudev, ARM_CPU_VIRQ)); > + sysbus_connect_irq(busdev, n + 3 * smp_cpus, > + qdev_get_gpio_in(cpudev, ARM_CPU_VFIQ)); > } > } > >
diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 5bfe2e43487..dc47ed84c20 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -251,6 +251,10 @@ static void init_cpus(const char *cpu_type, const char *privdev, sysbus_connect_irq(busdev, n, qdev_get_gpio_in(cpudev, ARM_CPU_IRQ)); sysbus_connect_irq(busdev, n + smp_cpus, qdev_get_gpio_in(cpudev, ARM_CPU_FIQ)); + sysbus_connect_irq(busdev, n + 2 * smp_cpus, + qdev_get_gpio_in(cpudev, ARM_CPU_VIRQ)); + sysbus_connect_irq(busdev, n + 3 * smp_cpus, + qdev_get_gpio_in(cpudev, ARM_CPU_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> --- hw/arm/vexpress.c | 4 ++++ 1 file changed, 4 insertions(+)