motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-20 00:22:02 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

acpi: pc/q35: tpm-tis: fix TPM device scope

Browse source 
tpm-tis 2.0, is not a PCI device but ISA one, move it
under ISA scope to fix incorrect placement.

Fixes: 24cf5413aa (acpi: Make TPM 2.0 with TIS available as MSFT0101)
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Ani Sinha <ani@anisinha.ca>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Message-Id: <20220608135340.3304695-32-imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Igor Mammedov 2022-06-08 09:53:36 -04:00 • committed by Michael S. Tsirkin
parent a5bf52d21c
commit 5198d7939c
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
hw/i386/acpi-build.c
View file

@ -1813,15 +1813,14 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
#ifdef CONFIG_TPM #ifdef CONFIG_TPM
if (TPM_IS_TIS_ISA(tpm)) { if (TPM_IS_TIS_ISA(tpm)) {
dev = aml_device("ISA.TPM");
if (misc->tpm_version == TPM_VERSION_2_0) { if (misc->tpm_version == TPM_VERSION_2_0) {
dev = aml_device("TPM");
aml_append(dev, aml_name_decl("_HID", aml_append(dev, aml_name_decl("_HID",
aml_string("MSFT0101"))); aml_string("MSFT0101")));
aml_append(dev, aml_append(dev,
aml_name_decl("_STR", aml_name_decl("_STR",
aml_string("TPM 2.0 Device"))); aml_string("TPM 2.0 Device")));
} else { } else {
dev = aml_device("ISA.TPM");
aml_append(dev, aml_name_decl("_HID", aml_append(dev, aml_name_decl("_HID",
aml_eisaid("PNP0C31"))); aml_eisaid("PNP0C31")));
} }