diff mbox series

[v7,10/10] tests/data/acpi/virt: Update IORT files for ITS

Message ID 20210805223002.144855-11-shashi.mallela@linaro.org
State Superseded
Headers show
Series GICv3 LPI and ITS feature implementation | expand

Commit Message

Shashi Mallela Aug. 5, 2021, 10:30 p.m. UTC
Updated expected IORT files applicable with latest GICv3
ITS changes.

Full diff of new file disassembly:

/*
 * Intel ACPI Component Architecture
 * AML/ASL+ Disassembler version 20180629 (64-bit version)
 * Copyright (c) 2000 - 2018 Intel Corporation
 *
 * Disassembly of tests/data/acpi/virt/IORT.pxb, Tue Jun 29 17:35:38 2021
 *
 * ACPI Data Table [IORT]
 *
 * Format: [HexOffset DecimalOffset ByteLength]  FieldName : FieldValue
 */

[000h 0000   4]                    Signature : "IORT"    [IO Remapping Table]
[004h 0004   4]                 Table Length : 0000007C
[008h 0008   1]                     Revision : 00
[009h 0009   1]                     Checksum : 07
[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   4]                   Node Count : 00000002
[028h 0040   4]                  Node Offset : 00000030
[02Ch 0044   4]                     Reserved : 00000000

[030h 0048   1]                         Type : 00
[031h 0049   2]                       Length : 0018
[033h 0051   1]                     Revision : 00
[034h 0052   4]                     Reserved : 00000000
[038h 0056   4]                Mapping Count : 00000000
[03Ch 0060   4]               Mapping Offset : 00000000

[040h 0064   4]                     ItsCount : 00000001
[044h 0068   4]                  Identifiers : 00000000

[048h 0072   1]                         Type : 02
[049h 0073   2]                       Length : 0034
[04Bh 0075   1]                     Revision : 00
[04Ch 0076   4]                     Reserved : 00000000
[050h 0080   4]                Mapping Count : 00000001
[054h 0084   4]               Mapping Offset : 00000020

[058h 0088   8]            Memory Properties : [IORT Memory Access Properties]
[058h 0088   4]              Cache Coherency : 00000001
[05Ch 0092   1]        Hints (decoded below) : 00
                                   Transient : 0
                              Write Allocate : 0
                               Read Allocate : 0
                                    Override : 0
[05Dh 0093   2]                     Reserved : 0000
[05Fh 0095   1] Memory Flags (decoded below) : 03
                                   Coherency : 1
                            Device Attribute : 1
[060h 0096   4]                ATS Attribute : 00000000
[064h 0100   4]           PCI Segment Number : 00000000
[068h 0104   1]            Memory Size Limit : 00
[069h 0105   3]                     Reserved : 000000

[068h 0104   4]                   Input base : 00000000
[06Ch 0108   4]                     ID Count : 0000FFFF
[070h 0112   4]                  Output Base : 00000000
[074h 0116   4]             Output Reference : 00000030
[078h 0120   4]        Flags (decoded below) : 00000000
                              Single Mapping : 0

Raw Table Data: Length 124 (0x7C)

    0000: 49 4F 52 54 7C 00 00 00 00 07 42 4F 43 48 53 20  // IORT|.....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 02 00 00 00 30 00 00 00 00 00 00 00  // ........0.......
    0030: 00 18 00 00 00 00 00 00 00 00 00 00 00 00 00 00  // ................
    0040: 01 00 00 00 00 00 00 00 02 34 00 00 00 00 00 00  // .........4......
    0050: 01 00 00 00 20 00 00 00 01 00 00 00 00 00 00 03  // .... ...........
    0060: 00 00 00 00 00 00 00 00 00 00 00 00 FF FF 00 00  // ................
    0070: 00 00 00 00 30 00 00 00 00 00 00 00              // ....0.......

Signed-off-by: Shashi Mallela <shashi.mallela@linaro.org>

---
 tests/data/acpi/virt/IORT                   | Bin 0 -> 124 bytes
 tests/data/acpi/virt/IORT.memhp             | Bin 0 -> 124 bytes
 tests/data/acpi/virt/IORT.numamem           | Bin 0 -> 124 bytes
 tests/data/acpi/virt/IORT.pxb               | Bin 0 -> 124 bytes
 tests/qtest/bios-tables-test-allowed-diff.h |   4 ----
 5 files changed, 4 deletions(-)

-- 
2.27.0

Comments

