[PATCH v2 0/3] tpm: Add missing ACPI device identification objects

[PATCH v2 0/3] tpm: Add missing ACPI device identification objects

[Stefan Berger]

This series of patches adds missing ACPI device identification objects _STR
and _UID to TPM 1.2 and TPM 2 ACPI tables.

   Stefan

Stefan Berger (3):
  tests: acpi: prepare for updated TPM related tables
  acpi: tpm: Add missing device identification objects
  tests: acpi: Add updated TPM related tables

 hw/arm/virt-acpi-build.c           |   1 +
 hw/i386/acpi-build.c               |   8 ++++++++
 tests/data/acpi/q35/DSDT.tis.tpm12 | Bin 8894 -> 8900 bytes
 tests/data/acpi/q35/DSDT.tis.tpm2  | Bin 8894 -> 8921 bytes
 4 files changed, 9 insertions(+)

-- 
2.31.1

[PATCH v2 1/3] tests: acpi: prepare for updated TPM related tables

[Stefan Berger]

Replace existing TPM related tables, that are about to change, with
empty files.

Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Ani Sinha <ani@anisinha.ca>
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
---
 tests/data/acpi/q35/DSDT.tis.tpm12          | Bin 8894 -> 0 bytes
 tests/data/acpi/q35/DSDT.tis.tpm2           | Bin 8894 -> 0 bytes
 tests/data/acpi/q35/TCPA.tis.tpm12          | Bin 50 -> 0 bytes
 tests/data/acpi/q35/TPM2.tis.tpm2           | Bin 76 -> 0 bytes
 tests/qtest/bios-tables-test-allowed-diff.h |  11 +++++++++++
 5 files changed, 11 insertions(+)

diff --git a/tests/data/acpi/q35/DSDT.tis.tpm12 b/tests/data/acpi/q35/DSDT.tis.tpm12
index c96b5277a14ae98174408d690d6e0246bd932623..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
GIT binary patch
literal 0
HcmV?d00001

literal 8894
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
E11ZdDc>n+a

diff --git a/tests/data/acpi/q35/DSDT.tis.tpm2 b/tests/data/acpi/q35/DSDT.tis.tpm2
index c92d4d29c79352a60974ea9f665d0b9a410a4bac..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
GIT binary patch
literal 0
HcmV?d00001

literal 8894
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
H_Sydd;%I4k

diff --git a/tests/data/acpi/q35/TCPA.tis.tpm12 b/tests/data/acpi/q35/TCPA.tis.tpm12
index a56961b413e7715b3d60f9836d1c8f2f4c7347cb..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
GIT binary patch
literal 0
HcmV?d00001

