[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 2/3] acpi: tpm: Add missing device identification objects
From: |
Stefan Berger |
Subject: |
[PATCH v2 2/3] acpi: tpm: Add missing device identification objects |
Date: |
Tue, 9 Nov 2021 09:01:51 -0500 |
Add missing device identification objects _STR and _UID. They will appear
as files 'description' and 'uid' under Linux sysfs.
Cc: Shannon Zhao <shannon.zhaosl@gmail.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Ani Sinha <ani@anisinha.ca>
Fixes: https://gitlab.com/qemu-project/qemu/-/issues/708
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
---
hw/arm/virt-acpi-build.c | 1 +
hw/i386/acpi-build.c | 8 ++++++++
2 files changed, 9 insertions(+)
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index 674f902652..09456424aa 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -228,6 +228,7 @@ static void acpi_dsdt_add_tpm(Aml *scope, VirtMachineState
*vms)
Aml *dev = aml_device("TPM0");
aml_append(dev, aml_name_decl("_HID", aml_string("MSFT0101")));
+ aml_append(dev, aml_name_decl("_STR", aml_string("TPM 2.0 Device")));
aml_append(dev, aml_name_decl("_UID", aml_int(0)));
Aml *crs = aml_resource_template();
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index a3ad6abd33..5bd2160a89 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1808,11 +1808,15 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
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")));
}
+ aml_append(dev, aml_name_decl("_UID", aml_int(1)));
aml_append(dev, aml_name_decl("_STA", aml_int(0xF)));
crs = aml_resource_template();
@@ -1840,6 +1844,8 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
if (TPM_IS_CRB(tpm)) {
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")));
crs = aml_resource_template();
aml_append(crs, aml_memory32_fixed(TPM_CRB_ADDR_BASE,
TPM_CRB_ADDR_SIZE, AML_READ_WRITE));
@@ -1847,6 +1853,8 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
aml_append(dev, aml_name_decl("_STA", aml_int(0xf)));
+ aml_append(dev, aml_name_decl("_UID", aml_int(1)));
+
tpm_build_ppi_acpi(tpm, dev);
aml_append(sb_scope, dev);
--
2.31.1
- [PATCH v2 3/3] tests: acpi: Add updated TPM related tables, (continued)
- [PATCH v2 3/3] tests: acpi: Add updated TPM related tables, Stefan Berger, 2021/11/09
- Re: [PATCH v2 3/3] tests: acpi: Add updated TPM related tables, Michael S. Tsirkin, 2021/11/09
- Re: [PATCH v2 3/3] tests: acpi: Add updated TPM related tables, Michael S. Tsirkin, 2021/11/09
- Re: [PATCH v2 3/3] tests: acpi: Add updated TPM related tables, Daniel P . Berrangé, 2021/11/09
- Re: [PATCH v2 3/3] tests: acpi: Add updated TPM related tables, Ani Sinha, 2021/11/09
- Re: [PATCH v2 3/3] tests: acpi: Add updated TPM related tables, Michael S. Tsirkin, 2021/11/09
[PATCH v2 2/3] acpi: tpm: Add missing device identification objects,
Stefan Berger <=
[PATCH v2 1/3] tests: acpi: prepare for updated TPM related tables, Stefan Berger, 2021/11/09