From: Beth Kon <eak@us.ibm.com>
To: avi@redhat.com
Cc: kvm@vger.kernel.org, Beth Kon <eak@us.ibm.com>
Subject: [PATCH 3/5] BIOS changes for qemu-kvm hpet support (v9)
Date: Tue, 7 Jul 2009 11:50:36 -0400 [thread overview]
Message-ID: <1246981838-20465-3-git-send-email-eak@us.ibm.com> (raw)
In-Reply-To: <1246981838-20465-1-git-send-email-eak@us.ibm.com>
Advertise HPET in ACPI HPET table
Signed-off-by: Beth Kon <eak@us.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
---
kvm/bios/acpi-dsdt.dsl | 2 --
kvm/bios/rombios32.c | 11 +++--------
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/kvm/bios/acpi-dsdt.dsl b/kvm/bios/acpi-dsdt.dsl
index 3560baa..26fc7ad 100755
--- a/kvm/bios/acpi-dsdt.dsl
+++ b/kvm/bios/acpi-dsdt.dsl
@@ -194,7 +194,6 @@ DefinitionBlock (
})
}
#ifdef BX_QEMU
-#ifdef HPET_WORKS_IN_KVM
Device(HPET) {
Name(_HID, EISAID("PNP0103"))
Name(_UID, 0)
@@ -214,7 +213,6 @@ DefinitionBlock (
})
}
#endif
-#endif
}
Scope(\_SB.PCI0) {
diff --git a/kvm/bios/rombios32.c b/kvm/bios/rombios32.c
index f9e0452..28f2b21 100755
--- a/kvm/bios/rombios32.c
+++ b/kvm/bios/rombios32.c
@@ -1526,8 +1526,8 @@ struct acpi_20_generic_address {
} __attribute__((__packed__));
/*
- * * HPET Description Table
- * */
+ * HPET Description Table
+ */
struct acpi_20_hpet {
ACPI_TABLE_HEADER_DEF /* ACPI common table header */
uint32_t timer_block_id;
@@ -1716,13 +1716,11 @@ void acpi_bios_init(void)
addr += madt_size;
#ifdef BX_QEMU
-#ifdef HPET_WORKS_IN_KVM
addr = (addr + 7) & ~7;
hpet_addr = addr;
hpet = (void *)(addr);
addr += sizeof(*hpet);
#endif
-#endif
/* RSDP */
memset(rsdp, 0, sizeof(*rsdp));
@@ -1900,7 +1898,6 @@ void acpi_bios_init(void)
}
/* HPET */
-#ifdef HPET_WORKS_IN_KVM
memset(hpet, 0, sizeof(*hpet));
/* Note timer_block_id value must be kept in sync with value advertised by
* emulated hpet
@@ -1909,7 +1906,6 @@ void acpi_bios_init(void)
hpet->addr.address = cpu_to_le32(ACPI_HPET_ADDRESS);
acpi_build_table_header((struct acpi_table_header *)hpet,
"HPET", sizeof(*hpet), 1);
-#endif
#endif
@@ -1919,8 +1915,7 @@ void acpi_bios_init(void)
rsdt->table_offset_entry[nb_rsdt_entries++] = cpu_to_le32(ssdt_addr);
rsdt->table_offset_entry[nb_rsdt_entries++] = cpu_to_le32(madt_addr);
#ifdef BX_QEMU
- /* No HPET (yet) */
-// rsdt->table_offset_entry[nb_rsdt_entries++] = cpu_to_le32(hpet_addr);
+ rsdt->table_offset_entry[nb_rsdt_entries++] = cpu_to_le32(hpet_addr);
if (nb_numa_nodes > 0)
rsdt->table_offset_entry[nb_rsdt_entries++] = cpu_to_le32(srat_addr);
acpi_additional_tables(); /* resets cfg to required entry */
next prev parent reply other threads:[~2009-07-07 15:47 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-07 15:50 [PATCH 1/5] BIOS changes for irq0->inti2 override (v9) Beth Kon
2009-07-07 15:50 ` [PATCH 2/5] Userspace changes for irq0->inti2 override support (v9) Beth Kon
2009-07-07 15:50 ` Beth Kon [this message]
2009-07-07 15:50 ` [PATCH 4/5] Userspace changes for qemu-kvm HPET support(v9) Beth Kon
2009-07-07 15:50 ` [PATCH 5/5] Kernel changes for HPET legacy support(v9) Beth Kon
2009-07-08 12:01 ` [PATCH 1/5] BIOS changes for irq0->inti2 override (v9) Avi Kivity
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1246981838-20465-3-git-send-email-eak@us.ibm.com \
--to=eak@us.ibm.com \
--cc=avi@redhat.com \
--cc=kvm@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).