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 D7D82C7EE3A for ; Fri, 27 Jun 2025 10:02:37 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uV5tZ-0007Sk-0M; Fri, 27 Jun 2025 06:01:21 -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 1uV5tJ-0007MQ-RO for qemu-devel@nongnu.org; Fri, 27 Jun 2025 06:01:10 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uV5tH-0000WA-PK for qemu-devel@nongnu.org; Fri, 27 Jun 2025 06:01:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751018463; 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=ftOQTU+H1GTSx78MzXNxfoxlD/TQU1QHzV8siU4sn64=; b=ONSuQUZ/GHsKGnmlPTbEHUPu2G0ktdoUyG9G3BePr0zNZ6EXyeYkJrOTZRlJEuXq6gPz7S yMzoZ/i1ZLuvzM/1UctgpioXRXCk67dhKF5+zwh//s8VC4fo8e0aUPD6yW5JtcAiVsn8Tl aNtrrnWDTSUAs7uyk83xyQGBm803HeY= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-349-NsDQu271OnuhVTkUgUhVJA-1; Fri, 27 Jun 2025 06:01:00 -0400 X-MC-Unique: NsDQu271OnuhVTkUgUhVJA-1 X-Mimecast-MFC-AGG-ID: NsDQu271OnuhVTkUgUhVJA_1751018459 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-3a6d90929d6so832752f8f.2 for ; Fri, 27 Jun 2025 03:01:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751018457; x=1751623257; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:reply-to:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ftOQTU+H1GTSx78MzXNxfoxlD/TQU1QHzV8siU4sn64=; b=UP8+WmlRRC9aev6KpeVvBvl+cl0iJKM1W4IMO68mWXBKHMIsJphauGbsYFQvL4GVBY DfQrg+ARwIXrSObmPfChDRSbXaHEE5YE4EC1aRMeXd+sMmp2Or4MA1xH7c5vm5YRkuka WtnnmRXPWVOwh+MXaDXy4363NUlW7pZ6GbvPwpH16K2LrshOKg4pkphQK9DR9lnio2Dv AaMbU3vcoPE1JQTU1yvLYSCO0nRHfsWh9+embsTw9aaqumST1WOxvxeLXmmGeWobbkOM EK8NhgvbFQwBGBWv/BoBN/eDcKefl/EREJ0jK/jcrPtGeoIADdcNq6aliMXIHR66/nsj TXgw== X-Forwarded-Encrypted: i=1; AJvYcCWwhBR+yH6IgqE5Jc2p4VwkVGgwaCU2beXR5gpXYTUqPc7dOn2PknNyFu0nHBmhUIg1n590Bkayz1x+@nongnu.org X-Gm-Message-State: AOJu0YzDo0uFvkKRf43ucmAWlKjJUxBc06qJOuUUOCHs9tyKDBO0N6ZX 1+ZexeYNWh+32KQuC1xCkQxDe5ki+h7qgrxwU8buOwamyrhb5Sq4d2MqwugkswnL+IZ3vuK28DW hdT4dTBFNlTgYt1hR7M7+ciQR1xFvp02lUvimCnAIiaU1fJpfN6Y1Q3YW X-Gm-Gg: ASbGnctGXSpxnMJdK5zKA2jWbB6jBGghkRlxLm9pbWW4l+yu2dFiwvG3WXW18U+m5Dr E5GANa+G7qTRgPl49tvxXzHsIICAhO6UklPU7AFSNN1QHS4LmAp1cWfLyBwtegEQo99MjdfvIcM /xcRpSWeh5vZDFzNYLm30kAkSSrcpBGCQcSLUZVg9k5XJn8Ma5YeFr3TB+hkifHUWOfZwx+giWP ohJKq1n2qXeYDtr2aaZBf/hpuRMGOTVNyes2loMf3tmFDcnCV7TTUeQoEPd0GYFGjvbEedz6k1c vnfY1NlwPfR4rDC4a4iapoeUWy5osjKV87wzQ/9U4dZ2rhTgF4oAUc8R7xiXpwSXOcu76Q== X-Received: by 2002:a05:6000:652:b0:3a4:d0fe:42b2 with SMTP id ffacd0b85a97d-3a8fdb2a48amr1949922f8f.19.1751018455266; Fri, 27 Jun 2025 03:00:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHEaEPioX+cPthgf8j/Wewywxia8pqsJQM9kNEbt3J8ndZcFqdbPcvICMOj/2hMd225D7K02A== X-Received: by 2002:a05:6000:652:b0:3a4:d0fe:42b2 with SMTP id ffacd0b85a97d-3a8fdb2a48amr1949844f8f.19.1751018454409; Fri, 27 Jun 2025 03:00:54 -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 5b1f17b1804b1-453923a22fbsm5359955e9.34.2025.06.27.03.00.53 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 27 Jun 2025 03:00:53 -0700 (PDT) Message-ID: Date: Fri, 27 Jun 2025 12:00:51 +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 To: 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 Cc: pbonzini@redhat.com, Jonathan.Cameron@huawei.com, philmd@linaro.org, alex.bennee@linaro.org References: <20250627095620.3300028-1-eric.auger@redhat.com> <20250627095620.3300028-20-eric.auger@redhat.com> Content-Language: en-US From: Eric Auger In-Reply-To: <20250627095620.3300028-20-eric.auger@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.129.124; envelope-from=eric.auger@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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/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? 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