diff mbox series

[3/3] tests/acpi: virt: update ACPI GTDT binaries

Message ID 20220920162137.75239-4-miguel.luis@oracle.com
State New
Headers show
Series fix for two ACPI GTDT physical addresses | expand

Commit Message

Miguel Luis Sept. 20, 2022, 4:21 p.m. UTC 
Step 6 & 7 of the bios-tables-test.c documented procedure.

Differences between disassembled ASL files for GTDT:

    @@ -13,14 +13,14 @@
     [000h 0000   4]                    Signature : "GTDT"    [Generic Timer Description Table]
     [004h 0004   4]                 Table Length : 00000060
     [008h 0008   1]                     Revision : 02
    -[009h 0009   1]                     Checksum : 8C
    +[009h 0009   1]                     Checksum : 9C
     [00Ah 0010   6]                       Oem ID : "BOCHS "
     [010h 0016   8]                 Oem Table ID : "BXPC    "
     [018h 0024   4]                 Oem Revision : 00000001
     [01Ch 0028   4]              Asl Compiler ID : "BXPC"
     [020h 0032   4]        Asl Compiler Revision : 00000001

    -[024h 0036   8]        Counter Block Address : 0000000000000000
    +[024h 0036   8]        Counter Block Address : FFFFFFFFFFFFFFFF
     [02Ch 0044   4]                     Reserved : 00000000

     [030h 0048   4]         Secure EL1 Interrupt : 0000001D
    @@ -46,16 +46,16 @@
                                     Trigger Mode : 0
                                         Polarity : 0
                                        Always On : 0
    -[050h 0080   8]   Counter Read Block Address : 0000000000000000
    +[050h 0080   8]   Counter Read Block Address : FFFFFFFFFFFFFFFF

     [058h 0088   4]         Platform Timer Count : 00000000
     [05Ch 0092   4]        Platform Timer Offset : 00000000

     Raw Table Data: Length 96 (0x60)

    -    0000: 47 54 44 54 60 00 00 00 02 8C 42 4F 43 48 53 20  // GTDT`.....BOCHS
    +    0000: 47 54 44 54 60 00 00 00 02 9C 42 4F 43 48 53 20  // GTDT`.....BOCHS
         0010: 42 58 50 43 20 20 20 20 01 00 00 00 42 58 50 43  // BXPC    ....BXPC
    -    0020: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  // ................
    +    0020: 01 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00  // ................
         0030: 1D 00 00 00 00 00 00 00 1E 00 00 00 04 00 00 00  // ................
         0040: 1B 00 00 00 00 00 00 00 1A 00 00 00 00 00 00 00  // ................
    -    0050: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  // ................
    +    0050: FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00  // ................

Signed-off-by: Miguel Luis <miguel.luis@oracle.com>
---
 tests/data/acpi/virt/GTDT                   | Bin 96 -> 96 bytes
 tests/data/acpi/virt/GTDT.memhp             | Bin 96 -> 96 bytes
 tests/data/acpi/virt/GTDT.numamem           | Bin 96 -> 96 bytes
 tests/qtest/bios-tables-test-allowed-diff.h |   3 ---
 4 files changed, 3 deletions(-)

Comments

Ani Sinha Sept. 21, 2022, 3:39 a.m. UTC | #1 
On Tue, 20 Sep 2022, Miguel Luis wrote:

