[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 31/35] acpi: pc/q35: tpm-tis: fix TPM device scope
From: |
Igor Mammedov |
Subject: |
[PATCH v2 31/35] acpi: pc/q35: tpm-tis: fix TPM device scope |
Date: |
Wed, 8 Jun 2022 09:53:36 -0400 |
tpm-tis 2.0, 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>
Reviewed-by: Ani Sinha <ani@anisinha.ca>
Acked-by: Gerd Hoffmann <kraxel@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 bbe02b068e..6b496480d2 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1813,15 +1813,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 v2 20/35] acpi: q35: isa bridge: use AcpiDevAmlIf interface to build ISA device descriptors, (continued)
- [PATCH v2 20/35] acpi: q35: isa bridge: use AcpiDevAmlIf interface to build ISA device descriptors, Igor Mammedov, 2022/06/08
- [PATCH v2 22/35] tests: acpi: add and white-list DSDT.applesmc expected blob, Igor Mammedov, 2022/06/08
- [PATCH v2 23/35] tests: acpi: add applesmc testcase, Igor Mammedov, 2022/06/08
- [PATCH v2 24/35] acpi: applesmc: use AcpiDevAmlIfClass:build_dev_aml to provide device's AML, Igor Mammedov, 2022/06/08
- [PATCH v2 26/35] tests: acpi: white-lists expected DSDT.pvpanic-isa blob, Igor Mammedov, 2022/06/08
- [PATCH v2 27/35] tests: acpi: add pvpanic-isa: testcase, Igor Mammedov, 2022/06/08
- [PATCH v2 21/35] tests: acpi: update expected blobs, Igor Mammedov, 2022/06/08
- [PATCH v2 29/35] tests: acpi: update expected DSDT.pvpanic-isa blob, Igor Mammedov, 2022/06/08
- [PATCH v2 25/35] tests: acpi: update expected blobs, Igor Mammedov, 2022/06/08
- [PATCH v2 31/35] acpi: pc/q35: tpm-tis: fix TPM device scope,
Igor Mammedov <=
- [PATCH v2 32/35] acpi: pc/q35: remove not needed 'if' condition on pci bus, Igor Mammedov, 2022/06/08
- [PATCH v2 28/35] acpi: pvpanic-isa: use AcpiDevAmlIfClass:build_dev_aml to provide device's AML, Igor Mammedov, 2022/06/08
- [PATCH v2 30/35] tests: acpi: white-list DSDT.tis.tpm2/DSDT.tis.tpm12 expected blobs, Igor Mammedov, 2022/06/08
- [PATCH v2 35/35] x86: acpi-build: do not include hw/isa/isa.h directly, Igor Mammedov, 2022/06/08
- [PATCH v2 33/35] acpi: tpm-tis: use AcpiDevAmlIfClass:build_dev_aml to provide device's AML, Igor Mammedov, 2022/06/08
- [PATCH v2 34/35] tests: acpi: update expected DSDT.tis.tpm2/DSDT.tis.tpm12 blobs, Igor Mammedov, 2022/06/08
- Re: [PATCH v2 00/35] pc/q35: refactor ISA and SMBUS AML generation, Igor Mammedov, 2022/06/09