[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 19/25] acpi: Make TPM 2.0 with TIS available as MSFT0
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 19/25] acpi: Make TPM 2.0 with TIS available as MSFT0101 |
Date: |
Mon, 4 Feb 2019 09:43:55 -0500 |
From: Stefan Berger <address@hidden>
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 <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
---
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 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,
--
MST
- [Qemu-devel] [PULL 23/25] mmap-alloc: fix hugetlbfs misaligned length in ppc64, (continued)
- [Qemu-devel] [PULL 23/25] mmap-alloc: fix hugetlbfs misaligned length in ppc64, Michael S. Tsirkin, 2019/02/04
- [Qemu-devel] [PULL 25/25] contrib/libvhost-user: cleanup casts, Michael S. Tsirkin, 2019/02/04
- [Qemu-devel] [PULL 20/25] fw_cfg: fix the life cycle and the name of "qemu_extra_params_fw", Michael S. Tsirkin, 2019/02/04
- [Qemu-devel] [PULL 24/25] r2d: fix build on mingw, Michael S. Tsirkin, 2019/02/04
- [Qemu-devel] [PULL 06/25] vhost-net-user: add stubs for when no virtio-net device is present, Michael S. Tsirkin, 2019/02/04
- [Qemu-devel] [PULL 22/25] mmap-alloc: unfold qemu_ram_mmap(), Michael S. Tsirkin, 2019/02/04
- [Qemu-devel] [PULL 17/25] vhost-user-blk: add discard/write zeroes features support, Michael S. Tsirkin, 2019/02/04
- [Qemu-devel] [PULL 18/25] hw/virtio: Use CONFIG_VIRTIO_PCI switch instead of CONFIG_PCI, Michael S. Tsirkin, 2019/02/04
- [Qemu-devel] [PULL 19/25] acpi: Make TPM 2.0 with TIS available as MSFT0101,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 16/25] contrib/vhost-user-blk: fix the compilation issue, Michael S. Tsirkin, 2019/02/04
- [Qemu-devel] [PULL 14/25] i386/kvm: ignore masked irqs when update msi routes, Michael S. Tsirkin, 2019/02/04
- [Qemu-devel] [PULL 07/25] vhost: restrict Linux dependency to kernel vhost, Michael S. Tsirkin, 2019/02/04
- [Qemu-devel] [PULL 11/25] intel_iommu: fix operator in vtd_switch_address_space, Michael S. Tsirkin, 2019/02/04
- [Qemu-devel] [PULL 08/25] vhost-net: compile it on all targets that have virtio-net., Michael S. Tsirkin, 2019/02/04
- [Qemu-devel] [PULL 15/25] contrib: compile vhost-user-blk tool by default, Michael S. Tsirkin, 2019/02/04