| Message ID | 20220516152610.1963435-32-imammedo@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | pc/q35: refactor ISA and SMBUS AML generation | expand |
On Mon, May 16, 2022 at 8:57 PM Igor Mammedov <imammedo@redhat.com> wrote: > > tpm-tis, is not a PCI device but ISA one, move it > under ISA scope to fix incorrect placement. This description is a little misleading. What we fix here is for TPM-tis 2.0 only. TPM 1.2 was already previously under ISA scope. > > Fixes: 24cf5413aa0 (acpi: Make TPM 2.0 with TIS available as MSFT0101) > Signed-off-by: Igor Mammedov <imammedo@redhat.com> modulo that above comment, Reviewed-by: Ani Sinha <ani@anisinha.ca> > --- > 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 >
On Wed, 18 May 2022 14:33:12 +0530 Ani Sinha <ani@anisinha.ca> wrote: > On Mon, May 16, 2022 at 8:57 PM Igor Mammedov <imammedo@redhat.com> wrote: > > > > tpm-tis, is not a PCI device but ISA one, move it > > under ISA scope to fix incorrect placement. > > This description is a little misleading. What we fix here is for > TPM-tis 2.0 only. TPM 1.2 was already previously under ISA scope. I'll fix it up on respin > > > > Fixes: 24cf5413aa0 (acpi: Make TPM 2.0 with TIS available as MSFT0101) > > Signed-off-by: Igor Mammedov <imammedo@redhat.com> > > modulo that above comment, > Reviewed-by: Ani Sinha <ani@anisinha.ca> > > > --- > > 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 > > >
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"))); }
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(-)