| Message ID | 20220103084636.2496-8-wangyanan55@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ARM virt: Support CPU cluster topology | expand |
On Mon, 3 Jan 2022, Yanan Wang wrote: > Run ./tests/data/acpi/rebuild-expected-aml.sh from build directory > to update PPTT binary. Also empty bios-tables-test-allowed-diff.h. > > The disassembled differences between actual and expected PPTT: > > /* > * Intel ACPI Component Architecture > * AML/ASL+ Disassembler version 20180810 (64-bit version) > * Copyright (c) 2000 - 2018 Intel Corporation > * > - * Disassembly of tests/data/acpi/virt/PPTT, Mon Oct 25 20:24:53 2021 > + * Disassembly of /tmp/aml-BPI5B1, Mon Oct 25 20:24:53 2021 > * > * ACPI Data Table [PPTT] > * > * Format: [HexOffset DecimalOffset ByteLength] FieldName : FieldValue > */ > > [000h 0000 4] Signature : "PPTT" [Processor Properties Topology Table] > -[004h 0004 4] Table Length : 0000004C > +[004h 0004 4] Table Length : 00000060 > [008h 0008 1] Revision : 02 > -[009h 0009 1] Checksum : A8 > +[009h 0009 1] Checksum : 48 > [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 1] Subtable Type : 00 [Processor Hierarchy Node] > [025h 0037 1] Length : 14 > [026h 0038 2] Reserved : 0000 > [028h 0040 4] Flags (decoded below) : 00000001 > Physical package : 1 > ACPI Processor ID valid : 0 > [02Ch 0044 4] Parent : 00000000 > [030h 0048 4] ACPI Processor ID : 00000000 > [034h 0052 4] Private Resource Number : 00000000 > > [038h 0056 1] Subtable Type : 00 [Processor Hierarchy Node] > [039h 0057 1] Length : 14 > [03Ah 0058 2] Reserved : 0000 > -[03Ch 0060 4] Flags (decoded below) : 0000000A > +[03Ch 0060 4] Flags (decoded below) : 00000000 > Physical package : 0 > - ACPI Processor ID valid : 1 > + ACPI Processor ID valid : 0 I do not know this very well but does the above two changes (flags and processor ID) makes sense? > [040h 0064 4] Parent : 00000024 > [044h 0068 4] ACPI Processor ID : 00000000 > [048h 0072 4] Private Resource Number : 00000000 > > -Raw Table Data: Length 76 (0x4C) > +[04Ch 0076 1] Subtable Type : 00 [Processor Hierarchy Node] > +[04Dh 0077 1] Length : 14 > +[04Eh 0078 2] Reserved : 0000 > +[050h 0080 4] Flags (decoded below) : 0000000A > + Physical package : 0 > + ACPI Processor ID valid : 1 > +[054h 0084 4] Parent : 00000038 > +[058h 0088 4] ACPI Processor ID : 00000000 > +[05Ch 0092 4] Private Resource Number : 00000000 > + > +Raw Table Data: Length 96 (0x60) > > - 0000: 50 50 54 54 4C 00 00 00 02 A8 42 4F 43 48 53 20 // PPTTL.....BOCHS > + 0000: 50 50 54 54 60 00 00 00 02 48 42 4F 43 48 53 20 // PPTT`....HBOCHS > 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 14 00 00 01 00 00 00 00 00 00 00 // ................ > - 0030: 00 00 00 00 00 00 00 00 00 14 00 00 0A 00 00 00 // ................ > - 0040: 24 00 00 00 00 00 00 00 00 00 00 00 // $........... > + 0030: 00 00 00 00 00 00 00 00 00 14 00 00 00 00 00 00 // ................ > + 0040: 24 00 00 00 00 00 00 00 00 00 00 00 00 14 00 00 // $............... > + 0050: 0A 00 00 00 38 00 00 00 00 00 00 00 00 00 00 00 // ....8........... > > Signed-off-by: Yanan Wang <wangyanan55@huawei.com> > --- > tests/data/acpi/virt/PPTT | Bin 76 -> 96 bytes > tests/qtest/bios-tables-test-allowed-diff.h | 1 - > 2 files changed, 1 deletion(-) > > diff --git a/tests/data/acpi/virt/PPTT b/tests/data/acpi/virt/PPTT > index 7a1258ecf123555b24462c98ccbb76b4ac1d0c2b..f56ea63b369a604877374ad696c396e796ab1c83 100644 > GIT binary patch > delta 53 > zcmV-50LuSNU<y!BR8(L90006=kqR;-00000Bme*a000000000002BZK3IG5AH~;_u > L0000000000uCW9Z > > delta 32 > qcmV+*0N?*$ObSp?R8&j=00080kqR=APy`Gl00000000000001OcLdh} > > diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h > index cb143a55a6..dfb8523c8b 100644 > --- a/tests/qtest/bios-tables-test-allowed-diff.h > +++ b/tests/qtest/bios-tables-test-allowed-diff.h > @@ -1,2 +1 @@ > /* List of comma-separated changed AML files to ignore */ > -"tests/data/acpi/virt/PPTT", > -- > 2.27.0 > >
Hi Ani, Thanks for your review. On 2022/1/3 20:01, Ani Sinha wrote: > > On Mon, 3 Jan 2022, Yanan Wang wrote: > >> Run ./tests/data/acpi/rebuild-expected-aml.sh from build directory >> to update PPTT binary. Also empty bios-tables-test-allowed-diff.h. >> >> The disassembled differences between actual and expected PPTT: >> >> /* >> * Intel ACPI Component Architecture >> * AML/ASL+ Disassembler version 20180810 (64-bit version) >> * Copyright (c) 2000 - 2018 Intel Corporation >> * >> - * Disassembly of tests/data/acpi/virt/PPTT, Mon Oct 25 20:24:53 2021 >> + * Disassembly of /tmp/aml-BPI5B1, Mon Oct 25 20:24:53 2021 >> * >> * ACPI Data Table [PPTT] >> * >> * Format: [HexOffset DecimalOffset ByteLength] FieldName : FieldValue >> */ >> >> [000h 0000 4] Signature : "PPTT" [Processor Properties Topology Table] >> -[004h 0004 4] Table Length : 0000004C >> +[004h 0004 4] Table Length : 00000060 >> [008h 0008 1] Revision : 02 >> -[009h 0009 1] Checksum : A8 >> +[009h 0009 1] Checksum : 48 >> [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 1] Subtable Type : 00 [Processor Hierarchy Node] >> [025h 0037 1] Length : 14 >> [026h 0038 2] Reserved : 0000 >> [028h 0040 4] Flags (decoded below) : 00000001 >> Physical package : 1 >> ACPI Processor ID valid : 0 >> [02Ch 0044 4] Parent : 00000000 >> [030h 0048 4] ACPI Processor ID : 00000000 >> [034h 0052 4] Private Resource Number : 00000000 >> >> [038h 0056 1] Subtable Type : 00 [Processor Hierarchy Node] >> [039h 0057 1] Length : 14 >> [03Ah 0058 2] Reserved : 0000 >> -[03Ch 0060 4] Flags (decoded below) : 0000000A >> +[03Ch 0060 4] Flags (decoded below) : 00000000 >> Physical package : 0 >> - ACPI Processor ID valid : 1 >> + ACPI Processor ID valid : 0 > I do not know this very well but does the above two changes (flags and > processor ID) makes sense? Yes. I think this is exactly what we expected. Above flags is for the newly inserted cluster node which is between socket node and core node. Flag "Physical package" is 0 because it does not represent the boundary of physical package. Flag "ACPI Processor ID valid" is 0, because we don't need a valid ID for a container in QEMU (cluster is container of CPU core) just like socket node. "0000000A" originally comes from core node, which now is at place [*] below. We can also read the reason why we don't need a valid ID for a container in 099f2df2e6b "hw/acpi/aml-build: Add PPTT table". > >> [040h 0064 4] Parent : 00000024 >> [044h 0068 4] ACPI Processor ID : 00000000 >> [048h 0072 4] Private Resource Number : 00000000 >> >> -Raw Table Data: Length 76 (0x4C) >> +[04Ch 0076 1] Subtable Type : 00 [Processor Hierarchy Node] >> +[04Dh 0077 1] Length : 14 >> +[04Eh 0078 2] Reserved : 0000 >> +[050h 0080 4] Flags (decoded below) : 0000000A >> + Physical package : 0 >> + ACPI Processor ID valid : 1 >> +[054h 0084 4] Parent : 00000038 >> +[058h 0088 4] ACPI Processor ID : 00000000 >> +[05Ch 0092 4] Private Resource Number : 00000000 [*] Information of core node. Thanks, Yanan >> + >> +Raw Table Data: Length 96 (0x60) >> >> - 0000: 50 50 54 54 4C 00 00 00 02 A8 42 4F 43 48 53 20 // PPTTL.....BOCHS >> + 0000: 50 50 54 54 60 00 00 00 02 48 42 4F 43 48 53 20 // PPTT`....HBOCHS >> 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 14 00 00 01 00 00 00 00 00 00 00 // ................ >> - 0030: 00 00 00 00 00 00 00 00 00 14 00 00 0A 00 00 00 // ................ >> - 0040: 24 00 00 00 00 00 00 00 00 00 00 00 // $........... >> + 0030: 00 00 00 00 00 00 00 00 00 14 00 00 00 00 00 00 // ................ >> + 0040: 24 00 00 00 00 00 00 00 00 00 00 00 00 14 00 00 // $............... >> + 0050: 0A 00 00 00 38 00 00 00 00 00 00 00 00 00 00 00 // ....8........... >> >> Signed-off-by: Yanan Wang <wangyanan55@huawei.com> >> --- >> tests/data/acpi/virt/PPTT | Bin 76 -> 96 bytes >> tests/qtest/bios-tables-test-allowed-diff.h | 1 - >> 2 files changed, 1 deletion(-) >> >> diff --git a/tests/data/acpi/virt/PPTT b/tests/data/acpi/virt/PPTT >> index 7a1258ecf123555b24462c98ccbb76b4ac1d0c2b..f56ea63b369a604877374ad696c396e796ab1c83 100644 >> GIT binary patch >> delta 53 >> zcmV-50LuSNU<y!BR8(L90006=kqR;-00000Bme*a000000000002BZK3IG5AH~;_u >> L0000000000uCW9Z >> >> delta 32 >> qcmV+*0N?*$ObSp?R8&j=00080kqR=APy`Gl00000000000001OcLdh} >> >> diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h >> index cb143a55a6..dfb8523c8b 100644 >> --- a/tests/qtest/bios-tables-test-allowed-diff.h >> +++ b/tests/qtest/bios-tables-test-allowed-diff.h >> @@ -1,2 +1 @@ >> /* List of comma-separated changed AML files to ignore */ >> -"tests/data/acpi/virt/PPTT", >> -- >> 2.27.0 >> >> > .
On Tue, 4 Jan 2022, wangyanan (Y) wrote: > Hi Ani, > Thanks for your review. > > On 2022/1/3 20:01, Ani Sinha wrote: > > > > On Mon, 3 Jan 2022, Yanan Wang wrote: > > > > > Run ./tests/data/acpi/rebuild-expected-aml.sh from build directory > > > to update PPTT binary. Also empty bios-tables-test-allowed-diff.h. > > > > > > The disassembled differences between actual and expected PPTT: > > > > > > /* > > > * Intel ACPI Component Architecture > > > * AML/ASL+ Disassembler version 20180810 (64-bit version) > > > * Copyright (c) 2000 - 2018 Intel Corporation > > > * > > > - * Disassembly of tests/data/acpi/virt/PPTT, Mon Oct 25 20:24:53 2021 > > > + * Disassembly of /tmp/aml-BPI5B1, Mon Oct 25 20:24:53 2021 > > > * > > > * ACPI Data Table [PPTT] > > > * > > > * Format: [HexOffset DecimalOffset ByteLength] FieldName : FieldValue > > > */ > > > > > > [000h 0000 4] Signature : "PPTT" [Processor > > > Properties Topology Table] > > > -[004h 0004 4] Table Length : 0000004C > > > +[004h 0004 4] Table Length : 00000060 > > > [008h 0008 1] Revision : 02 > > > -[009h 0009 1] Checksum : A8 > > > +[009h 0009 1] Checksum : 48 > > > [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 1] Subtable Type : 00 [Processor Hierarchy > > > Node] > > > [025h 0037 1] Length : 14 > > > [026h 0038 2] Reserved : 0000 > > > [028h 0040 4] Flags (decoded below) : 00000001 > > > Physical package : 1 > > > ACPI Processor ID valid : 0 > > > [02Ch 0044 4] Parent : 00000000 > > > [030h 0048 4] ACPI Processor ID : 00000000 > > > [034h 0052 4] Private Resource Number : 00000000 > > > > > > [038h 0056 1] Subtable Type : 00 [Processor Hierarchy > > > Node] > > > [039h 0057 1] Length : 14 > > > [03Ah 0058 2] Reserved : 0000 > > > -[03Ch 0060 4] Flags (decoded below) : 0000000A > > > +[03Ch 0060 4] Flags (decoded below) : 00000000 > > > Physical package : 0 > > > - ACPI Processor ID valid : 1 > > > + ACPI Processor ID valid : 0 > > I do not know this very well but does the above two changes (flags and > > processor ID) makes sense? > Yes. I think this is exactly what we expected. > Above flags is for the newly inserted cluster node which is between > socket node and core node. Flag "Physical package" is 0 because > it does not represent the boundary of physical package. Flag > "ACPI Processor ID valid" is 0, because we don't need a valid ID > for a container in QEMU (cluster is container of CPU core) just > like socket node. > > "0000000A" originally comes from core node, which now is at > place [*] below. > > We can also read the reason why we don't need a valid ID for a > container in 099f2df2e6b "hw/acpi/aml-build: Add PPTT table". Ok as long as we can explain it, I am good. > > > > > [040h 0064 4] Parent : 00000024 > > > [044h 0068 4] ACPI Processor ID : 00000000 > > > [048h 0072 4] Private Resource Number : 00000000 > > > > > > -Raw Table Data: Length 76 (0x4C) > > > +[04Ch 0076 1] Subtable Type : 00 [Processor Hierarchy > > > Node] > > > +[04Dh 0077 1] Length : 14 > > > +[04Eh 0078 2] Reserved : 0000 > > > +[050h 0080 4] Flags (decoded below) : 0000000A > > > + Physical package : 0 > > > + ACPI Processor ID valid : 1 > > > +[054h 0084 4] Parent : 00000038 > > > +[058h 0088 4] ACPI Processor ID : 00000000 > > > +[05Ch 0092 4] Private Resource Number : 00000000 > [*] Information of core node. > > Thanks, > Yanan > > > + > > > +Raw Table Data: Length 96 (0x60) > > > > > > - 0000: 50 50 54 54 4C 00 00 00 02 A8 42 4F 43 48 53 20 // > > > PPTTL.....BOCHS > > > + 0000: 50 50 54 54 60 00 00 00 02 48 42 4F 43 48 53 20 // > > > PPTT`....HBOCHS > > > 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 14 00 00 01 00 00 00 00 00 00 00 // > > > ................ > > > - 0030: 00 00 00 00 00 00 00 00 00 14 00 00 0A 00 00 00 // > > > ................ > > > - 0040: 24 00 00 00 00 00 00 00 00 00 00 00 // > > > $........... > > > + 0030: 00 00 00 00 00 00 00 00 00 14 00 00 00 00 00 00 // > > > ................ > > > + 0040: 24 00 00 00 00 00 00 00 00 00 00 00 00 14 00 00 // > > > $............... > > > + 0050: 0A 00 00 00 38 00 00 00 00 00 00 00 00 00 00 00 // > > > ....8........... > > > > > > Signed-off-by: Yanan Wang <wangyanan55@huawei.com> Reviewed-by: Ani Sinha <ani@anisinha.ca> > > > --- > > > tests/data/acpi/virt/PPTT | Bin 76 -> 96 bytes > > > tests/qtest/bios-tables-test-allowed-diff.h | 1 - > > > 2 files changed, 1 deletion(-) > > > > > > diff --git a/tests/data/acpi/virt/PPTT b/tests/data/acpi/virt/PPTT > > > index > > > 7a1258ecf123555b24462c98ccbb76b4ac1d0c2b..f56ea63b369a604877374ad696c396e796ab1c83 > > > 100644 > > > GIT binary patch > > > delta 53 > > > zcmV-50LuSNU<y!BR8(L90006=kqR;-00000Bme*a000000000002BZK3IG5AH~;_u > > > L0000000000uCW9Z > > > > > > delta 32 > > > qcmV+*0N?*$ObSp?R8&j=00080kqR=APy`Gl00000000000001OcLdh} > > > > > > diff --git a/tests/qtest/bios-tables-test-allowed-diff.h > > > b/tests/qtest/bios-tables-test-allowed-diff.h > > > index cb143a55a6..dfb8523c8b 100644 > > > --- a/tests/qtest/bios-tables-test-allowed-diff.h > > > +++ b/tests/qtest/bios-tables-test-allowed-diff.h > > > @@ -1,2 +1 @@ > > > /* List of comma-separated changed AML files to ignore */ > > > -"tests/data/acpi/virt/PPTT", > > > -- > > > 2.27.0 > > > > > > > > . > >
On 2022/1/4 12:27, Ani Sinha wrote: > > On Tue, 4 Jan 2022, wangyanan (Y) wrote: > >> Hi Ani, >> Thanks for your review. >> >> On 2022/1/3 20:01, Ani Sinha wrote: >>> On Mon, 3 Jan 2022, Yanan Wang wrote: >>> >>>> Run ./tests/data/acpi/rebuild-expected-aml.sh from build directory >>>> to update PPTT binary. Also empty bios-tables-test-allowed-diff.h. >>>> >>>> The disassembled differences between actual and expected PPTT: >>>> >>>> /* >>>> * Intel ACPI Component Architecture >>>> * AML/ASL+ Disassembler version 20180810 (64-bit version) >>>> * Copyright (c) 2000 - 2018 Intel Corporation >>>> * >>>> - * Disassembly of tests/data/acpi/virt/PPTT, Mon Oct 25 20:24:53 2021 >>>> + * Disassembly of /tmp/aml-BPI5B1, Mon Oct 25 20:24:53 2021 >>>> * >>>> * ACPI Data Table [PPTT] >>>> * >>>> * Format: [HexOffset DecimalOffset ByteLength] FieldName : FieldValue >>>> */ >>>> >>>> [000h 0000 4] Signature : "PPTT" [Processor >>>> Properties Topology Table] >>>> -[004h 0004 4] Table Length : 0000004C >>>> +[004h 0004 4] Table Length : 00000060 >>>> [008h 0008 1] Revision : 02 >>>> -[009h 0009 1] Checksum : A8 >>>> +[009h 0009 1] Checksum : 48 >>>> [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 1] Subtable Type : 00 [Processor Hierarchy >>>> Node] >>>> [025h 0037 1] Length : 14 >>>> [026h 0038 2] Reserved : 0000 >>>> [028h 0040 4] Flags (decoded below) : 00000001 >>>> Physical package : 1 >>>> ACPI Processor ID valid : 0 >>>> [02Ch 0044 4] Parent : 00000000 >>>> [030h 0048 4] ACPI Processor ID : 00000000 >>>> [034h 0052 4] Private Resource Number : 00000000 >>>> >>>> [038h 0056 1] Subtable Type : 00 [Processor Hierarchy >>>> Node] >>>> [039h 0057 1] Length : 14 >>>> [03Ah 0058 2] Reserved : 0000 >>>> -[03Ch 0060 4] Flags (decoded below) : 0000000A >>>> +[03Ch 0060 4] Flags (decoded below) : 00000000 >>>> Physical package : 0 >>>> - ACPI Processor ID valid : 1 >>>> + ACPI Processor ID valid : 0 >>> I do not know this very well but does the above two changes (flags and >>> processor ID) makes sense? >> Yes. I think this is exactly what we expected. >> Above flags is for the newly inserted cluster node which is between >> socket node and core node. Flag "Physical package" is 0 because >> it does not represent the boundary of physical package. Flag >> "ACPI Processor ID valid" is 0, because we don't need a valid ID >> for a container in QEMU (cluster is container of CPU core) just >> like socket node. >> >> "0000000A" originally comes from core node, which now is at >> place [*] below. >> >> We can also read the reason why we don't need a valid ID for a >> container in 099f2df2e6b "hw/acpi/aml-build: Add PPTT table". > Ok as long as we can explain it, I am good. > >>>> [040h 0064 4] Parent : 00000024 >>>> [044h 0068 4] ACPI Processor ID : 00000000 >>>> [048h 0072 4] Private Resource Number : 00000000 >>>> >>>> -Raw Table Data: Length 76 (0x4C) >>>> +[04Ch 0076 1] Subtable Type : 00 [Processor Hierarchy >>>> Node] >>>> +[04Dh 0077 1] Length : 14 >>>> +[04Eh 0078 2] Reserved : 0000 >>>> +[050h 0080 4] Flags (decoded below) : 0000000A >>>> + Physical package : 0 >>>> + ACPI Processor ID valid : 1 >>>> +[054h 0084 4] Parent : 00000038 >>>> +[058h 0088 4] ACPI Processor ID : 00000000 >>>> +[05Ch 0092 4] Private Resource Number : 00000000 >> [*] Information of core node. >> >> Thanks, >> Yanan >>>> + >>>> +Raw Table Data: Length 96 (0x60) >>>> >>>> - 0000: 50 50 54 54 4C 00 00 00 02 A8 42 4F 43 48 53 20 // >>>> PPTTL.....BOCHS >>>> + 0000: 50 50 54 54 60 00 00 00 02 48 42 4F 43 48 53 20 // >>>> PPTT`....HBOCHS >>>> 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 14 00 00 01 00 00 00 00 00 00 00 // >>>> ................ >>>> - 0030: 00 00 00 00 00 00 00 00 00 14 00 00 0A 00 00 00 // >>>> ................ >>>> - 0040: 24 00 00 00 00 00 00 00 00 00 00 00 // >>>> $........... >>>> + 0030: 00 00 00 00 00 00 00 00 00 14 00 00 00 00 00 00 // >>>> ................ >>>> + 0040: 24 00 00 00 00 00 00 00 00 00 00 00 00 14 00 00 // >>>> $............... >>>> + 0050: 0A 00 00 00 38 00 00 00 00 00 00 00 00 00 00 00 // >>>> ....8........... >>>> >>>> Signed-off-by: Yanan Wang <wangyanan55@huawei.com> > Reviewed-by: Ani Sinha <ani@anisinha.ca> Thank you. Yanan >>>> --- >>>> tests/data/acpi/virt/PPTT | Bin 76 -> 96 bytes >>>> tests/qtest/bios-tables-test-allowed-diff.h | 1 - >>>> 2 files changed, 1 deletion(-) >>>> >>>> diff --git a/tests/data/acpi/virt/PPTT b/tests/data/acpi/virt/PPTT >>>> index >>>> 7a1258ecf123555b24462c98ccbb76b4ac1d0c2b..f56ea63b369a604877374ad696c396e796ab1c83 >>>> 100644 >>>> GIT binary patch >>>> delta 53 >>>> zcmV-50LuSNU<y!BR8(L90006=kqR;-00000Bme*a000000000002BZK3IG5AH~;_u >>>> L0000000000uCW9Z >>>> >>>> delta 32 >>>> qcmV+*0N?*$ObSp?R8&j=00080kqR=APy`Gl00000000000001OcLdh} >>>> >>>> diff --git a/tests/qtest/bios-tables-test-allowed-diff.h >>>> b/tests/qtest/bios-tables-test-allowed-diff.h >>>> index cb143a55a6..dfb8523c8b 100644 >>>> --- a/tests/qtest/bios-tables-test-allowed-diff.h >>>> +++ b/tests/qtest/bios-tables-test-allowed-diff.h >>>> @@ -1,2 +1 @@ >>>> /* List of comma-separated changed AML files to ignore */ >>>> -"tests/data/acpi/virt/PPTT", >>>> -- >>>> 2.27.0 >>>> >>>> >>> . >> > .
diff --git a/tests/data/acpi/virt/PPTT b/tests/data/acpi/virt/PPTT index 7a1258ecf123555b24462c98ccbb76b4ac1d0c2b..f56ea63b369a604877374ad696c396e796ab1c83 100644 GIT binary patch delta 53 zcmV-50LuSNU<y!BR8(L90006=kqR;-00000Bme*a000000000002BZK3IG5AH~;_u L0000000000uCW9Z delta 32 qcmV+*0N?*$ObSp?R8&j=00080kqR=APy`Gl00000000000001OcLdh} diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index cb143a55a6..dfb8523c8b 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1,2 +1 @@ /* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/virt/PPTT",
Run ./tests/data/acpi/rebuild-expected-aml.sh from build directory to update PPTT binary. Also empty bios-tables-test-allowed-diff.h. The disassembled differences between actual and expected PPTT: /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20180810 (64-bit version) * Copyright (c) 2000 - 2018 Intel Corporation * - * Disassembly of tests/data/acpi/virt/PPTT, Mon Oct 25 20:24:53 2021 + * Disassembly of /tmp/aml-BPI5B1, Mon Oct 25 20:24:53 2021 * * ACPI Data Table [PPTT] * * Format: [HexOffset DecimalOffset ByteLength] FieldName : FieldValue */ [000h 0000 4] Signature : "PPTT" [Processor Properties Topology Table] -[004h 0004 4] Table Length : 0000004C +[004h 0004 4] Table Length : 00000060 [008h 0008 1] Revision : 02 -[009h 0009 1] Checksum : A8 +[009h 0009 1] Checksum : 48 [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 1] Subtable Type : 00 [Processor Hierarchy Node] [025h 0037 1] Length : 14 [026h 0038 2] Reserved : 0000 [028h 0040 4] Flags (decoded below) : 00000001 Physical package : 1 ACPI Processor ID valid : 0 [02Ch 0044 4] Parent : 00000000 [030h 0048 4] ACPI Processor ID : 00000000 [034h 0052 4] Private Resource Number : 00000000 [038h 0056 1] Subtable Type : 00 [Processor Hierarchy Node] [039h 0057 1] Length : 14 [03Ah 0058 2] Reserved : 0000 -[03Ch 0060 4] Flags (decoded below) : 0000000A +[03Ch 0060 4] Flags (decoded below) : 00000000 Physical package : 0 - ACPI Processor ID valid : 1 + ACPI Processor ID valid : 0 [040h 0064 4] Parent : 00000024 [044h 0068 4] ACPI Processor ID : 00000000 [048h 0072 4] Private Resource Number : 00000000 -Raw Table Data: Length 76 (0x4C) +[04Ch 0076 1] Subtable Type : 00 [Processor Hierarchy Node] +[04Dh 0077 1] Length : 14 +[04Eh 0078 2] Reserved : 0000 +[050h 0080 4] Flags (decoded below) : 0000000A + Physical package : 0 + ACPI Processor ID valid : 1 +[054h 0084 4] Parent : 00000038 +[058h 0088 4] ACPI Processor ID : 00000000 +[05Ch 0092 4] Private Resource Number : 00000000 + +Raw Table Data: Length 96 (0x60) - 0000: 50 50 54 54 4C 00 00 00 02 A8 42 4F 43 48 53 20 // PPTTL.....BOCHS + 0000: 50 50 54 54 60 00 00 00 02 48 42 4F 43 48 53 20 // PPTT`....HBOCHS 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 14 00 00 01 00 00 00 00 00 00 00 // ................ - 0030: 00 00 00 00 00 00 00 00 00 14 00 00 0A 00 00 00 // ................ - 0040: 24 00 00 00 00 00 00 00 00 00 00 00 // $........... + 0030: 00 00 00 00 00 00 00 00 00 14 00 00 00 00 00 00 // ................ + 0040: 24 00 00 00 00 00 00 00 00 00 00 00 00 14 00 00 // $............... + 0050: 0A 00 00 00 38 00 00 00 00 00 00 00 00 00 00 00 // ....8........... Signed-off-by: Yanan Wang <wangyanan55@huawei.com> --- tests/data/acpi/virt/PPTT | Bin 76 -> 96 bytes tests/qtest/bios-tables-test-allowed-diff.h | 1 - 2 files changed, 1 deletion(-)