|
|
@@ -144,13 +144,15 @@ void vgic_put_irq(struct kvm *kvm, struct vgic_irq *irq)
|
|
|
kfree(irq);
|
|
|
}
|
|
|
|
|
|
-/* Get the input level of a mapped IRQ directly from the physical GIC */
|
|
|
bool vgic_get_phys_line_level(struct vgic_irq *irq)
|
|
|
{
|
|
|
bool line_level;
|
|
|
|
|
|
BUG_ON(!irq->hw);
|
|
|
|
|
|
+ if (irq->get_input_level)
|
|
|
+ return irq->get_input_level(irq->intid);
|
|
|
+
|
|
|
WARN_ON(irq_get_irqchip_state(irq->host_irq,
|
|
|
IRQCHIP_STATE_PENDING,
|
|
|
&line_level));
|
|
|
@@ -436,7 +438,8 @@ int kvm_vgic_inject_irq(struct kvm *kvm, int cpuid, unsigned int intid,
|
|
|
|
|
|
/* @irq->irq_lock must be held */
|
|
|
static int kvm_vgic_map_irq(struct kvm_vcpu *vcpu, struct vgic_irq *irq,
|
|
|
- unsigned int host_irq)
|
|
|
+ unsigned int host_irq,
|
|
|
+ bool (*get_input_level)(int vindid))
|
|
|
{
|
|
|
struct irq_desc *desc;
|
|
|
struct irq_data *data;
|
|
|
@@ -456,6 +459,7 @@ static int kvm_vgic_map_irq(struct kvm_vcpu *vcpu, struct vgic_irq *irq,
|
|
|
irq->hw = true;
|
|
|
irq->host_irq = host_irq;
|
|
|
irq->hwintid = data->hwirq;
|
|
|
+ irq->get_input_level = get_input_level;
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
@@ -464,10 +468,11 @@ static inline void kvm_vgic_unmap_irq(struct vgic_irq *irq)
|
|
|
{
|
|
|
irq->hw = false;
|
|
|
irq->hwintid = 0;
|
|
|
+ irq->get_input_level = NULL;
|
|
|
}
|
|
|
|
|
|
int kvm_vgic_map_phys_irq(struct kvm_vcpu *vcpu, unsigned int host_irq,
|
|
|
- u32 vintid)
|
|
|
+ u32 vintid, bool (*get_input_level)(int vindid))
|
|
|
{
|
|
|
struct vgic_irq *irq = vgic_get_irq(vcpu->kvm, vcpu, vintid);
|
|
|
unsigned long flags;
|
|
|
@@ -476,7 +481,7 @@ int kvm_vgic_map_phys_irq(struct kvm_vcpu *vcpu, unsigned int host_irq,
|
|
|
BUG_ON(!irq);
|
|
|
|
|
|
spin_lock_irqsave(&irq->irq_lock, flags);
|
|
|
- ret = kvm_vgic_map_irq(vcpu, irq, host_irq);
|
|
|
+ ret = kvm_vgic_map_irq(vcpu, irq, host_irq, get_input_level);
|
|
|
spin_unlock_irqrestore(&irq->irq_lock, flags);
|
|
|
vgic_put_irq(vcpu->kvm, irq);
|
|
|
|