From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41431) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ai0i3-00071v-5C for qemu-devel@nongnu.org; Mon, 21 Mar 2016 10:21:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ai0hz-0002h8-3G for qemu-devel@nongnu.org; Mon, 21 Mar 2016 10:21:31 -0400 Received: from e35.co.us.ibm.com ([32.97.110.153]:39950) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ai0hy-0002fu-P7 for qemu-devel@nongnu.org; Mon, 21 Mar 2016 10:21:27 -0400 Received: from localhost by e35.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 21 Mar 2016 08:21:24 -0600 Received: from b03cxnp08028.gho.boulder.ibm.com (b03cxnp08028.gho.boulder.ibm.com [9.17.130.20]) by d03dlp01.boulder.ibm.com (Postfix) with ESMTP id 743A41FF0026 for ; Mon, 21 Mar 2016 08:09:27 -0600 (MDT) Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by b03cxnp08028.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u2LELIIf28704846 for ; Mon, 21 Mar 2016 07:21:18 -0700 Received: from d03av03.boulder.ibm.com (localhost [127.0.0.1]) by d03av03.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u2LELGmN016688 for ; Mon, 21 Mar 2016 08:21:18 -0600 From: Stefan Berger Date: Mon, 21 Mar 2016 10:21:11 -0400 Message-Id: <1458570071-1935-1-git-send-email-stefanb@us.ibm.com> Subject: [Qemu-devel] [PATCH] acpi: Fix TPM ACPI description to make TPM usable on Windows List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: mst@redhat.com, qemu-devel@nongnu.org Cc: Stefan Berger , Stefan Berger , crobinso@redhat.com This patch addresses BZ 1281413. Fix the APCI description to make it work on Windows again. The ACPI description was broken in commit 9e47226. Signed-off-by: Stefan Berger --- hw/i386/acpi-build.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 325d8ce..c6e90b6 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2334,22 +2334,20 @@ build_dsdt(GArray *table_data, GArray *linker, Aml *scope = aml_scope("PCI0"); /* Scan all PCI buses. Generate tables to support hotplug. */ build_append_pci_bus_devices(scope, bus, pm->pcihp_bridge_en); - - if (misc->tpm_version != TPM_VERSION_UNSPEC) { - dev = aml_device("ISA.TPM"); - aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0C31"))); - aml_append(dev, aml_name_decl("_STA", aml_int(0xF))); - crs = aml_resource_template(); - aml_append(crs, aml_memory32_fixed(TPM_TIS_ADDR_BASE, - TPM_TIS_ADDR_SIZE, AML_READ_WRITE)); - aml_append(crs, aml_irq_no_flags(TPM_TIS_IRQ)); - aml_append(dev, aml_name_decl("_CRS", crs)); - aml_append(scope, dev); - } - - aml_append(sb_scope, scope); } } + + if (misc->tpm_version != TPM_VERSION_UNSPEC) { + dev = aml_device("TPM"); + aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0C31"))); + aml_append(dev, aml_name_decl("_STA", aml_int(0xF))); + crs = aml_resource_template(); + aml_append(crs, aml_memory32_fixed(TPM_TIS_ADDR_BASE, + TPM_TIS_ADDR_SIZE, AML_READ_WRITE)); + //aml_append(crs, aml_irq_no_flags(TPM_TIS_IRQ)); + aml_append(dev, aml_name_decl("_CRS", crs)); + aml_append(sb_scope, dev); + } aml_append(dsdt, sb_scope); } -- 2.4.3