Hi Eric, On 5/28/25 06:48, Eric Auger wrote:
Hi Igor,On 5/28/25 11:38 AM, Igor Mammedov wrote:On Tue, 27 May 2025 09:40:26 +0200 Eric Auger <eric.au...@redhat.com> wrote:From: Gustavo Romero <gustavo.rom...@linaro.org> ACPI PCI hotplug is now turned on by default so we need to change the existing tests to keep it off. However, even setting the ACPI PCI hotplug off in the existing tests, there will be changes in the ACPI tables because the _OSC method was modified, hence in the next patch of this series the blobs are updated accordingly. Signed-off-by: Gustavo Romero <gustavo.rom...@linaro.org> Signed-off-by: Eric Auger <eric.au...@redhat.com>it would be better to test whatever default we end up with. (like x86)See my question on patch 2's comment. We intended to have tests for both modes (legacy and acpi pcihp). Gustavo added some new tests for the new default, namely acpi pcihp. Now I did not really understand your point about keeping legacy mode as a default.
I _think_ I understood what Igor is suggesting. In a separate series, that I've kept in a github branch to not add noise here, I removed the test for acpi-pcihp=on and just added one for acpi-pcihp=off after we adjust the blobs for the _OSC change. I added the test before acpi-pcihp=on becomes the default, since if everything is ok the native test must continue to work after acpi-pcihp=on becomes the default, as Igor said. Anyways, please see my last reply to Igor in this thread (for some reason I can't find the reply either in qemu-devel@ or qemu-arm@)... I'm pasting below the main part just in case (the branch and the overview for the tests location in the series): https://github.com/gromero/qemu/commits/v2_20250527_eric_auger_redhat_com/ 3c302f7222 tests/qtest/bios-tables-test: Update DSDT blobs #1c (update blob) \ 671f15f470 hw/arm/virt: Use ACPI PCI hotplug by default #1b (modify default) | acpi-pcihp=on 9468f730e1 tests/qtest/bios-tables-test: Prepare for changes in the DSDT table #1a (whitelist) / c9ec0e0226 hw/arm/virt: Plug pcihp hotplug/hotunplug callbacks dc44749a34 hw/arm/virt: Let virt support pci hotplug/unplug GED event f667079260 hw/core/sysbus: Introduce sysbus_mmio_map_name() helper 46731e563b hw/acpi/ged: Support migration of AcpiPciHpState 4fa7b0e0f6 hw/acpi/ged: Call pcihp plug callbacks in hotplug handler implementation 587b001876 hw/acpi/ged: Prepare the device to react to PCI hotplug events b55183d128 hw/arm/virt-acpi-build: Modify the DSDT ACPI table to enable ACPI PCI hotplug fe4c96b384 hw/i386/acpi-build: Move aml_pci_edsm to a generic place 010c50dbc7 hw/i386/acpi-build: Introduce and use acpi_get_pci_host 5a1be727e6 hw/i386/acpi-build: Move build_append_pci_bus_devices/pcihp_slots to pcihp 14a172e192 hw/i386/acpi-build: Move build_append_notification_callback to pcihp 5110ae8874 hw/acpi/pcihp: Add an AmlRegionSpace arg to build_acpi_pci_hotplug 82c2aef672 hw/i386/acpi-build: Introduce build_append_pcihp_resources() helper 6372fe7eef qtest/bios-tables-test: Update DSDT 'noacpipcihp' variant blob #2 (blob update for test), part 2 of 2 (update blob) ] New PCIe native test 6fb29ba18d tests/qtest/bios-tables-test: Add aarch64 PCIe native hotplug test #2 (pcie native hp test), part 1 of 2 (whitelist) / 12c63a505e tests/qtest/bios-tables-test: Update DSDT blobs after GPEX _OSC change Patch 10/25 in this series (update blob) \ 779bd47749 hw/pci-host/gpex-acpi: Use build_pci_host_bridge_osc_method Patch 9/25 in this series (modify default) | _OSC change f260fd59c1 tests/qtest/bios-tables-test: Prepare for changes in the DSDT table Patch 8/25 in this series (whitelist) / b000677fd9 hw/i386/acpi-build: Turn build_q35_osc_method into a generic method a72f87b634 hw/pci-host/gpex-acpi: Propagate hotplug type info from virt machine downto gpex 77a87b6ba3 hw/pci-host/gpex-acpi: Split host bridge OSC and DSM generation 67e4dc2e7b hw/pci-host/gpex-acpi: Add native_pci_hotplug arg to acpi_dsdt_add_pci_osc b89e69da54 hw/acpi: Rename and move build_x86_acpi_pci_hotplug to pcihp 74f1080a74 hw/arm/virt: Introduce machine state acpi pcihp flags and props 1048082f33 hw/i386/acpi-build: Make aml_pci_device_dsm() static Feel free to cherry-pick the tests and adjust them as you did before. I'll be off this week returning on June 9. Cheers, Gustavo
Thanks Eric--- [Eric] also added acpi-pcihp=off to test_acpi_aarch64_virt_tcg_numamem --- tests/qtest/bios-tables-test.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 0a333ec435..6379dba714 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1626,7 +1626,7 @@ static void test_acpi_aarch64_virt_tcg_memhp(void) };data.variant = ".memhp";- test_acpi_one(" -machine nvdimm=on" + test_acpi_one(" -machine nvdimm=on,acpi-pcihp=off" " -cpu cortex-a57" " -m 256M,slots=3,maxmem=1G" " -object memory-backend-ram,id=ram0,size=128M" @@ -1747,7 +1747,8 @@ static void test_acpi_aarch64_virt_tcg_numamem(void) };data.variant = ".numamem";- test_acpi_one(" -cpu cortex-a57" + test_acpi_one(" -machine acpi-pcihp=off" + " -cpu cortex-a57" " -object memory-backend-ram,id=ram0,size=128M" " -numa node,memdev=ram0", &data); @@ -1775,7 +1776,8 @@ static void test_acpi_aarch64_virt_tcg_pxb(void) * to solve the conflicts. */ data.variant = ".pxb"; - test_acpi_one(" -device pcie-root-port,chassis=1,id=pci.1" + test_acpi_one(" -machine acpi-pcihp=off" + " -device pcie-root-port,chassis=1,id=pci.1" " -device virtio-scsi-pci,id=scsi0,bus=pci.1" " -drive file=" "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2," @@ -1846,7 +1848,7 @@ static void test_acpi_aarch64_virt_tcg_acpi_hmat(void)data.variant = ".acpihmatvirt"; - test_acpi_one(" -machine hmat=on"+ test_acpi_one(" -machine hmat=on,acpi-pcihp=off" " -cpu cortex-a57" " -smp 4,sockets=2" " -m 384M" @@ -2123,6 +2125,7 @@ static void test_acpi_aarch64_virt_tcg(void) data.smbios_cpu_max_speed = 2900; data.smbios_cpu_curr_speed = 2700; test_acpi_one("-cpu cortex-a57 " + "-machine acpi-pcihp=off " "-smbios type=4,max-speed=2900,current-speed=2700", &data); free_test_data(&data); } @@ -2142,6 +2145,7 @@ static void test_acpi_aarch64_virt_tcg_topology(void) };test_acpi_one("-cpu cortex-a57 "+ "-machine acpi-pcihp=off " "-smp sockets=1,clusters=2,cores=2,threads=2", &data); free_test_data(&data); } @@ -2227,6 +2231,7 @@ static void test_acpi_aarch64_virt_viot(void) };test_acpi_one("-cpu cortex-a57 "+ "-machine acpi-pcihp=off " "-device virtio-iommu-pci", &data); free_test_data(&data); }