literal 50
qcmWG>4sbMLU|?V}a`Jcf2v%^42yj*a0!E-1hz+7a07U<12eAOxRtEt9

diff --git a/tests/data/acpi/q35/TPM2.tis.tpm2 b/tests/data/acpi/q35/TPM2.tis.tpm2
index fe0f05987be40f1c1742ae189df7821adc522fc0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
GIT binary patch
literal 0
HcmV?d00001

literal 76
wcmWFu@HO&bU|?Vob@F%i2v%^42yj*a0!E-1hz+8V0UI(0%m%6W&kkY&0CHRh0RR91

diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index dfb8523c8b..9743422eee 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1 +1,12 @@
 /* List of comma-separated changed AML files to ignore */
+"tests/data/acpi/q35/APIC.tis.tpm2",
+"tests/data/acpi/q35/DSDT.tis.tpm12",
+"tests/data/acpi/q35/DSDT.tis.tpm2",
+"tests/data/acpi/q35/FACP.tis.tpm2",
+"tests/data/acpi/q35/FACS.tis.tpm2",
+"tests/data/acpi/q35/HPET.tis.tpm2",
+"tests/data/acpi/q35/MCFG.tis.tpm2",
+"tests/data/acpi/q35/TCPA.tis.dsl",
+"tests/data/acpi/q35/TCPA.tis.tpm12",
+"tests/data/acpi/q35/TPM2.tis.tpm2",
+"tests/data/acpi/q35/WAET.tis.tpm2",
-- 
2.31.1

Re: [PATCH v2 1/3] tests: acpi: prepare for updated TPM related tables

[Michael S. Tsirkin]

On Tue, Nov 09, 2021 at 09:01:50AM -0500, Stefan Berger wrote:
> Replace existing TPM related tables, that are about to change, with
> empty files.
> 
> Cc: Michael S. Tsirkin <mst@redhat.com>
> Cc: Igor Mammedov <imammedo@redhat.com>
> Cc: Ani Sinha <ani@anisinha.ca>
> Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>

Why do it though?
I don't think it's a good idea - will make it harder
to see what the changes are.

> ---
>  tests/data/acpi/q35/DSDT.tis.tpm12          | Bin 8894 -> 0 bytes
>  tests/data/acpi/q35/DSDT.tis.tpm2           | Bin 8894 -> 0 bytes
>  tests/data/acpi/q35/TCPA.tis.tpm12          | Bin 50 -> 0 bytes
>  tests/data/acpi/q35/TPM2.tis.tpm2           | Bin 76 -> 0 bytes
>  tests/qtest/bios-tables-test-allowed-diff.h |  11 +++++++++++
>  5 files changed, 11 insertions(+)
> 
> diff --git a/tests/data/acpi/q35/DSDT.tis.tpm12 b/tests/data/acpi/q35/DSDT.tis.tpm12
> index c96b5277a14ae98174408d690d6e0246bd932623..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
> GIT binary patch
> literal 0
> HcmV?d00001
> 
> literal 8894
> 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
> E11ZdDc>n+a
> 
> diff --git a/tests/data/acpi/q35/DSDT.tis.tpm2 b/tests/data/acpi/q35/DSDT.tis.tpm2
> index c92d4d29c79352a60974ea9f665d0b9a410a4bac..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
> GIT binary patch
> literal 0
> HcmV?d00001
> 
> literal 8894
> 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
> H_Sydd;%I4k
> 
> diff --git a/tests/data/acpi/q35/TCPA.tis.tpm12 b/tests/data/acpi/q35/TCPA.tis.tpm12
> index a56961b413e7715b3d60f9836d1c8f2f4c7347cb..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
> GIT binary patch
> literal 0
> HcmV?d00001
> 
> literal 50
> qcmWG>4sbMLU|?V}a`Jcf2v%^42yj*a0!E-1hz+7a07U<12eAOxRtEt9
> 
> diff --git a/tests/data/acpi/q35/TPM2.tis.tpm2 b/tests/data/acpi/q35/TPM2.tis.tpm2
> index fe0f05987be40f1c1742ae189df7821adc522fc0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
> GIT binary patch
> literal 0
> HcmV?d00001
> 
> literal 76
> wcmWFu@HO&bU|?Vob@F%i2v%^42yj*a0!E-1hz+8V0UI(0%m%6W&kkY&0CHRh0RR91
> 
> diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
> index dfb8523c8b..9743422eee 100644
> --- a/tests/qtest/bios-tables-test-allowed-diff.h
> +++ b/tests/qtest/bios-tables-test-allowed-diff.h
> @@ -1 +1,12 @@
>  /* List of comma-separated changed AML files to ignore */
> +"tests/data/acpi/q35/APIC.tis.tpm2",
> +"tests/data/acpi/q35/DSDT.tis.tpm12",
> +"tests/data/acpi/q35/DSDT.tis.tpm2",
> +"tests/data/acpi/q35/FACP.tis.tpm2",
> +"tests/data/acpi/q35/FACS.tis.tpm2",
> +"tests/data/acpi/q35/HPET.tis.tpm2",
> +"tests/data/acpi/q35/MCFG.tis.tpm2",
> +"tests/data/acpi/q35/TCPA.tis.dsl",
> +"tests/data/acpi/q35/TCPA.tis.tpm12",
> +"tests/data/acpi/q35/TPM2.tis.tpm2",
> +"tests/data/acpi/q35/WAET.tis.tpm2",
> -- 
> 2.31.1

Re: [PATCH v2 1/3] tests: acpi: prepare for updated TPM related tables

[Stefan Berger]

On 11/9/21 09:11, Michael S. Tsirkin wrote:
> On Tue, Nov 09, 2021 at 09:01:50AM -0500, Stefan Berger wrote:
>> Replace existing TPM related tables, that are about to change, with
>> empty files.
>>
>> Cc: Michael S. Tsirkin <mst@redhat.com>
>> Cc: Igor Mammedov <imammedo@redhat.com>
>> Cc: Ani Sinha <ani@anisinha.ca>
>> Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
> Why do it though?

With 'it' are you referring to the empty files? Should I just leave the 
file untouched and just ignore them?

How many patches should it be? One for ignoring the about-to-change 
tables, one that does the changes, and one that re-introduces the 
tables? Or squash them together in less patches?

> I don't think it's a good idea - will make it harder
> to see what the changes are.

    Stefan

>
>> ---
>>   tests/data/acpi/q35/DSDT.tis.tpm12          | Bin 8894 -> 0 bytes
>>   tests/data/acpi/q35/DSDT.tis.tpm2           | Bin 8894 -> 0 bytes
>>   tests/data/acpi/q35/TCPA.tis.tpm12          | Bin 50 -> 0 bytes
>>   tests/data/acpi/q35/TPM2.tis.tpm2           | Bin 76 -> 0 bytes
>>   tests/qtest/bios-tables-test-allowed-diff.h |  11 +++++++++++
>>   5 files changed, 11 insertions(+)
>>
>> diff --git a/tests/data/acpi/q35/DSDT.tis.tpm12 b/tests/data/acpi/q35/DSDT.tis.tpm12
>> index c96b5277a14ae98174408d690d6e0246bd932623..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
>> GIT binary patch
>> literal 0
>> HcmV?d00001
>>
>> literal 8894
>> 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
>> E11ZdDc>n+a
>>
>> diff --git a/tests/data/acpi/q35/DSDT.tis.tpm2 b/tests/data/acpi/q35/DSDT.tis.tpm2
>> index c92d4d29c79352a60974ea9f665d0b9a410a4bac..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
>> GIT binary patch
>> literal 0
>> HcmV?d00001
>>
>> literal 8894
>> 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
>> H_Sydd;%I4k
>>
>> diff --git a/tests/data/acpi/q35/TCPA.tis.tpm12 b/tests/data/acpi/q35/TCPA.tis.tpm12
>> index a56961b413e7715b3d60f9836d1c8f2f4c7347cb..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
>> GIT binary patch
>> literal 0
>> HcmV?d00001
>>
>> literal 50
>> qcmWG>4sbMLU|?V}a`Jcf2v%^42yj*a0!E-1hz+7a07U<12eAOxRtEt9
>>
>> diff --git a/tests/data/acpi/q35/TPM2.tis.tpm2 b/tests/data/acpi/q35/TPM2.tis.tpm2
>> index fe0f05987be40f1c1742ae189df7821adc522fc0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
>> GIT binary patch
>> literal 0
>> HcmV?d00001
>>
>> literal 76
>> wcmWFu@HO&bU|?Vob@F%i2v%^42yj*a0!E-1hz+8V0UI(0%m%6W&kkY&0CHRh0RR91
>>
>> diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
>> index dfb8523c8b..9743422eee 100644
>> --- a/tests/qtest/bios-tables-test-allowed-diff.h
>> +++ b/tests/qtest/bios-tables-test-allowed-diff.h
>> @@ -1 +1,12 @@
>>   /* List of comma-separated changed AML files to ignore */
>> +"tests/data/acpi/q35/APIC.tis.tpm2",
>> +"tests/data/acpi/q35/DSDT.tis.tpm12",
>> +"tests/data/acpi/q35/DSDT.tis.tpm2",
>> +"tests/data/acpi/q35/FACP.tis.tpm2",
>> +"tests/data/acpi/q35/FACS.tis.tpm2",
>> +"tests/data/acpi/q35/HPET.tis.tpm2",
>> +"tests/data/acpi/q35/MCFG.tis.tpm2",
>> +"tests/data/acpi/q35/TCPA.tis.dsl",
>> +"tests/data/acpi/q35/TCPA.tis.tpm12",
>> +"tests/data/acpi/q35/TPM2.tis.tpm2",
>> +"tests/data/acpi/q35/WAET.tis.tpm2",
>> -- 
>> 2.31.1

Re: [PATCH v2 1/3] tests: acpi: prepare for updated TPM related tables

[Michael S. Tsirkin]

On Tue, Nov 09, 2021 at 09:30:48AM -0500, Stefan Berger wrote:
> 
> On 11/9/21 09:11, Michael S. Tsirkin wrote:
> > On Tue, Nov 09, 2021 at 09:01:50AM -0500, Stefan Berger wrote:
> > > Replace existing TPM related tables, that are about to change, with
> > > empty files.
> > > 
> > > Cc: Michael S. Tsirkin <mst@redhat.com>
> > > Cc: Igor Mammedov <imammedo@redhat.com>
> > > Cc: Ani Sinha <ani@anisinha.ca>
> > > Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
> > Why do it though?
> 
> With 'it' are you referring to the empty files? Should I just leave the file
> untouched and just ignore them?
> 
> How many patches should it be? One for ignoring the about-to-change tables,
> one that does the changes, and one that re-introduces the tables?

This, yes.

> Or squash
> them together in less patches?

Pls don't squash since this makes it harder to rebase/cherry-pick.
With this approach one just re-generates patches on rebase.

> > I don't think it's a good idea - will make it harder
> > to see what the changes are.
> 
>    Stefan
> 
> > 
> > > ---
> > >   tests/data/acpi/q35/DSDT.tis.tpm12          | Bin 8894 -> 0 bytes
> > >   tests/data/acpi/q35/DSDT.tis.tpm2           | Bin 8894 -> 0 bytes
> > >   tests/data/acpi/q35/TCPA.tis.tpm12          | Bin 50 -> 0 bytes
> > >   tests/data/acpi/q35/TPM2.tis.tpm2           | Bin 76 -> 0 bytes
> > >   tests/qtest/bios-tables-test-allowed-diff.h |  11 +++++++++++
> > >   5 files changed, 11 insertions(+)
> > > 
> > > diff --git a/tests/data/acpi/q35/DSDT.tis.tpm12 b/tests/data/acpi/q35/DSDT.tis.tpm12
> > > index c96b5277a14ae98174408d690d6e0246bd932623..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
> > > GIT binary patch
> > > literal 0
> > > HcmV?d00001
> > > 
> > > literal 8894
> > > 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
> > > E11ZdDc>n+a
> > > 
> > > diff --git a/tests/data/acpi/q35/DSDT.tis.tpm2 b/tests/data/acpi/q35/DSDT.tis.tpm2
> > > index c92d4d29c79352a60974ea9f665d0b9a410a4bac..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
> > > GIT binary patch
> > > literal 0
> > > HcmV?d00001
> > > 
> > > literal 8894
> > > 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
> > > H_Sydd;%I4k
> > > 
> > > diff --git a/tests/data/acpi/q35/TCPA.tis.tpm12 b/tests/data/acpi/q35/TCPA.tis.tpm12
> > > index a56961b413e7715b3d60f9836d1c8f2f4c7347cb..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
> > > GIT binary patch
> > > literal 0
> > > HcmV?d00001
> > > 
> > > literal 50
> > > qcmWG>4sbMLU|?V}a`Jcf2v%^42yj*a0!E-1hz+7a07U<12eAOxRtEt9
> > > 
> > > diff --git a/tests/data/acpi/q35/TPM2.tis.tpm2 b/tests/data/acpi/q35/TPM2.tis.tpm2
> > > index fe0f05987be40f1c1742ae189df7821adc522fc0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
> > > GIT binary patch
> > > literal 0
> > > HcmV?d00001
> > > 
> > > literal 76
> > > wcmWFu@HO&bU|?Vob@F%i2v%^42yj*a0!E-1hz+8V0UI(0%m%6W&kkY&0CHRh0RR91
> > > 
> > > diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
> > > index dfb8523c8b..9743422eee 100644
> > > --- a/tests/qtest/bios-tables-test-allowed-diff.h
> > > +++ b/tests/qtest/bios-tables-test-allowed-diff.h
> > > @@ -1 +1,12 @@
> > >   /* List of comma-separated changed AML files to ignore */
> > > +"tests/data/acpi/q35/APIC.tis.tpm2",
> > > +"tests/data/acpi/q35/DSDT.tis.tpm12",
> > > +"tests/data/acpi/q35/DSDT.tis.tpm2",
> > > +"tests/data/acpi/q35/FACP.tis.tpm2",
> > > +"tests/data/acpi/q35/FACS.tis.tpm2",
> > > +"tests/data/acpi/q35/HPET.tis.tpm2",
> > > +"tests/data/acpi/q35/MCFG.tis.tpm2",
> > > +"tests/data/acpi/q35/TCPA.tis.dsl",
> > > +"tests/data/acpi/q35/TCPA.tis.tpm12",
> > > +"tests/data/acpi/q35/TPM2.tis.tpm2",
> > > +"tests/data/acpi/q35/WAET.tis.tpm2",
> > > -- 
> > > 2.31.1

[PATCH v2 2/3] acpi: tpm: Add missing device identification objects

[Stefan Berger]

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

Re: [PATCH v2 2/3] acpi: tpm: Add missing device identification objects

[Michael S. Tsirkin]

On Tue, Nov 09, 2021 at 09:01:51AM -0500, Stefan Berger wrote:
> 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>

Do you want this in 6.2?

> ---
>  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")));


When we support more versions, won't this make us
do annoying tricks to say so in the string?
Why not just "TPM device" to future-proof it?

>                  } 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)));
>

