# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1256727554 0
# Node ID 5e110d89b647f2eb91b6da240c5f0ae0a32065ad
# Parent cff23354d026bd359241535c77d90b11604a6538
x86: vioapic: fix remote irr bit setting for level triggered interrupts
Clear all entries' remote irr bits once the RTE entries' vector field
match with EOI message's vector.
Signed-off-by: Xiantao Zhang <xiantao.zhang@xxxxxxxxx>
---
xen/arch/x86/hvm/vioapic.c | 61 +++++++++++++++++----------------------------
1 files changed, 24 insertions(+), 37 deletions(-)
diff -r cff23354d026 -r 5e110d89b647 xen/arch/x86/hvm/vioapic.c
--- a/xen/arch/x86/hvm/vioapic.c Wed Oct 28 10:56:39 2009 +0000
+++ b/xen/arch/x86/hvm/vioapic.c Wed Oct 28 10:59:14 2009 +0000
@@ -384,17 +384,6 @@ void vioapic_irq_positive_edge(struct do
}
}
-static int get_eoi_gsi(struct hvm_hw_vioapic *vioapic, int vector)
-{
- int i;
-
- for ( i = 0; i < VIOAPIC_NUM_PINS; i++ )
- if ( vioapic->redirtbl[i].fields.vector == vector )
- return i;
-
- return -1;
-}
-
void vioapic_update_EOI(struct domain *d, int vector)
{
struct hvm_hw_vioapic *vioapic = domain_vioapic(d);
@@ -404,32 +393,30 @@ void vioapic_update_EOI(struct domain *d
spin_lock(&d->arch.hvm_domain.irq_lock);
- if ( (gsi = get_eoi_gsi(vioapic, vector)) == -1 )
- {
- gdprintk(XENLOG_WARNING, "Can't find redir item for %d EOI\n", vector);
- goto out;
- }
-
- ent = &vioapic->redirtbl[gsi];
-
- ent->fields.remote_irr = 0;
-
- if ( iommu_enabled )
- {
- spin_unlock(&d->arch.hvm_domain.irq_lock);
- hvm_dpci_eoi(current->domain, gsi, ent);
- spin_lock(&d->arch.hvm_domain.irq_lock);
- }
-
- if ( (ent->fields.trig_mode == VIOAPIC_LEVEL_TRIG) &&
- !ent->fields.mask &&
- hvm_irq->gsi_assert_count[gsi] )
- {
- ent->fields.remote_irr = 1;
- vioapic_deliver(vioapic, gsi);
- }
-
- out:
+ for ( gsi = 0; gsi < VIOAPIC_NUM_PINS; gsi++ )
+ {
+ ent = &vioapic->redirtbl[gsi];
+ if ( ent->fields.vector != vector )
+ continue;
+
+ ent->fields.remote_irr = 0;
+
+ if ( iommu_enabled )
+ {
+ spin_unlock(&d->arch.hvm_domain.irq_lock);
+ hvm_dpci_eoi(d, gsi, ent);
+ spin_lock(&d->arch.hvm_domain.irq_lock);
+ }
+
+ if ( (ent->fields.trig_mode == VIOAPIC_LEVEL_TRIG) &&
+ !ent->fields.mask &&
+ hvm_irq->gsi_assert_count[gsi] )
+ {
+ ent->fields.remote_irr = 1;
+ vioapic_deliver(vioapic, gsi);
+ }
+ }
+
spin_unlock(&d->arch.hvm_domain.irq_lock);
}
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home