From 16b29ae1807b024bd5052301550f5d47dae958a2 Mon Sep 17 00:00:00 2001 From: aliguori Date: Wed, 17 Dec 2008 23:28:44 +0000 Subject: [PATCH] Add HPET emulation to qemu (Beth Kon) This patch adds HPET emulation. It can be disabled with -disable-hpet. An hpet provides a more finely granular clocksource than otherwise available on PC. This means that latency-dependent applications (e.g. multimedia) will generally be smoother when using the HPET. Signed-off-by: Beth Kon Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6081 c046a42c-6fe2-441c-8c8c-71466251a162 --- Makefile.target | 2 +- hw/apic.c | 7 + hw/hpet.c | 588 ++++++++++++++++++++++++++++++++ hw/hpet_emul.h | 85 +++++ hw/i8254.c | 21 ++ hw/mc146818rtc.c | 29 +- hw/pc.c | 4 + hw/pc.h | 3 + monitor.c | 7 + pc-bios/bios-pq/0005_hpet.patch | 190 +++++++++++ pc-bios/bios-pq/series | 1 + pc-bios/bios.bin | Bin 131072 -> 131072 bytes vl.c | 7 + 13 files changed, 938 insertions(+), 6 deletions(-) create mode 100644 hw/hpet.c create mode 100644 hw/hpet_emul.h create mode 100644 pc-bios/bios-pq/0005_hpet.patch diff --git a/Makefile.target b/Makefile.target index e14309c05b..6886aadea0 100644 --- a/Makefile.target +++ b/Makefile.target @@ -635,7 +635,7 @@ ifeq ($(TARGET_BASE_ARCH), i386) OBJS+= ide.o pckbd.o ps2.o vga.o $(SOUND_HW) dma.o OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o OBJS+= cirrus_vga.o apic.o parallel.o acpi.o piix_pci.o -OBJS+= usb-uhci.o vmmouse.o vmport.o vmware_vga.o +OBJS+= usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o # virtio support OBJS+= virtio.o virtio-blk.o virtio-balloon.o virtio-net.o CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE diff --git a/hw/apic.c b/hw/apic.c index a2915f8121..f6950ca4d4 100644 --- a/hw/apic.c +++ b/hw/apic.c @@ -945,6 +945,13 @@ void ioapic_set_irq(void *opaque, int vector, int level) { IOAPICState *s = opaque; + /* ISA IRQs map to GSI 1-1 except for IRQ0 which maps + * to GSI 2. GSI maps to ioapic 1-1. This is not + * the cleanest way of doing it but it should work. */ + + if (vector == 0) + vector = 2; + if (vector >= 0 && vector < IOAPIC_NUM_PINS) { uint32_t mask = 1 << vector; uint64_t entry = s->ioredtbl[vector]; diff --git a/hw/hpet.c b/hw/hpet.c new file mode 100644 index 0000000000..0dc05620c0 --- /dev/null +++ b/hw/hpet.c @@ -0,0 +1,588 @@ +/* + * High Precisition Event Timer emulation + * + * Copyright (c) 2007 Alexander Graf + * Copyright (c) 2008 IBM Corporation + * + * Authors: Beth Kon + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * ***************************************************************** + * + * This driver attempts to emulate an HPET device in software. + */ + +#include "hw.h" +#include "console.h" +#include "qemu-timer.h" +#include "hpet_emul.h" + +extern void hpet_pit_disable(void); +extern void hpet_pit_enable(void); + +//#define HPET_DEBUG +#ifdef HPET_DEBUG +#define dprintf printf +#else +#define dprintf(...) +#endif + +static HPETState *hpet_statep; + +uint32_t hpet_in_legacy_mode(void) +{ + if (hpet_statep) + return hpet_statep->config & HPET_CFG_LEGACY; + else + return 0; +} + +static uint32_t timer_int_route(struct HPETTimer *timer) +{ + uint32_t route; + route = (timer->config & HPET_TN_INT_ROUTE_MASK) >> HPET_TN_INT_ROUTE_SHIFT; + return route; +} + +static uint32_t hpet_enabled(void) +{ + return hpet_statep->config & HPET_CFG_ENABLE; +} + +static uint32_t timer_is_periodic(HPETTimer *t) +{ + return t->config & HPET_TN_PERIODIC; +} + +static uint32_t timer_enabled(HPETTimer *t) +{ + return t->config & HPET_TN_ENABLE; +} + +static uint32_t hpet_time_after(uint64_t a, uint64_t b) +{ + return ((int32_t)(b) - (int32_t)(a) < 0); +} + +static uint32_t hpet_time_after64(uint64_t a, uint64_t b) +{ + return ((int64_t)(b) - (int64_t)(a) < 0); +} + +static uint64_t ticks_to_ns(uint64_t value) +{ + return (muldiv64(value, HPET_CLK_PERIOD, FS_PER_NS)); +} + +static uint64_t ns_to_ticks(uint64_t value) +{ + return (muldiv64(value, FS_PER_NS, HPET_CLK_PERIOD)); +} + +static uint64_t hpet_fixup_reg(uint64_t new, uint64_t old, uint64_t mask) +{ + new &= mask; + new |= old & ~mask; + return new; +} + +static int activating_bit(uint64_t old, uint64_t new, uint64_t mask) +{ + return (!(old & mask) && (new & mask)); +} + +static int deactivating_bit(uint64_t old, uint64_t new, uint64_t mask) +{ + return ((old & mask) && !(new & mask)); +} + +static uint64_t hpet_get_ticks(void) +{ + uint64_t ticks; + ticks = ns_to_ticks(qemu_get_clock(vm_clock) + hpet_statep->hpet_offset); + return ticks; +} + +/* + * calculate diff between comparator value and current ticks + */ +static inline uint64_t hpet_calculate_diff(HPETTimer *t, uint64_t current) +{ + + if (t->config & HPET_TN_32BIT) { + uint32_t diff, cmp; + cmp = (uint32_t)t->cmp; + diff = cmp - (uint32_t)current; + diff = (int32_t)diff > 0 ? diff : (uint32_t)0; + return (uint64_t)diff; + } else { + uint64_t diff, cmp; + cmp = t->cmp; + diff = cmp - current; + diff = (int64_t)diff > 0 ? diff : (uint64_t)0; + return diff; + } +} + +static void update_irq(struct HPETTimer *timer) +{ + qemu_irq irq; + int route; + + if (timer->tn <= 1 && hpet_in_legacy_mode()) { + /* 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. + */ + if (timer->tn == 0) { + irq=timer->state->irqs[0]; + } else + irq=timer->state->irqs[8]; + } else { + route=timer_int_route(timer); + irq=timer->state->irqs[route]; + } + if (timer_enabled(timer) && hpet_enabled()) { + qemu_irq_pulse(irq); + } +} + +static void hpet_save(QEMUFile *f, void *opaque) +{ + HPETState *s = opaque; + int i; + qemu_put_be64s(f, &s->config); + qemu_put_be64s(f, &s->isr); + /* save current counter value */ + s->hpet_counter = hpet_get_ticks(); + qemu_put_be64s(f, &s->hpet_counter); + + for (i = 0; i < HPET_NUM_TIMERS; i++) { + qemu_put_8s(f, &s->timer[i].tn); + qemu_put_be64s(f, &s->timer[i].config); + qemu_put_be64s(f, &s->timer[i].cmp); + qemu_put_be64s(f, &s->timer[i].fsb); + qemu_put_be64s(f, &s->timer[i].period); + qemu_put_8s(f, &s->timer[i].wrap_flag); + if (s->timer[i].qemu_timer) { + qemu_put_timer(f, s->timer[i].qemu_timer); + } + } +} + +static int hpet_load(QEMUFile *f, void *opaque, int version_id) +{ + HPETState *s = opaque; + int i; + + if (version_id != 1) + return -EINVAL; + + qemu_get_be64s(f, &s->config); + qemu_get_be64s(f, &s->isr); + qemu_get_be64s(f, &s->hpet_counter); + /* Recalculate the offset between the main counter and guest time */ + s->hpet_offset = ticks_to_ns(s->hpet_counter) - qemu_get_clock(vm_clock); + + for (i = 0; i < HPET_NUM_TIMERS; i++) { + qemu_get_8s(f, &s->timer[i].tn); + qemu_get_be64s(f, &s->timer[i].config); + qemu_get_be64s(f, &s->timer[i].cmp); + qemu_get_be64s(f, &s->timer[i].fsb); + qemu_get_be64s(f, &s->timer[i].period); + qemu_get_8s(f, &s->timer[i].wrap_flag); + if (s->timer[i].qemu_timer) { + qemu_get_timer(f, s->timer[i].qemu_timer); + } + } + return 0; +} + +/* + * timer expiration callback + */ +static void hpet_timer(void *opaque) +{ + HPETTimer *t = (HPETTimer*)opaque; + uint64_t diff; + + uint64_t period = t->period; + uint64_t cur_tick = hpet_get_ticks(); + + if (timer_is_periodic(t) && period != 0) { + if (t->config & HPET_TN_32BIT) { + while (hpet_time_after(cur_tick, t->cmp)) + t->cmp = (uint32_t)(t->cmp + t->period); + } else + while (hpet_time_after64(cur_tick, t->cmp)) + t->cmp += period; + + diff = hpet_calculate_diff(t, cur_tick); + qemu_mod_timer(t->qemu_timer, qemu_get_clock(vm_clock) + + (int64_t)ticks_to_ns(diff)); + } else if (t->config & HPET_TN_32BIT && !timer_is_periodic(t)) { + if (t->wrap_flag) { + diff = hpet_calculate_diff(t, cur_tick); + qemu_mod_timer(t->qemu_timer, qemu_get_clock(vm_clock) + + (int64_t)ticks_to_ns(diff)); + t->wrap_flag = 0; + } + } + update_irq(t); +} + +static void hpet_set_timer(HPETTimer *t) +{ + uint64_t diff; + uint32_t wrap_diff; /* how many ticks until we wrap? */ + uint64_t cur_tick = hpet_get_ticks(); + + /* whenever new timer is being set up, make sure wrap_flag is 0 */ + t->wrap_flag = 0; + diff = hpet_calculate_diff(t, cur_tick); + + /* hpet spec says in one-shot 32-bit mode, generate an interrupt when + * counter wraps in addition to an interrupt with comparator match. + */ + if (t->config & HPET_TN_32BIT && !timer_is_periodic(t)) { + wrap_diff = 0xffffffff - (uint32_t)cur_tick; + if (wrap_diff < (uint32_t)diff) { + diff = wrap_diff; + t->wrap_flag = 1; + } + } + qemu_mod_timer(t->qemu_timer, qemu_get_clock(vm_clock) + + (int64_t)ticks_to_ns(diff)); +} + +static void hpet_del_timer(HPETTimer *t) +{ + qemu_del_timer(t->qemu_timer); +} + +#ifdef HPET_DEBUG +static uint32_t hpet_ram_readb(void *opaque, target_phys_addr_t addr) +{ + printf("qemu: hpet_read b at %" PRIx64 "\n", addr); + return 0; +} + +static uint32_t hpet_ram_readw(void *opaque, target_phys_addr_t addr) +{ + printf("qemu: hpet_read w at %" PRIx64 "\n", addr); + return 0; +} +#endif + +static uint32_t hpet_ram_readl(void *opaque, target_phys_addr_t addr) +{ + HPETState *s = (HPETState *)opaque; + uint64_t cur_tick, index; + + dprintf("qemu: Enter hpet_ram_readl at %" PRIx64 "\n", addr); + index = addr; + /*address range of all TN regs*/ + if (index >= 0x100 && index <= 0x3ff) { + uint8_t timer_id = (addr - 0x100) / 0x20; + if (timer_id > HPET_NUM_TIMERS - 1) { + printf("qemu: timer id out of range\n"); + return 0; + } + HPETTimer *timer = &s->timer[timer_id]; + + switch ((addr - 0x100) % 0x20) { + case HPET_TN_CFG: + return timer->config; + case HPET_TN_CFG + 4: // Interrupt capabilities + return timer->config >> 32; + case HPET_TN_CMP: // comparator register + return timer->cmp; + case HPET_TN_CMP + 4: + return timer->cmp >> 32; + case HPET_TN_ROUTE: + return timer->fsb >> 32; + default: + dprintf("qemu: invalid hpet_ram_readl\n"); + break; + } + } else { + switch (index) { + case HPET_ID: + return s->capability; + case HPET_PERIOD: + return s->capability >> 32; + case HPET_CFG: + return s->config; + case HPET_CFG + 4: + dprintf("qemu: invalid HPET_CFG + 4 hpet_ram_readl \n"); + return 0; + case HPET_COUNTER: + if (hpet_enabled()) + cur_tick = hpet_get_ticks(); + else + cur_tick = s->hpet_counter; + dprintf("qemu: reading counter = %" PRIx64 "\n", cur_tick); + return cur_tick; + case HPET_COUNTER + 4: + if (hpet_enabled()) + cur_tick = hpet_get_ticks(); + else + cur_tick = s->hpet_counter; + dprintf("qemu: reading counter + 4 = %" PRIx64 "\n", cur_tick); + return cur_tick >> 32; + case HPET_STATUS: + return s->isr; + default: + dprintf("qemu: invalid hpet_ram_readl\n"); + break; + } + } + return 0; +} + +#ifdef HPET_DEBUG +static void hpet_ram_writeb(void *opaque, target_phys_addr_t addr, + uint32_t value) +{ + printf("qemu: invalid hpet_write b at %" PRIx64 " = %#x\n", + addr, value); +} + +static void hpet_ram_writew(void *opaque, target_phys_addr_t addr, + uint32_t value) +{ + printf("qemu: invalid hpet_write w at %" PRIx64 " = %#x\n", + addr, value); +} +#endif + +static void hpet_ram_writel(void *opaque, target_phys_addr_t addr, + uint32_t value) +{ + int i; + HPETState *s = (HPETState *)opaque; + uint64_t old_val, new_val, index; + + dprintf("qemu: Enter hpet_ram_writel at %" PRIx64 " = %#x\n", addr, value); + index = addr; + old_val = hpet_ram_readl(opaque, addr); + new_val = value; + + /*address range of all TN regs*/ + if (index >= 0x100 && index <= 0x3ff) { + uint8_t timer_id = (addr - 0x100) / 0x20; + dprintf("qemu: hpet_ram_writel timer_id = %#x \n", timer_id); + HPETTimer *timer = &s->timer[timer_id]; + + switch ((addr - 0x100) % 0x20) { + case HPET_TN_CFG: + dprintf("qemu: hpet_ram_writel HPET_TN_CFG\n"); + timer->config = hpet_fixup_reg(new_val, old_val, 0x3e4e); + if (new_val & HPET_TN_32BIT) { + timer->cmp = (uint32_t)timer->cmp; + timer->period = (uint32_t)timer->period; + } + if (new_val & HPET_TIMER_TYPE_LEVEL) { + printf("qemu: level-triggered hpet not supported\n"); + exit (-1); + } + + break; + case HPET_TN_CFG + 4: // Interrupt capabilities + dprintf("qemu: invalid HPET_TN_CFG+4 write\n"); + break; + case HPET_TN_CMP: // comparator register + dprintf("qemu: hpet_ram_writel HPET_TN_CMP \n"); + if (timer->config & HPET_TN_32BIT) + new_val = (uint32_t)new_val; + if (!timer_is_periodic(timer) || + (timer->config & HPET_TN_SETVAL)) + timer->cmp = (timer->cmp & 0xffffffff00000000ULL) + | new_val; + else { + /* + * FIXME: Clamp period to reasonable min value? + * Clamp period to reasonable max value + */ + new_val &= (timer->config & HPET_TN_32BIT ? ~0u : ~0ull) >> 1; + timer->period = (timer->period & 0xffffffff00000000ULL) + | new_val; + } + timer->config &= ~HPET_TN_SETVAL; + if (hpet_enabled()) + hpet_set_timer(timer); + break; + case HPET_TN_CMP + 4: // comparator register high order + dprintf("qemu: hpet_ram_writel HPET_TN_CMP + 4\n"); + if (!timer_is_periodic(timer) || + (timer->config & HPET_TN_SETVAL)) + timer->cmp = (timer->cmp & 0xffffffffULL) + | new_val << 32; + else { + /* + * FIXME: Clamp period to reasonable min value? + * Clamp period to reasonable max value + */ + new_val &= (timer->config + & HPET_TN_32BIT ? ~0u : ~0ull) >> 1; + timer->period = (timer->period & 0xffffffffULL) + | new_val << 32; + } + timer->config &= ~HPET_TN_SETVAL; + if (hpet_enabled()) + hpet_set_timer(timer); + break; + case HPET_TN_ROUTE + 4: + dprintf("qemu: hpet_ram_writel HPET_TN_ROUTE + 4\n"); + break; + default: + dprintf("qemu: invalid hpet_ram_writel\n"); + break; + } + return; + } else { + switch (index) { + case HPET_ID: + return; + case HPET_CFG: + s->config = hpet_fixup_reg(new_val, old_val, 0x3); + if (activating_bit(old_val, new_val, HPET_CFG_ENABLE)) { + /* Enable main counter and interrupt generation. */ + s->hpet_offset = ticks_to_ns(s->hpet_counter) + - qemu_get_clock(vm_clock); + for (i = 0; i < HPET_NUM_TIMERS; i++) + if ((&s->timer[i])->cmp != ~0ULL) + hpet_set_timer(&s->timer[i]); + } + else if (deactivating_bit(old_val, new_val, HPET_CFG_ENABLE)) { + /* Halt main counter and disable interrupt generation. */ + s->hpet_counter = hpet_get_ticks(); + for (i = 0; i < HPET_NUM_TIMERS; i++) + hpet_del_timer(&s->timer[i]); + } + /* i8254 and RTC are disabled when HPET is in legacy mode */ + if (activating_bit(old_val, new_val, HPET_CFG_LEGACY)) { + hpet_pit_disable(); + } else if (deactivating_bit(old_val, new_val, HPET_CFG_LEGACY)) { + hpet_pit_enable(); + } + break; + case HPET_CFG + 4: + dprintf("qemu: invalid HPET_CFG+4 write \n"); + break; + case HPET_STATUS: + /* FIXME: need to handle level-triggered interrupts */ + break; + case HPET_COUNTER: + if (hpet_enabled()) + printf("qemu: Writing counter while HPET enabled!\n"); + s->hpet_counter = (s->hpet_counter & 0xffffffff00000000ULL) + | value; + dprintf("qemu: HPET counter written. ctr = %#x -> %" PRIx64 "\n", + value, s->hpet_counter); + break; + case HPET_COUNTER + 4: + if (hpet_enabled()) + printf("qemu: Writing counter while HPET enabled!\n"); + s->hpet_counter = (s->hpet_counter & 0xffffffffULL) + | (((uint64_t)value) << 32); + dprintf("qemu: HPET counter + 4 written. ctr = %#x -> %" PRIx64 "\n", + value, s->hpet_counter); + break; + default: + dprintf("qemu: invalid hpet_ram_writel\n"); + break; + } + } +} + +static CPUReadMemoryFunc *hpet_ram_read[] = { +#ifdef HPET_DEBUG + hpet_ram_readb, + hpet_ram_readw, +#else + NULL, + NULL, +#endif + hpet_ram_readl, +}; + +static CPUWriteMemoryFunc *hpet_ram_write[] = { +#ifdef HPET_DEBUG + hpet_ram_writeb, + hpet_ram_writew, +#else + NULL, + NULL, +#endif + hpet_ram_writel, +}; + +static void hpet_reset(void *opaque) { + HPETState *s = opaque; + int i; + static int count = 0; + + for (i=0; itimer[i]; + hpet_del_timer(timer); + timer->tn = i; + timer->cmp = ~0ULL; + timer->config = HPET_TN_PERIODIC_CAP | HPET_TN_SIZE_CAP; + /* advertise availability of irqs 5,10,11 */ + timer->config |= 0x00000c20ULL << 32; + timer->state = s; + timer->period = 0ULL; + timer->wrap_flag = 0; + } + + s->hpet_counter = 0ULL; + s->hpet_offset = 0ULL; + /* 64-bit main counter; 3 timers supported; LegacyReplacementRoute. */ + s->capability = 0x8086a201ULL; + s->capability |= ((HPET_CLK_PERIOD) << 32); + if (count > 0) + /* we don't enable pit when hpet_reset is first called (by hpet_init) + * because hpet is taking over for pit here. On subsequent invocations, + * hpet_reset is called due to system reset. At this point control must + * be returned to pit until SW reenables hpet. + */ + hpet_pit_enable(); + count = 1; +} + + +void hpet_init(qemu_irq *irq) { + int i, iomemtype; + HPETState *s; + + dprintf ("hpet_init\n"); + + s = qemu_mallocz(sizeof(HPETState)); + hpet_statep = s; + s->irqs = irq; + for (i=0; itimer[i]; + timer->qemu_timer = qemu_new_timer(vm_clock, hpet_timer, timer); + } + hpet_reset(s); + register_savevm("hpet", -1, 1, hpet_save, hpet_load, s); + qemu_register_reset(hpet_reset, s); + /* HPET Area */ + iomemtype = cpu_register_io_memory(0, hpet_ram_read, + hpet_ram_write, s); + cpu_register_physical_memory(HPET_BASE, 0x400, iomemtype); +} diff --git a/hw/hpet_emul.h b/hw/hpet_emul.h new file mode 100644 index 0000000000..93a277e263 --- /dev/null +++ b/hw/hpet_emul.h @@ -0,0 +1,85 @@ +/* + * QEMU Emulated HPET support + * + * Copyright IBM, Corp. 2008 + * + * Authors: + * Beth Kon + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + * + */ +#ifndef QEMU_HPET_EMUL_H +#define QEMU_HPET_EMUL_H + +#define HPET_BASE 0xfed00000 +#define HPET_CLK_PERIOD 10000000ULL /* 10000000 femtoseconds == 10ns*/ + +#define FS_PER_NS 1000000 +#define HPET_NUM_TIMERS 3 +#define HPET_TIMER_TYPE_LEVEL 1 +#define HPET_TIMER_TYPE_EDGE 0 +#define HPET_TIMER_DELIVERY_APIC 0 +#define HPET_TIMER_DELIVERY_FSB 1 +#define HPET_TIMER_CAP_FSB_INT_DEL (1 << 15) +#define HPET_TIMER_CAP_PER_INT (1 << 4) + +#define HPET_CFG_ENABLE 0x001 +#define HPET_CFG_LEGACY 0x002 + +#define HPET_ID 0x000 +#define HPET_PERIOD 0x004 +#define HPET_CFG 0x010 +#define HPET_STATUS 0x020 +#define HPET_COUNTER 0x0f0 +#define HPET_TN_CFG 0x000 +#define HPET_TN_CMP 0x008 +#define HPET_TN_ROUTE 0x010 + + +#define HPET_TN_ENABLE 0x004 +#define HPET_TN_PERIODIC 0x008 +#define HPET_TN_PERIODIC_CAP 0x010 +#define HPET_TN_SIZE_CAP 0x020 +#define HPET_TN_SETVAL 0x040 +#define HPET_TN_32BIT 0x100 +#define HPET_TN_INT_ROUTE_MASK 0x3e00 +#define HPET_TN_INT_ROUTE_SHIFT 9 +#define HPET_TN_INT_ROUTE_CAP_SHIFT 32 +#define HPET_TN_CFG_BITS_READONLY_OR_RESERVED 0xffff80b1U + +struct HPETState; +typedef struct HPETTimer { /* timers */ + uint8_t tn; /*timer number*/ + QEMUTimer *qemu_timer; + struct HPETState *state; + /* Memory-mapped, software visible timer registers */ + uint64_t config; /* configuration/cap */ + uint64_t cmp; /* comparator */ + uint64_t fsb; /* FSB route, not supported now */ + /* Hidden register state */ + uint64_t period; /* Last value written to comparator */ + uint8_t wrap_flag; /* timer pop will indicate wrap for one-shot 32-bit + * mode. Next pop will be actual timer expiration. + */ +} HPETTimer; + +typedef struct HPETState { + uint64_t hpet_offset; + qemu_irq *irqs; + HPETTimer timer[HPET_NUM_TIMERS]; + + /* Memory-mapped, software visible registers */ + uint64_t capability; /* capabilities */ + uint64_t config; /* configuration */ + uint64_t isr; /* interrupt status reg */ + uint64_t hpet_counter; /* main counter */ +} HPETState; + +#if defined TARGET_I386 || defined TARGET_X86_64 +extern uint32_t hpet_in_legacy_mode(void); +extern void hpet_init(qemu_irq *irq); +#endif + +#endif diff --git a/hw/i8254.c b/hw/i8254.c index 4813b0374c..16257872d9 100644 --- a/hw/i8254.c +++ b/hw/i8254.c @@ -463,6 +463,27 @@ static void pit_reset(void *opaque) } } +/* When HPET is operating in legacy mode, i8254 timer0 is disabled */ +void hpet_pit_disable(void) { + PITChannelState *s; + s = &pit_state.channels[0]; + qemu_del_timer(s->irq_timer); +} + +/* When HPET is reset or leaving legacy mode, it must reenable i8254 + * timer 0 + */ + +void hpet_pit_enable(void) +{ + PITState *pit = &pit_state; + PITChannelState *s; + s = &pit->channels[0]; + s->mode = 3; + s->gate = 1; + pit_load_count(s, 0); +} + PITState *pit_init(int base, qemu_irq irq) { PITState *pit = &pit_state; diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c index ac41a947b8..d25b52b4d3 100644 --- a/hw/mc146818rtc.c +++ b/hw/mc146818rtc.c @@ -26,6 +26,7 @@ #include "sysemu.h" #include "pc.h" #include "isa.h" +#include "hpet_emul.h" //#define DEBUG_CMOS @@ -69,6 +70,18 @@ struct RTCState { QEMUTimer *second_timer2; }; +static void rtc_irq_raise(qemu_irq irq) { + /* When HPET is operating in legacy mode, RTC interrupts are disabled + * We block qemu_irq_raise, but not qemu_irq_lower, in case legacy + * mode is established while interrupt is raised. We want it to + * be lowered in any case + */ +#if defined TARGET_I386 || defined TARGET_X86_64 + if (!hpet_in_legacy_mode()) +#endif + qemu_irq_raise(irq); +} + static void rtc_set_time(RTCState *s); static void rtc_copy_date(RTCState *s); @@ -78,8 +91,14 @@ static void rtc_timer_update(RTCState *s, int64_t current_time) int64_t cur_clock, next_irq_clock; period_code = s->cmos_data[RTC_REG_A] & 0x0f; - if (period_code != 0 && - (s->cmos_data[RTC_REG_B] & REG_B_PIE)) { +#if defined TARGET_I386 || defined TARGET_X86_64 + /* disable periodic timer if hpet is in legacy mode, since interrupts are + * disabled anyway. + */ + if (period_code != 0 && (s->cmos_data[RTC_REG_B] & REG_B_PIE) && !hpet_in_legacy_mode()) { +#else + if (period_code != 0 && (s->cmos_data[RTC_REG_B] & REG_B_PIE)) { +#endif if (period_code <= 2) period_code += 7; /* period in 32 Khz cycles */ @@ -100,7 +119,7 @@ static void rtc_periodic_timer(void *opaque) rtc_timer_update(s, s->next_periodic_time); s->cmos_data[RTC_REG_C] |= 0xc0; - qemu_irq_raise(s->irq); + rtc_irq_raise(s->irq); } static void cmos_ioport_write(void *opaque, uint32_t addr, uint32_t data) @@ -319,14 +338,14 @@ static void rtc_update_second2(void *opaque) s->cmos_data[RTC_HOURS_ALARM] == s->current_tm.tm_hour)) { s->cmos_data[RTC_REG_C] |= 0xa0; - qemu_irq_raise(s->irq); + rtc_irq_raise(s->irq); } } /* update ended interrupt */ if (s->cmos_data[RTC_REG_B] & REG_B_UIE) { s->cmos_data[RTC_REG_C] |= 0x90; - qemu_irq_raise(s->irq); + rtc_irq_raise(s->irq); } /* clear update in progress bit */ diff --git a/hw/pc.c b/hw/pc.c index fe03704288..64c08a4342 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -35,6 +35,7 @@ #include "fw_cfg.h" #include "virtio-blk.h" #include "virtio-balloon.h" +#include "hpet_emul.h" /* output Bochs bios info messages */ //#define DEBUG_BIOS @@ -977,6 +978,9 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size, } pit = pit_init(0x40, i8259[0]); pcspk_init(pit); + if (!no_hpet) { + hpet_init(i8259); + } if (pci_enabled) { pic_set_alt_irq_func(isa_pic, ioapic_set_irq, ioapic); } diff --git a/hw/pc.h b/hw/pc.h index b0b8970496..8433084221 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -97,6 +97,9 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, void piix4_smbus_register_device(SMBusDevice *dev, uint8_t addr); void acpi_bios_init(void); +/* hpet.c */ +extern int no_hpet; + /* pcspk.c */ void pcspk_init(PITState *); int pcspk_audio_init(AudioState *, qemu_irq *pic); diff --git a/monitor.c b/monitor.c index 0d55433172..042d2b0bd7 100644 --- a/monitor.c +++ b/monitor.c @@ -252,6 +252,11 @@ static void do_info_name(void) term_printf("%s\n", qemu_name); } +static void do_info_hpet(void) +{ + term_printf("HPET is %s by QEMU\n", (no_hpet) ? "disabled" : "enabled"); +} + static void do_info_uuid(void) { term_printf(UUID_FMT "\n", qemu_uuid[0], qemu_uuid[1], qemu_uuid[2], @@ -1531,6 +1536,8 @@ static const term_cmd_t info_cmds[] = { "", "show virtual to physical memory mappings", }, { "mem", "", mem_info, "", "show the active virtual memory mappings", }, + { "hpet", "", do_info_hpet, + "", "show state of HPET", }, #endif { "jit", "", do_info_jit, "", "show dynamic compiler info", }, diff --git a/pc-bios/bios-pq/0005_hpet.patch b/pc-bios/bios-pq/0005_hpet.patch new file mode 100644 index 0000000000..9347cb501e --- /dev/null +++ b/pc-bios/bios-pq/0005_hpet.patch @@ -0,0 +1,190 @@ +BOCHS BIOS changes to support HPET in QEMU. + +Signed-off-by Beth Kon + +Index: bochs-2.3.7/bios/acpi-dsdt.dsl +=================================================================== +--- bochs-2.3.7.orig/bios/acpi-dsdt.dsl 2008-10-15 12:39:14.000000000 -0500 ++++ bochs-2.3.7/bios/acpi-dsdt.dsl 2008-10-28 07:58:40.000000000 -0500 +@@ -159,6 +159,26 @@ + Return (MEMP) + } + } ++#ifdef BX_QEMU ++ Device(HPET) { ++ Name(_HID, EISAID("PNP0103")) ++ Name(_UID, 0) ++ Method (_STA, 0, NotSerialized) { ++ Return(0x0F) ++ } ++ Name(_CRS, ResourceTemplate() { ++ DWordMemory( ++ ResourceConsumer, PosDecode, MinFixed, MaxFixed, ++ NonCacheable, ReadWrite, ++ 0x00000000, ++ 0xFED00000, ++ 0xFED003FF, ++ 0x00000000, ++ 0x00000400 /* 1K memory: FED00000 - FED003FF */ ++ ) ++ }) ++ } ++#endif + } + + Scope(\_SB.PCI0) { +Index: bochs-2.3.7/bios/rombios32.c +=================================================================== +--- bochs-2.3.7.orig/bios/rombios32.c 2008-10-15 12:39:36.000000000 -0500 ++++ bochs-2.3.7/bios/rombios32.c 2008-11-12 14:41:41.000000000 -0600 +@@ -1087,7 +1087,11 @@ + struct rsdt_descriptor_rev1 + { + ACPI_TABLE_HEADER_DEF /* ACPI common table header */ ++#ifdef BX_QEMU ++ uint32_t table_offset_entry [4]; /* Array of pointers to other */ ++#else + uint32_t table_offset_entry [3]; /* Array of pointers to other */ ++#endif + /* ACPI tables */ + }; + +@@ -1227,6 +1231,32 @@ + #endif + }; + ++#ifdef BX_QEMU ++/* ++ * * ACPI 2.0 Generic Address Space definition. ++ * */ ++struct acpi_20_generic_address { ++ uint8_t address_space_id; ++ uint8_t register_bit_width; ++ uint8_t register_bit_offset; ++ uint8_t reserved; ++ uint64_t address; ++}; ++ ++/* ++ * * HPET Description Table ++ * */ ++struct acpi_20_hpet { ++ ACPI_TABLE_HEADER_DEF /* ACPI common table header */ ++ uint32_t timer_block_id; ++ struct acpi_20_generic_address addr; ++ uint8_t hpet_number; ++ uint16_t min_tick; ++ uint8_t page_protect; ++}; ++#define ACPI_HPET_ADDRESS 0xFED00000UL ++#endif ++ + struct madt_io_apic + { + APIC_HEADER_DEF +@@ -1237,6 +1267,17 @@ + * lines start */ + }; + ++#ifdef BX_QEMU ++struct madt_int_override ++{ ++ APIC_HEADER_DEF ++ uint8_t bus; /* Identifies ISA Bus */ ++ uint8_t source; /* Bus-relative interrupt source */ ++ uint32_t gsi; /* GSI that source will signal */ ++ uint16_t flags; /* MPS INTI flags */ ++}; ++#endif ++ + #include "acpi-dsdt.hex" + + static inline uint16_t cpu_to_le16(uint16_t x) +@@ -1342,6 +1383,10 @@ + struct facs_descriptor_rev1 *facs; + struct multiple_apic_table *madt; + uint8_t *dsdt, *ssdt; ++#ifdef BX_QEMU ++ struct acpi_20_hpet *hpet; ++ uint32_t hpet_addr; ++#endif + uint32_t base_addr, rsdt_addr, fadt_addr, addr, facs_addr, dsdt_addr, ssdt_addr; + uint32_t acpi_tables_size, madt_addr, madt_size; + int i; +@@ -1384,10 +1429,21 @@ + madt_addr = addr; + madt_size = sizeof(*madt) + + sizeof(struct madt_processor_apic) * smp_cpus + ++#ifdef BX_QEMU ++ sizeof(struct madt_io_apic) + sizeof(struct madt_int_override); ++#else + sizeof(struct madt_io_apic); ++#endif + madt = (void *)(addr); + addr += madt_size; + ++#ifdef BX_QEMU ++ addr = (addr + 7) & ~7; ++ hpet_addr = addr; ++ hpet = (void *)(addr); ++ addr += sizeof(*hpet); ++#endif ++ + acpi_tables_size = addr - base_addr; + + BX_INFO("ACPI tables: RSDP addr=0x%08lx ACPI DATA addr=0x%08lx size=0x%x\n", +@@ -1410,6 +1466,9 @@ + rsdt->table_offset_entry[0] = cpu_to_le32(fadt_addr); + rsdt->table_offset_entry[1] = cpu_to_le32(madt_addr); + rsdt->table_offset_entry[2] = cpu_to_le32(ssdt_addr); ++#ifdef BX_QEMU ++ rsdt->table_offset_entry[3] = cpu_to_le32(hpet_addr); ++#endif + acpi_build_table_header((struct acpi_table_header *)rsdt, + "RSDT", sizeof(*rsdt), 1); + +@@ -1448,6 +1507,9 @@ + { + struct madt_processor_apic *apic; + struct madt_io_apic *io_apic; ++#ifdef BX_QEMU ++ struct madt_int_override *int_override; ++#endif + + memset(madt, 0, madt_size); + madt->local_apic_address = cpu_to_le32(0xfee00000); +@@ -1467,10 +1529,34 @@ + io_apic->io_apic_id = smp_cpus; + io_apic->address = cpu_to_le32(0xfec00000); + io_apic->interrupt = cpu_to_le32(0); ++#ifdef BX_QEMU ++ io_apic++; ++ ++ int_override = (void *)io_apic; ++ int_override->type = APIC_XRUPT_OVERRIDE; ++ int_override->length = sizeof(*int_override); ++ int_override->bus = cpu_to_le32(0); ++ int_override->source = cpu_to_le32(0); ++ int_override->gsi = cpu_to_le32(2); ++ int_override->flags = cpu_to_le32(0); ++#endif + + acpi_build_table_header((struct acpi_table_header *)madt, + "APIC", madt_size, 1); + } ++ ++#ifdef BX_QEMU ++ /* HPET */ ++ memset(hpet, 0, sizeof(*hpet)); ++ /* Note timer_block_id value must be kept in sync with value advertised by ++ * emulated hpet ++ */ ++ hpet->timer_block_id = cpu_to_le32(0x8086a201); ++ hpet->addr.address = cpu_to_le32(ACPI_HPET_ADDRESS); ++ acpi_build_table_header((struct acpi_table_header *)hpet, ++ "HPET", sizeof(*hpet), 1); ++#endif ++ + } + + /* SMBIOS entry point -- must be written to a 16-bit aligned address diff --git a/pc-bios/bios-pq/series b/pc-bios/bios-pq/series index 96a4f9d8dc..beff2c6d44 100644 --- a/pc-bios/bios-pq/series +++ b/pc-bios/bios-pq/series @@ -2,3 +2,4 @@ 0002_e820-high-mem.patch 0003_smp-startup-poll.patch 0004_no-stack-protector.patch +0005_hpet.patch diff --git a/pc-bios/bios.bin b/pc-bios/bios.bin index 4aa218b28ccc6e4202026fb4872882361ddb67b1..c401d25ca9cffaba97bbcfd0a4c5df2629550d31 100644 GIT binary patch delta 22023 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 delta 21901 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 Ee=sSfEC2ui diff --git a/vl.c b/vl.c index 0a021515ab..66dd975f84 100644 --- a/vl.c +++ b/vl.c @@ -224,6 +224,7 @@ int usb_enabled = 0; int smp_cpus = 1; const char *vnc_display; int acpi_enabled = 1; +int no_hpet = 0; int fd_bootchk = 1; int no_reboot = 0; int no_shutdown = 0; @@ -3956,6 +3957,7 @@ static void help(int exitcode) #endif #ifdef TARGET_I386 "-no-acpi disable ACPI\n" + "-no-hpet disable HPET\n" #endif #ifdef CONFIG_CURSES "-curses use a curses/ncurses interface instead of SDL\n" @@ -4067,6 +4069,7 @@ enum { QEMU_OPTION_smp, QEMU_OPTION_vnc, QEMU_OPTION_no_acpi, + QEMU_OPTION_no_hpet, QEMU_OPTION_curses, QEMU_OPTION_no_reboot, QEMU_OPTION_no_shutdown, @@ -4180,6 +4183,7 @@ static const QEMUOption qemu_options[] = { /* temporary options */ { "usb", 0, QEMU_OPTION_usb }, { "no-acpi", 0, QEMU_OPTION_no_acpi }, + { "no-hpet", 0, QEMU_OPTION_no_hpet }, { "no-reboot", 0, QEMU_OPTION_no_reboot }, { "no-shutdown", 0, QEMU_OPTION_no_shutdown }, { "show-cursor", 0, QEMU_OPTION_show_cursor }, @@ -5017,6 +5021,9 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_no_acpi: acpi_enabled = 0; break; + case QEMU_OPTION_no_hpet: + no_hpet = 1; + break; case QEMU_OPTION_no_reboot: no_reboot = 1; break; -- GitLab