The ACPI spec mentions also matching on _CID.

  
>                  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

Re: [PATCH v2 2/3] acpi: tpm: Add missing device identification objects

[Stefan Berger]

On 11/9/21 09:20, Michael S. Tsirkin wrote:
> On Tue, Nov 09, 2021 at 09:01:51AM -0500, Stefan Berger wrote:
>> 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>
> Do you want this in 6.2?

Yes.


>
>> ---
>>   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")));
>
> When we support more versions, won't this make us
> do annoying tricks to say so in the string?
> Why not just "TPM device" to future-proof it?

I am not sure what other version there will be and I haven't seen any 
other descriptions than the one reported here:

https://gitlab.com/qemu-project/qemu/-/issues/708

That's why I took TPM 2.0 device. My TPM 1.2 machine doesn't report it 
for a TPM 1.2.



>
>> haven                 } 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)));
>>
> The ACPI spec mentions also matching on _CID.
"6.1.2 _CID (Compatible ID)
This optional object is used to supply OSPM with a device?s Plug and 
Play-Compatible Device ID. Use _CID

objects when a device has no other defined hardware standard method to 
report its compatible IDs"


6.1.12 _UID (Unique ID)
This object provides OSPM with a logical device ID that does not change 
across reboots. This object is
optional, but is required when the device has no other way to report a 
persistent unique device ID. The
_UID must be unique across all devices with either a common _HID or _CID.


Is _CID a must-have for TPM now? We have _HID.


>    
>>                   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

Re: [PATCH v2 2/3] acpi: tpm: Add missing device identification objects

[Michael S. Tsirkin]