> Step 6 & 7 of the bios-tables-test.c documented procedure.
>
> Differences between disassembled ASL files for GTDT:
>
>     @@ -13,14 +13,14 @@
>      [000h 0000   4]                    Signature : "GTDT"    [Generic Timer Description Table]
>      [004h 0004   4]                 Table Length : 00000060
>      [008h 0008   1]                     Revision : 02
>     -[009h 0009   1]                     Checksum : 8C
>     +[009h 0009   1]                     Checksum : 9C
>      [00Ah 0010   6]                       Oem ID : "BOCHS "
>      [010h 0016   8]                 Oem Table ID : "BXPC    "
>      [018h 0024   4]                 Oem Revision : 00000001
>      [01Ch 0028   4]              Asl Compiler ID : "BXPC"
>      [020h 0032   4]        Asl Compiler Revision : 00000001
>
>     -[024h 0036   8]        Counter Block Address : 0000000000000000
>     +[024h 0036   8]        Counter Block Address : FFFFFFFFFFFFFFFF
>      [02Ch 0044   4]                     Reserved : 00000000
>
>      [030h 0048   4]         Secure EL1 Interrupt : 0000001D
>     @@ -46,16 +46,16 @@
>                                      Trigger Mode : 0
>                                          Polarity : 0
>                                         Always On : 0
>     -[050h 0080   8]   Counter Read Block Address : 0000000000000000
>     +[050h 0080   8]   Counter Read Block Address : FFFFFFFFFFFFFFFF
>
>      [058h 0088   4]         Platform Timer Count : 00000000
>      [05Ch 0092   4]        Platform Timer Offset : 00000000
>
>      Raw Table Data: Length 96 (0x60)
>
>     -    0000: 47 54 44 54 60 00 00 00 02 8C 42 4F 43 48 53 20  // GTDT`.....BOCHS
>     +    0000: 47 54 44 54 60 00 00 00 02 9C 42 4F 43 48 53 20  // GTDT`.....BOCHS
>          0010: 42 58 50 43 20 20 20 20 01 00 00 00 42 58 50 43  // BXPC    ....BXPC
>     -    0020: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  // ................
>     +    0020: 01 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00  // ................
>          0030: 1D 00 00 00 00 00 00 00 1E 00 00 00 04 00 00 00  // ................
>          0040: 1B 00 00 00 00 00 00 00 1A 00 00 00 00 00 00 00  // ................
>     -    0050: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  // ................
>     +    0050: FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00  // ................
>
> Signed-off-by: Miguel Luis <miguel.luis@oracle.com>

Acked-by: Ani Sinha <ani@anisinha.ca>

