From ea99e85d5350f9a59e243de3863cf5ffdcf95183 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 28 Nov 2007 13:13:51 +0000 Subject: [PATCH] hvm: Fix 2 type mismatches in vlapic.h and hpet.c for 32-bit build Xen For 32-bit build of Xen: 1) the first mismatch (in hpet_read(), length is 4) makes guest think the HPET DM is buggy (we return 0 for HPET_CFG.COUNTER_CLK_PERIOD to guest), so guest wouldn't use HPET at all. 2) the second one: if tmict is 62500000 and timer_divisor is 16 (Fedoar7's installer uses the values at some time), 10 * 62500000 * 16 = 0x2540BE400 -- it's too big to be held in uint32_t. Signed-off-by: Dexuan Cui =20 --- xen/arch/x86/hvm/hpet.c | 2 +- xen/arch/x86/hvm/vlapic.c | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/hvm/hpet.c b/xen/arch/x86/hvm/hpet.c index ee7d91f652..74f8aa56f9 100644 --- a/xen/arch/x86/hvm/hpet.c +++ b/xen/arch/x86/hvm/hpet.c @@ -170,7 +170,7 @@ static unsigned long hpet_read( result = val; if ( length != 8 ) - result = (val >> ((addr & 7) * 8)) & ((1UL << (length * 8)) - 1); + result = (val >> ((addr & 7) * 8)) & ((1ULL << (length * 8)) - 1); spin_unlock(&h->lock); diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index fafc85f7c7..8bdb325369 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -661,7 +661,8 @@ static void vlapic_write(struct vcpu *v, unsigned long address, case APIC_TMICT: { - uint64_t period = APIC_BUS_CYCLE_NS * (uint32_t)val * vlapic->hw.timer_divisor; + uint64_t period = (uint64_t)APIC_BUS_CYCLE_NS * + (uint32_t)val * vlapic->hw.timer_divisor; vlapic_set_reg(vlapic, APIC_TMICT, val); create_periodic_time(current, &vlapic->pt, period, vlapic->pt.irq, @@ -820,8 +821,10 @@ static void lapic_rearm(struct vlapic *s) unsigned long tmict; tmict = vlapic_get_reg(s, APIC_TMICT); - if (tmict > 0) { - uint64_t period = APIC_BUS_CYCLE_NS * (uint32_t)tmict * s->hw.timer_divisor; + if ( tmict > 0 ) + { + uint64_t period = (uint64_t)APIC_BUS_CYCLE_NS * + (uint32_t)tmict * s->hw.timer_divisor; uint32_t lvtt = vlapic_get_reg(s, APIC_LVTT); s->pt.irq = lvtt & APIC_VECTOR_MASK; @@ -830,9 +833,9 @@ static void lapic_rearm(struct vlapic *s) &s->timer_last_update); printk("lapic_load to rearm the actimer:" - "bus cycle is %uns, " - "saved tmict count %lu, period %"PRIu64"ns, irq=%"PRIu8"\n", - APIC_BUS_CYCLE_NS, tmict, period, s->pt.irq); + "bus cycle is %uns, " + "saved tmict count %lu, period %"PRIu64"ns, irq=%"PRIu8"\n", + APIC_BUS_CYCLE_NS, tmict, period, s->pt.irq); } lapic_info(s); -- 2.39.5