diff options
| -rw-r--r-- | hw/hpet.c | 16 | ||||
| -rw-r--r-- | hw/hpet_emul.h | 15 | ||||
| -rw-r--r-- | hw/pc.c | 3 |
3 files changed, 34 insertions, 0 deletions
@@ -71,8 +71,11 @@ typedef struct HPETState { uint64_t config; /* configuration */ uint64_t isr; /* interrupt status reg */ uint64_t hpet_counter; /* main counter */ + uint8_t hpet_id; /* instance id */ } HPETState; +struct hpet_fw_config hpet_cfg = {.count = ~0}; + static uint32_t hpet_in_legacy_mode(HPETState *s) { return s->config & HPET_CFG_LEGACY; @@ -228,6 +231,7 @@ static int hpet_post_load(void *opaque, int version_id) /* Push number of timers into capability returned via HPET_ID */ s->capability &= ~HPET_ID_NUM_TIM_MASK; s->capability |= (s->num_timers - 1) << HPET_ID_NUM_TIM_SHIFT; + hpet_cfg.hpet[s->hpet_id].event_timer_block_id = (uint32_t)s->capability; /* Derive HPET_MSI_SUPPORT from the capability of the first timer. */ s->flags &= ~(1 << HPET_MSI_SUPPORT); @@ -657,6 +661,8 @@ static void hpet_reset(DeviceState *d) */ hpet_pit_enable(); } + hpet_cfg.hpet[s->hpet_id].event_timer_block_id = (uint32_t)s->capability; + hpet_cfg.hpet[s->hpet_id].address = sysbus_from_qdev(d)->mmio[0].addr; count = 1; } @@ -676,6 +682,16 @@ static int hpet_init(SysBusDevice *dev) int i, iomemtype; HPETTimer *timer; + if (hpet_cfg.count == ~0) /* first instance */ + hpet_cfg.count = 0; + + if (hpet_cfg.count == 8) { + fprintf(stderr, "Only 8 instances of HPET is allowed\n"); + return -1; + } + + s->hpet_id = hpet_cfg.count++; + for (i = 0; i < HPET_NUM_IRQ_ROUTES; i++) { sysbus_init_irq(dev, &s->irqs[i]); } diff --git a/hw/hpet_emul.h b/hw/hpet_emul.h index d7bc102c22..8bf312ab21 100644 --- a/hw/hpet_emul.h +++ b/hw/hpet_emul.h @@ -53,4 +53,19 @@ #define HPET_TN_INT_ROUTE_CAP_SHIFT 32 #define HPET_TN_CFG_BITS_READONLY_OR_RESERVED 0xffff80b1U +struct hpet_fw_entry +{ + uint32_t event_timer_block_id; + uint64_t address; + uint16_t min_tick; + uint8_t page_prot; +} __attribute__ ((packed)); + +struct hpet_fw_config +{ + uint8_t count; + struct hpet_fw_entry hpet[8]; +} __attribute__ ((packed)); + +extern struct hpet_fw_config hpet_cfg; #endif @@ -62,6 +62,7 @@ #define FW_CFG_SMBIOS_ENTRIES (FW_CFG_ARCH_LOCAL + 1) #define FW_CFG_IRQ0_OVERRIDE (FW_CFG_ARCH_LOCAL + 2) #define FW_CFG_E820_TABLE (FW_CFG_ARCH_LOCAL + 3) +#define FW_CFG_HPET (FW_CFG_ARCH_LOCAL + 4) #define E820_NR_ENTRIES 16 @@ -485,6 +486,8 @@ static void *bochs_bios_init(void) fw_cfg_add_bytes(fw_cfg, FW_CFG_E820_TABLE, (uint8_t *)&e820_table, sizeof(struct e820_table)); + fw_cfg_add_bytes(fw_cfg, FW_CFG_HPET, (uint8_t *)&hpet_cfg, + sizeof(struct hpet_fw_config)); /* allocate memory for the NUMA channel: one (64bit) word for the number * of nodes, one word for each VCPU->node and one word for each node to * hold the amount of memory. |