[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 31/35] acpi: pc/q35: tpm-tis: fix TPM device scope
From: |
Igor Mammedov |
Subject: |
[PATCH 31/35] acpi: pc/q35: tpm-tis: fix TPM device scope |
Date: |
Mon, 16 May 2022 11:26:06 -0400 |
tpm-tis, is not a PCI device but ISA one, move it
under ISA scope to fix incorrect placement.
Fixes: 24cf5413aa0 (acpi: Make TPM 2.0 with TIS available as MSFT0101)
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
hw/i386/acpi-build.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index a42f41f373..85a7313cad 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1764,15 +1764,14 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
#ifdef CONFIG_TPM
if (TPM_IS_TIS_ISA(tpm)) {
+ dev = aml_device("ISA.TPM");
if (misc->tpm_version == TPM_VERSION_2_0) {
- dev = aml_device("TPM");
aml_append(dev, aml_name_decl("_HID",
aml_string("MSFT0101")));
aml_append(dev,
aml_name_decl("_STR",
aml_string("TPM 2.0 Device")));
} else {
- dev = aml_device("ISA.TPM");
aml_append(dev, aml_name_decl("_HID",
aml_eisaid("PNP0C31")));
}
--
2.31.1
- [PATCH 24/35] acpi: applesmc: use AcpiDevAmlIfClass:build_dev_aml to provide device's AML, (continued)
- [PATCH 24/35] acpi: applesmc: use AcpiDevAmlIfClass:build_dev_aml to provide device's AML, Igor Mammedov, 2022/05/16
- [PATCH 26/35] tests: acpi: white-lists expected DSDT.pvpanic-isa blob, Igor Mammedov, 2022/05/16
- [PATCH 27/35] tests: acpi: add pvpanic-isa: testcase, Igor Mammedov, 2022/05/16
- [PATCH 28/35] acpi: pvpanic-isa: use AcpiDevAmlIfClass:build_dev_aml to provide device's AML, Igor Mammedov, 2022/05/16
- Re: [PATCH 28/35] acpi: pvpanic-isa: use AcpiDevAmlIfClass:build_dev_aml to provide device's AML, Igor Mammedov, 2022/05/17
[PATCH 25/35] tests: acpi: update expected blobs, Igor Mammedov, 2022/05/16
[PATCH 31/35] acpi: pc/q35: tpm-tis: fix TPM device scope,
Igor Mammedov <=
[PATCH 29/35] tests: acpi: update expected DSDT.pvpanic-isa blob, Igor Mammedov, 2022/05/16
[PATCH 30/35] tests: acpi: white-list DSDT.tis.tpm2/DSDT.tis.tpm12 expected blobs, Igor Mammedov, 2022/05/16
[PATCH 32/35] acpi: pc/q35: remove not needed 'if' condition on pci bus, Igor Mammedov, 2022/05/16
[PATCH 35/35] x86: acpi-build: do not include hw/isa/isa.h directly, Igor Mammedov, 2022/05/16
[PATCH 34/35] tests: acpi: update expected DSDT.tis.tpm2/DSDT.tis.tpm12 blobs, Igor Mammedov, 2022/05/16