From nobody Sat May 30 17:35:49 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 1779894439909556.411223313983; Wed, 27 May 2026 08:07:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wSFq3-0001V0-Ak; Wed, 27 May 2026 11:06:32 -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 1wSFq1-0001U6-2p; Wed, 27 May 2026 11:06:29 -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 1wSFpx-0003dh-Od; Wed, 27 May 2026 11:06:28 -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 64RF5nBi078744 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 28 May 2026 00:06:08 +0900 (JST) (envelope-from odaki@rsg.ci.i.u-tokyo.ac.jp) DKIM-Signature: a=rsa-sha256; bh=X0SPhmE0Xjpslj3iCmCvjK2ymSjQtmkUR5qYU1FCc1w=; c=relaxed/relaxed; d=rsg.ci.i.u-tokyo.ac.jp; h=From:Message-Id:To:Subject:Date; s=rs20250326; t=1779894368; v=1; b=YwGeIZpx7WJOiEzhzCmp+WLQgkjMt4iAQVdtcm8rISphUijhdEEkJVMqzxXK6M2V niDvp2d8/XT7bLgsOQ/5EE3jOIKv4H2S6To61RAfMsYljYPZ+cmBQeB1MIz0qFI+ 0U1CbkL83jareBnwjTSvtxzaS4/JVoWbqcvcWvxbDJPTy2qApxELGEBPHnVM3hOe DUNhTT8y3n8TVuXg5Q5dFy/rX5jRWFUOQu0hgyF4FcaiV/gqAWRtui78++fFsPoU yJA00hW7wLQ6qQV/oZEybEhAuzB5IOhJfEgj1Q/A4ZmgtutApxfzKs4SkDbHwsRT qAN16AgV3XWKhnl0UDWE+A== From: Akihiko Odaki Date: Thu, 28 May 2026 00:05:41 +0900 Subject: [PATCH v7 1/5] 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: <20260528-virt-v7-1-42c4d18620b8@rsg.ci.i.u-tokyo.ac.jp> References: <20260528-virt-v7-0-42c4d18620b8@rsg.ci.i.u-tokyo.ac.jp> In-Reply-To: <20260528-virt-v7-0-42c4d18620b8@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=2100; i=odaki@rsg.ci.i.u-tokyo.ac.jp; h=from:subject:message-id; bh=SEb0vlNxL6dzhkzJ1YzRxn1j5mKStS1Z9+siY2A2vQM=; b=owGbwMvMwCWmMbc20y1CyJDxtFoSQ5Y4R8ypzrsiZ5nu+1z6tk59jkDfesOlhnGSM+fItnaFf TKYraTSUcrCIMbFICumyJJStJtbI7r2U2FCfAvMHFYmkCEMXJwCMBGrk4wMkyr0/x/lT5aqCtz1 QuC6U4vB5Uilu1Jr4lds7Zs7qfTZRkaGp+xMHPc470vHtc0uLp35RWHRtU8yx+5+Umo3n1r8Lli ECQA= 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: 1779894443445158500 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 17:35:49 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 1779894459075147.5622888495269; Wed, 27 May 2026 08:07:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wSFq5-0001Ws-0B; Wed, 27 May 2026 11:06:33 -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 1wSFq1-0001U7-40; Wed, 27 May 2026 11:06:29 -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 1wSFpy-0003eu-2P; Wed, 27 May 2026 11:06:28 -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 64RF5nBj078744 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 28 May 2026 00:06:08 +0900 (JST) (envelope-from odaki@rsg.ci.i.u-tokyo.ac.jp) DKIM-Signature: a=rsa-sha256; bh=1NpkYbe09nefc0RnvTk7ppg+9dDqwBssmb7EfneRCog=; c=relaxed/relaxed; d=rsg.ci.i.u-tokyo.ac.jp; h=From:Message-Id:To:Subject:Date; s=rs20250326; t=1779894368; v=1; b=AjaNNsavTx3XYlDIanJLoRm6UpkfzvB2FKvcPBr0H3bG78jbTLklHElD3QIkxtjB /z3p/PA6/DK7GNmvWvepNoMvtrLCdIgvr3Z/5utdxo5o7PqDM8bZj26DMeWu3otN bxdO5EeApMH6hJkMjm6Lok+pJl1+PoSi8jw9UIw7I9jIWWqYDCaBzl7UVVcrbZIT 0cIvZc3KA3cqNEkq0gb+iJTqNLpJtrnrzqyccGMI5FOK7FrAcq9GCO/qZxmzIazV 63Lg67yUzxBjSRJJV93OhhJAurHnVoyo45Rz+BjsGJJ6kNeomCWyip8lrMQH9rQV o7YP1eEKI6ePXckx46ciyg== From: Akihiko Odaki Date: Thu, 28 May 2026 00:05:42 +0900 Subject: [PATCH v7 2/5] 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: <20260528-virt-v7-2-42c4d18620b8@rsg.ci.i.u-tokyo.ac.jp> References: <20260528-virt-v7-0-42c4d18620b8@rsg.ci.i.u-tokyo.ac.jp> In-Reply-To: <20260528-virt-v7-0-42c4d18620b8@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=1067; i=odaki@rsg.ci.i.u-tokyo.ac.jp; h=from:subject:message-id; bh=4BJJW5xIaPwdGlrXDIX5WLK3mVpXqCX+OYkHzAw5YjU=; b=owGbwMvMwCWmMbc20y1CyJDxtFoSQ5Y4R+w5HQ2dO2rtLyc9+HHJOvCfv/u5QGH3PQLNn/ok5 4iJey/vKGVhEONikBVTZEkp2s2tEV37qTAhvgVmDisTyBAGLk4BmEhGCiPDl6gJvA8+7lKP5f+x 8Y7IvWM9Ns37T31Xeilluahmfa72ZkaGT2GytaXad3omp5bF52mcTNkg+eA3t9dmzh9rGZ//nBz LAQA= 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: 1779894461193158500 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 17:35:49 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 1779894447800300.1217409511272; Wed, 27 May 2026 08:07:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wSFq4-0001WV-MG; Wed, 27 May 2026 11:06:32 -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 1wSFq1-0001UM-DW; Wed, 27 May 2026 11:06:29 -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 1wSFpy-0003dN-3W; Wed, 27 May 2026 11:06:29 -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 64RF5nBk078744 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 28 May 2026 00:06:08 +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=1779894368; v=1; b=gEBBdbuTQQL5aaR1Z9GH9PZrMxf9x3248u72qSAlQt8+ZMo08tTZCuHQ2uaerEY2 WrMrswyd1LssC2DZDJyja7WzL3EcI9yX/oOA03dIdwKST5AVuZZMbkeKWiksivdA c7RLmRT0hw+il7XjxqYjhJUs+WCli/bxvYoIK+RgBl3Yi/+tX8GPl84Lt+MALPys 61XUxV+OMp8fTyHrb+HZSFLOlFRQ6tVs5/lCFJgir5HJOONV8MbgV93i+hZYCko6 ryb0q1dfpye1Go6tJsSmlm0+96mXjilWEOQjfT57Pp2xVry+eRLz5S82W1yI+F4X uimgH0mN+1fGoQuNdWylYQ== From: Akihiko Odaki Date: Thu, 28 May 2026 00:05:43 +0900 Subject: [PATCH v7 3/5] 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: <20260528-virt-v7-3-42c4d18620b8@rsg.ci.i.u-tokyo.ac.jp> References: <20260528-virt-v7-0-42c4d18620b8@rsg.ci.i.u-tokyo.ac.jp> In-Reply-To: <20260528-virt-v7-0-42c4d18620b8@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=owGbwMvMwCWmMbc20y1CyJDxtFoSQ5Y4R+xHIYfGMl5Np63iPycqCaVMXnm35VJUedUcljmGc 96cWni8o5SFQYyLQVZMkSWlaDe3RnTtp8KE+BaYOaxMIEMYuDgFYCI7djAybPy03HOin/PV0C2h HHm5+0+Yfm/89++tmMGcglfHfxsvk2f4n1xjqzTxVElMb9gC0Qq3IAkOVbYmbv0HE9V3LjJfvvg gEwA= 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: 1779894449281158500 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 Reviewed-by: Igor Mammedov --- 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 17:35:49 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 1779894426497464.5600146977838; Wed, 27 May 2026 08:07:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wSFq3-0001VD-Av; Wed, 27 May 2026 11:06:32 -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 1wSFq1-0001UF-Ar; Wed, 27 May 2026 11:06:29 -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 1wSFpx-0003dR-OX; Wed, 27 May 2026 11:06:29 -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 64RF5nBl078744 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 28 May 2026 00:06:08 +0900 (JST) (envelope-from odaki@rsg.ci.i.u-tokyo.ac.jp) DKIM-Signature: a=rsa-sha256; bh=Dk9esH+Fk8rSH8ovg2aY7QTovyrHdSXzbZzrE1JpDmc=; c=relaxed/relaxed; d=rsg.ci.i.u-tokyo.ac.jp; h=From:Message-Id:To:Subject:Date; s=rs20250326; t=1779894369; v=1; b=AXLaPuuo0kkDpmbonUcVDJztesV6GYeYIq93WRMHyGXYdXeFBZk82UynU1caXpxv 1g7PFwFpgRCU00Bo8fbM9aKNxrJEWcaPLjOUZ1YzcAoq8wLn/oeJfF7bLOkmiw4Y k43ETfgOwYmm6/SozT2x0rMoWUbmFhJ+KSRy/RwunHpbJsQxayYjdPY8z6a6qbH3 pTubvrTzis/hZa/vni8PdIs/AiPzNPYHsd1yuGnYfDTqd989rBWVju9XqHpV/eqE n1IGdsopCJcnOIVJ5wcf4OYCkIZQNg0TBYeOu8NtsVvqriYAYp8axZwsHIPFu89Z F8qsqvtuSosRBhsusF2/nw== From: Akihiko Odaki Date: Thu, 28 May 2026 00:05:44 +0900 Subject: [PATCH v7 4/5] hw/arm/virt: Relax the lower bound of HighMem MMIO region size MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260528-virt-v7-4-42c4d18620b8@rsg.ci.i.u-tokyo.ac.jp> References: <20260528-virt-v7-0-42c4d18620b8@rsg.ci.i.u-tokyo.ac.jp> In-Reply-To: <20260528-virt-v7-0-42c4d18620b8@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=4988; i=odaki@rsg.ci.i.u-tokyo.ac.jp; h=from:subject:message-id; bh=IDqNDuoTnTZhnDAFjYZMWy3jwXqBtU4Lg6QQ0mAdB7A=; b=owGbwMvMwCWmMbc20y1CyJDxtFoSQ5Y4R9w1d0F595ezzF5PVb1uJ2KR7+fJosWbnnoovvGAm ODXphcdpSwMYlwMsmKKLClFu7k1oms/FSbEt8DMYWUCGcLAxSkAEzm8mpHhLsemY9f0nvHeWVEY /Fal/9fGPdpdZ0y35vf6930rqthZwPDf/WRWycN8/2WHElL6MrkC95V9jHTdUO+ScSi0+EnyjEh mAA== 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: 1779894432352154100 Relax the lower bound of the HighMem MMIO region size to make it more likely that the region fits in the PA space. The lower bound was especially problematic on Apple M2. The current lower bound, 512 GiB, is too big to fit in the limited PA space on the hardware. That makes the HighMem MMIO region unavailable and limits the PCIe MMIO space to the base MMIO region. The base MMIO region is not big enough to contain a large hostmem window configured for virtio-gpu-gl-pci with DRM native context, for example. Relax the lower bound to 64 KiB, matching the memory map comment that says "devices should generally be placed at multiples of 0x10000, to accommodate guests using 64K pages." Also, automatically lower the default HighMem MMIO region size to fit in the PA space for the latest machine version; the older machine versions retain the previous default HighMem MMIO region size for compatibility. Signed-off-by: Akihiko Odaki --- docs/system/arm/virt.rst | 2 +- include/hw/arm/virt.h | 1 + hw/arm/virt.c | 22 ++++++++++++++-------- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/docs/system/arm/virt.rst b/docs/system/arm/virt.rst index f811e662d68d..c8284ce2fa0e 100644 --- a/docs/system/arm/virt.rst +++ b/docs/system/arm/virt.rst @@ -149,7 +149,7 @@ highmem-mmio =20 highmem-mmio-size Set the high memory region size for PCI MMIO. Must be a power of 2 and - greater than or equal to the default size (512G). + greater than or equal to 64 KiB. =20 gic-version Specify the version of the Generic Interrupt Controller (GIC) to provide. diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index 6c8ba8f3185b..7aa289d3936f 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -143,6 +143,7 @@ typedef enum VirtGICType { struct VirtMachineClass { MachineClass parent; hwaddr min_highmem_base; + hwaddr high_pcie_mmio_size; 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 78a85a966ad7..dd97b0dd6a42 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -222,8 +222,7 @@ static const MemMapEntry base_memmap[] =3D { }; =20 /* Update the docs for highmem-mmio-size when changing this default */ -#define DEFAULT_HIGH_PCIE_MMIO_SIZE_GB 512 -#define DEFAULT_HIGH_PCIE_MMIO_SIZE (DEFAULT_HIGH_PCIE_MMIO_SIZE_GB * GiB) +#define MAX_DEFAULT_HIGH_PCIE_MMIO_SIZE (512 * GiB) =20 /* * Highmem IO Regions: This memory map is floating, located after the RAM. @@ -249,7 +248,7 @@ static MemMapEntry extended_memmap[] =3D { [VIRT_CXL_HOST] =3D { 0x0, 64 * KiB * 16 }, /* 16 UID */ [VIRT_HIGH_PCIE_ECAM] =3D { 0x0, 256 * MiB }, /* Second PCIe window */ - [VIRT_HIGH_PCIE_MMIO] =3D { 0x0, DEFAULT_HIGH_PCIE_MMIO_SIZE }, + [VIRT_HIGH_PCIE_MMIO] =3D { 0x0, 0 }, /* Any CXL Fixed memory windows come here */ }; =20 @@ -2448,9 +2447,14 @@ static void virt_set_high_memmap(VirtMachineState *v= ms, =20 for (i =3D VIRT_LOWMEMMAP_LAST; i < ARRAY_SIZE(extended_memmap); i++) { region_enabled =3D virt_get_high_memmap_enabled(vms, i); - region_base =3D ROUND_UP(base, extended_memmap[i].size); region_size =3D extended_memmap[i].size; =20 + if (i =3D=3D VIRT_HIGH_PCIE_MMIO && !region_size) { + region_size =3D CLAMP(pow2floor(BIT_ULL(pa_bits) - base), + 64 * KiB, MAX_DEFAULT_HIGH_PCIE_MMIO_SIZE); + } + + region_base =3D ROUND_UP(base, region_size); vms->memmap[i].base =3D region_base; vms->memmap[i].size =3D region_size; =20 @@ -3340,11 +3344,9 @@ static void virt_set_highmem_mmio_size(Object *obj, = Visitor *v, return; } =20 - if (size < DEFAULT_HIGH_PCIE_MMIO_SIZE) { - char *sz =3D size_to_str(DEFAULT_HIGH_PCIE_MMIO_SIZE); + if (size < 64 * KiB) { error_setg(errp, "highmem-mmio-size cannot be set to a lower value= " - "than the default (%s)", sz); - g_free(sz); + "than 64 KiB"); return; } =20 @@ -4271,6 +4273,8 @@ static void virt_instance_init(Object *obj) VirtMachineState *vms =3D VIRT_MACHINE(obj); VirtMachineClass *vmc =3D VIRT_MACHINE_GET_CLASS(vms); =20 + extended_memmap[VIRT_HIGH_PCIE_MMIO].size =3D vmc->high_pcie_mmio_size; + /* EL3 is disabled by default on virt: this makes us consistent * between KVM and TCG for this board, and it also allows us to * boot UEFI blobs which assume no TrustZone support. @@ -4372,6 +4376,8 @@ static void virt_machine_11_0_options(MachineClass *m= c) * < 255GiB we keep the legacy memory map. */ vmc->min_highmem_base =3D base_memmap[VIRT_MEM].base + LEGACY_RAMLIMIT= _BYTES; + + vmc->high_pcie_mmio_size =3D MAX_DEFAULT_HIGH_PCIE_MMIO_SIZE; } DEFINE_VIRT_MACHINE(11, 0) =20 --=20 2.54.0 From nobody Sat May 30 17:35:49 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 1779894486641876.73218044122; Wed, 27 May 2026 08:08:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wSFq6-0001Y6-IY; Wed, 27 May 2026 11:06:34 -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 1wSFq4-0001WZ-LK; Wed, 27 May 2026 11:06:32 -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 1wSFpx-0003dS-OY; Wed, 27 May 2026 11:06:32 -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 64RF5nBm078744 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 28 May 2026 00:06:09 +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=1779894369; v=1; b=gNDUngj/BHs5LsTYANMq36Qs+xXwviizB8Q7Vav2pXtD/+MFA0HUHyKai2KcYELE JgpC93S9i9UEsI50HxfHFfkkzZR56pyOOIvytb41eUeIVqiR3XeA3cwkBGZKZcto KBbh647MS5xcPJdRuPC82xbDQIRkZbbq+5FE31ehsuvqyNtEf5jqMZ9cJi+ZEnLk XhUlMSwVl/Hn96crp2wcXbo1e/rzbtT5+Ps7yalSZbTxuIxScX9Nm3Wd/7YOoftJ fvmZUvdENkrRZ7LZR94PyTR9PDb7ZASWwfwGnI+zUbsHAMvFzmbaE4WL/CT7AOk1 vd+nb47uh0LnjuQLAZ2mAQ== From: Akihiko Odaki Date: Thu, 28 May 2026 00:05:45 +0900 Subject: [PATCH v7 5/5] 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: <20260528-virt-v7-5-42c4d18620b8@rsg.ci.i.u-tokyo.ac.jp> References: <20260528-virt-v7-0-42c4d18620b8@rsg.ci.i.u-tokyo.ac.jp> In-Reply-To: <20260528-virt-v7-0-42c4d18620b8@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=owGbwMvMwCWmMbc20y1CyJDxtFoSQ5Y4R3zDJRvOTc6XD713+3v84tc1T70WMN+4NSOvh9fIz eXNFbv8jlIWBjEuBlkxRZaUot3cGtG1nwoT4ltg5rAygQxh4OIUgInE1zH8lWZ+PHPjyffadzzM tz0qeO09qSFA7IZK9bbHM7LOnupkCWVk+BFgoXlj0uqtIQaXpb7EctSJbtqwN/j/ikdyz6KORT2 JYAQA 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: 1779894492122154100 @@ -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