diff options
author | kaf24@localhost.localdomain <kaf24@localhost.localdomain> | 2006-12-26 19:49:11 +0000 |
---|---|---|
committer | kaf24@localhost.localdomain <kaf24@localhost.localdomain> | 2006-12-26 19:49:11 +0000 |
commit | 175eac1a6d020149c33d3536068db35fc72f56fe (patch) | |
tree | bf53d36d242ac977ba3598e7d036b0dde862e1b9 /xen/arch/x86/hvm/hpet.c | |
parent | 894243ac7bd572612b6264b2287f7d79ccee7168 (diff) | |
download | xen-175eac1a6d020149c33d3536068db35fc72f56fe.tar.gz xen-175eac1a6d020149c33d3536068db35fc72f56fe.tar.bz2 xen-175eac1a6d020149c33d3536068db35fc72f56fe.zip |
[HVM] Route ISA IRQ 0 to IOAPIC GSI 2, just like 99% of native systems.
This is a built-in assumption of HPET 'legacy' IRQ routing, which is
why we have changed to this routing strategy now.
Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'xen/arch/x86/hvm/hpet.c')
-rw-r--r-- | xen/arch/x86/hvm/hpet.c | 53 |
1 files changed, 5 insertions, 48 deletions
diff --git a/xen/arch/x86/hvm/hpet.c b/xen/arch/x86/hvm/hpet.c index be16bf89f7..536b698f17 100644 --- a/xen/arch/x86/hvm/hpet.c +++ b/xen/arch/x86/hvm/hpet.c @@ -97,9 +97,6 @@ ((timer_config(h, n) & HPET_TN_INT_ROUTE_CAP_MASK) \ >> HPET_TN_INT_ROUTE_CAP_SHIFT) -#define timer_int_route_valid(h, n) \ - (timer_int_route_cap(h, n) & (1 << timer_int_route(h, n))) - #define hpet_time_after(a, b) ((int32_t)(b) -(int32_t)(a) < 0) #define hpet_time_after64(a, b) ((int64_t)(b) -(int64_t)(a) < 0) @@ -409,54 +406,14 @@ struct hvm_mmio_handler hpet_mmio_handler = { .write_handler = hpet_write }; -static void hpet_irq_assert(struct domain *d, - unsigned int isa_irq, unsigned int intr) -{ - struct hvm_irq *hvm_irq = &d->arch.hvm_domain.irq; - - spin_lock(&hvm_irq->lock); - - if ( !__test_and_set_bit(isa_irq, &hvm_irq->isa_irq) && - (hvm_irq->gsi_assert_count[isa_irq]++ == 0) ) - { - vioapic_irq_positive_edge(d, intr); - vpic_irq_positive_edge(d, isa_irq); - } - - spin_unlock(&hvm_irq->lock); -} - -static void hpet_irq_deassert(struct domain *d, - unsigned int isa_irq, unsigned int intr) -{ - hvm_isa_irq_deassert(d, isa_irq); -} - static void hpet_set_irq(struct domain *d, int hpet_tn) { - int irq, intr; - - if ( (hpet_tn != 0) && (hpet_tn != 1) ) - return; - /* if LegacyReplacementRoute bit is set, HPET specification requires timer0 be routed to IRQ0 in NON-APIC or IRQ2 in the I/O APIC, - timer1 be routed to IRQ8 in NON-APIC or IRQ8 in the I/O APIC. - It's hard to distinguish NON-APIC and I/O APIC, so we set both PIC - and I/O APIC here. Guest OS shall make proper mask setting to ensure - only one interrupt is injected into it. */ - if ( hpet_tn == 0 ) - { - irq = 0; - intr = 2; - } - else - { - irq = intr = 8; - } - - hpet_irq_deassert(d, irq, intr); - hpet_irq_assert(d, irq, intr); + timer1 be routed to IRQ8 in NON-APIC or IRQ8 in the I/O APIC. */ + int isa_irq = (hpet_tn == 0) ? 0 : 8; + hvm_isa_irq_deassert(d, isa_irq); + hvm_isa_irq_assert(d, isa_irq); } static void hpet_route_interrupt(HPETState *h, unsigned int tn) @@ -465,7 +422,7 @@ static void hpet_route_interrupt(HPETState *h, unsigned int tn) struct domain *d = h->vcpu->domain; struct hvm_irq *hvm_irq = &d->arch.hvm_domain.irq; - if ( (tn_int_route >= VIOAPIC_NUM_PINS) || !timer_int_route_valid(h, tn) ) + if ( !(timer_int_route_cap(h, tn) & (1U << tn_int_route)) ) { gdprintk(XENLOG_ERR, "HPET: timer%u: invalid interrupt route config\n", tn); |