From patchwork Mon May 11 17:29:45 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Beth Kon X-Patchwork-Id: 23040 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 n4BHTVRN022542 for ; Mon, 11 May 2009 17:29:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757450AbZEKR31 (ORCPT ); Mon, 11 May 2009 13:29:27 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755314AbZEKR31 (ORCPT ); Mon, 11 May 2009 13:29:27 -0400 Received: from e9.ny.us.ibm.com ([32.97.182.139]:42415 "EHLO e9.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757363AbZEKR30 (ORCPT ); Mon, 11 May 2009 13:29:26 -0400 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by e9.ny.us.ibm.com (8.13.1/8.13.1) with ESMTP id n4BHI6WI013302 for ; Mon, 11 May 2009 13:18:06 -0400 Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id n4BHTQGH202124 for ; Mon, 11 May 2009 13:29:26 -0400 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n4BHTQ7C016032 for ; Mon, 11 May 2009 13:29:26 -0400 Received: from localhost.localdomain (sig-9-65-9-1.mts.ibm.com [9.65.9.1]) by d01av04.pok.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id n4BHT5cl015020; Mon, 11 May 2009 13:29:21 -0400 From: Beth Kon To: avi@redhat.com Cc: kvm@vger.kernel.org, Beth Kon Subject: [PATCH 3/4] BIOS changes for KVM HPET (v3) Date: Mon, 11 May 2009 13:29:45 -0400 Message-Id: <1242062986-29383-3-git-send-email-eak@us.ibm.com> X-Mailer: git-send-email 1.5.4.3 In-Reply-To: <1242062986-29383-1-git-send-email-eak@us.ibm.com> References: <1242062986-29383-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 --- 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 c756fed..0e142be 100755 --- a/kvm/bios/acpi-dsdt.dsl +++ b/kvm/bios/acpi-dsdt.dsl @@ -308,7 +308,6 @@ DefinitionBlock ( }) } #ifdef BX_QEMU -#ifdef HPET_WORKS_IN_KVM Device(HPET) { Name(_HID, EISAID("PNP0103")) Name(_UID, 0) @@ -328,7 +327,6 @@ DefinitionBlock ( }) } #endif -#endif } Scope(\_SB.PCI0) { diff --git a/kvm/bios/rombios32.c b/kvm/bios/rombios32.c index 53359b8..df83ee7 100755 --- a/kvm/bios/rombios32.c +++ b/kvm/bios/rombios32.c @@ -1519,8 +1519,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; @@ -1706,13 +1706,11 @@ void acpi_bios_init(void) #endif 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)); @@ -1884,7 +1882,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 @@ -1893,7 +1890,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++) { @@ -1913,8 +1909,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