> ---
>  tests/data/acpi/virt/GTDT                   | Bin 96 -> 96 bytes
>  tests/data/acpi/virt/GTDT.memhp             | Bin 96 -> 96 bytes
>  tests/data/acpi/virt/GTDT.numamem           | Bin 96 -> 96 bytes
>  tests/qtest/bios-tables-test-allowed-diff.h |   3 ---
>  4 files changed, 3 deletions(-)
>
> diff --git a/tests/data/acpi/virt/GTDT b/tests/data/acpi/virt/GTDT
> index 9408b71b59c0e0f2991c0053562280155b47bc0b..6f8cb9b8f30b55f4c93fe515982621e3db50feb2 100644
> GIT binary patch
> delta 45
> kcmYdD;BpUf2}xjJU|^avkxPo>KNL*VQ4xT#fs$YV0LH=;ng9R*
>
> delta 45
> jcmYdD;BpUf2}xjJU|{N*$R))AWPrg$9Tfo>8%6^Foy!E8
>
> diff --git a/tests/data/acpi/virt/GTDT.memhp b/tests/data/acpi/virt/GTDT.memhp
> index 9408b71b59c0e0f2991c0053562280155b47bc0b..6f8cb9b8f30b55f4c93fe515982621e3db50feb2 100644
> GIT binary patch
> delta 45
> kcmYdD;BpUf2}xjJU|^avkxPo>KNL*VQ4xT#fs$YV0LH=;ng9R*
>
> delta 45
> jcmYdD;BpUf2}xjJU|{N*$R))AWPrg$9Tfo>8%6^Foy!E8
>
> diff --git a/tests/data/acpi/virt/GTDT.numamem b/tests/data/acpi/virt/GTDT.numamem
> index 9408b71b59c0e0f2991c0053562280155b47bc0b..6f8cb9b8f30b55f4c93fe515982621e3db50feb2 100644
> GIT binary patch
> delta 45
> kcmYdD;BpUf2}xjJU|^avkxPo>KNL*VQ4xT#fs$YV0LH=;ng9R*
>
> delta 45
> jcmYdD;BpUf2}xjJU|{N*$R))AWPrg$9Tfo>8%6^Foy!E8
>
> diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
> index 957bd1b4f6..dfb8523c8b 100644
> --- a/tests/qtest/bios-tables-test-allowed-diff.h
> +++ b/tests/qtest/bios-tables-test-allowed-diff.h
> @@ -1,4 +1 @@
>  /* List of comma-separated changed AML files to ignore */
> -"tests/data/acpi/virt/GTDT",
> -"tests/data/acpi/virt/GTDT.memhp",
> -"tests/data/acpi/virt/GTDT.numamem",
> --
> 2.36.0
>
>
Miguel Luis Oct. 7, 2022, 2:32 p.m. UTC | #2 
> On 21 Sep 2022, at 03:39, Ani Sinha <ani@anisinha.ca> wrote:
> 
> 
> 
> On Tue, 20 Sep 2022, Miguel Luis wrote:
> 
>> Step 6 & 7 of the bios-tables-test.c documented procedure.
>> 
>> Differences between disassembled ASL files for GTDT:
>> 
>>    @@ -13,14 +13,14 @@
>>     [000h 0000   4]                    Signature : "GTDT"    [Generic Timer Description Table]
>>     [004h 0004   4]                 Table Length : 00000060
>>     [008h 0008   1]                     Revision : 02
>>    -[009h 0009   1]                     Checksum : 8C
>>    +[009h 0009   1]                     Checksum : 9C
>>     [00Ah 0010   6]                       Oem ID : "BOCHS "
>>     [010h 0016   8]                 Oem Table ID : "BXPC    "
>>     [018h 0024   4]                 Oem Revision : 00000001
>>     [01Ch 0028   4]              Asl Compiler ID : "BXPC"
>>     [020h 0032   4]        Asl Compiler Revision : 00000001
>> 
>>    -[024h 0036   8]        Counter Block Address : 0000000000000000
>>    +[024h 0036   8]        Counter Block Address : FFFFFFFFFFFFFFFF
>>     [02Ch 0044   4]                     Reserved : 00000000
>> 
>>     [030h 0048   4]         Secure EL1 Interrupt : 0000001D
>>    @@ -46,16 +46,16 @@
>>                                     Trigger Mode : 0
>>                                         Polarity : 0
>>                                        Always On : 0
>>    -[050h 0080   8]   Counter Read Block Address : 0000000000000000
>>    +[050h 0080   8]   Counter Read Block Address : FFFFFFFFFFFFFFFF
>> 
>>     [058h 0088   4]         Platform Timer Count : 00000000
>>     [05Ch 0092   4]        Platform Timer Offset : 00000000
>> 
>>     Raw Table Data: Length 96 (0x60)
>> 
>>    -    0000: 47 54 44 54 60 00 00 00 02 8C 42 4F 43 48 53 20  // GTDT`.....BOCHS
>>    +    0000: 47 54 44 54 60 00 00 00 02 9C 42 4F 43 48 53 20  // GTDT`.....BOCHS
>>         0010: 42 58 50 43 20 20 20 20 01 00 00 00 42 58 50 43  // BXPC    ....BXPC
>>    -    0020: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  // ................
>>    +    0020: 01 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00  // ................
>>         0030: 1D 00 00 00 00 00 00 00 1E 00 00 00 04 00 00 00  // ................
>>         0040: 1B 00 00 00 00 00 00 00 1A 00 00 00 00 00 00 00  // ................
>>    -    0050: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  // ................
>>    +    0050: FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00  // ................
>> 
>> Signed-off-by: Miguel Luis <miguel.luis@oracle.com>
> 
> Acked-by: Ani Sinha <ani@anisinha.ca>
> 

Thank you for the tags Ani. I’ve collected them and will spin v2 soon.

Thanks,
Miguel

