Hi Andre,
On 02/05/2018 04:19 PM, Andre Przywara wrote:
At the moment we happily access the VGIC internal struct pending_irq
(which describes a virtual IRQ) in irq.c.
Factor out the actually needed functionality to learn the associated
hardware IRQ and move that into gic-vgic.c to improve abstraction.
Signed-off-by: Andre Przywara <andre.przyw...@arm.com>
Acked-by: Stefano Stabellini <sstabell...@kernel.org>
Reviewed-by: Julien Grall <julien.gr...@arm.com>
Cheers,
---
xen/arch/arm/gic-vgic.c | 17 +++++++++++++++++
xen/arch/arm/irq.c | 7 ++-----
xen/include/asm-arm/vgic.h | 2 ++
3 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/xen/arch/arm/gic-vgic.c b/xen/arch/arm/gic-vgic.c
index fff7c01ee8..632c411565 100644
--- a/xen/arch/arm/gic-vgic.c
+++ b/xen/arch/arm/gic-vgic.c
@@ -397,6 +397,23 @@ void gic_dump_vgic_info(struct vcpu *v)
printk("Pending irq=%d\n", p->irq);
}
+struct irq_desc *vgic_get_hw_irq_desc(struct domain *d, struct vcpu *v,
+ unsigned int virq)
+{
+ struct pending_irq *p;
+
+ ASSERT(!v && virq >= 32);
+
+ if ( !v )
+ v = d->vcpu[0];
+
+ p = irq_to_pending(v, virq);
+ if ( !p )
+ return NULL;
+
+ return p->desc;
+}
+
int vgic_connect_hw_irq(struct domain *d, struct vcpu *v, unsigned int virq,
struct irq_desc *desc, bool connect)
{
diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c
index 7f133de549..62103a20e3 100644
--- a/xen/arch/arm/irq.c
+++ b/xen/arch/arm/irq.c
@@ -534,19 +534,16 @@ int release_guest_irq(struct domain *d, unsigned int virq)
struct irq_desc *desc;
struct irq_guest *info;
unsigned long flags;
- struct pending_irq *p;
int ret;
/* Only SPIs are supported */
if ( virq < NR_LOCAL_IRQS || virq >= vgic_num_irqs(d) )
return -EINVAL;
- p = spi_to_pending(d, virq);
- if ( !p->desc )
+ desc = vgic_get_hw_irq_desc(d, NULL, virq);
+ if ( !desc )
return -EINVAL;
- desc = p->desc;
-
spin_lock_irqsave(&desc->lock, flags);
ret = -EINVAL;
diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h
index fda082395b..6ea9f140a7 100644
--- a/xen/include/asm-arm/vgic.h
+++ b/xen/include/asm-arm/vgic.h
@@ -219,6 +219,8 @@ int vgic_v2_init(struct domain *d, int *mmio_count);
int vgic_v3_init(struct domain *d, int *mmio_count);
bool vgic_evtchn_irq_pending(struct vcpu *v);
+struct irq_desc *vgic_get_hw_irq_desc(struct domain *d, struct vcpu *v,
+ unsigned int virq);
int vgic_connect_hw_irq(struct domain *d, struct vcpu *v, unsigned int virq,
struct irq_desc *desc, bool connect);
--
Julien Grall
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
