On Fri, 25 Jan 2019 16:00:58 -0500 Stefan Berger <stef...@linux.ibm.com> wrote:
> This patch makes the a TPM 2.0 with TIS interface available under the > HID 'MSF0101'. This is supported by Linux and also Windows now > recognizes the TPM 2.0 with TIS interface. Leave the TPM 1.2 as before. > > Signed-off-by: Stefan Berger <stef...@linux.ibm.com> Reviewed-by: Igor Mammedov <imamm...@redhat.com> > --- > hw/i386/acpi-build.c | 12 ++++++++++-- > 1 file changed, 10 insertions(+), 2 deletions(-) > > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index 2e21a31f82..f51225b4a7 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -2141,8 +2141,16 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, > build_append_pci_bus_devices(scope, bus, pm->pcihp_bridge_en); > > if (TPM_IS_TIS(tpm)) { > - dev = aml_device("ISA.TPM"); > - aml_append(dev, aml_name_decl("_HID", > aml_eisaid("PNP0C31"))); > + if (misc->tpm_version == TPM_VERSION_2_0) { > + dev = aml_device("TPM"); > + aml_append(dev, aml_name_decl("_HID", > + aml_string("MSFT0101"))); > + } else { > + 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,