From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38688) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ai1oj-0005EN-Vd for qemu-devel@nongnu.org; Mon, 21 Mar 2016 11:32:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ai1oe-0003t9-1v for qemu-devel@nongnu.org; Mon, 21 Mar 2016 11:32:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40593) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ai1od-0003sx-T1 for qemu-devel@nongnu.org; Mon, 21 Mar 2016 11:32:23 -0400 References: <1458570071-1935-1-git-send-email-stefanb@us.ibm.com> From: Cole Robinson Message-ID: <56F01406.4040100@redhat.com> Date: Mon, 21 Mar 2016 11:32:22 -0400 MIME-Version: 1.0 In-Reply-To: <1458570071-1935-1-git-send-email-stefanb@us.ibm.com> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Subject: Re: [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: Stefan Berger , mst@redhat.com, qemu-devel@nongnu.org Cc: Stefan Berger On 03/21/2016 10:21 AM, Stefan Berger wrote: > This patch addresses BZ 1281413. > That is, https://bugzilla.redhat.com/show_bug.cgi?id=1281413 . Fedora 23 bug report from a TPM user > 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); > } > > After this, TPM shows up as functional in windows 10 device manager. Prior to this patch it had a warning icon. Tested-by: Cole Robinson - Cole