From patchwork Fri Jun 12 01:46:44 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Beth Kon X-Patchwork-Id: 29675 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n5C1kTHl014554 for ; Fri, 12 Jun 2009 01:46:30 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758545AbZFLBps (ORCPT ); Thu, 11 Jun 2009 21:45:48 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757677AbZFLBps (ORCPT ); Thu, 11 Jun 2009 21:45:48 -0400 Received: from e37.co.us.ibm.com ([32.97.110.158]:56799 "EHLO e37.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751116AbZFLBpp (ORCPT ); Thu, 11 Jun 2009 21:45:45 -0400 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by e37.co.us.ibm.com (8.13.1/8.13.1) with ESMTP id n5C1j8jD028957 for ; Thu, 11 Jun 2009 19:45:08 -0600 Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id n5C1jmWP248604 for ; Thu, 11 Jun 2009 19:45:48 -0600 Received: from d03av03.boulder.ibm.com (loopback [127.0.0.1]) by d03av03.boulder.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n5C1jl8s025595 for ; Thu, 11 Jun 2009 19:45:48 -0600 Received: from localhost.localdomain (sig-9-65-123-8.mts.ibm.com [9.65.123.8]) by d03av03.boulder.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id n5C1jjdd025531; Thu, 11 Jun 2009 19:45:47 -0600 From: Beth Kon To: avi@redhat.com Cc: kvm@vger.kernel.org, Beth Kon Subject: [PATCH 3/5] BIOS changes for KVM HPET (v6) Date: Thu, 11 Jun 2009 21:46:44 -0400 Message-Id: <1244771206-19872-3-git-send-email-eak@us.ibm.com> X-Mailer: git-send-email 1.5.4.3 In-Reply-To: <1244771206-19872-1-git-send-email-eak@us.ibm.com> References: <1244771206-19872-1-git-send-email-eak@us.ibm.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Signed-off-by: Beth Kon --- kvm/bios/acpi-dsdt.dsl | 2 -- kvm/bios/rombios32.c | 11 +++-------- 2 files changed, 3 insertions(+), 10 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/kvm/bios/acpi-dsdt.dsl b/kvm/bios/acpi-dsdt.dsl index db57307..71d0a5e 100755 --- a/kvm/bios/acpi-dsdt.dsl +++ b/kvm/bios/acpi-dsdt.dsl @@ -296,7 +296,6 @@ DefinitionBlock ( }) } #ifdef BX_QEMU -#ifdef HPET_WORKS_IN_KVM Device(HPET) { Name(_HID, EISAID("PNP0103")) Name(_UID, 0) @@ -316,7 +315,6 @@ DefinitionBlock ( }) } #endif -#endif } Scope(\_SB.PCI0) { diff --git a/kvm/bios/rombios32.c b/kvm/bios/rombios32.c index 9d6910e..1106f38 100755 --- a/kvm/bios/rombios32.c +++ b/kvm/bios/rombios32.c @@ -1518,8 +1518,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; @@ -1703,13 +1703,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)); @@ -1883,7 +1881,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 @@ -1892,7 +1889,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 acpi_additional_tables(); /* resets cfg to required entry */ for(i = 0; i < external_tables; i++) { @@ -1912,8 +1908,7 @@ void acpi_bios_init(void) /* kvm has no ssdt (processors are in dsdt) */ // rsdt->table_offset_entry[nb_rsdt_entries++] = cpu_to_le32(ssdt_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); #endif