>> ---
>> tests/data/acpi/virt/GTDT                   | Bin 96 -> 96 bytes
>> tests/data/acpi/virt/GTDT.memhp             | Bin 96 -> 96 bytes
>> tests/data/acpi/virt/GTDT.numamem           | Bin 96 -> 96 bytes
>> tests/qtest/bios-tables-test-allowed-diff.h |   3 ---
>> 4 files changed, 3 deletions(-)
>> 
>> diff --git a/tests/data/acpi/virt/GTDT b/tests/data/acpi/virt/GTDT
>> index 9408b71b59c0e0f2991c0053562280155b47bc0b..6f8cb9b8f30b55f4c93fe515982621e3db50feb2 100644
>> GIT binary patch
>> delta 45
>> kcmYdD;BpUf2}xjJU|^avkxPo>KNL*VQ4xT#fs$YV0LH=;ng9R*
>> 
>> delta 45
>> jcmYdD;BpUf2}xjJU|{N*$R))AWPrg$9Tfo>8%6^Foy!E8
>> 
>> diff --git a/tests/data/acpi/virt/GTDT.memhp b/tests/data/acpi/virt/GTDT.memhp
>> index 9408b71b59c0e0f2991c0053562280155b47bc0b..6f8cb9b8f30b55f4c93fe515982621e3db50feb2 100644
>> GIT binary patch
>> delta 45
>> kcmYdD;BpUf2}xjJU|^avkxPo>KNL*VQ4xT#fs$YV0LH=;ng9R*
>> 
>> delta 45
>> jcmYdD;BpUf2}xjJU|{N*$R))AWPrg$9Tfo>8%6^Foy!E8
>> 
>> diff --git a/tests/data/acpi/virt/GTDT.numamem b/tests/data/acpi/virt/GTDT.numamem
>> index 9408b71b59c0e0f2991c0053562280155b47bc0b..6f8cb9b8f30b55f4c93fe515982621e3db50feb2 100644
>> GIT binary patch
>> delta 45
>> kcmYdD;BpUf2}xjJU|^avkxPo>KNL*VQ4xT#fs$YV0LH=;ng9R*
>> 
>> delta 45
>> jcmYdD;BpUf2}xjJU|{N*$R))AWPrg$9Tfo>8%6^Foy!E8
>> 
>> diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
>> index 957bd1b4f6..dfb8523c8b 100644
>> --- a/tests/qtest/bios-tables-test-allowed-diff.h
>> +++ b/tests/qtest/bios-tables-test-allowed-diff.h
>> @@ -1,4 +1 @@
>> /* List of comma-separated changed AML files to ignore */
>> -"tests/data/acpi/virt/GTDT",
>> -"tests/data/acpi/virt/GTDT.memhp",
>> -"tests/data/acpi/virt/GTDT.numamem",
>> --
>> 2.36.0
>> 
>>
diff mbox series

Patch

diff --git a/tests/data/acpi/virt/GTDT b/tests/data/acpi/virt/GTDT
index 9408b71b59c0e0f2991c0053562280155b47bc0b..6f8cb9b8f30b55f4c93fe515982621e3db50feb2 100644
GIT binary patch
delta 45
kcmYdD;BpUf2}xjJU|^avkxPo>KNL*VQ4xT#fs$YV0LH=;ng9R*

delta 45
jcmYdD;BpUf2}xjJU|{N*$R))AWPrg$9Tfo>8%6^Foy!E8

diff --git a/tests/data/acpi/virt/GTDT.memhp b/tests/data/acpi/virt/GTDT.memhp
index 9408b71b59c0e0f2991c0053562280155b47bc0b..6f8cb9b8f30b55f4c93fe515982621e3db50feb2 100644
GIT binary patch
delta 45
kcmYdD;BpUf2}xjJU|^avkxPo>KNL*VQ4xT#fs$YV0LH=;ng9R*

delta 45
jcmYdD;BpUf2}xjJU|{N*$R))AWPrg$9Tfo>8%6^Foy!E8

diff --git a/tests/data/acpi/virt/GTDT.numamem b/tests/data/acpi/virt/GTDT.numamem
index 9408b71b59c0e0f2991c0053562280155b47bc0b..6f8cb9b8f30b55f4c93fe515982621e3db50feb2 100644
GIT binary patch
delta 45
kcmYdD;BpUf2}xjJU|^avkxPo>KNL*VQ4xT#fs$YV0LH=;ng9R*

delta 45
jcmYdD;BpUf2}xjJU|{N*$R))AWPrg$9Tfo>8%6^Foy!E8

diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index 957bd1b4f6..dfb8523c8b 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,4 +1 @@ 
 /* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/virt/GTDT",
-"tests/data/acpi/virt/GTDT.memhp",
-"tests/data/acpi/virt/GTDT.numamem",