On Tue, Nov 09, 2021 at 09:26:46AM -0500, Stefan Berger wrote:
> 
> On 11/9/21 09:20, Michael S. Tsirkin wrote:
> > On Tue, Nov 09, 2021 at 09:01:51AM -0500, Stefan Berger wrote:
> > > 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>
> > Do you want this in 6.2?
> 
> Yes.
> 
> 
> > 
> > > ---
> > >   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")));
> > 
> > When we support more versions, won't this make us
> > do annoying tricks to say so in the string?
> > Why not just "TPM device" to future-proof it?
> 
> I am not sure what other version there will be and I haven't seen any other
> descriptions than the one reported here:
> 
> https://gitlab.com/qemu-project/qemu/-/issues/708
> 
> That's why I took TPM 2.0 device. My TPM 1.2 machine doesn't report it for a
> TPM 1.2.
> 
> 

ok

> > 
> > > haven                 } 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)));
> > > 
> > The ACPI spec mentions also matching on _CID.
> "6.1.2 _CID (Compatible ID)
> This optional object is used to supply OSPM with a device?s Plug and
> Play-Compatible Device ID. Use _CID
> 
> objects when a device has no other defined hardware standard method to
> report its compatible IDs"
> 
> 
> 6.1.12 _UID (Unique ID)
> This object provides OSPM with a logical device ID that does not change
> across reboots. This object is
> optional, but is required when the device has no other way to report a
> persistent unique device ID. The
> _UID must be unique across all devices with either a common _HID or _CID.
> 
> 
> Is _CID a must-have for TPM now? We have _HID.


the spec says UID is unique for all
devices with a given CID or HID. Does this mean just HID is used
if no CID? Or that all devices without CID must have unique UIDs?

I think the former but just making sure.

> 
> > >                   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

[Stefan Berger]

