From nobody Sat May 30 18:38:47 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=reject dis=none) header.from=rsg.ci.i.u-tokyo.ac.jp Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779279226771274.6598601304487; Wed, 20 May 2026 05:13:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPfnW-0004g0-97; Wed, 20 May 2026 08:13:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPfnU-0004fK-ID; Wed, 20 May 2026 08:13:12 -0400 Received: from www3579.sakura.ne.jp ([49.212.243.89]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPfnS-00076Q-Nw; Wed, 20 May 2026 08:13:12 -0400 Received: from h183.csg.ci.i.u-tokyo.ac.jp (h183.csg.ci.i.u-tokyo.ac.jp [133.11.54.183]) (authenticated bits=0) by www3579.sakura.ne.jp (8.16.1/8.16.1) with ESMTPSA id 64K9utCQ091476 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 20 May 2026 18:57:03 +0900 (JST) (envelope-from odaki@rsg.ci.i.u-tokyo.ac.jp) DKIM-Signature: a=rsa-sha256; bh=lF474+G4+NG9g1XNzK4NJ+PvOc2o4tFIR7igJ2uelq8=; c=relaxed/relaxed; d=rsg.ci.i.u-tokyo.ac.jp; h=From:Message-Id:To:Subject:Date; s=rs20250326; t=1779271023; v=1; b=SNbkrYqwrBI+QttcwEDp70cErrfT8IU8NeGR73EApBKXUygfFjMMLS6Tp73VkQNr Fo5+Ayjj2KvijSc4PIa6/iUVOC+Yxxb/i+zHqVpWB45nfgzdS4ae/19vUYOZ4oyf CP6fBuzm2V2q2I3sPAS9pv6IVkvbeObJU/Hq0XcEQfJHJHgkyxPyByOc21xoDKfa pBMn8MxmlsgQKqVcu/zXtcHkluOjSma5cLCwfHUoiGb/R5PNePiAbrCYvo/V8H3q qHSLKsiaODFaItSQanKHkEaCQREiVesZMkGRrZTE3bnfFAofgk9SH5nbdJd5koi8 qsQ7gWlDIVZo49/l8wRJxw== From: Akihiko Odaki Date: Wed, 20 May 2026 18:56:30 +0900 Subject: [PATCH v6 1/4] test/acpi: aarch64/virt: Test version 11.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260520-virt-v6-1-d96180454fdf@rsg.ci.i.u-tokyo.ac.jp> References: <20260520-virt-v6-0-d96180454fdf@rsg.ci.i.u-tokyo.ac.jp> In-Reply-To: <20260520-virt-v6-0-d96180454fdf@rsg.ci.i.u-tokyo.ac.jp> To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Eric Auger , Andrew Jones , "Michael S. Tsirkin" , Igor Mammedov , Ani Sinha , Fabiano Rosas , Laurent Vivier , Paolo Bonzini , Akihiko Odaki , Mohamed Mediouni X-Mailer: b4 0.16-dev-16047 X-Developer-Signature: v=1; a=openpgp-sha256; l=2050; i=odaki@rsg.ci.i.u-tokyo.ac.jp; h=from:subject:message-id; bh=wupue4NMA2t2JnLHuDV5GkXDvb1UPJD9EvbYWmNflIM=; b=owGbwMvMwCWmMbc20y1CyJDxtFoSQxZva05IyVT7m5rpCba12nyXfbV/bues/Polo6ju2ZNzk gdnTfXtKGVhEONikBVTZEkp2s2tEV37qTAhvgVmDisTyBAGLk4BmMivkwx/xf69uut3sF21zzG1 aBZD83QJh5eTKqfy6Pyr4r695lWWM8P/sGS7L9fyVJekTd5WK+t17+67njsP0g3ubl33bGqBm8w ZDgA= X-Developer-Key: i=odaki@rsg.ci.i.u-tokyo.ac.jp; a=openpgp; fpr=AEDC03C9AF734F2EC26A7BFFA4BAEAA73536753C Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=49.212.243.89; envelope-from=odaki@rsg.ci.i.u-tokyo.ac.jp; helo=www3579.sakura.ne.jp X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1779279228928154100 A future commit changes the memory map for the latest version of the machine. Test that the memory map of the previous version is preserved. Suggested-by: Mohamed Mediouni Signed-off-by: Akihiko Odaki Reviewed-by: Igor Mammedov --- tests/qtest/bios-tables-test.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 510751799e48..00e62699197a 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -2214,6 +2214,28 @@ static void test_acpi_aarch64_virt_tcg(void) free_test_data(&data); } =20 +static void test_acpi_aarch64_virt_tcg_11_0(void) +{ + test_data data =3D { + .machine =3D "virt", + .machine_param =3D "-11.0", + .arch =3D "aarch64", + .variant =3D ".11.0", + .tcg_only =3D true, + .uefi_fl1 =3D "pc-bios/edk2-aarch64-code.fd", + .uefi_fl2 =3D "pc-bios/edk2-arm-vars.fd", + .cd =3D "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.= qcow2", + .ram_start =3D 0x40000000ULL, + .scan_len =3D 128ULL * MiB, + }; + + data.smbios_cpu_max_speed =3D 2900; + data.smbios_cpu_curr_speed =3D 2700; + test_acpi_one("-cpu cortex-a57 -machine ras=3Don " + "-smbios type=3D4,max-speed=3D2900,current-speed=3D2700"= , &data); + free_test_data(&data); +} + static void test_acpi_aarch64_virt_tcg_topology(void) { test_data data =3D { @@ -2851,6 +2873,8 @@ int main(int argc, char *argv[]) } else if (strcmp(arch, "aarch64") =3D=3D 0) { if (has_tcg && qtest_has_device("virtio-blk-pci")) { qtest_add_func("acpi/virt", test_acpi_aarch64_virt_tcg); + qtest_add_func("acpi/virt/11.0", + test_acpi_aarch64_virt_tcg_11_0); qtest_add_func("acpi/virt/acpihmatvirt", test_acpi_aarch64_virt_tcg_acpi_hmat); qtest_add_func("acpi/virt/topology", --=20 2.54.0 From nobody Sat May 30 18:38:47 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=reject dis=none) header.from=rsg.ci.i.u-tokyo.ac.jp Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779279162777684.3572089188813; Wed, 20 May 2026 05:12:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPfmD-0003M3-Gr; Wed, 20 May 2026 08:11:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPfmB-0003KS-P1; Wed, 20 May 2026 08:11:51 -0400 Received: from www3579.sakura.ne.jp ([49.212.243.89]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPfm9-00076Q-3y; Wed, 20 May 2026 08:11:51 -0400 Received: from h183.csg.ci.i.u-tokyo.ac.jp (h183.csg.ci.i.u-tokyo.ac.jp [133.11.54.183]) (authenticated bits=0) by www3579.sakura.ne.jp (8.16.1/8.16.1) with ESMTPSA id 64K9utCR091476 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 20 May 2026 18:57:03 +0900 (JST) (envelope-from odaki@rsg.ci.i.u-tokyo.ac.jp) DKIM-Signature: a=rsa-sha256; bh=SjYFtJsb0FRA58h9TXRtEmlQ3hZoNWJPwC9HoIYv5D4=; c=relaxed/relaxed; d=rsg.ci.i.u-tokyo.ac.jp; h=From:Message-Id:To:Subject:Date; s=rs20250326; t=1779271023; v=1; b=YC9v3xTxNlN5vGDB2xJjtJdKpcUi49u4UiPMRKMS4FB3YuBXvy4GRCImREkZGFJd PWbA0DOQioTEkDWCnawQLt1OSxaNw0b0TwPPMnoBG/L3TBBlZPU+FU+l/98b5Q1b XrHICXd9VxHZhy6wtnC3+VzfZlMoTe0cQuu8Ypg+Hp/gkCmtZmjh7raE9zSYB9oO A/Lw8sH21YhddkouQzlCkiR2zh8xkeI37SW/nWeHskuMWIjulC59oXnngYS9mSEx PBbdKUKw1vX58QVTguyR2xS7worEEAgxcwJOkVSgpztCz0zBVt09g1JXQE/y+lOx Kpmwt1nWSpjHk5MzHCS5tw== From: Akihiko Odaki Date: Wed, 20 May 2026 18:56:31 +0900 Subject: [PATCH v6 2/4] test/acpi: aarch64/virt: Allow DSDT and MCFG changes MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260520-virt-v6-2-d96180454fdf@rsg.ci.i.u-tokyo.ac.jp> References: <20260520-virt-v6-0-d96180454fdf@rsg.ci.i.u-tokyo.ac.jp> In-Reply-To: <20260520-virt-v6-0-d96180454fdf@rsg.ci.i.u-tokyo.ac.jp> To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Eric Auger , Andrew Jones , "Michael S. Tsirkin" , Igor Mammedov , Ani Sinha , Fabiano Rosas , Laurent Vivier , Paolo Bonzini , Akihiko Odaki X-Mailer: b4 0.16-dev-16047 X-Developer-Signature: v=1; a=openpgp-sha256; l=1020; i=odaki@rsg.ci.i.u-tokyo.ac.jp; h=from:subject:message-id; bh=L/SGCbMPDXlwLMU2o6k2QfWIShKkV4IZn/KCNSNhtoA=; b=owGbwMvMwCWmMbc20y1CyJDxtFoSQxZva877y0HaJ1b5L47nnH6+mtXMjrFX/ZXNd26W2vuPE /+p+NZ0lLIwiHExyIopsqQU7ebWiK79VJgQ3wIzh5UJZAgDF6cATMRciuGf3rv5c27PqHp+sWvO 577bd37tauQ9++Y118yN0Ukzv3kU1zH8z4lvfq6Xq+7AGOxswfa6dx2fgMyUi+x3slo4fO/XPzr CCwA= X-Developer-Key: i=odaki@rsg.ci.i.u-tokyo.ac.jp; a=openpgp; fpr=AEDC03C9AF734F2EC26A7BFFA4BAEAA73536753C Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=49.212.243.89; envelope-from=odaki@rsg.ci.i.u-tokyo.ac.jp; helo=www3579.sakura.ne.jp X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1779279167769154100 Signed-off-by: Akihiko Odaki Acked-by: Igor Mammedov --- tests/qtest/bios-tables-test-allowed-diff.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios= -tables-test-allowed-diff.h index dfb8523c8bf4..efb00724d09f 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,12 @@ /* 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.acpipcihp", +"tests/data/acpi/aarch64/virt/DSDT.hpoffacpiindex", +"tests/data/acpi/aarch64/virt/DSDT.memhp", +"tests/data/acpi/aarch64/virt/DSDT.pxb", +"tests/data/acpi/aarch64/virt/DSDT.smmuv3-dev", +"tests/data/acpi/aarch64/virt/DSDT.smmuv3-legacy", +"tests/data/acpi/aarch64/virt/DSDT.topology", +"tests/data/acpi/aarch64/virt/DSDT.viot", +"tests/data/acpi/aarch64/virt/MCFG", --=20 2.54.0 From nobody Sat May 30 18:38:47 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=reject dis=none) header.from=rsg.ci.i.u-tokyo.ac.jp Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779279147136153.9435740840771; Wed, 20 May 2026 05:12:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPfmF-0003P0-Rz; Wed, 20 May 2026 08:11:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPfmE-0003NJ-Se; Wed, 20 May 2026 08:11:54 -0400 Received: from www3579.sakura.ne.jp ([49.212.243.89]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPfmC-00076Q-N8; Wed, 20 May 2026 08:11:54 -0400 Received: from h183.csg.ci.i.u-tokyo.ac.jp (h183.csg.ci.i.u-tokyo.ac.jp [133.11.54.183]) (authenticated bits=0) by www3579.sakura.ne.jp (8.16.1/8.16.1) with ESMTPSA id 64K9utCS091476 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 20 May 2026 18:57:03 +0900 (JST) (envelope-from odaki@rsg.ci.i.u-tokyo.ac.jp) DKIM-Signature: a=rsa-sha256; bh=D4IYxHy6BWldRtJ5/xQ6YqI+yS6S5W3YifdRJmBXHNA=; c=relaxed/relaxed; d=rsg.ci.i.u-tokyo.ac.jp; h=From:Message-Id:To:Subject:Date; s=rs20250326; t=1779271024; v=1; b=ujRDC2CGz/dyadtq83l6DLcjjsut7Lk7+sIFJC30vHoxn9doiZSwBHcIv1N+d9PO IWdQmooXYXYN3sYlKe5fVUTZi5lJCJeAoVnmxBldO6uPiIKbDDZ308lG/A3GTsUG mRTGCYdNvq5RtktX4k593Ev0kcJHyVZK0I0ZDzSjLH9ZP4Z1SxkRczullMCJ5u9z 9WfkBg1l7NLQjXmiz1Bxo51+jT0KszDpRfrLHNAPdYHReYiczl4dz9gaueen8q0G A59GcdsHg2lC02DWojew6qPr//J5zNDSZEy4g1HlOAaNsEHRXGY19ZXNui0WJPsa W3/c2BPtZuUC/35QZ5OHfQ== From: Akihiko Odaki Date: Wed, 20 May 2026 18:56:32 +0900 Subject: [PATCH v6 3/4] hw/arm/virt: Remove the lower bound of HighMem IO Regions MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260520-virt-v6-3-d96180454fdf@rsg.ci.i.u-tokyo.ac.jp> References: <20260520-virt-v6-0-d96180454fdf@rsg.ci.i.u-tokyo.ac.jp> In-Reply-To: <20260520-virt-v6-0-d96180454fdf@rsg.ci.i.u-tokyo.ac.jp> To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Eric Auger , Andrew Jones , "Michael S. Tsirkin" , Igor Mammedov , Ani Sinha , Fabiano Rosas , Laurent Vivier , Paolo Bonzini , Akihiko Odaki X-Mailer: b4 0.16-dev-16047 X-Developer-Signature: v=1; a=openpgp-sha256; l=5573; i=odaki@rsg.ci.i.u-tokyo.ac.jp; h=from:subject:message-id; bh=yXpFUD6ylD0q/7Rto6f+wSUqoHHwDf87IN/AFjR1iRc=; b=owGbwMvMwCWmMbc20y1CyJDxtFoSQxZva66WjWnaAtFfJTFX7Tm5Zk0tK/ZZLJc6cbOsS8GMz urbjXM7SlkYxLgYZMUUWVKKdnNrRNd+KkyIb4GZw8oEMoSBi1MAJlIUx/A/tIVJMLkrZYadAId0 gMaN16n6+jyGdt6yZfvPXr6orSTC8E95WvY+6XXGj6uvvfy6hcOFY89sa9P6VRa+rqWxmduFOxg A X-Developer-Key: i=odaki@rsg.ci.i.u-tokyo.ac.jp; a=openpgp; fpr=AEDC03C9AF734F2EC26A7BFFA4BAEAA73536753C Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=49.212.243.89; envelope-from=odaki@rsg.ci.i.u-tokyo.ac.jp; helo=www3579.sakura.ne.jp X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, TVD_SUBJ_WIPE_DEBT=1.004 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1779279152713154100 Remove the lower bound of the Highmem IO Regions' addresses for the latest machine version to increase the chance to fit the regions in the PA space. The lower bound was especially problematic when using virt-install on Apple M2. virt-install 5.0.0 adds multiple pcie-root-port devices that require sufficient space in the ECAM region. However, the Highmem ECAM region did not fit in the limited PA space on the hardware, and the ECAM region size was limited to 16 MiB. If virt-install had added more than 16 devices to the root bridge, the region overflowed, which prevented edk2-stable202505 from scanning PCI devices, including the boot disk, causing boot failures. Ideally, a virtual machine with more than 16 devices added to the root bridge should just work so that users and management layers do not have to care whether they use constrained hardware. The base address of the Highmem IO Regions was fixed when commit f90747c4e8fb ("hw/arm/virt: GICv3 DT node with one or two redistributor regions") added the first Highmem IO Region. Later, commit 957e32cffa57 ("hw/arm/virt: Dynamic memory map depending on RAM requirements") allowed moving the Highmem IO Regions to higher addresses to accommodate RAM more than 255 GiB, but the lower bound remained to keep the legacy memory map. Remove the lower bound for the latest machine version to accommodate more devices with the root bridge. Keeping the lower bound for the old machine versions ensures the compatibility is still maintained. The hardcoded memory map in tests/qtest/libqos/generic-pcihost.c is also updated. Signed-off-by: Akihiko Odaki Reviewed-by: Eric Auger --- include/hw/arm/virt.h | 1 + hw/arm/virt.c | 17 +++++++++++------ tests/qtest/libqos/generic-pcihost.c | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index 3ba33b4bd274..6c8ba8f3185b 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -142,6 +142,7 @@ typedef enum VirtGICType { =20 struct VirtMachineClass { MachineClass parent; + hwaddr min_highmem_base; bool no_tcg_its; bool no_highmem_compact; bool no_kvm_steal_time; diff --git a/hw/arm/virt.c b/hw/arm/virt.c index b090233893c5..78a85a966ad7 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -229,8 +229,7 @@ static const MemMapEntry base_memmap[] =3D { * Highmem IO Regions: This memory map is floating, located after the RAM. * Each MemMapEntry base (GPA) will be dynamically computed, depending on = the * top of the RAM, so that its base get the same alignment as the size, - * ie. a 512GiB entry will be aligned on a 512GiB boundary. If there is - * less than 256GiB of RAM, the floating area starts at the 256GiB mark. + * ie. a 512GiB entry will be aligned on a 512GiB boundary. * Note the extended_memmap is sized so that it eventually also includes t= he * base_memmap entries (VIRT_HIGH_GIC_REDIST2 index is greater than the la= st * index of base_memmap). @@ -2479,6 +2478,7 @@ static void virt_set_high_memmap(VirtMachineState *vm= s, static void virt_set_memmap(VirtMachineState *vms, int pa_bits) { MachineState *ms =3D MACHINE(vms); + VirtMachineClass *vmc =3D VIRT_MACHINE_GET_CLASS(vms); hwaddr base, device_memory_base, device_memory_size, memtop; int i; =20 @@ -2505,8 +2505,7 @@ static void virt_set_memmap(VirtMachineState *vms, in= t pa_bits) /* * We compute the base of the high IO region depending on the * amount of initial and device memory. The device memory start/size - * is aligned on 1GiB. We never put the high IO region below 256GiB - * so that if maxram_size is < 255GiB we keep the legacy memory map. + * is aligned on 1GiB. * The device region size assumes 1GiB page max alignment per slot. */ device_memory_base =3D @@ -2524,8 +2523,8 @@ static void virt_set_memmap(VirtMachineState *vms, in= t pa_bits) error_report("maxmem/slots too huge"); exit(EXIT_FAILURE); } - if (base < vms->memmap[VIRT_MEM].base + LEGACY_RAMLIMIT_BYTES) { - base =3D vms->memmap[VIRT_MEM].base + LEGACY_RAMLIMIT_BYTES; + if (base < vmc->min_highmem_base) { + base =3D vmc->min_highmem_base; } =20 /* We know for sure that at least the memory fits in the PA space */ @@ -4367,6 +4366,12 @@ static void virt_machine_11_0_options(MachineClass *= mc) virt_machine_11_1_options(mc); compat_props_add(mc->compat_props, hw_compat_11_0, hw_compat_11_0_len); vmc->hvf_no_kernel_irqchip_default =3D true; + + /* + * Do not put the high IO region below 256GiB so that if maxram_size is + * < 255GiB we keep the legacy memory map. + */ + vmc->min_highmem_base =3D base_memmap[VIRT_MEM].base + LEGACY_RAMLIMIT= _BYTES; } DEFINE_VIRT_MACHINE(11, 0) =20 diff --git a/tests/qtest/libqos/generic-pcihost.c b/tests/qtest/libqos/gene= ric-pcihost.c index b77617524cac..287e8445ec5b 100644 --- a/tests/qtest/libqos/generic-pcihost.c +++ b/tests/qtest/libqos/generic-pcihost.c @@ -210,7 +210,7 @@ void qpci_init_generic(QGenericPCIBus *qpci, QTestState= *qts, qpci->bus.pio_limit =3D 0x10000; qpci->bus.mmio_alloc_ptr =3D 0x10000000; qpci->bus.mmio_limit =3D 0x2eff0000; - qpci->ecam_alloc_ptr =3D 0x4010000000; + qpci->ecam_alloc_ptr =3D 0x90000000; =20 qpci->obj.get_driver =3D qpci_generic_get_driver; } --=20 2.54.0 From nobody Sat May 30 18:38:47 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=reject dis=none) header.from=rsg.ci.i.u-tokyo.ac.jp Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779279238557136.74969359714282; Wed, 20 May 2026 05:13:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPfnf-0004k2-RH; Wed, 20 May 2026 08:13:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPfnd-0004hH-P9; Wed, 20 May 2026 08:13:21 -0400 Received: from www3579.sakura.ne.jp ([49.212.243.89]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPfnY-00076Q-On; Wed, 20 May 2026 08:13:21 -0400 Received: from h183.csg.ci.i.u-tokyo.ac.jp (h183.csg.ci.i.u-tokyo.ac.jp [133.11.54.183]) (authenticated bits=0) by www3579.sakura.ne.jp (8.16.1/8.16.1) with ESMTPSA id 64K9utCT091476 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 20 May 2026 18:57:04 +0900 (JST) (envelope-from odaki@rsg.ci.i.u-tokyo.ac.jp) DKIM-Signature: a=rsa-sha256; bh=GsBOkcgqvossjjRmJLtfzPtwWVVe0gT2Rq5UeFjN7lE=; c=relaxed/relaxed; d=rsg.ci.i.u-tokyo.ac.jp; h=From:Message-Id:To:Subject:Date; s=rs20250326; t=1779271024; v=1; b=Ht2pO63TyIcH/EihjQnCLQQki2Gv8U/Rty70MVIIixN5h4cG2k4VHQGwDpBx9or0 LLOdKN1ebZWEEGEcMtagrv0ryg0RQGy+9EoBJIZANNMYb2VxIWYn2GPNh1mLPsaM fS3lIaf9yjXSVGhN8eWNqfiWOX/qvnyHjISmrcyIRjaZ0LIM3ALEQ8hzQdQF3WVr 3/f2CcEJhIuOSgUFbCgO9Q8R0XpZKJilbHHv9CPCUS8NHaK7gW7n0+iA4vaW4p33 0ciUPjT1hXYZ1iMNNiiUpOL3u7LmnHbj8yjAj/2PRusnw5JVrMlX6s9rDVsos51a bCcEe2ngvH06H9XrSaRr+w== From: Akihiko Odaki Date: Wed, 20 May 2026 18:56:33 +0900 Subject: [PATCH v6 4/4] test/acpi: aarch64/virt: Update golden masters for DSDT and MCFG MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260520-virt-v6-4-d96180454fdf@rsg.ci.i.u-tokyo.ac.jp> References: <20260520-virt-v6-0-d96180454fdf@rsg.ci.i.u-tokyo.ac.jp> In-Reply-To: <20260520-virt-v6-0-d96180454fdf@rsg.ci.i.u-tokyo.ac.jp> To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Eric Auger , Andrew Jones , "Michael S. Tsirkin" , Igor Mammedov , Ani Sinha , Fabiano Rosas , Laurent Vivier , Paolo Bonzini , Akihiko Odaki X-Mailer: b4 0.16-dev-16047 X-Developer-Signature: v=1; a=openpgp-sha256; l=64133; i=odaki@rsg.ci.i.u-tokyo.ac.jp; h=from:subject:message-id; bh=bEiMcJWn3Q6KwSEKQ6lNsd69XELKIs5DDGCpPQtd/ZM=; b=owGbwMvMwCWmMbc20y1CyJDxtFoSQxZva97kwxOeyllk8Kqo5z9ZkafluW9y+U32bZU82a7xE Q0TGG50lLIwiHExyIopsqQU7ebWiK79VJgQ3wIzh5UJZAgDF6cATETgHcNvtpiuL86fJeU7V2RN /3Dz1nemY8zXnmvstWL60rHnnPb1qwz/q3UYCpn5dlQnlKgmBTPuFNzC3To79ahB9u5+5xk2R49 xAgA= X-Developer-Key: i=odaki@rsg.ci.i.u-tokyo.ac.jp; a=openpgp; fpr=AEDC03C9AF734F2EC26A7BFFA4BAEAA73536753C Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=49.212.243.89; envelope-from=odaki@rsg.ci.i.u-tokyo.ac.jp; helo=www3579.sakura.ne.jp X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1779279241665158500 @@ -1,36 +1,36 @@ /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20240322 (64-bit version) * Copyright (c) 2000 - 2023 Intel Corporation * - * Disassembly of tests/data/acpi/aarch64/virt/MCFG + * Disassembly of /tmp/aml-EFVEJ3 * * ACPI Data Table [MCFG] * * Format: [HexOffset DecimalOffset ByteLength] FieldName : FieldValue (i= n hex) */ [000h 0000 004h] Signature : "MCFG" [Memory Mapped Co= nfiguration Table] [004h 0004 004h] Table Length : 0000003C [008h 0008 001h] Revision : 01 -[009h 0009 001h] Checksum : EC +[009h 0009 001h] Checksum : AC [00Ah 0010 006h] Oem ID : "BOCHS " [010h 0016 008h] Oem Table ID : "BXPC " [018h 0024 004h] Oem Revision : 00000001 [01Ch 0028 004h] Asl Compiler ID : "BXPC" [020h 0032 004h] Asl Compiler Revision : 00000001 [024h 0036 008h] Reserved : 0000000000000000 -[02Ch 0044 008h] Base Address : 0000004010000000 +[02Ch 0044 008h] Base Address : 0000000090000000 [034h 0052 002h] Segment Group Number : 0000 [036h 0054 001h] Start Bus Number : 00 [037h 0055 001h] End Bus Number : FF [038h 0056 004h] Reserved : 00000000 Raw Table Data: Length 60 (0x3C) - 0000: 4D 43 46 47 3C 00 00 00 01 EC 42 4F 43 48 53 20 // MCFG<.....BO= CHS + 0000: 4D 43 46 47 3C 00 00 00 01 AC 42 4F 43 48 53 20 // MCFG<.....BO= CHS 0010: 42 58 50 43 20 20 20 20 01 00 00 00 42 58 50 43 // BXPC ....= BXPC - 0020: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 10 // ............= .... - 0030: 40 00 00 00 00 00 00 FF 00 00 00 00 // @........... + 0020: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 90 // ............= .... + 0030: 00 00 00 00 00 00 00 FF 00 00 00 00 // ............ @@ -1,30 +1,30 @@ /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20240322 (64-bit version) * Copyright (c) 2000 - 2023 Intel Corporation * * Disassembling to symbolic ASL+ operators * - * Disassembly of tests/data/acpi/aarch64/virt/DSDT + * Disassembly of /tmp/aml-5GVEJ3 * * Original Table Header: * Signature "DSDT" - * Length 0x000014D9 (5337) + * Length 0x000014D5 (5333) * Revision 0x02 - * Checksum 0xA5 + * Checksum 0xF7 * 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: Hardw= are ID Name (_UID, Zero) // _UID: Unique ID } @@ -1751,33 +1751,33 @@ 0x001FFFFF, 0x02, L001, Zero }, Package (0x04) { 0x001FFFFF, 0x03, L002, Zero } }) Method (_CBA, 0, NotSerialized) // _CBA: Configuration Base A= ddress { - Return (0x0000004010000000) + Return (0x90000000) } Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings { WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDe= code, 0x0000, // Granularity 0x0000, // Range Minimum 0x00FF, // Range Maximum 0x0000, // Translation Offset 0x0100, // Length ,, ) DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFix= ed, NonCacheable, ReadWrite, 0x00000000, // Granularity 0x10000000, // Range Minimum 0x3EFEFFFF, // Range Maximum 0x00000000, // Translation Offset @@ -1840,34 +1840,34 @@ } } Return (Buffer (One) { 0x00 // . }) } Device (RES0) { Name (_HID, "PNP0C02" /* PNP Motherboard Resources */) //= _HID: Hardware ID Name (_CRS, ResourceTemplate () // _CRS: Current Resource= Settings { QWordMemory (ResourceProducer, PosDecode, MinFixed, Ma= xFixed, NonCacheable, ReadWrite, 0x0000000000000000, // Granularity - 0x0000004010000000, // Range Minimum - 0x000000401FFFFFFF, // Range Maximum + 0x0000000090000000, // Range Minimum + 0x000000009FFFFFFF, // Range Maximum 0x0000000000000000, // Translation Offset 0x0000000010000000, // Length ,, , AddressRangeMemory, TypeStatic) }) } } Device (\_SB.GED) { Name (_HID, "ACPI0013" /* Generic Event Device */) // _HID: H= ardware ID Name (_UID, "GED") // _UID: Unique ID Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings { Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, = ,, ) { 0x00000029, @@ -1,30 +1,30 @@ /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20240322 (64-bit version) * Copyright (c) 2000 - 2023 Intel Corporation * * Disassembling to symbolic ASL+ operators * - * Disassembly of tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt + * Disassembly of /tmp/aml-HQ03I3 * * Original Table Header: * Signature "DSDT" - * Length 0x0000152F (5423) + * Length 0x0000152B (5419) * Revision 0x02 - * Checksum 0x70 + * Checksum 0xB3 * 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: Hardw= are ID Name (_UID, Zero) // _UID: Unique ID } @@ -1769,33 +1769,33 @@ 0x001FFFFF, 0x02, L001, Zero }, Package (0x04) { 0x001FFFFF, 0x03, L002, Zero } }) Method (_CBA, 0, NotSerialized) // _CBA: Configuration Base A= ddress { - Return (0x0000004010000000) + Return (0x90000000) } Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings { WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDe= code, 0x0000, // Granularity 0x0000, // Range Minimum 0x00FF, // Range Maximum 0x0000, // Translation Offset 0x0100, // Length ,, ) DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFix= ed, NonCacheable, ReadWrite, 0x00000000, // Granularity 0x10000000, // Range Minimum 0x3EFEFFFF, // Range Maximum 0x00000000, // Translation Offset @@ -1858,34 +1858,34 @@ } } Return (Buffer (One) { 0x00 // . }) } Device (RES0) { Name (_HID, "PNP0C02" /* PNP Motherboard Resources */) //= _HID: Hardware ID Name (_CRS, ResourceTemplate () // _CRS: Current Resource= Settings { QWordMemory (ResourceProducer, PosDecode, MinFixed, Ma= xFixed, NonCacheable, ReadWrite, 0x0000000000000000, // Granularity - 0x0000004010000000, // Range Minimum - 0x000000401FFFFFFF, // Range Maximum + 0x0000000090000000, // Range Minimum + 0x000000009FFFFFFF, // Range Maximum 0x0000000000000000, // Translation Offset 0x0000000010000000, // Length ,, , AddressRangeMemory, TypeStatic) }) } } Device (\_SB.GED) { Name (_HID, "ACPI0013" /* Generic Event Device */) // _HID: H= ardware ID Name (_UID, "GED") // _UID: Unique ID Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings { Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, = ,, ) { 0x00000029, @@ -1,30 +1,30 @@ /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20240322 (64-bit version) * Copyright (c) 2000 - 2023 Intel Corporation * * Disassembling to symbolic ASL+ operators * - * Disassembly of tests/data/acpi/aarch64/virt/DSDT.topology + * Disassembly of /tmp/aml-UC05I3 * * Original Table Header: * Signature "DSDT" - * Length 0x000015A3 (5539) + * Length 0x0000159F (5535) * Revision 0x02 - * Checksum 0x99 + * Checksum 0xEB * 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: Hardw= are ID Name (_UID, Zero) // _UID: Unique ID } @@ -1793,33 +1793,33 @@ 0x001FFFFF, 0x02, L001, Zero }, Package (0x04) { 0x001FFFFF, 0x03, L002, Zero } }) Method (_CBA, 0, NotSerialized) // _CBA: Configuration Base A= ddress { - Return (0x0000004010000000) + Return (0x90000000) } Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings { WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDe= code, 0x0000, // Granularity 0x0000, // Range Minimum 0x00FF, // Range Maximum 0x0000, // Translation Offset 0x0100, // Length ,, ) DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFix= ed, NonCacheable, ReadWrite, 0x00000000, // Granularity 0x10000000, // Range Minimum 0x3EFEFFFF, // Range Maximum 0x00000000, // Translation Offset @@ -1882,34 +1882,34 @@ } } Return (Buffer (One) { 0x00 // . }) } Device (RES0) { Name (_HID, "PNP0C02" /* PNP Motherboard Resources */) //= _HID: Hardware ID Name (_CRS, ResourceTemplate () // _CRS: Current Resource= Settings { QWordMemory (ResourceProducer, PosDecode, MinFixed, Ma= xFixed, NonCacheable, ReadWrite, 0x0000000000000000, // Granularity - 0x0000004010000000, // Range Minimum - 0x000000401FFFFFFF, // Range Maximum + 0x0000000090000000, // Range Minimum + 0x000000009FFFFFFF, // Range Maximum 0x0000000000000000, // Translation Offset 0x0000000010000000, // Length ,, , AddressRangeMemory, TypeStatic) }) } } Device (\_SB.GED) { Name (_HID, "ACPI0013" /* Generic Event Device */) // _HID: H= ardware ID Name (_UID, "GED") // _UID: Unique ID Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings { Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, = ,, ) { 0x00000029, @@ -1,30 +1,30 @@ /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20240322 (64-bit version) * Copyright (c) 2000 - 2023 Intel Corporation * * Disassembling to symbolic ASL+ operators * - * Disassembly of tests/data/acpi/aarch64/virt/DSDT + * Disassembly of /tmp/aml-TZRGJ3 * * Original Table Header: * Signature "DSDT" - * Length 0x000014D9 (5337) + * Length 0x000014D5 (5333) * Revision 0x02 - * Checksum 0xA5 + * Checksum 0xF7 * 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: Hardw= are ID Name (_UID, Zero) // _UID: Unique ID } @@ -1751,33 +1751,33 @@ 0x001FFFFF, 0x02, L001, Zero }, Package (0x04) { 0x001FFFFF, 0x03, L002, Zero } }) Method (_CBA, 0, NotSerialized) // _CBA: Configuration Base A= ddress { - Return (0x0000004010000000) + Return (0x90000000) } Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings { WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDe= code, 0x0000, // Granularity 0x0000, // Range Minimum 0x00FF, // Range Maximum 0x0000, // Translation Offset 0x0100, // Length ,, ) DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFix= ed, NonCacheable, ReadWrite, 0x00000000, // Granularity 0x10000000, // Range Minimum 0x3EFEFFFF, // Range Maximum 0x00000000, // Translation Offset @@ -1840,34 +1840,34 @@ } } Return (Buffer (One) { 0x00 // . }) } Device (RES0) { Name (_HID, "PNP0C02" /* PNP Motherboard Resources */) //= _HID: Hardware ID Name (_CRS, ResourceTemplate () // _CRS: Current Resource= Settings { QWordMemory (ResourceProducer, PosDecode, MinFixed, Ma= xFixed, NonCacheable, ReadWrite, 0x0000000000000000, // Granularity - 0x0000004010000000, // Range Minimum - 0x000000401FFFFFFF, // Range Maximum + 0x0000000090000000, // Range Minimum + 0x000000009FFFFFFF, // Range Maximum 0x0000000000000000, // Translation Offset 0x0000000010000000, // Length ,, , AddressRangeMemory, TypeStatic) }) } } Device (\_SB.GED) { Name (_HID, "ACPI0013" /* Generic Event Device */) // _HID: H= ardware ID Name (_UID, "GED") // _UID: Unique ID Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings { Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, = ,, ) { 0x00000029, @@ -1,30 +1,30 @@ /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20240322 (64-bit version) * Copyright (c) 2000 - 2023 Intel Corporation * * Disassembling to symbolic ASL+ operators * - * Disassembly of tests/data/acpi/aarch64/virt/DSDT + * Disassembly of /tmp/aml-9EZ4I3 * * Original Table Header: * Signature "DSDT" - * Length 0x000014D9 (5337) + * Length 0x000014D5 (5333) * Revision 0x02 - * Checksum 0xA5 + * Checksum 0xF7 * 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: Hardw= are ID Name (_UID, Zero) // _UID: Unique ID } @@ -1751,33 +1751,33 @@ 0x001FFFFF, 0x02, L001, Zero }, Package (0x04) { 0x001FFFFF, 0x03, L002, Zero } }) Method (_CBA, 0, NotSerialized) // _CBA: Configuration Base A= ddress { - Return (0x0000004010000000) + Return (0x90000000) } Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings { WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDe= code, 0x0000, // Granularity 0x0000, // Range Minimum 0x00FF, // Range Maximum 0x0000, // Translation Offset 0x0100, // Length ,, ) DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFix= ed, NonCacheable, ReadWrite, 0x00000000, // Granularity 0x10000000, // Range Minimum 0x3EFEFFFF, // Range Maximum 0x00000000, // Translation Offset @@ -1840,34 +1840,34 @@ } } Return (Buffer (One) { 0x00 // . }) } Device (RES0) { Name (_HID, "PNP0C02" /* PNP Motherboard Resources */) //= _HID: Hardware ID Name (_CRS, ResourceTemplate () // _CRS: Current Resource= Settings { QWordMemory (ResourceProducer, PosDecode, MinFixed, Ma= xFixed, NonCacheable, ReadWrite, 0x0000000000000000, // Granularity - 0x0000004010000000, // Range Minimum - 0x000000401FFFFFFF, // Range Maximum + 0x0000000090000000, // Range Minimum + 0x000000009FFFFFFF, // Range Maximum 0x0000000000000000, // Translation Offset 0x0000000010000000, // Length ,, , AddressRangeMemory, TypeStatic) }) } } Device (\_SB.GED) { Name (_HID, "ACPI0013" /* Generic Event Device */) // _HID: H= ardware ID Name (_UID, "GED") // _UID: Unique ID Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings { Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, = ,, ) { 0x00000029, @@ -1,30 +1,30 @@ /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20240322 (64-bit version) * Copyright (c) 2000 - 2023 Intel Corporation * * Disassembling to symbolic ASL+ operators * - * Disassembly of tests/data/acpi/aarch64/virt/DSDT.memhp + * Disassembly of /tmp/aml-32Q9I3 * * Original Table Header: * Signature "DSDT" * Length 0x00001A2A (6698) * Revision 0x02 - * Checksum 0xD4 + * Checksum 0x11 * OEM ID "BOCHS " * OEM Table ID "BXPC " * OEM Revision 0x00000001 (1) * Compiler ID "BXPC" * Compiler Version 0x00000001 (1) */ DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPC ", 0x00000001) { External (_SB_.NVDR, UnknownObj) Scope (\_SB) { Device (C000) { Name (_HID, "ACPI0007" /* Processor Device */) // _HID: Hardw= are ID Name (_UID, Zero) // _UID: Unique ID @@ -1753,33 +1753,33 @@ 0x001FFFFF, 0x02, L001, Zero }, Package (0x04) { 0x001FFFFF, 0x03, L002, Zero } }) Method (_CBA, 0, NotSerialized) // _CBA: Configuration Base A= ddress { - Return (0x0000004010000000) + Return (0x0000000190000000) } Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings { WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDe= code, 0x0000, // Granularity 0x0000, // Range Minimum 0x00FF, // Range Maximum 0x0000, // Translation Offset 0x0100, // Length ,, ) DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFix= ed, NonCacheable, ReadWrite, 0x00000000, // Granularity 0x10000000, // Range Minimum 0x3EFEFFFF, // Range Maximum 0x00000000, // Translation Offset @@ -1842,34 +1842,34 @@ } } Return (Buffer (One) { 0x00 // . }) } Device (RES0) { Name (_HID, "PNP0C02" /* PNP Motherboard Resources */) //= _HID: Hardware ID Name (_CRS, ResourceTemplate () // _CRS: Current Resource= Settings { QWordMemory (ResourceProducer, PosDecode, MinFixed, Ma= xFixed, NonCacheable, ReadWrite, 0x0000000000000000, // Granularity - 0x0000004010000000, // Range Minimum - 0x000000401FFFFFFF, // Range Maximum + 0x0000000190000000, // Range Minimum + 0x000000019FFFFFFF, // Range Maximum 0x0000000000000000, // Translation Offset 0x0000000010000000, // Length ,, , AddressRangeMemory, TypeStatic) }) } } Device (\_SB.GED) { Name (_HID, "ACPI0013" /* Generic Event Device */) // _HID: H= ardware ID Name (_UID, "GED") // _UID: Unique ID Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings { Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, = ,, ) { 0x00000029, @@ -1,30 +1,30 @@ /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20240322 (64-bit version) * Copyright (c) 2000 - 2023 Intel Corporation * * Disassembling to symbolic ASL+ operators * - * Disassembly of tests/data/acpi/aarch64/virt/DSDT.acpipcihp + * Disassembly of /tmp/aml-DCVWI3 * * Original Table Header: * Signature "DSDT" - * Length 0x00001866 (6246) + * Length 0x00001862 (6242) * Revision 0x02 - * Checksum 0x71 + * Checksum 0xC3 * 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: Hardw= are ID Name (_UID, Zero) // _UID: Unique ID } @@ -1751,33 +1751,33 @@ 0x001FFFFF, 0x02, L001, Zero }, Package (0x04) { 0x001FFFFF, 0x03, L002, Zero } }) Method (_CBA, 0, NotSerialized) // _CBA: Configuration Base A= ddress { - Return (0x0000004010000000) + Return (0x90000000) } Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings { WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDe= code, 0x0000, // Granularity 0x0000, // Range Minimum 0x00FF, // Range Maximum 0x0000, // Translation Offset 0x0100, // Length ,, ) DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFix= ed, NonCacheable, ReadWrite, 0x00000000, // Granularity 0x10000000, // Range Minimum 0x3EFEFFFF, // Range Maximum 0x00000000, // Translation Offset @@ -1840,34 +1840,34 @@ } } Return (Buffer (One) { 0x00 // . }) } Device (RES0) { Name (_HID, "PNP0C02" /* PNP Motherboard Resources */) //= _HID: Hardware ID Name (_CRS, ResourceTemplate () // _CRS: Current Resource= Settings { QWordMemory (ResourceProducer, PosDecode, MinFixed, Ma= xFixed, NonCacheable, ReadWrite, 0x0000000000000000, // Granularity - 0x0000004010000000, // Range Minimum - 0x000000401FFFFFFF, // Range Maximum + 0x0000000090000000, // Range Minimum + 0x000000009FFFFFFF, // Range Maximum 0x0000000000000000, // Translation Offset 0x0000000010000000, // Length ,, , AddressRangeMemory, TypeStatic) }) } } Device (\_SB.GED) { Name (_HID, "ACPI0013" /* Generic Event Device */) // _HID: H= ardware ID Name (_UID, "GED") // _UID: Unique ID Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings { Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, = ,, ) { 0x00000029, @@ -1,30 +1,30 @@ /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20240322 (64-bit version) * Copyright (c) 2000 - 2023 Intel Corporation * * Disassembling to symbolic ASL+ operators * - * Disassembly of tests/data/acpi/aarch64/virt/DSDT.hpoffacpiindex + * Disassembly of /tmp/aml-KHOBJ3 * * Original Table Header: * Signature "DSDT" - * Length 0x0000150F (5391) + * Length 0x0000150B (5387) * Revision 0x02 - * Checksum 0x4C + * Checksum 0x9E * 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: Hardw= are ID Name (_UID, Zero) // _UID: Unique ID } @@ -1751,33 +1751,33 @@ 0x001FFFFF, 0x02, L001, Zero }, Package (0x04) { 0x001FFFFF, 0x03, L002, Zero } }) Method (_CBA, 0, NotSerialized) // _CBA: Configuration Base A= ddress { - Return (0x0000004010000000) + Return (0x90000000) } Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings { WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDe= code, 0x0000, // Granularity 0x0000, // Range Minimum 0x00FF, // Range Maximum 0x0000, // Translation Offset 0x0100, // Length ,, ) DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFix= ed, NonCacheable, ReadWrite, 0x00000000, // Granularity 0x10000000, // Range Minimum 0x3EFEFFFF, // Range Maximum 0x00000000, // Translation Offset @@ -1840,34 +1840,34 @@ } } Return (Buffer (One) { 0x00 // . }) } Device (RES0) { Name (_HID, "PNP0C02" /* PNP Motherboard Resources */) //= _HID: Hardware ID Name (_CRS, ResourceTemplate () // _CRS: Current Resource= Settings { QWordMemory (ResourceProducer, PosDecode, MinFixed, Ma= xFixed, NonCacheable, ReadWrite, 0x0000000000000000, // Granularity - 0x0000004010000000, // Range Minimum - 0x000000401FFFFFFF, // Range Maximum + 0x0000000090000000, // Range Minimum + 0x000000009FFFFFFF, // Range Maximum 0x0000000000000000, // Translation Offset 0x0000000010000000, // Length ,, , AddressRangeMemory, TypeStatic) }) } } Device (\_SB.GED) { Name (_HID, "ACPI0013" /* Generic Event Device */) // _HID: H= ardware ID Name (_UID, "GED") // _UID: Unique ID Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings { Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, = ,, ) { 0x00000029, @@ -1,30 +1,30 @@ /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20240322 (64-bit version) * Copyright (c) 2000 - 2023 Intel Corporation * * Disassembling to symbolic ASL+ operators * - * Disassembly of tests/data/acpi/aarch64/virt/DSDT.pxb + * Disassembly of /tmp/aml-FHLGJ3 * * Original Table Header: * Signature "DSDT" - * Length 0x00001E84 (7812) + * Length 0x00001E80 (7808) * Revision 0x02 - * Checksum 0x15 + * Checksum 0x67 * 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: Hardw= are ID Name (_UID, Zero) // _UID: Unique ID } @@ -2936,33 +2936,33 @@ 0x001FFFFF, 0x02, L001, Zero }, Package (0x04) { 0x001FFFFF, 0x03, L002, Zero } }) Method (_CBA, 0, NotSerialized) // _CBA: Configuration Base A= ddress { - Return (0x0000004010000000) + Return (0x90000000) } Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings { WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDe= code, 0x0000, // Granularity 0x0000, // Range Minimum 0x007F, // Range Maximum 0x0000, // Translation Offset 0x0080, // Length ,, ) DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFix= ed, NonCacheable, ReadWrite, 0x00000000, // Granularity 0x10000000, // Range Minimum 0x3EFEFFFF, // Range Maximum 0x00000000, // Translation Offset @@ -3025,34 +3025,34 @@ } } Return (Buffer (One) { 0x00 // . }) } Device (RES0) { Name (_HID, "PNP0C02" /* PNP Motherboard Resources */) //= _HID: Hardware ID Name (_CRS, ResourceTemplate () // _CRS: Current Resource= Settings { QWordMemory (ResourceProducer, PosDecode, MinFixed, Ma= xFixed, NonCacheable, ReadWrite, 0x0000000000000000, // Granularity - 0x0000004010000000, // Range Minimum - 0x000000401FFFFFFF, // Range Maximum + 0x0000000090000000, // Range Minimum + 0x000000009FFFFFFF, // Range Maximum 0x0000000000000000, // Translation Offset 0x0000000010000000, // Length ,, , AddressRangeMemory, TypeStatic) }) } } Device (\_SB.GED) { Name (_HID, "ACPI0013" /* Generic Event Device */) // _HID: H= ardware ID Name (_UID, "GED") // _UID: Unique ID Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings { Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, = ,, ) { 0x00000029, @@ -1,30 +1,30 @@ /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20240322 (64-bit version) * Copyright (c) 2000 - 2023 Intel Corporation * * Disassembling to symbolic ASL+ operators * - * Disassembly of tests/data/acpi/aarch64/virt/DSDT + * Disassembly of /tmp/aml-BP7DJ3 * * Original Table Header: * Signature "DSDT" - * Length 0x000014D9 (5337) + * Length 0x000014D5 (5333) * Revision 0x02 - * Checksum 0xA5 + * Checksum 0xF7 * 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: Hardw= are ID Name (_UID, Zero) // _UID: Unique ID } @@ -1751,33 +1751,33 @@ 0x001FFFFF, 0x02, L001, Zero }, Package (0x04) { 0x001FFFFF, 0x03, L002, Zero } }) Method (_CBA, 0, NotSerialized) // _CBA: Configuration Base A= ddress { - Return (0x0000004010000000) + Return (0x90000000) } Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings { WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDe= code, 0x0000, // Granularity 0x0000, // Range Minimum 0x00FF, // Range Maximum 0x0000, // Translation Offset 0x0100, // Length ,, ) DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFix= ed, NonCacheable, ReadWrite, 0x00000000, // Granularity 0x10000000, // Range Minimum 0x3EFEFFFF, // Range Maximum 0x00000000, // Translation Offset @@ -1840,34 +1840,34 @@ } } Return (Buffer (One) { 0x00 // . }) } Device (RES0) { Name (_HID, "PNP0C02" /* PNP Motherboard Resources */) //= _HID: Hardware ID Name (_CRS, ResourceTemplate () // _CRS: Current Resource= Settings { QWordMemory (ResourceProducer, PosDecode, MinFixed, Ma= xFixed, NonCacheable, ReadWrite, 0x0000000000000000, // Granularity - 0x0000004010000000, // Range Minimum - 0x000000401FFFFFFF, // Range Maximum + 0x0000000090000000, // Range Minimum + 0x000000009FFFFFFF, // Range Maximum 0x0000000000000000, // Translation Offset 0x0000000010000000, // Length ,, , AddressRangeMemory, TypeStatic) }) } } Device (\_SB.GED) { Name (_HID, "ACPI0013" /* Generic Event Device */) // _HID: H= ardware ID Name (_UID, "GED") // _UID: Unique ID Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings { Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, = ,, ) { 0x00000029, @@ -1,30 +1,30 @@ /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20240322 (64-bit version) * Copyright (c) 2000 - 2023 Intel Corporation * * Disassembling to symbolic ASL+ operators * - * Disassembly of tests/data/acpi/aarch64/virt/DSDT.viot + * Disassembly of /tmp/aml-ARLYI3 * * Original Table Header: * Signature "DSDT" - * Length 0x000014EA (5354) + * Length 0x000014E6 (5350) * Revision 0x02 - * Checksum 0x47 + * Checksum 0x99 * 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: Hardw= are ID Name (_UID, Zero) // _UID: Unique ID } @@ -1751,33 +1751,33 @@ 0x001FFFFF, 0x02, L001, Zero }, Package (0x04) { 0x001FFFFF, 0x03, L002, Zero } }) Method (_CBA, 0, NotSerialized) // _CBA: Configuration Base A= ddress { - Return (0x0000004010000000) + Return (0x90000000) } Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings { WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDe= code, 0x0000, // Granularity 0x0000, // Range Minimum 0x00FF, // Range Maximum 0x0000, // Translation Offset 0x0100, // Length ,, ) DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFix= ed, NonCacheable, ReadWrite, 0x00000000, // Granularity 0x10000000, // Range Minimum 0x3EFEFFFF, // Range Maximum 0x00000000, // Translation Offset @@ -1840,34 +1840,34 @@ } } Return (Buffer (One) { 0x00 // . }) } Device (RES0) { Name (_HID, "PNP0C02" /* PNP Motherboard Resources */) //= _HID: Hardware ID Name (_CRS, ResourceTemplate () // _CRS: Current Resource= Settings { QWordMemory (ResourceProducer, PosDecode, MinFixed, Ma= xFixed, NonCacheable, ReadWrite, 0x0000000000000000, // Granularity - 0x0000004010000000, // Range Minimum - 0x000000401FFFFFFF, // Range Maximum + 0x0000000090000000, // Range Minimum + 0x000000009FFFFFFF, // Range Maximum 0x0000000000000000, // Translation Offset 0x0000000010000000, // Length ,, , AddressRangeMemory, TypeStatic) }) } } Device (\_SB.GED) { Name (_HID, "ACPI0013" /* Generic Event Device */) // _HID: H= ardware ID Name (_UID, "GED") // _UID: Unique ID Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings { Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, = ,, ) { 0x00000029, @@ -1,30 +1,30 @@ /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20240322 (64-bit version) * Copyright (c) 2000 - 2023 Intel Corporation * * Disassembling to symbolic ASL+ operators * - * Disassembly of tests/data/acpi/aarch64/virt/DSDT.smmuv3-legacy + * Disassembly of /tmp/aml-XDBZI3 * * Original Table Header: * Signature "DSDT" - * Length 0x00002822 (10274) + * Length 0x0000281E (10270) * Revision 0x02 - * Checksum 0xAB + * Checksum 0xFD * 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: Hardw= are ID Name (_UID, Zero) // _UID: Unique ID } @@ -4121,33 +4121,33 @@ 0x001FFFFF, 0x02, L001, Zero }, Package (0x04) { 0x001FFFFF, 0x03, L002, Zero } }) Method (_CBA, 0, NotSerialized) // _CBA: Configuration Base A= ddress { - Return (0x0000004010000000) + Return (0x90000000) } Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings { WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDe= code, 0x0000, // Granularity 0x0000, // Range Minimum 0x000F, // Range Maximum 0x0000, // Translation Offset 0x0010, // Length ,, ) DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFix= ed, NonCacheable, ReadWrite, 0x00000000, // Granularity 0x10000000, // Range Minimum 0x3EFEFFFF, // Range Maximum 0x00000000, // Translation Offset @@ -4210,34 +4210,34 @@ } } Return (Buffer (One) { 0x00 // . }) } Device (RES0) { Name (_HID, "PNP0C02" /* PNP Motherboard Resources */) //= _HID: Hardware ID Name (_CRS, ResourceTemplate () // _CRS: Current Resource= Settings { QWordMemory (ResourceProducer, PosDecode, MinFixed, Ma= xFixed, NonCacheable, ReadWrite, 0x0000000000000000, // Granularity - 0x0000004010000000, // Range Minimum - 0x000000401FFFFFFF, // Range Maximum + 0x0000000090000000, // Range Minimum + 0x000000009FFFFFFF, // Range Maximum 0x0000000000000000, // Translation Offset 0x0000000010000000, // Length ,, , AddressRangeMemory, TypeStatic) }) } } Device (\_SB.GED) { Name (_HID, "ACPI0013" /* Generic Event Device */) // _HID: H= ardware ID Name (_UID, "GED") // _UID: Unique ID Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings { Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, = ,, ) { 0x00000029, @@ -1,30 +1,30 @@ /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20240322 (64-bit version) * Copyright (c) 2000 - 2023 Intel Corporation * * Disassembling to symbolic ASL+ operators * - * Disassembly of tests/data/acpi/aarch64/virt/DSDT.smmuv3-dev + * Disassembly of /tmp/aml-OB0ZI3 * * Original Table Header: * Signature "DSDT" - * Length 0x00002822 (10274) + * Length 0x0000281E (10270) * Revision 0x02 - * Checksum 0xAB + * Checksum 0xFD * 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: Hardw= are ID Name (_UID, Zero) // _UID: Unique ID } @@ -4121,33 +4121,33 @@ 0x001FFFFF, 0x02, L001, Zero }, Package (0x04) { 0x001FFFFF, 0x03, L002, Zero } }) Method (_CBA, 0, NotSerialized) // _CBA: Configuration Base A= ddress { - Return (0x0000004010000000) + Return (0x90000000) } Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings { WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDe= code, 0x0000, // Granularity 0x0000, // Range Minimum 0x000F, // Range Maximum 0x0000, // Translation Offset 0x0010, // Length ,, ) DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFix= ed, NonCacheable, ReadWrite, 0x00000000, // Granularity 0x10000000, // Range Minimum 0x3EFEFFFF, // Range Maximum 0x00000000, // Translation Offset @@ -4210,34 +4210,34 @@ } } Return (Buffer (One) { 0x00 // . }) } Device (RES0) { Name (_HID, "PNP0C02" /* PNP Motherboard Resources */) //= _HID: Hardware ID Name (_CRS, ResourceTemplate () // _CRS: Current Resource= Settings { QWordMemory (ResourceProducer, PosDecode, MinFixed, Ma= xFixed, NonCacheable, ReadWrite, 0x0000000000000000, // Granularity - 0x0000004010000000, // Range Minimum - 0x000000401FFFFFFF, // Range Maximum + 0x0000000090000000, // Range Minimum + 0x000000009FFFFFFF, // Range Maximum 0x0000000000000000, // Translation Offset 0x0000000010000000, // Length ,, , AddressRangeMemory, TypeStatic) }) } } Device (\_SB.GED) { Name (_HID, "ACPI0013" /* Generic Event Device */) // _HID: H= ardware ID Name (_UID, "GED") // _UID: Unique ID Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings { Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, = ,, ) { 0x00000029, Signed-off-by: Akihiko Odaki --- tests/qtest/bios-tables-test-allowed-diff.h | 11 ----------- tests/data/acpi/aarch64/virt/DSDT | Bin 5337 -> 5333 bytes tests/data/acpi/aarch64/virt/DSDT.11.0 | Bin 0 -> 5337 bytes tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt | Bin 5423 -> 5419 bytes tests/data/acpi/aarch64/virt/DSDT.acpipcihp | Bin 6246 -> 6242 bytes tests/data/acpi/aarch64/virt/DSDT.hpoffacpiindex | Bin 5391 -> 5387 bytes tests/data/acpi/aarch64/virt/DSDT.memhp | Bin 6698 -> 6698 bytes tests/data/acpi/aarch64/virt/DSDT.pxb | Bin 7812 -> 7808 bytes tests/data/acpi/aarch64/virt/DSDT.smmuv3-dev | Bin 10274 -> 10270 bytes tests/data/acpi/aarch64/virt/DSDT.smmuv3-legacy | Bin 10274 -> 10270 bytes tests/data/acpi/aarch64/virt/DSDT.topology | Bin 5539 -> 5535 bytes tests/data/acpi/aarch64/virt/DSDT.viot | Bin 5354 -> 5350 bytes tests/data/acpi/aarch64/virt/MCFG | Bin 60 -> 60 bytes tests/data/acpi/aarch64/virt/MCFG.11.0 | Bin 0 -> 60 bytes tests/data/acpi/aarch64/virt/MCFG.memhp | Bin 0 -> 60 bytes 15 files changed, 11 deletions(-) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios= -tables-test-allowed-diff.h index efb00724d09f..dfb8523c8bf4 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1,12 +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.acpipcihp", -"tests/data/acpi/aarch64/virt/DSDT.hpoffacpiindex", -"tests/data/acpi/aarch64/virt/DSDT.memhp", -"tests/data/acpi/aarch64/virt/DSDT.pxb", -"tests/data/acpi/aarch64/virt/DSDT.smmuv3-dev", -"tests/data/acpi/aarch64/virt/DSDT.smmuv3-legacy", -"tests/data/acpi/aarch64/virt/DSDT.topology", -"tests/data/acpi/aarch64/virt/DSDT.viot", -"tests/data/acpi/aarch64/virt/MCFG", diff --git a/tests/data/acpi/aarch64/virt/DSDT b/tests/data/acpi/aarch64/vi= rt/DSDT index 35a862e44714d26ded01d40dc147e76cc73a1c84..649b1e78d57748d3d941c9b79d7= d30cfb43ec7ca 100644 GIT binary patch delta 65 zcmV-H0KWg(Db*koja49qn=3DqfzK`?W``w(8j<4<5`+w#E zLO-|mtR1J?`nYdZtJSIk0OGs&Ykb#I?z&FP9ZpJ?X_}h5)3H-ctKTtAa|1N@cE^U{ zaKtxc~r*ZRI)wbiO^m3?)hR+O z`wAk25H%ms61%8#2tC9xRK%!bMuTO9IYtyQ8kljJWvCoOLyXIqvBokY979KpHOyFN z8BvarM2vOJ*kBnkj*&);4b0eN85+kh5MvWFuCRRx3=3D1*pe4gex#+!&?V+Nn6 z^Bm)C#Ass%pQj5P<6Xqq!VEr73mjt=3DF}5*-&(lSYVIsy3X7G7h zvF9^7YWJ)l>hJbV%iKCEKKcVElhzYno%6akUluX6FCTTCfujs1%HIw_DH=3DgtWKgp2 z40TiN%71$ZN)#h_TW>Hd*+*IaTSQr5%DTj`WZyaKW#8)f|24sCnw#QGI=3D0_xh?=3Djx z4Vv3(?Vg>Zvp>jG^l~38=3D)irbf(ccy;XZr`58xBH4fx|8s|+BY5H?RUS$2O zB_e~VAsK1_GJ*gQ=3D>F3^uRI$Y7NS z@r)492=3D$D}$Y7Ny@r)ABDD{j|&lvHH5ziR)j8RXGcxuE`qn;Y|j1$i|@r+Z?IQ7(t zr%pU|>Zw!D1o2D|&jj^MP|qasOcKu|^-NOF6!AS<8V4Drkm&kXgc@w=3DX4wagvG^E08R?bL)OdOFK>1pP zdt8aBTa?Rg2e*4>5`>OYS;h$ddSF1OT zpFD)qOjwa0!%0sav>jC3Sl$(uxcF-5<}2pj>CR@eia2HT7~;FQ5wo8l$Ok z@?@lo+T>aPV9?T!WJeYB>a*>(ZR!BCkKa6(x-0001x Yvvm?#0Sb@+00030|Nox=3Dv)B_?0cSN6mH+?% delta 70 zcmZ3jwO)(MCDhCC8v%#0CPxYZMzd}Tp$7~MUqeDc0Hh26005A) X9}-ys3XlK*00960|DOP}f)nHfU)K{t delta 69 zcmaE4@XUbACDrw8J6%dFfa%>FfcG| WmKKU+ek|N33dtL7G+>ynm3V4nz3`EnmZSx+vYs3h3q^$@yeu3O33dtL7iC~z@|nmb&Dgt9&7F(UYjYmgLUsXxcxNX^h9!Iq3=3D9Ge3=3D9mL WrG+9Hxxmc-|NqN7Y_1dTWdr~us1U6H diff --git a/tests/data/acpi/aarch64/virt/DSDT.memhp b/tests/data/acpi/aarc= h64/virt/DSDT.memhp index ffc5f1c0d1090582672c60ade3eb1bc41acc5ef7..8a6cafac00d406077d6a369747c= 6e383d94a0786 100644 GIT binary patch delta 43 zcmZ2wvdVB>ef0U;&rw8J6%dFfa%>FfcG| WULhUH$OUHp|Nmd!VKcXEDI)-PzY;eKjMlLY(|NsB;4x4AFwJ`z!LyZ-I diff --git a/tests/data/acpi/aarch64/virt/DSDT.smmuv3-legacy b/tests/data/a= cpi/aarch64/virt/DSDT.smmuv3-legacy index 6c12a7aaf8a6315bac968a685f5b6673e7248817..f1419cbda7167ed5a36410f71c5= 2e3d2a22218fe 100644 GIT binary patch delta 73 zcmV-P0Ji_4P@YfeKjMlLY(|NsB;4x4AFwJ`z!LyZ-I diff --git a/tests/data/acpi/aarch64/virt/DSDT.topology b/tests/data/acpi/a= arch64/virt/DSDT.topology index 208a3163a6bf2a59cf421418dcb16ad1156285c6..33a9c4c397ca498f5b3fbcc7e7e= 446fe8ac0b125 100644 GIT binary patch delta 65 zcmV-H0KWgDE1xS0L{mgmpA`TA0_%|q8v%o{CJ_q(Mzc5zp$7~MUqeDc0Hh26005A) X=3D@MB13XlK*00960|DOP}OcYlEOyd%( delta 69 zcmbQQy;z&eCDim-~i$L2T=3DezMF;@^ literal 0 HcmV?d00001 diff --git a/tests/data/acpi/aarch64/virt/MCFG.memhp b/tests/data/acpi/aarc= h64/virt/MCFG.memhp new file mode 100644 index 0000000000000000000000000000000000000000..360f1dbbea17e4857f1c26a172f= f533eef446823 GIT binary patch literal 60 ucmeZuc5}C3U|?We?d0$55v<@85#X$#prF9Wz`y`vgJ>i$0m}am5(5A*-UtBz literal 0 HcmV?d00001 --=20 2.54.0