From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id ED255C77B7C for ; Thu, 3 Jul 2025 05:13:18 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uXCFH-0002bq-V4; Thu, 03 Jul 2025 01:12:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXCFD-0002at-1r for qemu-devel@nongnu.org; Thu, 03 Jul 2025 01:12:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXCFB-0007Z2-32 for qemu-devel@nongnu.org; Thu, 03 Jul 2025 01:12:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751519538; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=e409tKlSOQls0qfKIfh9Uq3MEqXSt50BS9oiWdfTBA4=; b=B6Nl6G/begNe3+C/WYJogc0L6RaHEIDMAGjqZw+q+n+zP2LOrzu1jgkseb/X2utW/X8GTE FPz990YDGrpFWsYvT31DcNZyofW6h6P1v44ES+gGSUzQxp65dRUECJmwvNWTu6bj73oDM7 uKgGKs0bkFL+zS33odRvT3bIiTFKnGs= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-450-OnDKR5okN0eNDxziPh7baA-1; Thu, 03 Jul 2025 01:12:17 -0400 X-MC-Unique: OnDKR5okN0eNDxziPh7baA-1 X-Mimecast-MFC-AGG-ID: OnDKR5okN0eNDxziPh7baA_1751519536 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-3a4f6ff23ccso5137165f8f.2 for ; Wed, 02 Jul 2025 22:12:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751519531; x=1752124331; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:reply-to:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=e409tKlSOQls0qfKIfh9Uq3MEqXSt50BS9oiWdfTBA4=; b=TKlslgXzZL6TCEJGHGb+eke843nM/twDVMZppXw013NQ9iN63ze6b5BI3d9SiJYKZd 15OZtRsOltls4CyUx6UIh7fovkcZFTfFLN6ThY3A+5tQ5IgirWytqdUT8fqEt7IYFxIv 8rLsn/ai9b0/b/A3r3AYdbsHv1gchB537eRX7Iw5QOstxnZ+I1KAiD2GZShtG/4ONqP0 eK1kO5+3GZuaL9TrJEzt60clhnCGMMo2y3pdScfeV3l9UpC8BMRjHD5iRhp3JqiUaAjU WO3Xa5Py4ERxSEzmjaEHhdSjQLC+vKJnaiVHXPq3eXS6r57+LjSxfzn8ur9MtWriya45 ILQg== X-Forwarded-Encrypted: i=1; AJvYcCUNc5/fLDecdMMMz17JzlkpgTNjk0/tz8texmHs4ujUtc9QTrwYAHLzZmvdpjwvrllrnkAqkawnVLNl@nongnu.org X-Gm-Message-State: AOJu0YxJXJxELSDEZPf33fmRIOnfxPdCIr98i0hxmsK0zkWtNDp/QV1I 9FHowymu62kJPo4HJRIOWdMaP78u2npoi3K4MD6FOZoMyEvGIZoUAgdlwPN0+cBnbjSqACLlVpB t8Euk4X7vSD4E+xwsr624zWzb+wdauo0PgtvaWZOl4uzFM+6oKjD6A8fr X-Gm-Gg: ASbGncttc/5iDndGWatnzmppFCXzanNaeSrx+KbwvCXzflSlUc22tJ/nypK66sPfMnr ++zxL7xKZ5zs/I6Z6Atkx/bh7UaK8YMSIRPX+YfXQB6RGxDtc8vADCoOFOaytTCzl4m1IO4dr/A BVnqZEPSAoYn2HeCo2P1ek9G0yxpmbl0q2OWgcfd6v8sWXqyxYmzJpdA62iXV8L42zSN+mP2Smt e7mcU5p25MLocMS+JszOCQqXeOz8brHIAfcFq1ToqF63nGoMjuoihZFDvmuNc7KiwwzAPxMfbzo jdwS0HjXZw+RYhsWZ5aUQpCGsgJyBiW3BVajRBqE2HfqXnVwoMnXOG93bys5rNZ6qJ2uOA== X-Received: by 2002:a05:6000:42c8:b0:3a5:1241:c1a3 with SMTP id ffacd0b85a97d-3b200d3393bmr2709502f8f.50.1751519530925; Wed, 02 Jul 2025 22:12:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFrtRBrgPLhALWhRgahMOkIl7Bhl/Yfi0h0tNuVdDS/4iaeARElW3dAub7H+y01tnL5s4G/UQ== X-Received: by 2002:a05:6000:42c8:b0:3a5:1241:c1a3 with SMTP id ffacd0b85a97d-3b200d3393bmr2709489f8f.50.1751519530439; Wed, 02 Jul 2025 22:12:10 -0700 (PDT) Received: from ?IPV6:2a01:e0a:f0e:9070:527b:9dff:feef:3874? ([2a01:e0a:f0e:9070:527b:9dff:feef:3874]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a892e52ca4sm17752357f8f.58.2025.07.02.22.12.09 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 02 Jul 2025 22:12:09 -0700 (PDT) Message-ID: <5d84a15c-5b1e-465d-84c8-321a49ab6d4f@redhat.com> Date: Thu, 3 Jul 2025 07:12:08 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 19/32] tests/qtest/bios-tables-test: Update ARM DSDT reference blobs Content-Language: en-US To: Jonathan Cameron Cc: eric.auger.pro@gmail.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org, imammedo@redhat.com, gustavo.romero@linaro.org, anisinha@redhat.com, mst@redhat.com, shannon.zhaosl@gmail.com, pbonzini@redhat.com, philmd@linaro.org, alex.bennee@linaro.org References: <20250627095620.3300028-1-eric.auger@redhat.com> <20250627095620.3300028-20-eric.auger@redhat.com> <20250630133105.00002f43@huawei.com> From: Eric Auger In-Reply-To: <20250630133105.00002f43@huawei.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=eric.auger@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.237, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: eric.auger@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Hi, On 6/30/25 2:31 PM, Jonathan Cameron wrote: > On Fri, 27 Jun 2025 12:00:51 +0200 > Eric Auger 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 >>> >>> --- >>> >>> 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>> z85t55NKKlYAt=lxaKZfK(_qso--+U{d?gP%`z}dXz&>> zv$)s`gjksvco`B3nmckB7!nH-A(GKe+`$G0@f`7vE>> OU=c&8G!Fv<69WJ)j4yfs >>> >>> delta 19 >>> acmdm|xlDu0CDC8qh84&>> >>> 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>> zj0_12q$W+y5ESMTxL|(rX|QRP??mxezLJNXeU~IGV4s@F#k3@$fUB`1fq`L3!UCDe >>> zSzPP|Laa;-ybK8i%^f)m42cDa5XtB!?qCChc#e2Smmr4dCjMXpi+GNB4o8>> 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>> z85t55NKKlYAt=lxaKZfK(_qso--+U{d?gP%`z}dXz&>> zv$)s`gjksvco`B3nmckB7!nH-A(GKe+`$G0@f`7vE>> F3;>E4EZYD8 >>> >>> delta 19 >>> acmexo{N0GlCDFq|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>> z85t55NKKl&K}IZRNx}m5shM0%OA-pW8aomg7?va~keQst#a>> uSda*jjBer%HZX|ih<9`eVu)^%2{y2RaCjIP7#YxH`GXCiN_iL2+L6)WZd >>> >>> delta 19 >>> acmca%v)P)>> >>> 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_4CDHJ2nXCn0iZX7Xs@xe~<0nVNVBHpa7F2TOM3(O{GF%$?g >>> zGcqJBkeW0(Lr|DY;DY(dr@^LGz7xe?`AQyk_Fa;&fPHEv7t@l20>> zXK}F?2(dCT@G>M6G>> F8359@EocA$ >>> >>> delta 19 >>> acmeya^+A)%CD>> >>