Igor Mammedov Aug. 6, 2021, 11:11 a.m. UTC | #1
On Thu,  5 Aug 2021 18:30:02 -0400
Shashi Mallela <shashi.mallela@linaro.org> wrote:

> Updated expected IORT files applicable with latest GICv3

> ITS changes.

> 

> Full diff of new file disassembly:

> 

> /*

>  * Intel ACPI Component Architecture

>  * AML/ASL+ Disassembler version 20180629 (64-bit version)

>  * Copyright (c) 2000 - 2018 Intel Corporation

>  *

>  * Disassembly of tests/data/acpi/virt/IORT.pxb, Tue Jun 29 17:35:38 2021

>  *

>  * ACPI Data Table [IORT]

>  *

>  * Format: [HexOffset DecimalOffset ByteLength]  FieldName : FieldValue

>  */

> 

> [000h 0000   4]                    Signature : "IORT"    [IO Remapping Table]

> [004h 0004   4]                 Table Length : 0000007C

> [008h 0008   1]                     Revision : 00

> [009h 0009   1]                     Checksum : 07

> [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   4]                   Node Count : 00000002

> [028h 0040   4]                  Node Offset : 00000030

> [02Ch 0044   4]                     Reserved : 00000000

> 

> [030h 0048   1]                         Type : 00

> [031h 0049   2]                       Length : 0018

> [033h 0051   1]                     Revision : 00

> [034h 0052   4]                     Reserved : 00000000

> [038h 0056   4]                Mapping Count : 00000000

> [03Ch 0060   4]               Mapping Offset : 00000000

> 

> [040h 0064   4]                     ItsCount : 00000001

> [044h 0068   4]                  Identifiers : 00000000

> 

> [048h 0072   1]                         Type : 02

> [049h 0073   2]                       Length : 0034

> [04Bh 0075   1]                     Revision : 00

> [04Ch 0076   4]                     Reserved : 00000000

> [050h 0080   4]                Mapping Count : 00000001

> [054h 0084   4]               Mapping Offset : 00000020

> 

> [058h 0088   8]            Memory Properties : [IORT Memory Access Properties]

> [058h 0088   4]              Cache Coherency : 00000001

> [05Ch 0092   1]        Hints (decoded below) : 00

>                                    Transient : 0

>                               Write Allocate : 0

>                                Read Allocate : 0

>                                     Override : 0

> [05Dh 0093   2]                     Reserved : 0000

> [05Fh 0095   1] Memory Flags (decoded below) : 03

>                                    Coherency : 1

>                             Device Attribute : 1

> [060h 0096   4]                ATS Attribute : 00000000

> [064h 0100   4]           PCI Segment Number : 00000000

> [068h 0104   1]            Memory Size Limit : 00

> [069h 0105   3]                     Reserved : 000000

> 

> [068h 0104   4]                   Input base : 00000000

> [06Ch 0108   4]                     ID Count : 0000FFFF

> [070h 0112   4]                  Output Base : 00000000

> [074h 0116   4]             Output Reference : 00000030

> [078h 0120   4]        Flags (decoded below) : 00000000

>                               Single Mapping : 0

> 

> Raw Table Data: Length 124 (0x7C)

> 

>     0000: 49 4F 52 54 7C 00 00 00 00 07 42 4F 43 48 53 20  // IORT|.....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 02 00 00 00 30 00 00 00 00 00 00 00  // ........0.......

>     0030: 00 18 00 00 00 00 00 00 00 00 00 00 00 00 00 00  // ................

>     0040: 01 00 00 00 00 00 00 00 02 34 00 00 00 00 00 00  // .........4......

>     0050: 01 00 00 00 20 00 00 00 01 00 00 00 00 00 00 03  // .... ...........

>     0060: 00 00 00 00 00 00 00 00 00 00 00 00 FF FF 00 00  // ................

>     0070: 00 00 00 00 30 00 00 00 00 00 00 00              // ....0.......

> 

> Signed-off-by: Shashi Mallela <shashi.mallela@linaro.org>



Acked-by: Igor Mammedov <imammedo@redhat.com>


> ---

>  tests/data/acpi/virt/IORT                   | Bin 0 -> 124 bytes

>  tests/data/acpi/virt/IORT.memhp             | Bin 0 -> 124 bytes

>  tests/data/acpi/virt/IORT.numamem           | Bin 0 -> 124 bytes

>  tests/data/acpi/virt/IORT.pxb               | Bin 0 -> 124 bytes

>  tests/qtest/bios-tables-test-allowed-diff.h |   4 ----

>  5 files changed, 4 deletions(-)

