Commit 24cf5413 authored by Stefan Berger's avatar Stefan Berger Committed by Michael S. Tsirkin
Browse files

acpi: Make TPM 2.0 with TIS available as MSFT0101 



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: default avatarStefan Berger <stefanb@linux.ibm.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
parent 87593a47

hw/i386/acpi-build.c

+10 −2
Original line number Diff line number Diff line
@@ -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)) {

                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("_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,