| Message ID | 1468513325-29492-7-git-send-email-julien.grall@arm.com |
|---|---|
| State | Superseded |
| Headers | show |
Hi, On 14/07/16 17:22, Julien Grall wrote: > This reverts commit f91c84edebe67296e4051af055dbf0adafb13a37. SPI > routing for ACPI support will be added in a follow-up patch. > > Signed-off-by: Julien Grall <julien.grall@arm.com> > Reviewed-by: Stefano Stabellini <sttabellini@kernel.org> I made a typo in Stefano's address mail. This should be sstabellini@kernel.org. Regards, > > --- > Changes in v2: > - Add Stefano's reviewed-by > --- > xen/arch/arm/vgic.c | 15 --------------- > 1 file changed, 15 deletions(-) > > diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c > index 35723c9..5070452 100644 > --- a/xen/arch/arm/vgic.c > +++ b/xen/arch/arm/vgic.c > @@ -25,8 +25,6 @@ > #include <xen/irq.h> > #include <xen/sched.h> > #include <xen/perfc.h> > -#include <xen/iocap.h> > -#include <xen/acpi.h> > > #include <asm/current.h> > > @@ -354,22 +352,9 @@ void vgic_enable_irqs(struct vcpu *v, uint32_t r, int n) > unsigned long flags; > int i = 0; > struct vcpu *v_target; > - struct domain *d = v->domain; > > while ( (i = find_next_bit(&mask, 32, i)) < 32 ) { > irq = i + (32 * n); > - /* Set the irq type and route it to guest only for SPI and Dom0 */ > - if( irq_access_permitted(d, irq) && is_hardware_domain(d) && > - ( irq >= 32 ) && ( !acpi_disabled ) ) > - { > - static int log_once = 0; > - if ( !log_once ) > - { > - gprintk(XENLOG_WARNING, "Routing SPIs to Dom0 on ACPI systems is unimplemented.\n"); > - log_once++; > - } > - } > - > v_target = __vgic_get_target_vcpu(v, irq); > p = irq_to_pending(v_target, irq); > set_bit(GIC_IRQ_GUEST_ENABLED, &p->status); >
diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 35723c9..5070452 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -25,8 +25,6 @@ #include <xen/irq.h> #include <xen/sched.h> #include <xen/perfc.h> -#include <xen/iocap.h> -#include <xen/acpi.h> #include <asm/current.h> @@ -354,22 +352,9 @@ void vgic_enable_irqs(struct vcpu *v, uint32_t r, int n) unsigned long flags; int i = 0; struct vcpu *v_target; - struct domain *d = v->domain; while ( (i = find_next_bit(&mask, 32, i)) < 32 ) { irq = i + (32 * n); - /* Set the irq type and route it to guest only for SPI and Dom0 */ - if( irq_access_permitted(d, irq) && is_hardware_domain(d) && - ( irq >= 32 ) && ( !acpi_disabled ) ) - { - static int log_once = 0; - if ( !log_once ) - { - gprintk(XENLOG_WARNING, "Routing SPIs to Dom0 on ACPI systems is unimplemented.\n"); - log_once++; - } - } - v_target = __vgic_get_target_vcpu(v, irq); p = irq_to_pending(v_target, irq); set_bit(GIC_IRQ_GUEST_ENABLED, &p->status);