Hi Andre,
On 05/03/18 16:04, Andre Przywara wrote:
The VGIC supports virtual IRQs to be connected to a hardware IRQ, so
when a guest EOIs the virtual interrupt, it affects the state of that
corresponding interrupt on the hardware side at the same time.
Implement the interface that the Xen arch/core code expects to connect
the virtual and the physical world.
Signed-off-by: Andre Przywara <andre.przyw...@linaro.org>
Reviewed-by: Julien Grall <julien.gr...@arm.com>
Cheers,
---
Changelog RFC ... v1:
- add ASSERT for hardware mapped IRQs being SPI only
- check h/w IRQ matches before disconnecting
xen/arch/arm/vgic/vgic.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 71 insertions(+)
diff --git a/xen/arch/arm/vgic/vgic.c b/xen/arch/arm/vgic/vgic.c
index 5246d7c2e7..5bbf55da21 100644
--- a/xen/arch/arm/vgic/vgic.c
+++ b/xen/arch/arm/vgic/vgic.c
@@ -698,6 +698,77 @@ void vgic_kick_vcpus(struct domain *d)
}
}
+struct irq_desc *vgic_get_hw_irq_desc(struct domain *d, struct vcpu *v,
+ unsigned int virq)
+{
+ struct irq_desc *desc = NULL;
+ struct vgic_irq *irq = vgic_get_irq(d, v, virq);
+ unsigned long flags;
+
+ if ( !irq )
+ return NULL;
+
+ spin_lock_irqsave(&irq->irq_lock, flags);
+ if ( irq->hw )
+ {
+ ASSERT(irq->hwintid >= VGIC_NR_PRIVATE_IRQS);
+ desc = irq_to_desc(irq->hwintid);
+ }
+ spin_unlock_irqrestore(&irq->irq_lock, flags);
+
+ vgic_put_irq(d, irq);
+
+ return desc;
+}
+
+/*
+ * was:
+ * int kvm_vgic_map_phys_irq(struct vcpu *vcpu, u32 virt_irq, u32
phys_irq)
+ * int kvm_vgic_unmap_phys_irq(struct vcpu *vcpu, unsigned int virt_irq)
+ */
+int vgic_connect_hw_irq(struct domain *d, struct vcpu *vcpu,
+ unsigned int virt_irq, struct irq_desc *desc,
+ bool connect)
+{
+ struct vgic_irq *irq = vgic_get_irq(d, vcpu, virt_irq);
+ unsigned long flags;
+ int ret = 0;
+
+ if ( !irq )
+ return -EINVAL;
+
+ spin_lock_irqsave(&irq->irq_lock, flags);
+
+ if ( connect ) /* assign a mapped IRQ */
+ {
+ /* The VIRQ should not be already enabled by the guest */
+ if ( !irq->hw && !irq->enabled )
+ {
+ irq->hw = true;
+ irq->hwintid = desc->irq;
+ }
+ else
+ ret = -EBUSY;
+ }
+ else /* remove a mapped IRQ */
+ {
+ if ( desc && irq->hwintid != desc->irq )
+ {
+ ret = -EINVAL;
+ }
+ else
+ {
+ irq->hw = false;
+ irq->hwintid = 0;
+ }
+ }
+
+ spin_unlock_irqrestore(&irq->irq_lock, flags);
+ vgic_put_irq(d, irq);
+
+ return ret;
+}
+
static unsigned int translate_irq_type(bool is_level)
{
return is_level ? IRQ_TYPE_LEVEL_HIGH : IRQ_TYPE_EDGE_RISING;
--
Julien Grall
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
