[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 16/21] HPET support.
From: |
Gleb Natapov |
Subject: |
[Qemu-devel] [PATCH 16/21] HPET support. |
Date: |
Thu, 8 Oct 2009 17:59:21 +0200 |
Part of qemu pcbios commit e04da91178f0e11febbbd61d9795e49cc27e9ad4
Signed-off-by: Gleb Natapov <address@hidden>
---
src/acpi-dsdt.dsl | 19 +++++++++++++++++++
src/acpi.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 65 insertions(+), 0 deletions(-)
diff --git a/src/acpi-dsdt.dsl b/src/acpi-dsdt.dsl
index 4cd6f6a..c7e6547 100644
--- a/src/acpi-dsdt.dsl
+++ b/src/acpi-dsdt.dsl
@@ -165,6 +165,25 @@ DefinitionBlock (
,, , AddressRangeMemory, TypeStatic)
})
}
+
+ 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 */
+ )
+ })
+ }
}
Scope(\_SB.PCI0) {
diff --git a/src/acpi.c b/src/acpi.c
index 7c96427..3e7efc8 100644
--- a/src/acpi.c
+++ b/src/acpi.c
@@ -206,6 +206,30 @@ struct madt_intsrcovr {
u16 flags;
} PACKED;
+/*
+ * ACPI 2.0 Generic Address Space definition.
+ */
+struct acpi_20_generic_address {
+ u8 address_space_id;
+ u8 register_bit_width;
+ u8 register_bit_offset;
+ u8 reserved;
+ u64 address;
+} PACKED;
+
+/*
+ * HPET Description Table
+ */
+struct acpi_20_hpet {
+ ACPI_TABLE_HEADER_DEF /* ACPI common table header */
+ u32 timer_block_id;
+ struct acpi_20_generic_address addr;
+ u8 hpet_number;
+ u16 min_tick;
+ u8 page_protect;
+} PACKED;
+#define ACPI_HPET_ADDRESS 0xFED00000UL
+
#include "acpi-dsdt.hex"
static inline u16 cpu_to_le16(u16 x)
@@ -402,6 +426,27 @@ build_ssdt(void)
return ssdt;
}
+#define HPET_SIGNATURE 0x54455048 //HPET
+static void*
+build_hpet(void)
+{
+ struct acpi_20_hpet *hpet = malloc_high(sizeof(*hpet));
+ if (!hpet) {
+ dprintf(1, "Not enough memory for hpet!\n");
+ return NULL;
+ }
+
+ 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);
+ build_header((void*)hpet, HPET_SIGNATURE, sizeof(*hpet), 1);
+
+ return hpet;
+}
+
struct rsdp_descriptor *RsdpAddr;
#define MAX_ACPI_TABLES 20
@@ -440,6 +485,7 @@ acpi_bios_init(void)
ACPI_INIT_TABLE(build_fadt(bdf));
ACPI_INIT_TABLE(build_ssdt());
ACPI_INIT_TABLE(build_madt());
+ ACPI_INIT_TABLE(build_hpet());
u16 i, external_tables = qemu_cfg_acpi_additional_tables();
--
1.6.3.3
- [Qemu-devel] [PATCH 07/21] Remove CONFIG_KVM compile option., (continued)
- [Qemu-devel] [PATCH 07/21] Remove CONFIG_KVM compile option., Gleb Natapov, 2009/10/08
- [Qemu-devel] [PATCH 06/21] Check at runtime if VM is KVM., Gleb Natapov, 2009/10/08
- [Qemu-devel] [PATCH 12/21] Use extended interrupt descriptor for pci irqs., Gleb Natapov, 2009/10/08
- [Qemu-devel] [PATCH v2 02/21] Load SMBIOS entries and files from qemu, Gleb Natapov, 2009/10/08
- [Qemu-devel] [PATCH 15/21] Pci hotplug support., Gleb Natapov, 2009/10/08
- [Qemu-devel] [PATCH 10/21] Advertise pci irqs as active high in DSDT, Gleb Natapov, 2009/10/08
- [Qemu-devel] [PATCH 05/21] irq0override provided by qemu., Gleb Natapov, 2009/10/08
- [Qemu-devel] [PATCH 14/21] Provide gpe _L0x methods., Gleb Natapov, 2009/10/08
- [Qemu-devel] [PATCH 16/21] HPET support.,
Gleb Natapov <=
- [Qemu-devel] [PATCH 09/21] Use preprocessor for pci link routing., Gleb Natapov, 2009/10/08
- [Qemu-devel] [PATCH 17/21] Add 26 pci slots, bringing the total to 32., Gleb Natapov, 2009/10/08
- [Qemu-devel] [PATCH 18/21] Add SRAT ACPI table support., Gleb Natapov, 2009/10/08
- [Qemu-devel] [PATCH 21/21] Use MaxCountCPUs during building of per cpu tables., Gleb Natapov, 2009/10/08
- [Qemu-devel] [PATCH 13/21] Remove irq 9 from the pci interrupt link resources., Gleb Natapov, 2009/10/08
- [Qemu-devel] [PATCH 20/21] Move qemu cfg init before smp init., Gleb Natapov, 2009/10/08