> 

> diff --git a/tests/data/acpi/virt/IORT b/tests/data/acpi/virt/IORT

> index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..521acefe9ba66706c5607321a82d330586f3f280 100644

> GIT binary patch

> literal 124

> zcmebD4+^Pa00MR=e`k+i1*eDrX9XZ&1PX!JAesq?4S*O7Bw!2(4Uz`|CKCt^;wu0#

> QRGb+i3L*dhhtM#y0PN=p0RR91

> 

> literal 0

> HcmV?d00001

> 

> diff --git a/tests/data/acpi/virt/IORT.memhp b/tests/data/acpi/virt/IORT.memhp

> index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..521acefe9ba66706c5607321a82d330586f3f280 100644

> GIT binary patch

> literal 124

> zcmebD4+^Pa00MR=e`k+i1*eDrX9XZ&1PX!JAesq?4S*O7Bw!2(4Uz`|CKCt^;wu0#

> QRGb+i3L*dhhtM#y0PN=p0RR91

> 

> literal 0

> HcmV?d00001

> 

> diff --git a/tests/data/acpi/virt/IORT.numamem b/tests/data/acpi/virt/IORT.numamem

> index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..521acefe9ba66706c5607321a82d330586f3f280 100644

> GIT binary patch

> literal 124

> zcmebD4+^Pa00MR=e`k+i1*eDrX9XZ&1PX!JAesq?4S*O7Bw!2(4Uz`|CKCt^;wu0#

> QRGb+i3L*dhhtM#y0PN=p0RR91

> 

> literal 0

> HcmV?d00001

> 

> diff --git a/tests/data/acpi/virt/IORT.pxb b/tests/data/acpi/virt/IORT.pxb

> index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..521acefe9ba66706c5607321a82d330586f3f280 100644

> GIT binary patch

> literal 124

> zcmebD4+^Pa00MR=e`k+i1*eDrX9XZ&1PX!JAesq?4S*O7Bw!2(4Uz`|CKCt^;wu0#

> QRGb+i3L*dhhtM#y0PN=p0RR91

> 

> 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 2ef211df59..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/virt/IORT",

> -"tests/data/acpi/virt/IORT.memhp",

> -"tests/data/acpi/virt/IORT.numamem",

