[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v2 05/15] tests: acpi: update expected tables blobs
|
From: |
Michael S. Tsirkin |
|
Subject: |
Re: [PATCH v2 05/15] tests: acpi: update expected tables blobs |
|
Date: |
Wed, 20 Oct 2021 05:45:03 -0400 |
On Wed, Oct 20, 2021 at 11:05:21AM +0200, Igor Mammedov wrote:
> On Tue, 19 Oct 2021 06:27:26 -0400
> "Michael S. Tsirkin" <mst@redhat.com> wrote:
>
> > On Tue, Oct 19, 2021 at 11:56:32AM +0200, Igor Mammedov wrote:
> > > On Mon, 18 Oct 2021 16:37:28 -0400
> > > "Michael S. Tsirkin" <mst@redhat.com> wrote:
> > >
> > > > On Thu, Sep 02, 2021 at 07:35:41AM -0400, Igor Mammedov wrote:
> > > > > Update adds CPU entries to MADT/SRAT/FACP and DSDT to cover 288 CPUs.
> > > > > Notable changes are that CPUs with APIC ID 255 and higher
> > > > > use 'Processor Local x2APIC Affinity' structure in SRAT and
> > > > > "Device" element in DSDT.
> > > > >
> > > > > FACP:
> > > > > - Use APIC Cluster Model (V4) : 0
> > > > > + Use APIC Cluster Model (V4) : 1
> > > > >
> > > > > SRAT:
> > > > > ...
> > > > > +[1010h 4112 1] Subtable Type : 00 [Processor Local
> > > > > APIC/SAPIC Affinity]
> > > > > +[1011h 4113 1] Length : 10
> > > > > +
> > > > > +[1012h 4114 1] Proximity Domain Low(8) : 00
> > > > > +[1013h 4115 1] Apic ID : FE
> > > > > +[1014h 4116 4] Flags (decoded below) : 00000001
> > > > > + Enabled : 1
> > > > > +[1018h 4120 1] Local Sapic EID : 00
> > > > > +[1019h 4121 3] Proximity Domain High(24) : 000000
> > > > > +[101Ch 4124 4] Clock Domain : 00000000
> > > > > +
> > > > > +[1020h 4128 1] Subtable Type : 02 [Processor Local
> > > > > x2APIC Affinity]
> > > > > +[1021h 4129 1] Length : 18
> > > > > +
> > > > > +[1022h 4130 2] Reserved1 : 0000
> > > > > +[1024h 4132 4] Proximity Domain : 00000001
> > > > > +[1028h 4136 4] Apic ID : 000000FF
> > > > > +[102Ch 4140 4] Flags (decoded below) : 00000001
> > > > > + Enabled : 1
> > > > > +[1030h 4144 4] Clock Domain : 00000000
> > > > > +[1034h 4148 4] Reserved2 : 00000000
> > > > >
> > > > > ...
> > > > >
> > > > > +[1320h 4896 1] Subtable Type : 02 [Processor Local
> > > > > x2APIC Affinity]
> > > > > +[1321h 4897 1] Length : 18
> > > > > +
> > > > > +[1322h 4898 2] Reserved1 : 0000
> > > > > +[1324h 4900 4] Proximity Domain : 00000001
> > > > > +[1328h 4904 4] Apic ID : 0000011F
> > > > > +[132Ch 4908 4] Flags (decoded below) : 00000001
> > > > > + Enabled : 1
> > > > > +[1330h 4912 4] Clock Domain : 00000000
> > > > > +[1334h 4916 4] Reserved2 : 00000000
> > > > >
> > > > > DSDT:
> > > > >
> > > > > ...
> > > > > + Processor (C0FE, 0xFE, 0x00000000, 0x00)
> > > > > + {
> > > > > ...
> > > > > + }
> > > > > +
> > > > > + Device (C0FF)
> > > > > + {
> > > > > + Name (_HID, "ACPI0007" /* Processor Device */) //
> > > > > _HID: Hardware ID
> > > > > + Name (_UID, 0xFF) // _UID: Unique ID
> > > > > ...
> > > > > + }
> > > > >
> > > > > + Device (C11F)
> > > > > + {
> > > > > + Name (_HID, "ACPI0007" /* Processor Device */) //
> > > > > _HID: Hardware ID
> > > > > + Name (_UID, 0x011F) // _UID: Unique ID
> > > > > ...
> > > > > + }
> > > > >
> > > > > APIC:
> > > > > +[034h 0052 1] Subtable Type : 00 [Processor Local
> > > > > APIC]
> > > > > +[035h 0053 1] Length : 08
> > > > > +[036h 0054 1] Processor ID : 01
> > > > > +[037h 0055 1] Local Apic ID : 01
> > > > > +[038h 0056 4] Flags (decoded below) : 00000000
> > > > > + Processor Enabled : 0
> > > > >
> > > > > ...
> > > > >
> > > > > +[81Ch 2076 1] Subtable Type : 00 [Processor Local
> > > > > APIC]
> > > > > +[81Dh 2077 1] Length : 08
> > > > > +[81Eh 2078 1] Processor ID : FE
> > > > > +[81Fh 2079 1] Local Apic ID : FE
> > > > > +[820h 2080 4] Flags (decoded below) : 00000000
> > > > > + Processor Enabled : 0
> > > > > +
> > > > > +[824h 2084 1] Subtable Type : 09 [Processor Local
> > > > > x2APIC]
> > > > > +[825h 2085 1] Length : 10
> > > > > +[826h 2086 2] Reserved : 0000
> > > > > +[828h 2088 4] Processor x2Apic ID : 000000FF
> > > > > +[82Ch 2092 4] Flags (decoded below) : 00000000
> > > > > + Processor Enabled : 0
> > > > > +[830h 2096 4] Processor UID : 000000FF
> > > > >
> > > > > ...
> > > > >
> > > > > +[A24h 2596 1] Subtable Type : 09 [Processor Local
> > > > > x2APIC]
> > > > > +[A25h 2597 1] Length : 10
> > > > > +[A26h 2598 2] Reserved : 0000
> > > > > +[A28h 2600 4] Processor x2Apic ID : 0000011F
> > > > > +[A2Ch 2604 4] Flags (decoded below) : 00000000
> > > > > + Processor Enabled : 0
> > > > > +[A30h 2608 4] Processor UID : 0000011F
> > > > > +
> > > > > +[A34h 2612 1] Subtable Type : 01 [I/O APIC]
> > > > > +[A35h 2613 1] Length : 0C
> > > > > +[A36h 2614 1] I/O Apic ID : 00
> > > > > +[A37h 2615 1] Reserved : 00
> > > > > +[A38h 2616 4] Address : FEC00000
> > > > > +[A3Ch 2620 4] Interrupt : 00000000
> > > > > +
> > > > > +[A40h 2624 1] Subtable Type : 02 [Interrupt Source
> > > > > Override]
> > > > > +[A41h 2625 1] Length : 0A
> > > > > +[A42h 2626 1] Bus : 00
> > > > > +[A43h 2627 1] Source : 00
> > > > > +[A44h 2628 4] Interrupt : 00000002
> > > > > +[A48h 2632 2] Flags (decoded below) : 0000
> > > > > Polarity : 0
> > > > > Trigger Mode : 0
> > > > >
> > > > > -[04Ah 0074 1] Subtable Type : 02 [Interrupt Source
> > > > > Override]
> > > > > -[04Bh 0075 1] Length : 0A
> > > > > -[04Ch 0076 1] Bus : 00
> > > > > -[04Dh 0077 1] Source : 05
> > > > > -[04Eh 0078 4] Interrupt : 00000005
> > > > > -[052h 0082 2] Flags (decoded below) : 000D
> > > > > +[A4Ah 2634 1] Subtable Type : 02 [Interrupt Source
> > > > > Override]
> > > > > +[A4Bh 2635 1] Length : 0A
> > > > > +[A4Ch 2636 1] Bus : 00
> > > > > +[A4Dh 2637 1] Source : 05
> > > > > +[A4Eh 2638 4] Interrupt : 00000005
> > > > > +[A52h 2642 2] Flags (decoded below) : 000D
> > > > > Polarity : 1
> > > > > Trigger Mode : 3
> > > > >
> > > > > -[054h 0084 1] Subtable Type : 02 [Interrupt Source
> > > > > Override]
> > > > > -[055h 0085 1] Length : 0A
> > > > > -[056h 0086 1] Bus : 00
> > > > > -[057h 0087 1] Source : 09
> > > > > -[058h 0088 4] Interrupt : 00000009
> > > > > -[05Ch 0092 2] Flags (decoded below) : 000D
> > > > > +[A54h 2644 1] Subtable Type : 02 [Interrupt Source
> > > > > Override]
> > > > > +[A55h 2645 1] Length : 0A
> > > > > +[A56h 2646 1] Bus : 00
> > > > > +[A57h 2647 1] Source : 09
> > > > > +[A58h 2648 4] Interrupt : 00000009
> > > > > +[A5Ch 2652 2] Flags (decoded below) : 000D
> > > > > Polarity : 1
> > > > > Trigger Mode : 3
> > > > >
> > > > > -[05Eh 0094 1] Subtable Type : 02 [Interrupt Source
> > > > > Override]
> > > > > -[05Fh 0095 1] Length : 0A
> > > > > -[060h 0096 1] Bus : 00
> > > > > -[061h 0097 1] Source : 0A
> > > > > -[062h 0098 4] Interrupt : 0000000A
> > > > > -[066h 0102 2] Flags (decoded below) : 000D
> > > > > +[A5Eh 2654 1] Subtable Type : 02 [Interrupt Source
> > > > > Override]
> > > > > +[A5Fh 2655 1] Length : 0A
> > > > > +[A60h 2656 1] Bus : 00
> > > > > +[A61h 2657 1] Source : 0A
> > > > > +[A62h 2658 4] Interrupt : 0000000A
> > > > > +[A66h 2662 2] Flags (decoded below) : 000D
> > > > > Polarity : 1
> > > > > Trigger Mode : 3
> > > > >
> > > > > -[068h 0104 1] Subtable Type : 02 [Interrupt Source
> > > > > Override]
> > > > > -[069h 0105 1] Length : 0A
> > > > > -[06Ah 0106 1] Bus : 00
> > > > > -[06Bh 0107 1] Source : 0B
> > > > > -[06Ch 0108 4] Interrupt : 0000000B
> > > > > -[070h 0112 2] Flags (decoded below) : 000D
> > > > > +[A68h 2664 1] Subtable Type : 02 [Interrupt Source
> > > > > Override]
> > > > > +[A69h 2665 1] Length : 0A
> > > > > +[A6Ah 2666 1] Bus : 00
> > > > > +[A6Bh 2667 1] Source : 0B
> > > > > +[A6Ch 2668 4] Interrupt : 0000000B
> > > > > +[A70h 2672 2] Flags (decoded below) : 000D
> > > > > Polarity : 1
> > > > > Trigger Mode : 3
> > > > >
> > > > > -[072h 0114 1] Subtable Type : 04 [Local APIC NMI]
> > > > > -[073h 0115 1] Length : 06
> > > > > -[074h 0116 1] Processor ID : FF
> > > > > -[075h 0117 2] Flags (decoded below) : 0000
> > > > > +[A72h 2674 1] Subtable Type : 0A [Local x2APIC NMI]
> > > > > +[A73h 2675 1] Length : 0C
> > > > > +[A74h 2676 2] Flags (decoded below) : 0000
> > > > > Polarity : 0
> > > > > Trigger Mode : 0
> > > > > -[077h 0119 1] Interrupt Input LINT : 01
> > > > > +[A76h 2678 4] Processor UID : FFFFFFFF
> > > > > +[A7Ah 2682 1] Interrupt Input LINT : 01
> > > > > +[A7Bh 2683 3] Reserved : 000000
> > > > >
> > > > > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > > > > ---
> > > > > v2:
> > > > > - rebase on top of ACPI PCI hotplug changes
> > > > > ---
> > > > > tests/qtest/bios-tables-test-allowed-diff.h | 4 ----
> > > > > tests/data/acpi/q35/APIC.xapic | Bin 0 -> 2686 bytes
> > > > > tests/data/acpi/q35/DSDT.xapic | Bin 0 -> 35652 bytes
> > > > > tests/data/acpi/q35/FACP.xapic | Bin 0 -> 244 bytes
> > > > > tests/data/acpi/q35/SRAT.xapic | Bin 0 -> 5080 bytes
> > > > > 5 files changed, 4 deletions(-)
> > > > > create mode 100644 tests/data/acpi/q35/APIC.xapic
> > > > > create mode 100644 tests/data/acpi/q35/FACP.xapic
> > > > >
> > > > > diff --git a/tests/qtest/bios-tables-test-allowed-diff.h
> > > > > b/tests/qtest/bios-tables-test-allowed-diff.h
> > > > > index c79ff104fb..dfb8523c8b 100644
> > > > > --- a/tests/qtest/bios-tables-test-allowed-diff.h
> > > > > +++ b/tests/qtest/bios-tables-test-allowed-diff.h
> > > > > @@ -1,5 +1 @@
> > > > > /* List of comma-separated changed AML files to ignore */
> > > > > -"tests/data/acpi/q35/DSDT.xapic",
> > > > > -"tests/data/acpi/q35/SRAT.xapic",
> > > > > -"tests/data/acpi/q35/FACP",
> > > > > -"tests/data/acpi/q35/APIC",
> > > >
> > >
> > > > This should have just allowed changes to FACP.xapic and APIC.xapic
> > > Probably, I don't recall why I did this.
> > > Maybe I wanted to get diff for this tables vs baseline as opposed to
> > > whole new table.
> >
> > You can softlink the table to expected if you want this.
>
> that would make git copy/commit link's content
Are you sure? Git has a special object type for symlinks ...
> (unless it's done temporary to just generate diff,
> but then there might be a question why it's not full
> table diff as it's committed)
>
> Using suffixless baseline here is fine
> what rises questions is that .xapic is used only for some files,
> and I don't recall why I wrote it this way anymore.
>
>
>
> > > Shall I respin?