Hi, On 6/30/25 2:31 PM, Jonathan Cameron wrote: > On Fri, 27 Jun 2025 12:00:51 +0200 > Eric Auger <[email protected]> wrote: > >> Hi, >> >> On 6/27/25 11:55 AM, Eric Auger wrote: >>> Changes relate to the introduction of pieces related to >>> acpi-index static support along with root ports with no hotplug. >>> >>> + >>> + Scope (\_SB.PCI0) >>> + { >>> + Method (EDSM, 5, Serialized) >>> + { >>> + If ((Arg2 == Zero)) >>> + { >>> + Local0 = Buffer (One) >>> + { >>> + 0x00 >>> // . >>> + } >>> + If ((Arg0 != ToUUID >>> ("e5c937d0-3553-4d7a-9117-ea4d19c3434d") /* Device Labeling Interface */)) >>> + { >>> + Return (Local0) >>> + } >>> + >>> + If ((Arg1 < 0x02)) >>> + { >>> + Return (Local0) >>> + } >>> + >>> + Local0 [Zero] = 0x81 >>> + Return (Local0) >>> + } >>> + >>> + If ((Arg2 == 0x07)) >>> + { >>> + Local0 = Package (0x02) >>> + { >>> + Zero, >>> + "" >>> + } >>> + Local1 = DerefOf (Arg4 [Zero]) >>> + Local0 [Zero] = Local1 >>> + Return (Local0) >>> + } >>> + } >>> + >>> + Device (S00) >>> + { >>> + Name (_ADR, Zero) // _ADR: Address >>> + } >>> + >>> + Device (S08) >>> + { >>> + Name (_ADR, 0x00010000) // _ADR: Address >>> + } >>> + >>> + Device (S10) >>> + { >>> + Name (_ADR, 0x00020000) // _ADR: Address >>> + } >>> + } >> after regenerating the blobs using >> >> ../tests/data/acpi/rebuild-expected-aml.sh >> >> I still get an error : >> Using expected file 'tests/data/acpi/aarch64/virt/DSDT' >> acpi-test: Warning! DSDT binary file mismatch. Actual >> [aml:/tmp/aml-2YB972], Expected [aml:tests/data/acpi/aarch64/virt/DSDT]. >> See source file tests/qtest/bios-tables-test.c for instructions on how >> to update expected files. >> acpi-test: Warning! DSDT mismatch. Actual [asl:/tmp/asl-O0B972.dsl, >> aml:/tmp/aml-2YB972], Expected [asl:/tmp/asl-NO6872.dsl, >> aml:tests/data/acpi/aarch64/virt/DSDT]. >> >> ../.. >> >> - >> - Device (S10) >> - { >> - Name (_ADR, 0x00020000) // _ADR: Address >> - } >> } >> } >> >> ** >> ERROR:../tests/qtest/bios-tables-test.c:554:test_acpi_asl: assertion >> failed: (all_tables_match) >> >> (test program exited with status code -6) >> >> >> I don't get what is wrong. >> >> Thoughts? > I've hit so many problems over time with regenerating these I tend > to just blow away the build directory whenever this sort of > issue happens to make sure it's building a clean set. > > Otherwise, no idea!
I actually found the reason of this failure. The viot test for aarch64 is missing a "variant" and this causes the DSDT ref blob to be overriden. Fixing that asap Cheers Eric > > Jonathan > >> Eric >>> } >>> >>> Signed-off-by: Eric Auger <[email protected]> >>> >>> --- >>> >>> above changes are reported after running make check V=2 >>> then I launched ../tests/data/acpi/rebuild-expected-aml.sh from the >>> build directory and it putput those reference blobs. >>> >>> But I run make check V=2 after committing those changes I get and error >>> which looks totally unexpected to me: >>> >>> acpi-test: Warning! DSDT binary file mismatch. Actual >>> [aml:/tmp/aml-LZSL82], Expected [aml:tests/data/acpi/aarch64/virt/DSDT]. >>> See source file tests/qtest/bios-tables-test.c for instructions on how to >>> update expected files. >>> acpi-test: Warning! DSDT mismatch. Actual [asl:/tmp/asl-FTSL82.dsl, >>> aml:/tmp/aml-LZSL82], Expected [asl:/tmp/asl-ZAWL82.dsl, >>> aml:tests/data/acpi/aarch64/virt/DSDT]. >>> --- /tmp/asl-ZAWL82.dsl 2025-06-27 03:34:45.518848387 -0400 >>> +++ /tmp/asl-FTSL82.dsl 2025-06-27 03:34:45.514848036 -0400 >>> @@ -1,30 +1,30 @@ >>> /* >>> * Intel ACPI Component Architecture >>> * AML/ASL+ Disassembler version 20210604 (64-bit version) >>> * Copyright (c) 2000 - 2021 Intel Corporation >>> * >>> * Disassembling to symbolic ASL+ operators >>> * >>> - * Disassembly of tests/data/acpi/aarch64/virt/DSDT, Fri Jun 27 03:34:45 >>> 2025 >>> + * Disassembly of /tmp/aml-LZSL82, Fri Jun 27 03:34:45 2025 >>> * >>> * Original Table Header: >>> * Signature "DSDT" >>> - * Length 0x000014BE (5310) >>> + * Length 0x000014AD (5293) >>> * Revision 0x02 >>> - * Checksum 0x8C >>> + * Checksum 0xEA >>> * OEM ID "BOCHS " >>> * OEM Table ID "BXPC " >>> * OEM Revision 0x00000001 (1) >>> * Compiler ID "BXPC" >>> * Compiler Version 0x00000001 (1) >>> */ >>> DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPC ", 0x00000001) >>> { >>> Scope (\_SB) >>> { >>> Device (C000) >>> { >>> Name (_HID, "ACPI0007" /* Processor Device */) // _HID: >>> Hardware ID >>> Name (_UID, Zero) // _UID: Unique ID >>> } >>> >>> @@ -1929,24 +1929,19 @@ >>> } >>> Local1 = DerefOf (Arg4 [Zero]) >>> Local0 [Zero] = Local1 >>> Return (Local0) >>> } >>> } >>> >>> Device (S00) >>> { >>> Name (_ADR, Zero) // _ADR: Address >>> } >>> >>> Device (S08) >>> { >>> Name (_ADR, 0x00010000) // _ADR: Address >>> } >>> - >>> - Device (S10) >>> - { >>> - Name (_ADR, 0x00020000) // _ADR: Address >>> - } >>> } >>> } >>> --- >>> tests/qtest/bios-tables-test-allowed-diff.h | 5 ----- >>> tests/data/acpi/aarch64/virt/DSDT | Bin 5158 -> 5310 bytes >>> .../data/acpi/aarch64/virt/DSDT.acpihmatvirt | Bin 5244 -> 5379 bytes >>> tests/data/acpi/aarch64/virt/DSDT.memhp | Bin 6519 -> 6654 bytes >>> tests/data/acpi/aarch64/virt/DSDT.pxb | Bin 7603 -> 7768 bytes >>> tests/data/acpi/aarch64/virt/DSDT.topology | Bin 5360 -> 5495 bytes >>> 6 files changed, 5 deletions(-) >>> >>> diff --git a/tests/qtest/bios-tables-test-allowed-diff.h >>> b/tests/qtest/bios-tables-test-allowed-diff.h >>> index abe00ad4ee..dfb8523c8b 100644 >>> --- a/tests/qtest/bios-tables-test-allowed-diff.h >>> +++ b/tests/qtest/bios-tables-test-allowed-diff.h >>> @@ -1,6 +1 @@ >>> /* List of comma-separated changed AML files to ignore */ >>> -"tests/data/acpi/aarch64/virt/DSDT", >>> -"tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt", >>> -"tests/data/acpi/aarch64/virt/DSDT.memhp", >>> -"tests/data/acpi/aarch64/virt/DSDT.pxb", >>> -"tests/data/acpi/aarch64/virt/DSDT.topology", >>> diff --git a/tests/data/acpi/aarch64/virt/DSDT >>> b/tests/data/acpi/aarch64/virt/DSDT >>> index >>> acab6e65febbc210158d4c39be0680bbb90250f5..b897d667971500da4732000091a6f0828d05d89e >>> 100644 >>> GIT binary patch >>> delta 173 >>> zcmZ3cu}_oBCD<iop9lj3Q_n^&8IgJccg`5S_+Y2_0B27F5pPykmtbGs1!j}87zzZL >>> z85t55NKKlYAt=lxaKZfK(_qso--+U{d?gP%`z}dXz&<sTi)l$h0as&30t3U6gatB_ >>> zv$)s`gjksvco`B3nmckB7!nH-A(GKe+`$G0@f`7vE<p^@P5i+I7V#YMl8!DxJPZts >>> OU=c&8G!Fv<69WJ)j4yfs >>> >>> delta 19 >>> acmdm|xlDu0CD<iIO@x7g>C8qh84&<COa$Tp >>> >>> diff --git a/tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt >>> b/tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt >>> index >>> 54c27e7d95b4956ed1b5dee0d299ccb08dc2a73e..2cef095bcc1bb404f8cd9ec77a879ed81c191875 >>> 100644 >>> GIT binary patch >>> delta 156 >>> zcmeyP(X7Sg66_MfEXu&Zv}_|+kx0FO8%K;@e6Uk|fU~E8h&QXNORz8R0<+0k3<ZMB >>> zj0_12q$W+y5ESMTxL|(rX|QRP??mxezLJNXeU~IGV4s@F#k3@$fUB`1fq`L3!UCDe >>> zSzPP|Laa;-ybK8i%^f)m42cDa5XtB!?qCChc#e2Smmr4dCjMXpi+GNB4o8<D9tH+R >>> F1_1j$EA9XQ >>> >>> delta 19 >>> acmZqH`lG?+66_LEBf`MI)VYzXNCW^oYz1ck >>> >>> diff --git a/tests/data/acpi/aarch64/virt/DSDT.memhp >>> b/tests/data/acpi/aarch64/virt/DSDT.memhp >>> index >>> 4330bc97cba0950191c45ac833533db7a190db81..372ca3d7fb1e2927c7c12f97eec406d597f294ab >>> 100644 >>> GIT binary patch >>> delta 156 >>> zcmexv^v{^fCD<k8pCkhV6Zb~0T*-O?H;x#+_+Y2_0B27F5pPykmtbGs1!j}87zzZL >>> z85t55NKKlYAt=lxaKZfK(_qso--+U{d?gP%`z}dXz&<sTi)l$h0as&30t3U6gatB_ >>> zv$)s`gjksvco`B3nmckB7!nH-A(GKe+`$G0@f`7vE<p^@P5i+I7V#YM9F8tQJPZts >>> F3;>E4EZYD8 >>> >>> delta 19 >>> acmexo{N0GlCD<jTT#|u->Fq|YTuA^&WCm0K >>> >>> diff --git a/tests/data/acpi/aarch64/virt/DSDT.pxb >>> b/tests/data/acpi/aarch64/virt/DSDT.pxb >>> index >>> 7fdbc03e2bf9fb7d35704779253de36e362f0bf9..c2779882494e16920787b8ab7b4cb3c3b70f224b >>> 100644 >>> GIT binary patch >>> delta 168 >>> zcmdmNeZz*!CD<h-LXLrf$!jCmN?BzA7p@q+_+Y2_0B27F5pPykmtbGs1!j}87zzZL >>> z85t55NKKl&K}IZRNx}m5shM0%OA-pW8aomg7?va~keQst#a<x9%EZ9SkWkRvk;A}{ >>> uSda*jjBer%HZX|ih<9`eVu)^%2{y2RaCjIP7#YxH`GXCiN_iL<m>2+L6)WZd >>> >>> delta 19 >>> acmca%v)P)<CD<iovn&Gx)9sC1D`f#g-Uey_ >>> >>> diff --git a/tests/data/acpi/aarch64/virt/DSDT.topology >>> b/tests/data/acpi/aarch64/virt/DSDT.topology >>> index >>> 969b4f6560d3ae39f5b7e0064b7122905476fce8..ebbeedc1ed30d811315c350f4cb42f8aa265af73 >>> 100644 >>> GIT binary patch >>> delta 156 >>> zcmeyM`CW_4CD<jTT$F)<>HJ2nXCn0iZX7Xs@xe~<0nVNVBHpa7F2TOM3(O{GF%$?g >>> zGcqJBkeW0(Lr|DY;DY(dr@^LGz7xe?`AQyk_Fa;&fPHEv7t@l20<Ol61O|pB2@7N< >>> zXK}F?2(dCT@G>M6G<W1MFeDZvLL{S`xPuK0;yL0SU4j^*oA`qbEaExhIUHSrco-NM >>> F8359@EocA$ >>> >>> delta 19 >>> acmeya^+A)%CD<k8g9rly)25AF&qM%8i3Z^S >>> >>