> -"tests/data/acpi/virt/IORT.pxb",
Igor Mammedov Sept. 1, 2021, 8:03 a.m. UTC | #2
not directly related to the patch but while I was testing IORT testcase
(https://github.com/imammedo/qemu acpi-tests)
after rebase to 6.1, I get test failure due to change in MADT table vs
expected blobs made in 6.0 time and it does look like ABI change
(what is bad, it also happens to virt-6.0 machine type).
Can ARM folks check if we didn't break something?

acpi-test: Warning! APIC mismatch. Actual [asl:/tmp/asl-1TCW80.dsl, aml:/tmp/aml-OUIW80], Expected [asl:/tmp/asl-O8DW80.dsl, aml:tests/data/acpi/virt/APIC].
--- /tmp/asl-O8DW80.dsl	2021-09-01 03:49:02.311023292 -0400
+++ /tmp/asl-1TCW80.dsl	2021-09-01 03:49:02.311023292 -0400
@@ -1,78 +1,82 @@
 /*
  * Intel ACPI Component Architecture
  * AML/ASL+ Disassembler version 20180629 (64-bit version)
  * Copyright (c) 2000 - 2018 Intel Corporation
  * 
- * Disassembly of tests/data/acpi/virt/APIC, Wed Sep  1 03:49:02 2021
+ * Disassembly of /tmp/aml-OUIW80, Wed Sep  1 03:49:02 2021
  *
  * ACPI Data Table [APIC]
  *
  * Format: [HexOffset DecimalOffset ByteLength]  FieldName : FieldValue
  */
 
 [000h 0000   4]                    Signature : "APIC"    [Multiple APIC Description Table (MADT)]
-[004h 0004   4]                 Table Length : 000000A8
+[004h 0004   4]                 Table Length : 000000B4
 [008h 0008   1]                     Revision : 03
-[009h 0009   1]                     Checksum : 50
+[009h 0009   1]                     Checksum : CA
 [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   4]           Local Apic Address : 00000000
 [028h 0040   4]        Flags (decoded below) : 00000000
                          PC-AT Compatibility : 0
 
 [02Ch 0044   1]                Subtable Type : 0C [Generic Interrupt Distributor]
 [02Dh 0045   1]                       Length : 18
 [02Eh 0046   2]                     Reserved : 0000
 [030h 0048   4]        Local GIC Hardware ID : 00000000
 [034h 0052   8]                 Base Address : 0000000008000000
 [03Ch 0060   4]               Interrupt Base : 00000000
-[040h 0064   1]                      Version : 02
+[040h 0064   1]                      Version : 03
 [041h 0065   3]                     Reserved : 000000
 
 [044h 0068   1]                Subtable Type : 0B [Generic Interrupt Controller]
 [045h 0069   1]                       Length : 4C
 [046h 0070   2]                     Reserved : 0000
 [048h 0072   4]         CPU Interface Number : 00000000
 [04Ch 0076   4]                Processor UID : 00000000
 [050h 0080   4]        Flags (decoded below) : 00000001
                            Processor Enabled : 1
           Performance Interrupt Trigger Mode : 0
           Virtual GIC Interrupt Trigger Mode : 0
 [054h 0084   4]     Parking Protocol Version : 00000000
 [058h 0088   4]        Performance Interrupt : 00000017
 [05Ch 0092   8]               Parked Address : 0000000000000000
-[064h 0100   8]                 Base Address : 0000000008010000
-[06Ch 0108   8]     Virtual GIC Base Address : 0000000008040000
-[074h 0116   8]  Hypervisor GIC Base Address : 0000000008030000
+[064h 0100   8]                 Base Address : 0000000000000000
+[06Ch 0108   8]     Virtual GIC Base Address : 0000000000000000
+[074h 0116   8]  Hypervisor GIC Base Address : 0000000000000000
 [07Ch 0124   4]        Virtual GIC Interrupt : 00000000
 [080h 0128   8]   Redistributor Base Address : 0000000000000000
 [088h 0136   8]                    ARM MPIDR : 0000000000000000
 /**** ACPI subtable terminates early - may be older version (dump table) */
 
-[090h 0144   1]                Subtable Type : 0D [Generic MSI Frame]
-[091h 0145   1]                       Length : 18
+[090h 0144   1]                Subtable Type : 0E [Generic Interrupt Redistributor]
+[091h 0145   1]                       Length : 10
 [092h 0146   2]                     Reserved : 0000
-[094h 0148   4]                 MSI Frame ID : 00000000
-[098h 0152   8]                 Base Address : 0000000008020000
-[0A0h 0160   4]        Flags (decoded below) : 00000001
-                                  Select SPI : 1
-[0A4h 0164   2]                    SPI Count : 0040
-[0A6h 0166   2]                     SPI Base : 0050
+[094h 0148   8]                 Base Address : 00000000080A0000
+[09Ch 0156   4]                       Length : 00F60000
 
-Raw Table Data: Length 168 (0xA8)
+[0A0h 0160   1]                Subtable Type : 0F [Generic Interrupt Translator]
+[0A1h 0161   1]                       Length : 14
+[0A2h 0162   2]                     Reserved : 0000
+[0A4h 0164   4]               Translation ID : 00000000
+[0A8h 0168   8]                 Base Address : 0000000008080000
+[0B0h 0176   4]                     Reserved : 00000000
Peter Maydell Sept. 1, 2021, 8:06 a.m. UTC | #3
On Wed, 1 Sept 2021 at 09:03, Igor Mammedov <imammedo@redhat.com> wrote:
>

> not directly related to the patch but while I was testing IORT testcase

> (https://github.com/imammedo/qemu acpi-tests)

> after rebase to 6.1, I get test failure due to change in MADT table vs

> expected blobs made in 6.0 time and it does look like ABI change

> (what is bad, it also happens to virt-6.0 machine type).

> Can ARM folks check if we didn't break something?


>  [02Ch 0044   1]                Subtable Type : 0C [Generic Interrupt Distributor]

>  [02Dh 0045   1]                       Length : 18

>  [02Eh 0046   2]                     Reserved : 0000

>  [030h 0048   4]        Local GIC Hardware ID : 00000000

>  [034h 0052   8]                 Base Address : 0000000008000000

>  [03Ch 0060   4]               Interrupt Base : 00000000

> -[040h 0064   1]                      Version : 02

> +[040h 0064   1]                      Version : 03


This says the GIC changed from GICv2 to v3. What QEMU command line are
you using here ?

-- PMM
Igor Mammedov Sept. 1, 2021, 9:02 a.m. UTC | #4
On Wed, 1 Sep 2021 09:06:41 +0100
Peter Maydell <peter.maydell@linaro.org> wrote:

> On Wed, 1 Sept 2021 at 09:03, Igor Mammedov <imammedo@redhat.com> wrote:

> >

> > not directly related to the patch but while I was testing IORT testcase

> > (https://github.com/imammedo/qemu acpi-tests)

> > after rebase to 6.1, I get test failure due to change in MADT table vs

> > expected blobs made in 6.0 time and it does look like ABI change

> > (what is bad, it also happens to virt-6.0 machine type).

> > Can ARM folks check if we didn't break something?  

> 

> >  [02Ch 0044   1]                Subtable Type : 0C [Generic Interrupt Distributor]

> >  [02Dh 0045   1]                       Length : 18

> >  [02Eh 0046   2]                     Reserved : 0000

> >  [030h 0048   4]        Local GIC Hardware ID : 00000000

> >  [034h 0052   8]                 Base Address : 0000000008000000

> >  [03Ch 0060   4]               Interrupt Base : 00000000

> > -[040h 0064   1]                      Version : 02

> > +[040h 0064   1]                      Version : 03  

> 

> This says the GIC changed from GICv2 to v3. What QEMU command line are

For the test case, I'm more interested in if the rest of numbers are correct for defaut virt machine type.

But in case of virt-6.0 we might have problem.

> you using here ?


-machine virt -accel kvm -accel tcg -nodefaults -nographic -drive if=pflash,format=raw,file=pc-bios/edk2-aarch64-code.fd,readonly=on -drive if=pflash,format=raw,file=pc-bios/edk2-arm-vars.fd,snapshot=on -cdrom tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2 -cpu host -machine virt-6.0
                                                                                  ^^^^^^^^

it's running on aarch64 host with kvm enabled to test IORT table.

> 

> -- PMM

>
Peter Maydell Sept. 1, 2021, 9:45 a.m. UTC | #5
On Wed, 1 Sept 2021 at 10:02, Igor Mammedov <imammedo@redhat.com> wrote:
>

> On Wed, 1 Sep 2021 09:06:41 +0100

> Peter Maydell <peter.maydell@linaro.org> wrote:

>

> > On Wed, 1 Sept 2021 at 09:03, Igor Mammedov <imammedo@redhat.com> wrote:

> > >

> > > not directly related to the patch but while I was testing IORT testcase

> > > (https://github.com/imammedo/qemu acpi-tests)

> > > after rebase to 6.1, I get test failure due to change in MADT table vs

> > > expected blobs made in 6.0 time and it does look like ABI change

> > > (what is bad, it also happens to virt-6.0 machine type).

> > > Can ARM folks check if we didn't break something?

> >

> > >  [02Ch 0044   1]                Subtable Type : 0C [Generic Interrupt Distributor]

> > >  [02Dh 0045   1]                       Length : 18

> > >  [02Eh 0046   2]                     Reserved : 0000

> > >  [030h 0048   4]        Local GIC Hardware ID : 00000000

> > >  [034h 0052   8]                 Base Address : 0000000008000000

> > >  [03Ch 0060   4]               Interrupt Base : 00000000

> > > -[040h 0064   1]                      Version : 02

> > > +[040h 0064   1]                      Version : 03

> >

> > This says the GIC changed from GICv2 to v3. What QEMU command line are

> For the test case, I'm more interested in if the rest of numbers are correct for defaut virt machine type.

>

> But in case of virt-6.0 we might have problem.

>

> > you using here ?

>

> -machine virt -accel kvm -accel tcg -nodefaults -nographic -drive if=pflash,format=raw,file=pc-bios/edk2-aarch64-code.fd,readonly=on -drive if=pflash,format=raw,file=pc-bios/edk2-arm-vars.fd,snapshot=on -cdrom tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2 -cpu host -machine virt-6.0

>                                                                                   ^^^^^^^^


With KVM enabled you get "whatever interrupt controller the host has",
so the configuration is not stable across different host machines. So this
is not a usable setup to generate or cross-check the ACPI test blobs.
(It should get you the same configuration across QEMU versions but on
the same host machine, though.)

(All the diffs you quote are interrupt-controller related in one way
or another.)

-- PMM
Igor Mammedov Sept. 1, 2021, 10:04 a.m. UTC | #6
On Wed, 1 Sep 2021 10:45:43 +0100
Peter Maydell <peter.maydell@linaro.org> wrote:

> On Wed, 1 Sept 2021 at 10:02, Igor Mammedov <imammedo@redhat.com> wrote:

> >

> > On Wed, 1 Sep 2021 09:06:41 +0100

> > Peter Maydell <peter.maydell@linaro.org> wrote:

> >  

> > > On Wed, 1 Sept 2021 at 09:03, Igor Mammedov <imammedo@redhat.com> wrote:  

> > > >

> > > > not directly related to the patch but while I was testing IORT testcase

> > > > (https://github.com/imammedo/qemu acpi-tests)

> > > > after rebase to 6.1, I get test failure due to change in MADT table vs

> > > > expected blobs made in 6.0 time and it does look like ABI change

> > > > (what is bad, it also happens to virt-6.0 machine type).

> > > > Can ARM folks check if we didn't break something?  

> > >  

> > > >  [02Ch 0044   1]                Subtable Type : 0C [Generic Interrupt Distributor]

> > > >  [02Dh 0045   1]                       Length : 18

> > > >  [02Eh 0046   2]                     Reserved : 0000

> > > >  [030h 0048   4]        Local GIC Hardware ID : 00000000

> > > >  [034h 0052   8]                 Base Address : 0000000008000000

> > > >  [03Ch 0060   4]               Interrupt Base : 00000000

> > > > -[040h 0064   1]                      Version : 02

> > > > +[040h 0064   1]                      Version : 03  

> > >

> > > This says the GIC changed from GICv2 to v3. What QEMU command line are  

> > For the test case, I'm more interested in if the rest of numbers are correct for defaut virt machine type.

> >

> > But in case of virt-6.0 we might have problem.

> >  

> > > you using here ?  

> >

> > -machine virt -accel kvm -accel tcg -nodefaults -nographic -drive if=pflash,format=raw,file=pc-bios/edk2-aarch64-code.fd,readonly=on -drive if=pflash,format=raw,file=pc-bios/edk2-arm-vars.fd,snapshot=on -cdrom tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2 -cpu host -machine virt-6.0

> >                                                                                   ^^^^^^^^  

> 

> With KVM enabled you get "whatever interrupt controller the host has",

> so the configuration is not stable across different host machines. So this

> is not a usable setup to generate or cross-check the ACPI test blobs.

> (It should get you the same configuration across QEMU versions but on

> the same host machine, though.)


Ok, I'll drop IORT test case for now and revisit it once this series is
merged.

> 

> (All the diffs you quote are interrupt-controller related in one way

> or another.)

>

> -- PMM

>
diff mbox series

Patch

diff --git a/tests/data/acpi/virt/IORT b/tests/data/acpi/virt/IORT
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..521acefe9ba66706c5607321a82d330586f3f280 100644
GIT binary patch
literal 124
zcmebD4+^Pa00MR=e`k+i1*eDrX9XZ&1PX!JAesq?4S*O7Bw!2(4Uz`|CKCt^;wu0#
QRGb+i3L*dhhtM#y0PN=p0RR91

literal 0
HcmV?d00001

diff --git a/tests/data/acpi/virt/IORT.memhp b/tests/data/acpi/virt/IORT.memhp
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..521acefe9ba66706c5607321a82d330586f3f280 100644
GIT binary patch
literal 124
zcmebD4+^Pa00MR=e`k+i1*eDrX9XZ&1PX!JAesq?4S*O7Bw!2(4Uz`|CKCt^;wu0#
QRGb+i3L*dhhtM#y0PN=p0RR91

literal 0
HcmV?d00001

diff --git a/tests/data/acpi/virt/IORT.numamem b/tests/data/acpi/virt/IORT.numamem
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..521acefe9ba66706c5607321a82d330586f3f280 100644
GIT binary patch
literal 124
zcmebD4+^Pa00MR=e`k+i1*eDrX9XZ&1PX!JAesq?4S*O7Bw!2(4Uz`|CKCt^;wu0#
QRGb+i3L*dhhtM#y0PN=p0RR91

literal 0
HcmV?d00001

diff --git a/tests/data/acpi/virt/IORT.pxb b/tests/data/acpi/virt/IORT.pxb
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..521acefe9ba66706c5607321a82d330586f3f280 100644
GIT binary patch
literal 124
zcmebD4+^Pa00MR=e`k+i1*eDrX9XZ&1PX!JAesq?4S*O7Bw!2(4Uz`|CKCt^;wu0#
QRGb+i3L*dhhtM#y0PN=p0RR91

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 2ef211df59..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/virt/IORT",
-"tests/data/acpi/virt/IORT.memhp",
-"tests/data/acpi/virt/IORT.numamem",
-"tests/data/acpi/virt/IORT.pxb",