diff options
| author | Stefan Berger | 2019-01-25 22:00:58 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin | 2019-02-05 16:58:33 +0100 |
| commit | 24cf5413aa059f874c34e442802ce25cd1e72178 (patch) | |
| tree | a69926f647adc97acdc95317d0021caf5747de46 | |
| parent | hw/virtio: Use CONFIG_VIRTIO_PCI switch instead of CONFIG_PCI (diff) | |
| download | qemu-24cf5413aa059f874c34e442802ce25cd1e72178.tar.gz qemu-24cf5413aa059f874c34e442802ce25cd1e72178.tar.xz qemu-24cf5413aa059f874c34e442802ce25cd1e72178.zip | |
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: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
| -rw-r--r-- | hw/i386/acpi-build.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index d60603abd7..26cef4af2d 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, |