The updated TPM related tables have the following additions:

   Device (TPM)
   {
       Name (_HID, "MSFT0101" /* TPM 2.0 Security Device */)  // _HID: Hardware ID
+      Name (_STR, "TPM 2.0 Device")  // _STR: Description String
+      Name (_UID, One)  // _UID: Unique ID
       Name (_STA, 0x0F)  // _STA: Status
       Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings

Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Ani Sinha <ani@anisinha.ca>
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
---
 tests/data/acpi/q35/DSDT.tis.tpm12          | Bin 0 -> 8900 bytes
 tests/data/acpi/q35/DSDT.tis.tpm2           | Bin 0 -> 8921 bytes
 tests/data/acpi/q35/TCPA.tis.tpm12          | Bin 0 -> 50 bytes
 tests/data/acpi/q35/TPM2.tis.tpm2           | Bin 0 -> 76 bytes
 tests/qtest/bios-tables-test-allowed-diff.h |  11 -----------
 5 files changed, 11 deletions(-)

diff --git a/tests/data/acpi/q35/DSDT.tis.tpm12 b/tests/data/acpi/q35/DSDT.tis.tpm12
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..dc1c990496a8fb0fc268081a54c5af363bcd833f 100644
GIT binary patch
literal 8900
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
F`#<HBYk2?w

literal 0
HcmV?d00001

diff --git a/tests/data/acpi/q35/DSDT.tis.tpm2 b/tests/data/acpi/q35/DSDT.tis.tpm2
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..1314a5d3dad1b7b9aff782e649058873c492acb0 100644
GIT binary patch
literal 8921
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
YedqfyBbvsj5$(-l5+y&No7rdo2O|D&c>n+a

literal 0
HcmV?d00001

diff --git a/tests/data/acpi/q35/TCPA.tis.tpm12 b/tests/data/acpi/q35/TCPA.tis.tpm12
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a56961b413e7715b3d60f9836d1c8f2f4c7347cb 100644
GIT binary patch
literal 50
qcmWG>4sbMLU|?V}a`Jcf2v%^42yj*a0!E-1hz+7a07U<12eAOxRtEt9

literal 0
HcmV?d00001

diff --git a/tests/data/acpi/q35/TPM2.tis.tpm2 b/tests/data/acpi/q35/TPM2.tis.tpm2
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..fe0f05987be40f1c1742ae189df7821adc522fc0 100644
GIT binary patch
literal 76
wcmWFu@HO&bU|?Vob@F%i2v%^42yj*a0!E-1hz+8V0UI(0%m%6W&kkY&0CHRh0RR91

literal 0
HcmV?d00001

diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index 9743422eee..dfb8523c8b 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,12 +1 @@
 /* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/q35/APIC.tis.tpm2",
-"tests/data/acpi/q35/DSDT.tis.tpm12",
-"tests/data/acpi/q35/DSDT.tis.tpm2",
-"tests/data/acpi/q35/FACP.tis.tpm2",
-"tests/data/acpi/q35/FACS.tis.tpm2",
-"tests/data/acpi/q35/HPET.tis.tpm2",
-"tests/data/acpi/q35/MCFG.tis.tpm2",
-"tests/data/acpi/q35/TCPA.tis.dsl",
-"tests/data/acpi/q35/TCPA.tis.tpm12",
-"tests/data/acpi/q35/TPM2.tis.tpm2",
-"tests/data/acpi/q35/WAET.tis.tpm2",
-- 
2.31.1

Re: [PATCH v2 3/3] tests: acpi: Add updated TPM related tables

[Michael S. Tsirkin]

On Tue, Nov 09, 2021 at 09:01:52AM -0500, Stefan Berger wrote:
> The updated TPM related tables have the following additions:
> 
>    Device (TPM)
>    {
>        Name (_HID, "MSFT0101" /* TPM 2.0 Security Device */)  // _HID: Hardware ID
> +      Name (_STR, "TPM 2.0 Device")  // _STR: Description String
> +      Name (_UID, One)  // _UID: Unique ID
>        Name (_STA, 0x0F)  // _STA: Status
>        Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings
> 
> Cc: Michael S. Tsirkin <mst@redhat.com>
> Cc: Igor Mammedov <imammedo@redhat.com>
> Cc: Ani Sinha <ani@anisinha.ca>
> Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
> ---
>  tests/data/acpi/q35/DSDT.tis.tpm12          | Bin 0 -> 8900 bytes
>  tests/data/acpi/q35/DSDT.tis.tpm2           | Bin 0 -> 8921 bytes
>  tests/data/acpi/q35/TCPA.tis.tpm12          | Bin 0 -> 50 bytes
>  tests/data/acpi/q35/TPM2.tis.tpm2           | Bin 0 -> 76 bytes
>  tests/qtest/bios-tables-test-allowed-diff.h |  11 -----------
>  5 files changed, 11 deletions(-)

A disadvantage to doing it like this is that git thinks
it's ok to replace any empty file with this, so if acpi
changed in any way git will happily resolve it
replacing it with this version.

> diff --git a/tests/data/acpi/q35/DSDT.tis.tpm12 b/tests/data/acpi/q35/DSDT.tis.tpm12
> index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..dc1c990496a8fb0fc268081a54c5af363bcd833f 100644
> GIT binary patch
> literal 8900
> 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
> F`#<HBYk2?w
> 
> literal 0
> HcmV?d00001
> 
> diff --git a/tests/data/acpi/q35/DSDT.tis.tpm2 b/tests/data/acpi/q35/DSDT.tis.tpm2
> index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..1314a5d3dad1b7b9aff782e649058873c492acb0 100644
> GIT binary patch
> literal 8921
> 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
> YedqfyBbvsj5$(-l5+y&No7rdo2O|D&c>n+a
> 
> literal 0
> HcmV?d00001
> 
> diff --git a/tests/data/acpi/q35/TCPA.tis.tpm12 b/tests/data/acpi/q35/TCPA.tis.tpm12
> index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a56961b413e7715b3d60f9836d1c8f2f4c7347cb 100644
> GIT binary patch
> literal 50
> qcmWG>4sbMLU|?V}a`Jcf2v%^42yj*a0!E-1hz+7a07U<12eAOxRtEt9
> 
> literal 0
> HcmV?d00001
> 
> diff --git a/tests/data/acpi/q35/TPM2.tis.tpm2 b/tests/data/acpi/q35/TPM2.tis.tpm2
> index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..fe0f05987be40f1c1742ae189df7821adc522fc0 100644
> GIT binary patch
> literal 76
> wcmWFu@HO&bU|?Vob@F%i2v%^42yj*a0!E-1hz+8V0UI(0%m%6W&kkY&0CHRh0RR91
> 
> literal 0
> HcmV?d00001
> 
> diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
> index 9743422eee..dfb8523c8b 100644
> --- a/tests/qtest/bios-tables-test-allowed-diff.h
> +++ b/tests/qtest/bios-tables-test-allowed-diff.h
> @@ -1,12 +1 @@
>  /* List of comma-separated changed AML files to ignore */
> -"tests/data/acpi/q35/APIC.tis.tpm2",
> -"tests/data/acpi/q35/DSDT.tis.tpm12",
> -"tests/data/acpi/q35/DSDT.tis.tpm2",
> -"tests/data/acpi/q35/FACP.tis.tpm2",
> -"tests/data/acpi/q35/FACS.tis.tpm2",
> -"tests/data/acpi/q35/HPET.tis.tpm2",
> -"tests/data/acpi/q35/MCFG.tis.tpm2",
> -"tests/data/acpi/q35/TCPA.tis.dsl",
> -"tests/data/acpi/q35/TCPA.tis.tpm12",
> -"tests/data/acpi/q35/TPM2.tis.tpm2",
> -"tests/data/acpi/q35/WAET.tis.tpm2",
> -- 
> 2.31.1
> 
> 
> 

Re: [PATCH v2 3/3] tests: acpi: Add updated TPM related tables

[Daniel P. Berrangé]

On Tue, Nov 09, 2021 at 09:14:25AM -0500, Michael S. Tsirkin wrote:
> On Tue, Nov 09, 2021 at 09:01:52AM -0500, Stefan Berger wrote:
> > The updated TPM related tables have the following additions:
> > 
> >    Device (TPM)
> >    {
> >        Name (_HID, "MSFT0101" /* TPM 2.0 Security Device */)  // _HID: Hardware ID
> > +      Name (_STR, "TPM 2.0 Device")  // _STR: Description String
> > +      Name (_UID, One)  // _UID: Unique ID
> >        Name (_STA, 0x0F)  // _STA: Status
> >        Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings
> > 
> > Cc: Michael S. Tsirkin <mst@redhat.com>
> > Cc: Igor Mammedov <imammedo@redhat.com>
> > Cc: Ani Sinha <ani@anisinha.ca>
> > Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
> > ---
> >  tests/data/acpi/q35/DSDT.tis.tpm12          | Bin 0 -> 8900 bytes
> >  tests/data/acpi/q35/DSDT.tis.tpm2           | Bin 0 -> 8921 bytes
> >  tests/data/acpi/q35/TCPA.tis.tpm12          | Bin 0 -> 50 bytes
> >  tests/data/acpi/q35/TPM2.tis.tpm2           | Bin 0 -> 76 bytes
> >  tests/qtest/bios-tables-test-allowed-diff.h |  11 -----------
> >  5 files changed, 11 deletions(-)
> 
> A disadvantage to doing it like this is that git thinks
> it's ok to replace any empty file with this, so if acpi
> changed in any way git will happily resolve it
> replacing it with this version.

Do we actually need to be storing these binary files in git
at all ?

IIUC, the test will do two things

 - memcmp the expected binary we store, against the new binary
   we generated.
 - if they differ, then disassemble both and report the
   differences in a user friendly-ish way

What if we only stored the sha256 checksum of the binary *and*
the dissasembled output in git, never the full binary.

IIUC, that would give us the same level of diagnostic output
from the test failures. The dissasembled output would then
give us meaningful patches for reviewers to look at. The
author wouldn't have to describe the difference in the
commit message as Stefan has (helpfully) done here.



Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [PATCH v2 3/3] tests: acpi: Add updated TPM related tables

[Ani Sinha]

On Tue, Nov 9, 2021 at 8:00 PM Daniel P. Berrangé <berrange@redhat.com> wrote:
>
> On Tue, Nov 09, 2021 at 09:14:25AM -0500, Michael S. Tsirkin wrote:
> > On Tue, Nov 09, 2021 at 09:01:52AM -0500, Stefan Berger wrote:
> > > The updated TPM related tables have the following additions:
> > >
> > >    Device (TPM)
> > >    {
> > >        Name (_HID, "MSFT0101" /* TPM 2.0 Security Device */)  // _HID: Hardware ID
> > > +      Name (_STR, "TPM 2.0 Device")  // _STR: Description String
> > > +      Name (_UID, One)  // _UID: Unique ID
> > >        Name (_STA, 0x0F)  // _STA: Status
> > >        Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings
> > >
> > > Cc: Michael S. Tsirkin <mst@redhat.com>
> > > Cc: Igor Mammedov <imammedo@redhat.com>
> > > Cc: Ani Sinha <ani@anisinha.ca>
> > > Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
> > > ---
> > >  tests/data/acpi/q35/DSDT.tis.tpm12          | Bin 0 -> 8900 bytes
> > >  tests/data/acpi/q35/DSDT.tis.tpm2           | Bin 0 -> 8921 bytes
> > >  tests/data/acpi/q35/TCPA.tis.tpm12          | Bin 0 -> 50 bytes
> > >  tests/data/acpi/q35/TPM2.tis.tpm2           | Bin 0 -> 76 bytes
> > >  tests/qtest/bios-tables-test-allowed-diff.h |  11 -----------
> > >  5 files changed, 11 deletions(-)
> >
> > A disadvantage to doing it like this is that git thinks
> > it's ok to replace any empty file with this, so if acpi
> > changed in any way git will happily resolve it
> > replacing it with this version.
>
> Do we actually need to be storing these binary files in git
> at all ?
>
> IIUC, the test will do two things
>
>  - memcmp the expected binary we store, against the new binary
>    we generated.
>  - if they differ, then disassemble both and report the
>    differences in a user friendly-ish way
>
> What if we only stored the sha256 checksum of the binary *and*
> the dissasembled output in git, never the full binary.

If you are going down that path, why need the sha256 at all? The test
can disassemble the tables from qemu and only compare the disassembled
ASL.

>
> IIUC, that would give us the same level of diagnostic output
> from the test failures. The dissasembled output would then
> give us meaningful patches for reviewers to look at. The
> author wouldn't have to describe the difference in the
> commit message as Stefan has (helpfully) done here.
>
>
>
> Regards,
> Daniel
> --
> |: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
> |: https://libvirt.org         -o-            https://fstop138.berrange.com :|
> |: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
>

Re: [PATCH v2 3/3] tests: acpi: Add updated TPM related tables

[Daniel P. Berrangé]

On Tue, Nov 09, 2021 at 08:26:11PM +0530, Ani Sinha wrote:
> On Tue, Nov 9, 2021 at 8:00 PM Daniel P. Berrangé <berrange@redhat.com> wrote:
> >
> > On Tue, Nov 09, 2021 at 09:14:25AM -0500, Michael S. Tsirkin wrote:
> > > On Tue, Nov 09, 2021 at 09:01:52AM -0500, Stefan Berger wrote:
> > > > The updated TPM related tables have the following additions:
> > > >
> > > >    Device (TPM)
> > > >    {
> > > >        Name (_HID, "MSFT0101" /* TPM 2.0 Security Device */)  // _HID: Hardware ID
> > > > +      Name (_STR, "TPM 2.0 Device")  // _STR: Description String
> > > > +      Name (_UID, One)  // _UID: Unique ID
> > > >        Name (_STA, 0x0F)  // _STA: Status
> > > >        Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings
> > > >
> > > > Cc: Michael S. Tsirkin <mst@redhat.com>
> > > > Cc: Igor Mammedov <imammedo@redhat.com>
> > > > Cc: Ani Sinha <ani@anisinha.ca>
> > > > Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
> > > > ---
> > > >  tests/data/acpi/q35/DSDT.tis.tpm12          | Bin 0 -> 8900 bytes
> > > >  tests/data/acpi/q35/DSDT.tis.tpm2           | Bin 0 -> 8921 bytes
> > > >  tests/data/acpi/q35/TCPA.tis.tpm12          | Bin 0 -> 50 bytes
> > > >  tests/data/acpi/q35/TPM2.tis.tpm2           | Bin 0 -> 76 bytes
> > > >  tests/qtest/bios-tables-test-allowed-diff.h |  11 -----------
> > > >  5 files changed, 11 deletions(-)
> > >
> > > A disadvantage to doing it like this is that git thinks
> > > it's ok to replace any empty file with this, so if acpi
> > > changed in any way git will happily resolve it
> > > replacing it with this version.
> >
> > Do we actually need to be storing these binary files in git
> > at all ?
> >
> > IIUC, the test will do two things
> >
> >  - memcmp the expected binary we store, against the new binary
> >    we generated.
> >  - if they differ, then disassemble both and report the
> >    differences in a user friendly-ish way
> >
> > What if we only stored the sha256 checksum of the binary *and*
> > the dissasembled output in git, never the full binary.
> 
> If you are going down that path, why need the sha256 at all? The test
> can disassemble the tables from qemu and only compare the disassembled
> ASL.

We don't currently mandate 'iasl' as a dependancy. Currently we
still run the tests, but without the pretty error message details.

If we didn't have the sha256, we would either need iasl to be
mandatory, or not run the test at all.


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [PATCH v2 3/3] tests: acpi: Add updated TPM related tables

[Michael S. Tsirkin]

On Tue, Nov 09, 2021 at 08:26:11PM +0530, Ani Sinha wrote:
> On Tue, Nov 9, 2021 at 8:00 PM Daniel P. Berrangé <berrange@redhat.com> wrote:
> >
> > On Tue, Nov 09, 2021 at 09:14:25AM -0500, Michael S. Tsirkin wrote:
> > > On Tue, Nov 09, 2021 at 09:01:52AM -0500, Stefan Berger wrote:
> > > > The updated TPM related tables have the following additions:
> > > >
> > > >    Device (TPM)
> > > >    {
> > > >        Name (_HID, "MSFT0101" /* TPM 2.0 Security Device */)  // _HID: Hardware ID
> > > > +      Name (_STR, "TPM 2.0 Device")  // _STR: Description String
> > > > +      Name (_UID, One)  // _UID: Unique ID
> > > >        Name (_STA, 0x0F)  // _STA: Status
> > > >        Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings
> > > >
> > > > Cc: Michael S. Tsirkin <mst@redhat.com>
> > > > Cc: Igor Mammedov <imammedo@redhat.com>
> > > > Cc: Ani Sinha <ani@anisinha.ca>
> > > > Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
> > > > ---
> > > >  tests/data/acpi/q35/DSDT.tis.tpm12          | Bin 0 -> 8900 bytes
> > > >  tests/data/acpi/q35/DSDT.tis.tpm2           | Bin 0 -> 8921 bytes
> > > >  tests/data/acpi/q35/TCPA.tis.tpm12          | Bin 0 -> 50 bytes
> > > >  tests/data/acpi/q35/TPM2.tis.tpm2           | Bin 0 -> 76 bytes
> > > >  tests/qtest/bios-tables-test-allowed-diff.h |  11 -----------
> > > >  5 files changed, 11 deletions(-)
> > >
> > > A disadvantage to doing it like this is that git thinks
> > > it's ok to replace any empty file with this, so if acpi
> > > changed in any way git will happily resolve it
> > > replacing it with this version.
> >
> > Do we actually need to be storing these binary files in git
> > at all ?
> >
> > IIUC, the test will do two things
> >
> >  - memcmp the expected binary we store, against the new binary
> >    we generated.
> >  - if they differ, then disassemble both and report the
> >    differences in a user friendly-ish way
> >
> > What if we only stored the sha256 checksum of the binary *and*
> > the dissasembled output in git, never the full binary.
> 
> If you are going down that path, why need the sha256 at all? The test
> can disassemble the tables from qemu and only compare the disassembled
> ASL.

The output isn't stable unfortunately, so it can't replace the binary..
However, the process of documenting what changed is quite fiddly, so I
am open to including both the binary and the dis-assembled file.
An issue is that iasl does not support all platforms that qemu
supports, in particular the disassembler is broken on BE platforms.
Not sure how big a deal that is ...

> >
> > IIUC, that would give us the same level of diagnostic output
> > from the test failures. The dissasembled output would then
> > give us meaningful patches for reviewers to look at. The
> > author wouldn't have to describe the difference in the
> > commit message as Stefan has (helpfully) done here.
> >
> >
> >
> > Regards,
> > Daniel
> > --
> > |: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
> > |: https://libvirt.org         -o-            https://fstop138.berrange.com :|
> > |: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
> >

Re: [PATCH v2 3/3] tests: acpi: Add updated TPM related tables

[Michael S. Tsirkin]

On Tue, Nov 09, 2021 at 02:29:26PM +0000, Daniel P. Berrangé wrote:
> On Tue, Nov 09, 2021 at 09:14:25AM -0500, Michael S. Tsirkin wrote:
> > On Tue, Nov 09, 2021 at 09:01:52AM -0500, Stefan Berger wrote:
> > > The updated TPM related tables have the following additions:
> > > 
> > >    Device (TPM)
> > >    {
> > >        Name (_HID, "MSFT0101" /* TPM 2.0 Security Device */)  // _HID: Hardware ID
> > > +      Name (_STR, "TPM 2.0 Device")  // _STR: Description String
> > > +      Name (_UID, One)  // _UID: Unique ID
> > >        Name (_STA, 0x0F)  // _STA: Status
> > >        Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings
> > > 
> > > Cc: Michael S. Tsirkin <mst@redhat.com>
> > > Cc: Igor Mammedov <imammedo@redhat.com>
> > > Cc: Ani Sinha <ani@anisinha.ca>
> > > Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
> > > ---
> > >  tests/data/acpi/q35/DSDT.tis.tpm12          | Bin 0 -> 8900 bytes
> > >  tests/data/acpi/q35/DSDT.tis.tpm2           | Bin 0 -> 8921 bytes
> > >  tests/data/acpi/q35/TCPA.tis.tpm12          | Bin 0 -> 50 bytes
> > >  tests/data/acpi/q35/TPM2.tis.tpm2           | Bin 0 -> 76 bytes
> > >  tests/qtest/bios-tables-test-allowed-diff.h |  11 -----------
> > >  5 files changed, 11 deletions(-)
> > 
> > A disadvantage to doing it like this is that git thinks
> > it's ok to replace any empty file with this, so if acpi
> > changed in any way git will happily resolve it
> > replacing it with this version.
> 
> Do we actually need to be storing these binary files in git
> at all ?
> 
> IIUC, the test will do two things
> 
>  - memcmp the expected binary we store, against the new binary
>    we generated.
>  - if they differ, then disassemble both and report the
>    differences in a user friendly-ish way

Second if iasl is installed.

> What if we only stored the sha256 checksum of the binary

Hmm, point being? Same some space?

> *and*
> the dissasembled output in git, never the full binary.

We used to. The issue is that dissasembled output depends
very much on the disassembler. Disassembling both
with the same tool is one way to address this.

> IIUC, that would give us the same level of diagnostic output
> from the test failures. The dissasembled output would then
> give us meaningful patches for reviewers to look at. The
> author wouldn't have to describe the difference in the
> commit message as Stefan has (helpfully) done here.
> 
> 
> 
> Regards,
> Daniel
> -- 
> |: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
> |: https://libvirt.org         -o-            https://fstop138.berrange.com :|
> |: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [PATCH v2 3/3] tests: acpi: Add updated TPM related tables

[Daniel P. Berrangé]

On Tue, Nov 09, 2021 at 11:05:28AM -0500, Michael S. Tsirkin wrote:
> On Tue, Nov 09, 2021 at 02:29:26PM +0000, Daniel P. Berrangé wrote:
> > On Tue, Nov 09, 2021 at 09:14:25AM -0500, Michael S. Tsirkin wrote:
> > > On Tue, Nov 09, 2021 at 09:01:52AM -0500, Stefan Berger wrote:
> > > > The updated TPM related tables have the following additions:
> > > > 
> > > >    Device (TPM)
> > > >    {
> > > >        Name (_HID, "MSFT0101" /* TPM 2.0 Security Device */)  // _HID: Hardware ID
> > > > +      Name (_STR, "TPM 2.0 Device")  // _STR: Description String
> > > > +      Name (_UID, One)  // _UID: Unique ID
> > > >        Name (_STA, 0x0F)  // _STA: Status
> > > >        Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings
> > > > 
> > > > Cc: Michael S. Tsirkin <mst@redhat.com>
> > > > Cc: Igor Mammedov <imammedo@redhat.com>
> > > > Cc: Ani Sinha <ani@anisinha.ca>
> > > > Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
> > > > ---
> > > >  tests/data/acpi/q35/DSDT.tis.tpm12          | Bin 0 -> 8900 bytes
> > > >  tests/data/acpi/q35/DSDT.tis.tpm2           | Bin 0 -> 8921 bytes
> > > >  tests/data/acpi/q35/TCPA.tis.tpm12          | Bin 0 -> 50 bytes
> > > >  tests/data/acpi/q35/TPM2.tis.tpm2           | Bin 0 -> 76 bytes
> > > >  tests/qtest/bios-tables-test-allowed-diff.h |  11 -----------
> > > >  5 files changed, 11 deletions(-)
> > > 
> > > A disadvantage to doing it like this is that git thinks
> > > it's ok to replace any empty file with this, so if acpi
> > > changed in any way git will happily resolve it
> > > replacing it with this version.
> > 
> > Do we actually need to be storing these binary files in git
> > at all ?
> > 
> > IIUC, the test will do two things
> > 
> >  - memcmp the expected binary we store, against the new binary
> >    we generated.
> >  - if they differ, then disassemble both and report the
> >    differences in a user friendly-ish way
> 
> Second if iasl is installed.
> 
> > What if we only stored the sha256 checksum of the binary
> 
> Hmm, point being? Same some space?
> 
> > *and*
> > the dissasembled output in git, never the full binary.
> 
> We used to. The issue is that dissasembled output depends
> very much on the disassembler. Disassembling both
> with the same tool is one way to address this.

Oh, so new isal releases can change the format, that's
annoying :-(

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [PATCH v2 3/3] tests: acpi: Add updated TPM related tables

[Ani Sinha]

On Tue, Nov 9, 2021 at 9:46 PM Daniel P. Berrangé <berrange@redhat.com> wrote:
>
> On Tue, Nov 09, 2021 at 11:05:28AM -0500, Michael S. Tsirkin wrote:
> > On Tue, Nov 09, 2021 at 02:29:26PM +0000, Daniel P. Berrangé wrote:
> > > On Tue, Nov 09, 2021 at 09:14:25AM -0500, Michael S. Tsirkin wrote:
> > > > On Tue, Nov 09, 2021 at 09:01:52AM -0500, Stefan Berger wrote:
> > > > > The updated TPM related tables have the following additions:
> > > > >
> > > > >    Device (TPM)
> > > > >    {
> > > > >        Name (_HID, "MSFT0101" /* TPM 2.0 Security Device */)  // _HID: Hardware ID
> > > > > +      Name (_STR, "TPM 2.0 Device")  // _STR: Description String
> > > > > +      Name (_UID, One)  // _UID: Unique ID
> > > > >        Name (_STA, 0x0F)  // _STA: Status
> > > > >        Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings
> > > > >
> > > > > Cc: Michael S. Tsirkin <mst@redhat.com>
> > > > > Cc: Igor Mammedov <imammedo@redhat.com>
> > > > > Cc: Ani Sinha <ani@anisinha.ca>
> > > > > Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
> > > > > ---
> > > > >  tests/data/acpi/q35/DSDT.tis.tpm12          | Bin 0 -> 8900 bytes
> > > > >  tests/data/acpi/q35/DSDT.tis.tpm2           | Bin 0 -> 8921 bytes
> > > > >  tests/data/acpi/q35/TCPA.tis.tpm12          | Bin 0 -> 50 bytes
> > > > >  tests/data/acpi/q35/TPM2.tis.tpm2           | Bin 0 -> 76 bytes
> > > > >  tests/qtest/bios-tables-test-allowed-diff.h |  11 -----------
> > > > >  5 files changed, 11 deletions(-)
> > > >
> > > > A disadvantage to doing it like this is that git thinks
> > > > it's ok to replace any empty file with this, so if acpi
> > > > changed in any way git will happily resolve it
> > > > replacing it with this version.
> > >
> > > Do we actually need to be storing these binary files in git
> > > at all ?
> > >
> > > IIUC, the test will do two things
> > >
> > >  - memcmp the expected binary we store, against the new binary
> > >    we generated.
> > >  - if they differ, then disassemble both and report the
> > >    differences in a user friendly-ish way
> >
> > Second if iasl is installed.
> >
> > > What if we only stored the sha256 checksum of the binary
> >
> > Hmm, point being? Same some space?
> >
> > > *and*
> > > the dissasembled output in git, never the full binary.
> >
> > We used to. The issue is that dissasembled output depends
> > very much on the disassembler. Disassembling both
> > with the same tool is one way to address this.
>
> Oh, so new isal releases can change the format, that's
> annoying :-(

Additionally, depending on iasl binary being used, some tables may or
may not be properly interpreted or recognized. For example, the
existing iasl binary that comes with the dostro does not recognize the
new VIOT tables. One has to use a binary directly compiled from the
upstream iasl repo at this time.

>
> Regards,
> Daniel
> --
> |: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
> |: https://libvirt.org         -o-            https://fstop138.berrange.com :|
> |: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
>

Re: [PATCH v2 3/3] tests: acpi: Add updated TPM related tables

[Michael S. Tsirkin]

On Tue, Nov 09, 2021 at 04:16:34PM +0000, Daniel P. Berrangé wrote:
> On Tue, Nov 09, 2021 at 11:05:28AM -0500, Michael S. Tsirkin wrote:
> > On Tue, Nov 09, 2021 at 02:29:26PM +0000, Daniel P. Berrangé wrote:
> > > On Tue, Nov 09, 2021 at 09:14:25AM -0500, Michael S. Tsirkin wrote:
> > > > On Tue, Nov 09, 2021 at 09:01:52AM -0500, Stefan Berger wrote:
> > > > > The updated TPM related tables have the following additions:
> > > > > 
> > > > >    Device (TPM)
> > > > >    {
> > > > >        Name (_HID, "MSFT0101" /* TPM 2.0 Security Device */)  // _HID: Hardware ID
> > > > > +      Name (_STR, "TPM 2.0 Device")  // _STR: Description String
> > > > > +      Name (_UID, One)  // _UID: Unique ID
> > > > >        Name (_STA, 0x0F)  // _STA: Status
> > > > >        Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings
> > > > > 
> > > > > Cc: Michael S. Tsirkin <mst@redhat.com>
> > > > > Cc: Igor Mammedov <imammedo@redhat.com>
> > > > > Cc: Ani Sinha <ani@anisinha.ca>
> > > > > Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
> > > > > ---
> > > > >  tests/data/acpi/q35/DSDT.tis.tpm12          | Bin 0 -> 8900 bytes
> > > > >  tests/data/acpi/q35/DSDT.tis.tpm2           | Bin 0 -> 8921 bytes
> > > > >  tests/data/acpi/q35/TCPA.tis.tpm12          | Bin 0 -> 50 bytes
> > > > >  tests/data/acpi/q35/TPM2.tis.tpm2           | Bin 0 -> 76 bytes
> > > > >  tests/qtest/bios-tables-test-allowed-diff.h |  11 -----------
> > > > >  5 files changed, 11 deletions(-)
> > > > 
> > > > A disadvantage to doing it like this is that git thinks
> > > > it's ok to replace any empty file with this, so if acpi
> > > > changed in any way git will happily resolve it
> > > > replacing it with this version.
> > > 
> > > Do we actually need to be storing these binary files in git
> > > at all ?
> > > 
> > > IIUC, the test will do two things
> > > 
> > >  - memcmp the expected binary we store, against the new binary
> > >    we generated.
> > >  - if they differ, then disassemble both and report the
> > >    differences in a user friendly-ish way
> > 
> > Second if iasl is installed.
> > 
> > > What if we only stored the sha256 checksum of the binary
> > 
> > Hmm, point being? Same some space?
> > 
> > > *and*
> > > the dissasembled output in git, never the full binary.
> > 
> > We used to. The issue is that dissasembled output depends
> > very much on the disassembler. Disassembling both
> > with the same tool is one way to address this.
> 
> Oh, so new isal releases can change the format, that's
> annoying :-(

Well iasl never promised to generate exactly the same output
for the same input. For example, at some point they
started adding comments documenting the output.
How stable it's been recently/on platforms we care about - I don't know.
I'm fine with adding the disassembled files and seeing
where does it lead us.

> Regards,
> Daniel
> -- 
> |: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
> |: https://libvirt.org         -o-            https://fstop138.berrange.com :|
> |: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|