* [PATCH 1/5] tests/qtest/bios-tables-test: Prepare for changes in the ACPI tables
2025-05-26 5:31 [PATCH 0/5] ACPI tests for PCI Hotplug on ARM Gustavo Romero
@ 2025-05-26 5:31 ` Gustavo Romero
2025-05-26 10:22 ` Eric Auger
2025-05-26 5:31 ` [PATCH 2/5] tests/qtest/bios-tables-test: Keep ACPI PCI hotplug off Gustavo Romero
` (3 subsequent siblings)
4 siblings, 1 reply; 15+ messages in thread
From: Gustavo Romero @ 2025-05-26 5:31 UTC (permalink / raw)
To: qemu-devel, eric.auger
Cc: qemu-arm, thuth, gustavo.romero, alex.bennee, mst, imammedo
This commit adds to the allow list the ACPI blob related to the base
aarch64 'virt' machine and all of its variants, in preparation to adding
the ACPI PCI hotplug feature, which changes the _OSC method, the GED
device, and adds a couple of new methods, like the PDSM.
Signed-off-by: Gustavo Romero <gustavo.romero@linaro.org>
---
tests/qtest/bios-tables-test-allowed-diff.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index dfb8523c8b..abe00ad4ee 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1 +1,6 @@
/* List of comma-separated changed AML files to ignore */
+"tests/data/acpi/aarch64/virt/DSDT",
+"tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt",
+"tests/data/acpi/aarch64/virt/DSDT.memhp",
+"tests/data/acpi/aarch64/virt/DSDT.pxb",
+"tests/data/acpi/aarch64/virt/DSDT.topology",
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH 1/5] tests/qtest/bios-tables-test: Prepare for changes in the ACPI tables
2025-05-26 5:31 ` [PATCH 1/5] tests/qtest/bios-tables-test: Prepare for changes in the ACPI tables Gustavo Romero
@ 2025-05-26 10:22 ` Eric Auger
0 siblings, 0 replies; 15+ messages in thread
From: Eric Auger @ 2025-05-26 10:22 UTC (permalink / raw)
To: Gustavo Romero, qemu-devel; +Cc: qemu-arm, thuth, alex.bennee, mst, imammedo
Hi Gustavo,
On 5/26/25 7:31 AM, Gustavo Romero wrote:
> This commit adds to the allow list the ACPI blob related to the base
> aarch64 'virt' machine and all of its variants, in preparation to adding
> the ACPI PCI hotplug feature, which changes the _OSC method, the GED
> device, and adds a couple of new methods, like the PDSM.
>
> Signed-off-by: Gustavo Romero <gustavo.romero@linaro.org>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Cheers
Eric
> ---
> tests/qtest/bios-tables-test-allowed-diff.h | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
> index dfb8523c8b..abe00ad4ee 100644
> --- a/tests/qtest/bios-tables-test-allowed-diff.h
> +++ b/tests/qtest/bios-tables-test-allowed-diff.h
> @@ -1 +1,6 @@
> /* List of comma-separated changed AML files to ignore */
> +"tests/data/acpi/aarch64/virt/DSDT",
> +"tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt",
> +"tests/data/acpi/aarch64/virt/DSDT.memhp",
> +"tests/data/acpi/aarch64/virt/DSDT.pxb",
> +"tests/data/acpi/aarch64/virt/DSDT.topology",
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 2/5] tests/qtest/bios-tables-test: Keep ACPI PCI hotplug off
2025-05-26 5:31 [PATCH 0/5] ACPI tests for PCI Hotplug on ARM Gustavo Romero
2025-05-26 5:31 ` [PATCH 1/5] tests/qtest/bios-tables-test: Prepare for changes in the ACPI tables Gustavo Romero
@ 2025-05-26 5:31 ` Gustavo Romero
2025-05-26 13:23 ` Eric Auger
2025-05-26 15:28 ` Eric Auger
2025-05-26 5:31 ` [PATCH 3/5] tests/qtest/bios-tables-test: Update changed ACPI blobs Gustavo Romero
` (2 subsequent siblings)
4 siblings, 2 replies; 15+ messages in thread
From: Gustavo Romero @ 2025-05-26 5:31 UTC (permalink / raw)
To: qemu-devel, eric.auger
Cc: qemu-arm, thuth, gustavo.romero, alex.bennee, mst, imammedo
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.romero@linaro.org>
---
tests/qtest/bios-tables-test.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index 0a333ec435..216941dbb5 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"
@@ -1775,7 +1775,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 +1847,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 +2124,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 +2144,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 +2230,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);
}
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH 2/5] tests/qtest/bios-tables-test: Keep ACPI PCI hotplug off
2025-05-26 5:31 ` [PATCH 2/5] tests/qtest/bios-tables-test: Keep ACPI PCI hotplug off Gustavo Romero
@ 2025-05-26 13:23 ` Eric Auger
2025-05-26 13:59 ` Gustavo Romero
2025-05-26 15:28 ` Eric Auger
1 sibling, 1 reply; 15+ messages in thread
From: Eric Auger @ 2025-05-26 13:23 UTC (permalink / raw)
To: Gustavo Romero, qemu-devel; +Cc: qemu-arm, thuth, alex.bennee, mst, imammedo
Hi Gustavo,
On 5/26/25 7:31 AM, Gustavo Romero wrote:
> 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.romero@linaro.org>
> ---
> tests/qtest/bios-tables-test.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
> index 0a333ec435..216941dbb5 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"
> @@ -1775,7 +1775,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 +1847,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 +2124,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 +2144,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 +2230,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);
I think this is also meaningful that this gets inserted in the ACPI PCI
hotplug series before it acpi pci hp becomes the new default (of course
if you agree on that)
Cheers
Eric
> }
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH 2/5] tests/qtest/bios-tables-test: Keep ACPI PCI hotplug off
2025-05-26 13:23 ` Eric Auger
@ 2025-05-26 13:59 ` Gustavo Romero
0 siblings, 0 replies; 15+ messages in thread
From: Gustavo Romero @ 2025-05-26 13:59 UTC (permalink / raw)
To: eric.auger, qemu-devel; +Cc: qemu-arm, thuth, alex.bennee, mst, imammedo
Hi Eric,
On 5/26/25 10:23, Eric Auger wrote:
> Hi Gustavo,
>
> On 5/26/25 7:31 AM, Gustavo Romero wrote:
>> 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.romero@linaro.org>
>> ---
>> tests/qtest/bios-tables-test.c | 10 +++++++---
>> 1 file changed, 7 insertions(+), 3 deletions(-)
>>
>> diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
>> index 0a333ec435..216941dbb5 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"
>> @@ -1775,7 +1775,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 +1847,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 +2124,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 +2144,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 +2230,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);
> I think this is also meaningful that this gets inserted in the ACPI PCI
> hotplug series before it acpi pci hp becomes the new default (of course
> if you agree on that)
Yeah! I've indeed just mentioned it when replying to you in 3/5 :)
Cheers,
Gustavo
> Cheers
>
> Eric
>> }
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/5] tests/qtest/bios-tables-test: Keep ACPI PCI hotplug off
2025-05-26 5:31 ` [PATCH 2/5] tests/qtest/bios-tables-test: Keep ACPI PCI hotplug off Gustavo Romero
2025-05-26 13:23 ` Eric Auger
@ 2025-05-26 15:28 ` Eric Auger
2025-05-26 16:09 ` Gustavo Romero
1 sibling, 1 reply; 15+ messages in thread
From: Eric Auger @ 2025-05-26 15:28 UTC (permalink / raw)
To: Gustavo Romero, qemu-devel; +Cc: qemu-arm, thuth, alex.bennee, mst, imammedo
Hi Gustavo,
On 5/26/25 7:31 AM, Gustavo Romero wrote:
> 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.romero@linaro.org>
> ---
> tests/qtest/bios-tables-test.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
> index 0a333ec435..216941dbb5 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"
> @@ -1775,7 +1775,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 +1847,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 +2124,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);
On my end I also need to add -machine acpi-pcihp=off in
test_acpi_aarch64_virt_tcg_numamem
with that fixed,
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Thanks
Eric
> }
> @@ -2142,6 +2144,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 +2230,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);
> }
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH 2/5] tests/qtest/bios-tables-test: Keep ACPI PCI hotplug off
2025-05-26 15:28 ` Eric Auger
@ 2025-05-26 16:09 ` Gustavo Romero
2025-05-27 6:46 ` Eric Auger
0 siblings, 1 reply; 15+ messages in thread
From: Gustavo Romero @ 2025-05-26 16:09 UTC (permalink / raw)
To: eric.auger, qemu-devel; +Cc: qemu-arm, thuth, alex.bennee, mst, imammedo
Hi Eric,
On 5/26/25 12:28, Eric Auger wrote:
> Hi Gustavo,
>
> On 5/26/25 7:31 AM, Gustavo Romero wrote:
>> 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.romero@linaro.org>
>> ---
>> tests/qtest/bios-tables-test.c | 10 +++++++---
>> 1 file changed, 7 insertions(+), 3 deletions(-)
>>
>> diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
>> index 0a333ec435..216941dbb5 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"
>> @@ -1775,7 +1775,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 +1847,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 +2124,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);
> On my end I also need to add -machine acpi-pcihp=off in
> test_acpi_aarch64_virt_tcg_numamem
Yeah, by reading the code I'm pretty sure this is required by the numamem variant
as well but I don't see a failure here :( I have _no clue_ why the failure doesn't
happen on my env. Are you running simply "make check V=2"? arm64 host?
> with that fixed,
>
> Reviewed-by: Eric Auger <eric.auger@redhat.com>
Thanks for the review! I'm sending a v2 with numamem variant fixed.
BTW, I'm sending soon also a functional test variant for acpi-pcihp=off.
Cheers,
Gustavo
>
> Thanks
>
> Eric
>> }
>> @@ -2142,6 +2144,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 +2230,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);
>> }
>
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH 2/5] tests/qtest/bios-tables-test: Keep ACPI PCI hotplug off
2025-05-26 16:09 ` Gustavo Romero
@ 2025-05-27 6:46 ` Eric Auger
0 siblings, 0 replies; 15+ messages in thread
From: Eric Auger @ 2025-05-27 6:46 UTC (permalink / raw)
To: Gustavo Romero, qemu-devel; +Cc: qemu-arm, thuth, alex.bennee, mst, imammedo
Hi Gustavo,
On 5/26/25 6:09 PM, Gustavo Romero wrote:
> Hi Eric,
>
> On 5/26/25 12:28, Eric Auger wrote:
>> Hi Gustavo,
>>
>> On 5/26/25 7:31 AM, Gustavo Romero wrote:
>>> 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.romero@linaro.org>
>>> ---
>>> tests/qtest/bios-tables-test.c | 10 +++++++---
>>> 1 file changed, 7 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/tests/qtest/bios-tables-test.c
>>> b/tests/qtest/bios-tables-test.c
>>> index 0a333ec435..216941dbb5 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"
>>> @@ -1775,7 +1775,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 +1847,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 +2124,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);
>> On my end I also need to add -machine acpi-pcihp=off in
>> test_acpi_aarch64_virt_tcg_numamem
>
> Yeah, by reading the code I'm pretty sure this is required by the
> numamem variant
> as well but I don't see a failure here :( I have _no clue_ why the
> failure doesn't
> happen on my env. Are you running simply "make check V=2"? arm64 host?
on my end I am running on x86 host with TCG aarch64 configured qemu
make -j 128 tests/qtest/bios-tables-test
cd build
QTEST_QEMU_BINARY=./qemu-system-aarch64 tests/qtest/bios-tables-test
>
>
>> with that fixed,
>>
>> Reviewed-by: Eric Auger <eric.auger@redhat.com>
>
> Thanks for the review! I'm sending a v2 with numamem variant fixed.
>
> BTW, I'm sending soon also a functional test variant for acpi-pcihp=off.
OK thanks!
Cheers
Eric
>
>
> Cheers,
> Gustavo
>
>>
>> Thanks
>>
>> Eric
>>> }
>>> @@ -2142,6 +2144,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 +2230,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);
>>> }
>>
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 3/5] tests/qtest/bios-tables-test: Update changed ACPI blobs
2025-05-26 5:31 [PATCH 0/5] ACPI tests for PCI Hotplug on ARM Gustavo Romero
2025-05-26 5:31 ` [PATCH 1/5] tests/qtest/bios-tables-test: Prepare for changes in the ACPI tables Gustavo Romero
2025-05-26 5:31 ` [PATCH 2/5] tests/qtest/bios-tables-test: Keep ACPI PCI hotplug off Gustavo Romero
@ 2025-05-26 5:31 ` Gustavo Romero
2025-05-26 10:25 ` Eric Auger
2025-05-26 5:31 ` [PATCH 4/5] tests/qtest/bios-tables-test: Add aarch64 ACPI PCI hotplug test Gustavo Romero
2025-05-26 5:31 ` [PATCH 5/5] qtest/bios-tables-test: Update aarch64/virt 'acpipcihp' variant blob Gustavo Romero
4 siblings, 1 reply; 15+ messages in thread
From: Gustavo Romero @ 2025-05-26 5:31 UTC (permalink / raw)
To: qemu-devel, eric.auger
Cc: qemu-arm, thuth, gustavo.romero, alex.bennee, mst, imammedo
Update the aarch64 'virt' base blob and all of its variants. All of them
have the same diff, so only one is shown below. The essential changes is
in the AML code of the _OSC (OS Capabilities) method, (variable name
from 'CTRL' to 'Local0') and the scope for GED device.
DSDT table diff:
DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPC ", 0x00000001)
{
Scope (\_SB)
{
Device (C000)
{
Name (_HID, "ACPI0007" /* Processor Device */) // _HID: Hardware ID
Name (_UID, Zero) // _UID: Unique ID
}
@@ -1794,53 +1794,52 @@
0x0000000000000000, // Granularity
0x0000008000000000, // Range Minimum
0x000000FFFFFFFFFF, // Range Maximum
0x0000000000000000, // Translation Offset
0x0000008000000000, // Length
,, , AddressRangeMemory, TypeStatic)
})
Name (SUPP, Zero)
Name (CTRL, Zero)
Method (_OSC, 4, NotSerialized) // _OSC: Operating System Capabilities
{
CreateDWordField (Arg3, Zero, CDW1)
If ((Arg0 == ToUUID ("33db4d5b-1ff7-401c-9657-7441c03dd766") /* PCI Host Bridge Device */))
{
CreateDWordField (Arg3, 0x04, CDW2)
CreateDWordField (Arg3, 0x08, CDW3)
- SUPP = CDW2 /* \_SB_.PCI0._OSC.CDW2 */
- CTRL = CDW3 /* \_SB_.PCI0._OSC.CDW3 */
- CTRL &= 0x1F
+ Local0 = CDW3 /* \_SB_.PCI0._OSC.CDW3 */
+ Local0 &= 0x1F
If ((Arg1 != One))
{
CDW1 |= 0x08
}
- If ((CDW3 != CTRL))
+ If ((CDW3 != Local0))
{
CDW1 |= 0x10
}
- CDW3 = CTRL /* \_SB_.PCI0.CTRL */
- Return (Arg3)
+ CDW3 = Local0
}
Else
{
CDW1 |= 0x04
- Return (Arg3)
}
+
+ Return (Arg3)
}
Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific Method
{
If ((Arg0 == ToUUID ("e5c937d0-3553-4d7a-9117-ea4d19c3434d") /* Device Labeling Interface */))
{
If ((Arg2 == Zero))
{
Return (Buffer (One)
{
0x01 // .
})
}
}
Return (Buffer (One)
@@ -1851,33 +1850,36 @@
Device (RES0)
{
Name (_HID, "PNP0C02" /* PNP Motherboard Resources */) // _HID: Hardware ID
Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
{
QWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, NonCacheable, ReadWrite,
0x0000000000000000, // Granularity
0x0000004010000000, // Range Minimum
0x000000401FFFFFFF, // Range Maximum
0x0000000000000000, // Translation Offset
0x0000000010000000, // Length
,, , AddressRangeMemory, TypeStatic)
})
}
}
+ }
+ Scope (\_SB)
+ {
Device (\_SB.GED)
{
Name (_HID, "ACPI0013" /* Generic Event Device */) // _HID: Hardware ID
Name (_UID, "GED") // _UID: Unique ID
Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
{
Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, ,, )
{
0x00000029,
}
})
OperationRegion (EREG, SystemMemory, 0x09080000, 0x04)
Field (EREG, DWordAcc, NoLock, WriteAsZeros)
{
ESEL, 32
}
Signed-off-by: Gustavo Romero <gustavo.romero@linaro.org>
---
tests/data/acpi/aarch64/virt/DSDT | Bin 5196 -> 5178 bytes
.../data/acpi/aarch64/virt/DSDT.acpihmatvirt | Bin 5282 -> 5264 bytes
tests/data/acpi/aarch64/virt/DSDT.memhp | Bin 6557 -> 6539 bytes
tests/data/acpi/aarch64/virt/DSDT.pxb | Bin 7679 -> 7635 bytes
tests/data/acpi/aarch64/virt/DSDT.topology | Bin 5398 -> 5380 bytes
tests/qtest/bios-tables-test-allowed-diff.h | 5 -----
6 files changed, 5 deletions(-)
diff --git a/tests/data/acpi/aarch64/virt/DSDT b/tests/data/acpi/aarch64/virt/DSDT
index 36d3e5d5a5e47359b6dcb3706f98b4f225677591..5c73e64e0c29d3cea5299929afd00e9a1238e559 100644
GIT binary patch
delta 125
zcmX@3u}g!?CD<jzN`!%dNoFFKG*h4XMs+tXCb!9(^SP`!1bx`!{ezuZy0RIZUBV3)
z__0pjEu>{)oKT&>C7-ZBVAAAF##)dJ7YA5gc+zAbZJYoR699=7B!EN~@=P`s?&1(|
P<BW+9c8Z_8SGXSlZJ{Hk
delta 142
zcmdm`aYlp7CD<jzM}&caNqQoeG*i3NMs+tXCWon;^SP`!1l>5}{ezuZy0RIZUBV3)
zc(702Eu`gV6dW25PyiG$b`A;hsRj{T@*r}7z@*8UjI|)OTpVB>Vv{Dr)Io#=K*9we
U#USw|*$eq5OA2>QUM<`Y00vhni~s-t
diff --git a/tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt b/tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt
index e6154d0355f84fdcc51387b4db8f9ee63acae4e9..b0a875d8da3592b5927095304ca31ceb001b2fdf 100644
GIT binary patch
delta 125
zcmZ3aIYE=lCD<iof(Qcx(~F5*(o8M38`bA<F}Y3Ne3Z+YL(qpk-apuxr7N4k*(Ka?
zfgkH+L18Tu<Amx2F8PE70+S|ZGS-4*xH!P_!jmQgY2yTlm;gwuAOR$@kY{qIa2JPw
P8)r;>uv7eGVUd0S*;^zc
delta 142
zcmbQBxk!`CCD<iokq83=(~XH-(oDVX8`bA<F*!`#e3Z+YL(q*g-apuxr7N4k*(Ka?
zfd~6!L18UFqu|hhfC8Y1v2#d}Pc?|(k_V9s1SU<+WUK|L<>CPA5Sug^rVb)301_?$
UDF%rz$zI4eIbXPIGNVX80DOQd2mk;8
diff --git a/tests/data/acpi/aarch64/virt/DSDT.memhp b/tests/data/acpi/aarch64/virt/DSDT.memhp
index 33f011d6b635035a04c0b39ce9b4e219f7ae74b7..21a6b086cbf72298d125d8bfc4c4b7ec9315267b 100644
GIT binary patch
delta 126
zcmbPh+-=O|66_MvEy=*ZWIK^dnyJrxqq-XxliTFY`CQf<f<El={=v>HUD*uIF5!j?
z{8%UN7Sb{?PN+`cl22G5FllloV=YLAivuh#JZUnJHco(u34p{35<nsgc_teRcX0@~
Q$Hl}4JH>C_EBt^J0I0kqp#T5?
delta 143
zcmeA+o@>nI66_K(SCWB&$z~##G*id)jp}Y(Ob$~w=W|(e2)c2``v*I-bY(L*yM!Aq
z@L-?3TS&{#C^$4Apa3Xh>>Lv0Qw<`x<U!;Dfk~4y8EZjmxj4WoIKse=d$fP@P`
Vib3K_vKR7AmK5&Vyju7HD*$j8Du)07
diff --git a/tests/data/acpi/aarch64/virt/DSDT.pxb b/tests/data/acpi/aarch64/virt/DSDT.pxb
index c0fdc6e9c1396cc2259dc4bc665ba023adcf4c9b..c8548a5e5d41a843142c7bbe64580025e006445d 100644
GIT binary patch
delta 217
zcmexwec77JCD<k8vMd7w)AEU2(oF3aH>$gFF?qIa&ga_8F6hG^?;q^U(v{8N>=JIc
zz>jruo{W}>aYA(hmwdtkfk~4y8EZi@TpVC|;YpK$v~dDNOaLTSkN^@{$TRtwjP2%6
gLVAo$Zj(1FiCA+`*X%A10XNQ=_+Y2_$py0g04PO4(EtDd
delta 260
zcmca?{ok6)CD<k8zbpd-Q^!OuX{N5b8`a&on4CK{=X3347j)x{_YZbv>B?qsb_q9J
z;K4rGR!GawC^$4Apa3Xh>>Lv0Qw<`x<U!;Dfk~4y8EZjmxj4WoIKse=d$fP@P`
oib3K_vKR7go-LHk$mB3}Glz&Z2VHEOJX^?i@_QNI$u6?}0Luzao&W#<
diff --git a/tests/data/acpi/aarch64/virt/DSDT.topology b/tests/data/acpi/aarch64/virt/DSDT.topology
index 029d03eecc4efddc001e5377e85ac8e831294362..73aa833317627204aef7ac858d178445bcd37a54 100644
GIT binary patch
delta 125
zcmbQH)uP4a66_MfBFezPBruUnnyJHOqq+b$liTFYmfY4Hf<El={=v>HUD*uIF5!j?
z{8%Tq3Tv4dCsZeJ$tNrjm^3+)u@)r5#Q~NVo-`Rq8z(@-1VCa12_TV$Jd^(lcX0@~
PamK_4JH=0K7wHE8^splO
delta 142
zcmZqCnx@6&66_KpCd$CT#6OWsnyJx$qq+b$lf%@_mfY4Hf^MAg{=v>HUD*uIF5!j?
zJlH3<3Tycp1&0O%6aYnxokN0rszC&oJcwK%FllloV=YK67YA5}*rdrYbr4|zkZ=J=
UF-Uw#_CmhNkA=G?mx}ZQ0C4*#-~a#s
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index abe00ad4ee..dfb8523c8b 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,6 +1 @@
/* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/aarch64/virt/DSDT",
-"tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt",
-"tests/data/acpi/aarch64/virt/DSDT.memhp",
-"tests/data/acpi/aarch64/virt/DSDT.pxb",
-"tests/data/acpi/aarch64/virt/DSDT.topology",
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH 3/5] tests/qtest/bios-tables-test: Update changed ACPI blobs
2025-05-26 5:31 ` [PATCH 3/5] tests/qtest/bios-tables-test: Update changed ACPI blobs Gustavo Romero
@ 2025-05-26 10:25 ` Eric Auger
2025-05-26 13:51 ` Gustavo Romero
0 siblings, 1 reply; 15+ messages in thread
From: Eric Auger @ 2025-05-26 10:25 UTC (permalink / raw)
To: Gustavo Romero, qemu-devel; +Cc: qemu-arm, thuth, alex.bennee, mst, imammedo
Hi Gustavo,
On 5/26/25 7:31 AM, Gustavo Romero wrote:
> Update the aarch64 'virt' base blob and all of its variants. All of them
> have the same diff, so only one is shown below. The essential changes is
> in the AML code of the _OSC (OS Capabilities) method, (variable name
> from 'CTRL' to 'Local0') and the scope for GED device.
Maybe we shall split the update into 2 steps
1) introduce/validate the changes related to _OSC first
2) produce the DSDT ref code with ACPI PCIHP hotplug elements
What do you think?
Eruc
>
> DSDT table diff:
>
> DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPC ", 0x00000001)
> {
> Scope (\_SB)
> {
> Device (C000)
> {
> Name (_HID, "ACPI0007" /* Processor Device */) // _HID: Hardware ID
> Name (_UID, Zero) // _UID: Unique ID
> }
>
> @@ -1794,53 +1794,52 @@
> 0x0000000000000000, // Granularity
> 0x0000008000000000, // Range Minimum
> 0x000000FFFFFFFFFF, // Range Maximum
> 0x0000000000000000, // Translation Offset
> 0x0000008000000000, // Length
> ,, , AddressRangeMemory, TypeStatic)
> })
> Name (SUPP, Zero)
> Name (CTRL, Zero)
> Method (_OSC, 4, NotSerialized) // _OSC: Operating System Capabilities
> {
> CreateDWordField (Arg3, Zero, CDW1)
> If ((Arg0 == ToUUID ("33db4d5b-1ff7-401c-9657-7441c03dd766") /* PCI Host Bridge Device */))
> {
> CreateDWordField (Arg3, 0x04, CDW2)
> CreateDWordField (Arg3, 0x08, CDW3)
> - SUPP = CDW2 /* \_SB_.PCI0._OSC.CDW2 */
> - CTRL = CDW3 /* \_SB_.PCI0._OSC.CDW3 */
> - CTRL &= 0x1F
> + Local0 = CDW3 /* \_SB_.PCI0._OSC.CDW3 */
> + Local0 &= 0x1F
> If ((Arg1 != One))
> {
> CDW1 |= 0x08
> }
>
> - If ((CDW3 != CTRL))
> + If ((CDW3 != Local0))
> {
> CDW1 |= 0x10
> }
>
> - CDW3 = CTRL /* \_SB_.PCI0.CTRL */
> - Return (Arg3)
> + CDW3 = Local0
> }
> Else
> {
> CDW1 |= 0x04
> - Return (Arg3)
> }
> +
> + Return (Arg3)
> }
>
> Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific Method
> {
> If ((Arg0 == ToUUID ("e5c937d0-3553-4d7a-9117-ea4d19c3434d") /* Device Labeling Interface */))
> {
> If ((Arg2 == Zero))
> {
> Return (Buffer (One)
> {
> 0x01 // .
> })
> }
> }
>
> Return (Buffer (One)
> @@ -1851,33 +1850,36 @@
>
> Device (RES0)
> {
> Name (_HID, "PNP0C02" /* PNP Motherboard Resources */) // _HID: Hardware ID
> Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
> {
> QWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, NonCacheable, ReadWrite,
> 0x0000000000000000, // Granularity
> 0x0000004010000000, // Range Minimum
> 0x000000401FFFFFFF, // Range Maximum
> 0x0000000000000000, // Translation Offset
> 0x0000000010000000, // Length
> ,, , AddressRangeMemory, TypeStatic)
> })
> }
> }
> + }
>
> + Scope (\_SB)
> + {
> Device (\_SB.GED)
> {
> Name (_HID, "ACPI0013" /* Generic Event Device */) // _HID: Hardware ID
> Name (_UID, "GED") // _UID: Unique ID
> Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
> {
> Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, ,, )
> {
> 0x00000029,
> }
> })
> OperationRegion (EREG, SystemMemory, 0x09080000, 0x04)
> Field (EREG, DWordAcc, NoLock, WriteAsZeros)
> {
> ESEL, 32
> }
>
> Signed-off-by: Gustavo Romero <gustavo.romero@linaro.org>
> ---
> tests/data/acpi/aarch64/virt/DSDT | Bin 5196 -> 5178 bytes
> .../data/acpi/aarch64/virt/DSDT.acpihmatvirt | Bin 5282 -> 5264 bytes
> tests/data/acpi/aarch64/virt/DSDT.memhp | Bin 6557 -> 6539 bytes
> tests/data/acpi/aarch64/virt/DSDT.pxb | Bin 7679 -> 7635 bytes
> tests/data/acpi/aarch64/virt/DSDT.topology | Bin 5398 -> 5380 bytes
> tests/qtest/bios-tables-test-allowed-diff.h | 5 -----
> 6 files changed, 5 deletions(-)
>
> diff --git a/tests/data/acpi/aarch64/virt/DSDT b/tests/data/acpi/aarch64/virt/DSDT
> index 36d3e5d5a5e47359b6dcb3706f98b4f225677591..5c73e64e0c29d3cea5299929afd00e9a1238e559 100644
> GIT binary patch
> delta 125
> zcmX@3u}g!?CD<jzN`!%dNoFFKG*h4XMs+tXCb!9(^SP`!1bx`!{ezuZy0RIZUBV3)
> z__0pjEu>{)oKT&>C7-ZBVAAAF##)dJ7YA5gc+zAbZJYoR699=7B!EN~@=P`s?&1(|
> P<BW+9c8Z_8SGXSlZJ{Hk
>
> delta 142
> zcmdm`aYlp7CD<jzM}&caNqQoeG*i3NMs+tXCWon;^SP`!1l>5}{ezuZy0RIZUBV3)
> zc(702Eu`gV6dW25PyiG$b`A;hsRj{T@*r}7z@*8UjI|)OTpVB>Vv{Dr)Io#=K*9we
> U#USw|*$eq5OA2>QUM<`Y00vhni~s-t
>
> diff --git a/tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt b/tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt
> index e6154d0355f84fdcc51387b4db8f9ee63acae4e9..b0a875d8da3592b5927095304ca31ceb001b2fdf 100644
> GIT binary patch
> delta 125
> zcmZ3aIYE=lCD<iof(Qcx(~F5*(o8M38`bA<F}Y3Ne3Z+YL(qpk-apuxr7N4k*(Ka?
> zfgkH+L18Tu<Amx2F8PE70+S|ZGS-4*xH!P_!jmQgY2yTlm;gwuAOR$@kY{qIa2JPw
> P8)r;>uv7eGVUd0S*;^zc
>
> delta 142
> zcmbQBxk!`CCD<iokq83=(~XH-(oDVX8`bA<F*!`#e3Z+YL(q*g-apuxr7N4k*(Ka?
> zfd~6!L18UFqu|hhfC8Y1v2#d}Pc?|(k_V9s1SU<+WUK|L<>CPA5Sug^rVb)301_?$
> UDF%rz$zI4eIbXPIGNVX80DOQd2mk;8
>
> diff --git a/tests/data/acpi/aarch64/virt/DSDT.memhp b/tests/data/acpi/aarch64/virt/DSDT.memhp
> index 33f011d6b635035a04c0b39ce9b4e219f7ae74b7..21a6b086cbf72298d125d8bfc4c4b7ec9315267b 100644
> GIT binary patch
> delta 126
> zcmbPh+-=O|66_MvEy=*ZWIK^dnyJrxqq-XxliTFY`CQf<f<El={=v>HUD*uIF5!j?
> z{8%UN7Sb{?PN+`cl22G5FllloV=YLAivuh#JZUnJHco(u34p{35<nsgc_teRcX0@~
> Q$Hl}4JH>C_EBt^J0I0kqp#T5?
>
> delta 143
> zcmeA+o@>nI66_K(SCWB&$z~##G*id)jp}Y(Ob$~w=W|(e2)c2``v*I-bY(L*yM!Aq
> z@L-?3TS&{#C^$4Apa3Xh>>Lv0Qw<`x<U!;Dfk~4y8EZjmxj4WoIKse=d$fP@P`
> Vib3K_vKR7AmK5&Vyju7HD*$j8Du)07
>
> diff --git a/tests/data/acpi/aarch64/virt/DSDT.pxb b/tests/data/acpi/aarch64/virt/DSDT.pxb
> index c0fdc6e9c1396cc2259dc4bc665ba023adcf4c9b..c8548a5e5d41a843142c7bbe64580025e006445d 100644
> GIT binary patch
> delta 217
> zcmexwec77JCD<k8vMd7w)AEU2(oF3aH>$gFF?qIa&ga_8F6hG^?;q^U(v{8N>=JIc
> zz>jruo{W}>aYA(hmwdtkfk~4y8EZi@TpVC|;YpK$v~dDNOaLTSkN^@{$TRtwjP2%6
> gLVAo$Zj(1FiCA+`*X%A10XNQ=_+Y2_$py0g04PO4(EtDd
>
> delta 260
> zcmca?{ok6)CD<k8zbpd-Q^!OuX{N5b8`a&on4CK{=X3347j)x{_YZbv>B?qsb_q9J
> z;K4rGR!GawC^$4Apa3Xh>>Lv0Qw<`x<U!;Dfk~4y8EZjmxj4WoIKse=d$fP@P`
> oib3K_vKR7go-LHk$mB3}Glz&Z2VHEOJX^?i@_QNI$u6?}0Luzao&W#<
>
> diff --git a/tests/data/acpi/aarch64/virt/DSDT.topology b/tests/data/acpi/aarch64/virt/DSDT.topology
> index 029d03eecc4efddc001e5377e85ac8e831294362..73aa833317627204aef7ac858d178445bcd37a54 100644
> GIT binary patch
> delta 125
> zcmbQH)uP4a66_MfBFezPBruUnnyJHOqq+b$liTFYmfY4Hf<El={=v>HUD*uIF5!j?
> z{8%Tq3Tv4dCsZeJ$tNrjm^3+)u@)r5#Q~NVo-`Rq8z(@-1VCa12_TV$Jd^(lcX0@~
> PamK_4JH=0K7wHE8^splO
>
> delta 142
> zcmZqCnx@6&66_KpCd$CT#6OWsnyJx$qq+b$lf%@_mfY4Hf^MAg{=v>HUD*uIF5!j?
> zJlH3<3Tycp1&0O%6aYnxokN0rszC&oJcwK%FllloV=YK67YA5}*rdrYbr4|zkZ=J=
> UF-Uw#_CmhNkA=G?mx}ZQ0C4*#-~a#s
>
> diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
> index abe00ad4ee..dfb8523c8b 100644
> --- a/tests/qtest/bios-tables-test-allowed-diff.h
> +++ b/tests/qtest/bios-tables-test-allowed-diff.h
> @@ -1,6 +1 @@
> /* List of comma-separated changed AML files to ignore */
> -"tests/data/acpi/aarch64/virt/DSDT",
> -"tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt",
> -"tests/data/acpi/aarch64/virt/DSDT.memhp",
> -"tests/data/acpi/aarch64/virt/DSDT.pxb",
> -"tests/data/acpi/aarch64/virt/DSDT.topology",
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH 3/5] tests/qtest/bios-tables-test: Update changed ACPI blobs
2025-05-26 10:25 ` Eric Auger
@ 2025-05-26 13:51 ` Gustavo Romero
2025-05-26 14:46 ` Eric Auger
0 siblings, 1 reply; 15+ messages in thread
From: Gustavo Romero @ 2025-05-26 13:51 UTC (permalink / raw)
To: eric.auger, qemu-devel; +Cc: qemu-arm, thuth, alex.bennee, mst, imammedo
Hi Eric,
On 5/26/25 07:25, Eric Auger wrote:
> Hi Gustavo,
>
> On 5/26/25 7:31 AM, Gustavo Romero wrote:
>> Update the aarch64 'virt' base blob and all of its variants. All of them
>> have the same diff, so only one is shown below. The essential changes is
>> in the AML code of the _OSC (OS Capabilities) method, (variable name
>> from 'CTRL' to 'Local0') and the scope for GED device.
>
> Maybe we shall split the update into 2 steps
Yes, I think so.
> 1) introduce/validate the changes related to _OSC first
Yep, if I'm following you correctly :) When you say "introduce/validade
the changes related to _OSC first" you mean putting your series [0] (all patches or
at least patch 08/22 "hw/pci-host/gpex-acpi: Use build_pci_host_bridge_osc_method")
before this patch, 3/5, and after 1/5? If that's it, yip, I think that would
be the right thing to do.
> 2) produce the DSDT ref code with ACPI PCIHP hotplug elements
Yep, but you mean "with ACPI PCIHP hotplug elements" when acpi-pcihp=off, right?
Which is equivalent to put this patch, which contains the DSDT ref code with
ACPI PCI hotplug in place and with acpi-pcihp=off, after your changes in _OSC.
> What do you think?
Yeah, feel free to pick patches 1-3 from this series and apply accordingly to your
series. Patch 1/5 would be right before the change in _OSC in your series, i.e. before
patch 8/22, and patches 2/5 and 3/5 right after patch 8/22. Is this what you meant?
It seems there is also an inoffensive change in the scope of the GED, but I'm not
sure where it's coming from, maybe it comes from yet another patch, not from 8/22,
that also must be included between 1/5 and 2-3/5?
An alternative, which I think is less ideal, have 1/3 before your series and 2/5 and 3/5
at the end of your whole series. But I prefer them "sandwiching" the 8/22 patch and the
patches that exclusively touch the DSDT table, instead.
Then patches 4-5/5 in this series would come a separate series, after everything else,
and so can be merged separate.
Cheers,
Gustavo
[0] https://lists.nongnu.org/archive/html/qemu-devel/2025-05/msg03487.html
> Eruc
>
>>
>> DSDT table diff:
>>
>> DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPC ", 0x00000001)
>> {
>> Scope (\_SB)
>> {
>> Device (C000)
>> {
>> Name (_HID, "ACPI0007" /* Processor Device */) // _HID: Hardware ID
>> Name (_UID, Zero) // _UID: Unique ID
>> }
>>
>> @@ -1794,53 +1794,52 @@
>> 0x0000000000000000, // Granularity
>> 0x0000008000000000, // Range Minimum
>> 0x000000FFFFFFFFFF, // Range Maximum
>> 0x0000000000000000, // Translation Offset
>> 0x0000008000000000, // Length
>> ,, , AddressRangeMemory, TypeStatic)
>> })
>> Name (SUPP, Zero)
>> Name (CTRL, Zero)
>> Method (_OSC, 4, NotSerialized) // _OSC: Operating System Capabilities
>> {
>> CreateDWordField (Arg3, Zero, CDW1)
>> If ((Arg0 == ToUUID ("33db4d5b-1ff7-401c-9657-7441c03dd766") /* PCI Host Bridge Device */))
>> {
>> CreateDWordField (Arg3, 0x04, CDW2)
>> CreateDWordField (Arg3, 0x08, CDW3)
>> - SUPP = CDW2 /* \_SB_.PCI0._OSC.CDW2 */
>> - CTRL = CDW3 /* \_SB_.PCI0._OSC.CDW3 */
>> - CTRL &= 0x1F
>> + Local0 = CDW3 /* \_SB_.PCI0._OSC.CDW3 */
>> + Local0 &= 0x1F
>> If ((Arg1 != One))
>> {
>> CDW1 |= 0x08
>> }
>>
>> - If ((CDW3 != CTRL))
>> + If ((CDW3 != Local0))
>> {
>> CDW1 |= 0x10
>> }
>>
>> - CDW3 = CTRL /* \_SB_.PCI0.CTRL */
>> - Return (Arg3)
>> + CDW3 = Local0
>> }
>> Else
>> {
>> CDW1 |= 0x04
>> - Return (Arg3)
>> }
>> +
>> + Return (Arg3)
>> }
>>
>> Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific Method
>> {
>> If ((Arg0 == ToUUID ("e5c937d0-3553-4d7a-9117-ea4d19c3434d") /* Device Labeling Interface */))
>> {
>> If ((Arg2 == Zero))
>> {
>> Return (Buffer (One)
>> {
>> 0x01 // .
>> })
>> }
>> }
>>
>> Return (Buffer (One)
>> @@ -1851,33 +1850,36 @@
>>
>> Device (RES0)
>> {
>> Name (_HID, "PNP0C02" /* PNP Motherboard Resources */) // _HID: Hardware ID
>> Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
>> {
>> QWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, NonCacheable, ReadWrite,
>> 0x0000000000000000, // Granularity
>> 0x0000004010000000, // Range Minimum
>> 0x000000401FFFFFFF, // Range Maximum
>> 0x0000000000000000, // Translation Offset
>> 0x0000000010000000, // Length
>> ,, , AddressRangeMemory, TypeStatic)
>> })
>> }
>> }
>> + }
>>
>> + Scope (\_SB)
>> + {
>> Device (\_SB.GED)
>> {
>> Name (_HID, "ACPI0013" /* Generic Event Device */) // _HID: Hardware ID
>> Name (_UID, "GED") // _UID: Unique ID
>> Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
>> {
>> Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, ,, )
>> {
>> 0x00000029,
>> }
>> })
>> OperationRegion (EREG, SystemMemory, 0x09080000, 0x04)
>> Field (EREG, DWordAcc, NoLock, WriteAsZeros)
>> {
>> ESEL, 32
>> }
>>
>> Signed-off-by: Gustavo Romero <gustavo.romero@linaro.org>
>> ---
>> tests/data/acpi/aarch64/virt/DSDT | Bin 5196 -> 5178 bytes
>> .../data/acpi/aarch64/virt/DSDT.acpihmatvirt | Bin 5282 -> 5264 bytes
>> tests/data/acpi/aarch64/virt/DSDT.memhp | Bin 6557 -> 6539 bytes
>> tests/data/acpi/aarch64/virt/DSDT.pxb | Bin 7679 -> 7635 bytes
>> tests/data/acpi/aarch64/virt/DSDT.topology | Bin 5398 -> 5380 bytes
>> tests/qtest/bios-tables-test-allowed-diff.h | 5 -----
>> 6 files changed, 5 deletions(-)
>>
>> diff --git a/tests/data/acpi/aarch64/virt/DSDT b/tests/data/acpi/aarch64/virt/DSDT
>> index 36d3e5d5a5e47359b6dcb3706f98b4f225677591..5c73e64e0c29d3cea5299929afd00e9a1238e559 100644
>> GIT binary patch
>> delta 125
>> zcmX@3u}g!?CD<jzN`!%dNoFFKG*h4XMs+tXCb!9(^SP`!1bx`!{ezuZy0RIZUBV3)
>> z__0pjEu>{)oKT&>C7-ZBVAAAF##)dJ7YA5gc+zAbZJYoR699=7B!EN~@=P`s?&1(|
>> P<BW+9c8Z_8SGXSlZJ{Hk
>>
>> delta 142
>> zcmdm`aYlp7CD<jzM}&caNqQoeG*i3NMs+tXCWon;^SP`!1l>5}{ezuZy0RIZUBV3)
>> zc(702Eu`gV6dW25PyiG$b`A;hsRj{T@*r}7z@*8UjI|)OTpVB>Vv{Dr)Io#=K*9we
>> U#USw|*$eq5OA2>QUM<`Y00vhni~s-t
>>
>> diff --git a/tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt b/tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt
>> index e6154d0355f84fdcc51387b4db8f9ee63acae4e9..b0a875d8da3592b5927095304ca31ceb001b2fdf 100644
>> GIT binary patch
>> delta 125
>> zcmZ3aIYE=lCD<iof(Qcx(~F5*(o8M38`bA<F}Y3Ne3Z+YL(qpk-apuxr7N4k*(Ka?
>> zfgkH+L18Tu<Amx2F8PE70+S|ZGS-4*xH!P_!jmQgY2yTlm;gwuAOR$@kY{qIa2JPw
>> P8)r;>uv7eGVUd0S*;^zc
>>
>> delta 142
>> zcmbQBxk!`CCD<iokq83=(~XH-(oDVX8`bA<F*!`#e3Z+YL(q*g-apuxr7N4k*(Ka?
>> zfd~6!L18UFqu|hhfC8Y1v2#d}Pc?|(k_V9s1SU<+WUK|L<>CPA5Sug^rVb)301_?$
>> UDF%rz$zI4eIbXPIGNVX80DOQd2mk;8
>>
>> diff --git a/tests/data/acpi/aarch64/virt/DSDT.memhp b/tests/data/acpi/aarch64/virt/DSDT.memhp
>> index 33f011d6b635035a04c0b39ce9b4e219f7ae74b7..21a6b086cbf72298d125d8bfc4c4b7ec9315267b 100644
>> GIT binary patch
>> delta 126
>> zcmbPh+-=O|66_MvEy=*ZWIK^dnyJrxqq-XxliTFY`CQf<f<El={=v>HUD*uIF5!j?
>> z{8%UN7Sb{?PN+`cl22G5FllloV=YLAivuh#JZUnJHco(u34p{35<nsgc_teRcX0@~
>> Q$Hl}4JH>C_EBt^J0I0kqp#T5?
>>
>> delta 143
>> zcmeA+o@>nI66_K(SCWB&$z~##G*id)jp}Y(Ob$~w=W|(e2)c2``v*I-bY(L*yM!Aq
>> z@L-?3TS&{#C^$4Apa3Xh>>Lv0Qw<`x<U!;Dfk~4y8EZjmxj4WoIKse=d$fP@P`
>> Vib3K_vKR7AmK5&Vyju7HD*$j8Du)07
>>
>> diff --git a/tests/data/acpi/aarch64/virt/DSDT.pxb b/tests/data/acpi/aarch64/virt/DSDT.pxb
>> index c0fdc6e9c1396cc2259dc4bc665ba023adcf4c9b..c8548a5e5d41a843142c7bbe64580025e006445d 100644
>> GIT binary patch
>> delta 217
>> zcmexwec77JCD<k8vMd7w)AEU2(oF3aH>$gFF?qIa&ga_8F6hG^?;q^U(v{8N>=JIc
>> zz>jruo{W}>aYA(hmwdtkfk~4y8EZi@TpVC|;YpK$v~dDNOaLTSkN^@{$TRtwjP2%6
>> gLVAo$Zj(1FiCA+`*X%A10XNQ=_+Y2_$py0g04PO4(EtDd
>>
>> delta 260
>> zcmca?{ok6)CD<k8zbpd-Q^!OuX{N5b8`a&on4CK{=X3347j)x{_YZbv>B?qsb_q9J
>> z;K4rGR!GawC^$4Apa3Xh>>Lv0Qw<`x<U!;Dfk~4y8EZjmxj4WoIKse=d$fP@P`
>> oib3K_vKR7go-LHk$mB3}Glz&Z2VHEOJX^?i@_QNI$u6?}0Luzao&W#<
>>
>> diff --git a/tests/data/acpi/aarch64/virt/DSDT.topology b/tests/data/acpi/aarch64/virt/DSDT.topology
>> index 029d03eecc4efddc001e5377e85ac8e831294362..73aa833317627204aef7ac858d178445bcd37a54 100644
>> GIT binary patch
>> delta 125
>> zcmbQH)uP4a66_MfBFezPBruUnnyJHOqq+b$liTFYmfY4Hf<El={=v>HUD*uIF5!j?
>> z{8%Tq3Tv4dCsZeJ$tNrjm^3+)u@)r5#Q~NVo-`Rq8z(@-1VCa12_TV$Jd^(lcX0@~
>> PamK_4JH=0K7wHE8^splO
>>
>> delta 142
>> zcmZqCnx@6&66_KpCd$CT#6OWsnyJx$qq+b$lf%@_mfY4Hf^MAg{=v>HUD*uIF5!j?
>> zJlH3<3Tycp1&0O%6aYnxokN0rszC&oJcwK%FllloV=YK67YA5}*rdrYbr4|zkZ=J=
>> UF-Uw#_CmhNkA=G?mx}ZQ0C4*#-~a#s
>>
>> diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
>> index abe00ad4ee..dfb8523c8b 100644
>> --- a/tests/qtest/bios-tables-test-allowed-diff.h
>> +++ b/tests/qtest/bios-tables-test-allowed-diff.h
>> @@ -1,6 +1 @@
>> /* List of comma-separated changed AML files to ignore */
>> -"tests/data/acpi/aarch64/virt/DSDT",
>> -"tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt",
>> -"tests/data/acpi/aarch64/virt/DSDT.memhp",
>> -"tests/data/acpi/aarch64/virt/DSDT.pxb",
>> -"tests/data/acpi/aarch64/virt/DSDT.topology",
>
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH 3/5] tests/qtest/bios-tables-test: Update changed ACPI blobs
2025-05-26 13:51 ` Gustavo Romero
@ 2025-05-26 14:46 ` Eric Auger
0 siblings, 0 replies; 15+ messages in thread
From: Eric Auger @ 2025-05-26 14:46 UTC (permalink / raw)
To: Gustavo Romero, qemu-devel; +Cc: qemu-arm, thuth, alex.bennee, mst, imammedo
On 5/26/25 3:51 PM, Gustavo Romero wrote:
> Hi Eric,
>
> On 5/26/25 07:25, Eric Auger wrote:
>> Hi Gustavo,
>>
>> On 5/26/25 7:31 AM, Gustavo Romero wrote:
>>> Update the aarch64 'virt' base blob and all of its variants. All of
>>> them
>>> have the same diff, so only one is shown below. The essential
>>> changes is
>>> in the AML code of the _OSC (OS Capabilities) method, (variable name
>>> from 'CTRL' to 'Local0') and the scope for GED device.
>>
>> Maybe we shall split the update into 2 steps
>
> Yes, I think so.
>
>
>> 1) introduce/validate the changes related to _OSC first
>
> Yep, if I'm following you correctly :) When you say "introduce/validade
> the changes related to _OSC first" you mean putting your series [0]
> (all patches or
> at least patch 08/22 "hw/pci-host/gpex-acpi: Use
> build_pci_host_bridge_osc_method")
> before this patch, 3/5, and after 1/5? If that's it, yip, I think that
> would
> be the right thing to do.
yep this allows to validate the acpi changes in an incremental manner.
>
>
>> 2) produce the DSDT ref code with ACPI PCIHP hotplug elements
>
> Yep, but you mean "with ACPI PCIHP hotplug elements" when
> acpi-pcihp=off, right?
> Which is equivalent to put this patch, which contains the DSDT ref
> code with
> ACPI PCI hotplug in place and with acpi-pcihp=off, after your changes
> in _OSC.
logically if acpi-pcihp is off the DSDT should not be altered, besides
the small _OSC change. in practice I can see there is a tiny change with
a SB scope closure and reopening. I need to see if I get rid of that
one. Then when setting the option as default we obviously get a lot of
changes for which we need to regenerate ref blobs.
>
>
>> What do you think?
>
> Yeah, feel free to pick patches 1-3 from this series and apply
> accordingly to your
> series. Patch 1/5 would be right before the change in _OSC in your
> series, i.e. before
> patch 8/22, and patches 2/5 and 3/5 right after patch 8/22. Is this
> what you meant?
>
> It seems there is also an inoffensive change in the scope of the GED,
> but I'm not
> sure where it's coming from, maybe it comes from yet another patch,
> not from 8/22,
> that also must be included between 1/5 and 2-3/5?
Yep I just noticed that one, already mentionned above. I will try to fix
that.
>
> An alternative, which I think is less ideal, have 1/3 before your
> series and 2/5 and 3/5
> at the end of your whole series. But I prefer them "sandwiching" the
> 8/22 patch and the
> patches that exclusively touch the DSDT table, instead.
>
> Then patches 4-5/5 in this series would come a separate series, after
> everything else,
> and so can be merged separate.
agreed
Cheers
Eric
>
>
> Cheers,
> Gustavo
>
> [0]
> https://lists.nongnu.org/archive/html/qemu-devel/2025-05/msg03487.html
>
>> Eruc
>>
>>>
>>> DSDT table diff:
>>>
>>> DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPC ", 0x00000001)
>>> {
>>> Scope (\_SB)
>>> {
>>> Device (C000)
>>> {
>>> Name (_HID, "ACPI0007" /* Processor Device */) //
>>> _HID: Hardware ID
>>> Name (_UID, Zero) // _UID: Unique ID
>>> }
>>>
>>> @@ -1794,53 +1794,52 @@
>>> 0x0000000000000000, // Granularity
>>> 0x0000008000000000, // Range Minimum
>>> 0x000000FFFFFFFFFF, // Range Maximum
>>> 0x0000000000000000, // Translation Offset
>>> 0x0000008000000000, // Length
>>> ,, , AddressRangeMemory, TypeStatic)
>>> })
>>> Name (SUPP, Zero)
>>> Name (CTRL, Zero)
>>> Method (_OSC, 4, NotSerialized) // _OSC: Operating
>>> System Capabilities
>>> {
>>> CreateDWordField (Arg3, Zero, CDW1)
>>> If ((Arg0 == ToUUID
>>> ("33db4d5b-1ff7-401c-9657-7441c03dd766") /* PCI Host Bridge Device */))
>>> {
>>> CreateDWordField (Arg3, 0x04, CDW2)
>>> CreateDWordField (Arg3, 0x08, CDW3)
>>> - SUPP = CDW2 /* \_SB_.PCI0._OSC.CDW2 */
>>> - CTRL = CDW3 /* \_SB_.PCI0._OSC.CDW3 */
>>> - CTRL &= 0x1F
>>> + Local0 = CDW3 /* \_SB_.PCI0._OSC.CDW3 */
>>> + Local0 &= 0x1F
>>> If ((Arg1 != One))
>>> {
>>> CDW1 |= 0x08
>>> }
>>>
>>> - If ((CDW3 != CTRL))
>>> + If ((CDW3 != Local0))
>>> {
>>> CDW1 |= 0x10
>>> }
>>>
>>> - CDW3 = CTRL /* \_SB_.PCI0.CTRL */
>>> - Return (Arg3)
>>> + CDW3 = Local0
>>> }
>>> Else
>>> {
>>> CDW1 |= 0x04
>>> - Return (Arg3)
>>> }
>>> +
>>> + Return (Arg3)
>>> }
>>>
>>> Method (_DSM, 4, NotSerialized) // _DSM:
>>> Device-Specific Method
>>> {
>>> If ((Arg0 == ToUUID
>>> ("e5c937d0-3553-4d7a-9117-ea4d19c3434d") /* Device Labeling
>>> Interface */))
>>> {
>>> If ((Arg2 == Zero))
>>> {
>>> Return (Buffer (One)
>>> {
>>>
>>> 0x01 // .
>>> })
>>> }
>>> }
>>>
>>> Return (Buffer (One)
>>> @@ -1851,33 +1850,36 @@
>>>
>>> Device (RES0)
>>> {
>>> Name (_HID, "PNP0C02" /* PNP Motherboard Resources
>>> */) // _HID: Hardware ID
>>> Name (_CRS, ResourceTemplate () // _CRS: Current
>>> Resource Settings
>>> {
>>> QWordMemory (ResourceProducer, PosDecode,
>>> MinFixed, MaxFixed, NonCacheable, ReadWrite,
>>> 0x0000000000000000, // Granularity
>>> 0x0000004010000000, // Range Minimum
>>> 0x000000401FFFFFFF, // Range Maximum
>>> 0x0000000000000000, // Translation Offset
>>> 0x0000000010000000, // Length
>>> ,, , AddressRangeMemory, TypeStatic)
>>> })
>>> }
>>> }
>>> + }
>>>
>>> + Scope (\_SB)
>>> + {
>>> Device (\_SB.GED)
>>> {
>>> Name (_HID, "ACPI0013" /* Generic Event Device */) //
>>> _HID: Hardware ID
>>> Name (_UID, "GED") // _UID: Unique ID
>>> Name (_CRS, ResourceTemplate () // _CRS: Current
>>> Resource Settings
>>> {
>>> Interrupt (ResourceConsumer, Edge, ActiveHigh,
>>> Exclusive, ,, )
>>> {
>>> 0x00000029,
>>> }
>>> })
>>> OperationRegion (EREG, SystemMemory, 0x09080000, 0x04)
>>> Field (EREG, DWordAcc, NoLock, WriteAsZeros)
>>> {
>>> ESEL, 32
>>> }
>>>
>>> Signed-off-by: Gustavo Romero <gustavo.romero@linaro.org>
>>> ---
>>> tests/data/acpi/aarch64/virt/DSDT | Bin 5196 -> 5178
>>> bytes
>>> .../data/acpi/aarch64/virt/DSDT.acpihmatvirt | Bin 5282 -> 5264
>>> bytes
>>> tests/data/acpi/aarch64/virt/DSDT.memhp | Bin 6557 -> 6539
>>> bytes
>>> tests/data/acpi/aarch64/virt/DSDT.pxb | Bin 7679 -> 7635
>>> bytes
>>> tests/data/acpi/aarch64/virt/DSDT.topology | Bin 5398 -> 5380
>>> bytes
>>> tests/qtest/bios-tables-test-allowed-diff.h | 5 -----
>>> 6 files changed, 5 deletions(-)
>>>
>>> diff --git a/tests/data/acpi/aarch64/virt/DSDT
>>> b/tests/data/acpi/aarch64/virt/DSDT
>>> index
>>> 36d3e5d5a5e47359b6dcb3706f98b4f225677591..5c73e64e0c29d3cea5299929afd00e9a1238e559
>>> 100644
>>> GIT binary patch
>>> delta 125
>>> zcmX@3u}g!?CD<jzN`!%dNoFFKG*h4XMs+tXCb!9(^SP`!1bx`!{ezuZy0RIZUBV3)
>>> z__0pjEu>{)oKT&>C7-ZBVAAAF##)dJ7YA5gc+zAbZJYoR699=7B!EN~@=P`s?&1(|
>>> P<BW+9c8Z_8SGXSlZJ{Hk
>>>
>>> delta 142
>>> zcmdm`aYlp7CD<jzM}&caNqQoeG*i3NMs+tXCWon;^SP`!1l>5}{ezuZy0RIZUBV3)
>>> zc(702Eu`gV6dW25PyiG$b`A;hsRj{T@*r}7z@*8UjI|)OTpVB>Vv{Dr)Io#=K*9we
>>> U#USw|*$eq5OA2>QUM<`Y00vhni~s-t
>>>
>>> diff --git a/tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt
>>> b/tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt
>>> index
>>> e6154d0355f84fdcc51387b4db8f9ee63acae4e9..b0a875d8da3592b5927095304ca31ceb001b2fdf
>>> 100644
>>> GIT binary patch
>>> delta 125
>>> zcmZ3aIYE=lCD<iof(Qcx(~F5*(o8M38`bA<F}Y3Ne3Z+YL(qpk-apuxr7N4k*(Ka?
>>> zfgkH+L18Tu<Amx2F8PE70+S|ZGS-4*xH!P_!jmQgY2yTlm;gwuAOR$@kY{qIa2JPw
>>> P8)r;>uv7eGVUd0S*;^zc
>>>
>>> delta 142
>>> zcmbQBxk!`CCD<iokq83=(~XH-(oDVX8`bA<F*!`#e3Z+YL(q*g-apuxr7N4k*(Ka?
>>> zfd~6!L18UFqu|hhfC8Y1v2#d}Pc?|(k_V9s1SU<+WUK|L<>CPA5Sug^rVb)301_?$
>>> UDF%rz$zI4eIbXPIGNVX80DOQd2mk;8
>>>
>>> diff --git a/tests/data/acpi/aarch64/virt/DSDT.memhp
>>> b/tests/data/acpi/aarch64/virt/DSDT.memhp
>>> index
>>> 33f011d6b635035a04c0b39ce9b4e219f7ae74b7..21a6b086cbf72298d125d8bfc4c4b7ec9315267b
>>> 100644
>>> GIT binary patch
>>> delta 126
>>> zcmbPh+-=O|66_MvEy=*ZWIK^dnyJrxqq-XxliTFY`CQf<f<El={=v>HUD*uIF5!j?
>>> z{8%UN7Sb{?PN+`cl22G5FllloV=YLAivuh#JZUnJHco(u34p{35<nsgc_teRcX0@~
>>> Q$Hl}4JH>C_EBt^J0I0kqp#T5?
>>>
>>> delta 143
>>> zcmeA+o@>nI66_K(SCWB&$z~##G*id)jp}Y(Ob$~w=W|(e2)c2``v*I-bY(L*yM!Aq
>>> z@L-?3TS&{#C^$4Apa3Xh>>Lv0Qw<`x<U!;Dfk~4y8EZjmxj4WoIKse=d$fP@P`
>>> Vib3K_vKR7AmK5&Vyju7HD*$j8Du)07
>>>
>>> diff --git a/tests/data/acpi/aarch64/virt/DSDT.pxb
>>> b/tests/data/acpi/aarch64/virt/DSDT.pxb
>>> index
>>> c0fdc6e9c1396cc2259dc4bc665ba023adcf4c9b..c8548a5e5d41a843142c7bbe64580025e006445d
>>> 100644
>>> GIT binary patch
>>> delta 217
>>> zcmexwec77JCD<k8vMd7w)AEU2(oF3aH>$gFF?qIa&ga_8F6hG^?;q^U(v{8N>=JIc
>>> zz>jruo{W}>aYA(hmwdtkfk~4y8EZi@TpVC|;YpK$v~dDNOaLTSkN^@{$TRtwjP2%6
>>> gLVAo$Zj(1FiCA+`*X%A10XNQ=_+Y2_$py0g04PO4(EtDd
>>>
>>> delta 260
>>> zcmca?{ok6)CD<k8zbpd-Q^!OuX{N5b8`a&on4CK{=X3347j)x{_YZbv>B?qsb_q9J
>>> z;K4rGR!GawC^$4Apa3Xh>>Lv0Qw<`x<U!;Dfk~4y8EZjmxj4WoIKse=d$fP@P`
>>> oib3K_vKR7go-LHk$mB3}Glz&Z2VHEOJX^?i@_QNI$u6?}0Luzao&W#<
>>>
>>> diff --git a/tests/data/acpi/aarch64/virt/DSDT.topology
>>> b/tests/data/acpi/aarch64/virt/DSDT.topology
>>> index
>>> 029d03eecc4efddc001e5377e85ac8e831294362..73aa833317627204aef7ac858d178445bcd37a54
>>> 100644
>>> GIT binary patch
>>> delta 125
>>> zcmbQH)uP4a66_MfBFezPBruUnnyJHOqq+b$liTFYmfY4Hf<El={=v>HUD*uIF5!j?
>>> z{8%Tq3Tv4dCsZeJ$tNrjm^3+)u@)r5#Q~NVo-`Rq8z(@-1VCa12_TV$Jd^(lcX0@~
>>> PamK_4JH=0K7wHE8^splO
>>>
>>> delta 142
>>> zcmZqCnx@6&66_KpCd$CT#6OWsnyJx$qq+b$lf%@_mfY4Hf^MAg{=v>HUD*uIF5!j?
>>> zJlH3<3Tycp1&0O%6aYnxokN0rszC&oJcwK%FllloV=YK67YA5}*rdrYbr4|zkZ=J=
>>> UF-Uw#_CmhNkA=G?mx}ZQ0C4*#-~a#s
>>>
>>> diff --git a/tests/qtest/bios-tables-test-allowed-diff.h
>>> b/tests/qtest/bios-tables-test-allowed-diff.h
>>> index abe00ad4ee..dfb8523c8b 100644
>>> --- a/tests/qtest/bios-tables-test-allowed-diff.h
>>> +++ b/tests/qtest/bios-tables-test-allowed-diff.h
>>> @@ -1,6 +1 @@
>>> /* List of comma-separated changed AML files to ignore */
>>> -"tests/data/acpi/aarch64/virt/DSDT",
>>> -"tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt",
>>> -"tests/data/acpi/aarch64/virt/DSDT.memhp",
>>> -"tests/data/acpi/aarch64/virt/DSDT.pxb",
>>> -"tests/data/acpi/aarch64/virt/DSDT.topology",
>>
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 4/5] tests/qtest/bios-tables-test: Add aarch64 ACPI PCI hotplug test
2025-05-26 5:31 [PATCH 0/5] ACPI tests for PCI Hotplug on ARM Gustavo Romero
` (2 preceding siblings ...)
2025-05-26 5:31 ` [PATCH 3/5] tests/qtest/bios-tables-test: Update changed ACPI blobs Gustavo Romero
@ 2025-05-26 5:31 ` Gustavo Romero
2025-05-26 5:31 ` [PATCH 5/5] qtest/bios-tables-test: Update aarch64/virt 'acpipcihp' variant blob Gustavo Romero
4 siblings, 0 replies; 15+ messages in thread
From: Gustavo Romero @ 2025-05-26 5:31 UTC (permalink / raw)
To: qemu-devel, eric.auger
Cc: qemu-arm, thuth, gustavo.romero, alex.bennee, mst, imammedo
Add a test to verify that the aarch64 'virt' machine correctly generates
the ACPI tables and AML code for PCI device hotplug.
Signed-off-by: Gustavo Romero <gustavo.romero@linaro.org>
---
tests/data/acpi/aarch64/virt/DSDT.acpipcihp | 0
tests/qtest/bios-tables-test-allowed-diff.h | 1 +
tests/qtest/bios-tables-test.c | 32 +++++++++++++++++++++
3 files changed, 33 insertions(+)
create mode 100644 tests/data/acpi/aarch64/virt/DSDT.acpipcihp
diff --git a/tests/data/acpi/aarch64/virt/DSDT.acpipcihp b/tests/data/acpi/aarch64/virt/DSDT.acpipcihp
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index dfb8523c8b..dc3ab24d05 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1 +1,2 @@
/* List of comma-separated changed AML files to ignore */
+"tests/data/acpi/aarch64/virt/DSDT.acpipcihp",
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index 216941dbb5..1bf45bc6e3 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -1643,6 +1643,37 @@ static void test_acpi_aarch64_virt_tcg_memhp(void)
}
+static void test_acpi_aarch64_virt_pci_hotplug(void)
+{
+ test_data data = {
+ .machine = "virt",
+ .arch = "aarch64",
+ .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
+ .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
+ .ram_start = 0x40000000ULL,
+ .scan_len = 512ULL * 1024 * 1024,
+ .variant = ".acpipcihp",
+ };
+
+ test_acpi_one(" -machine acpi-pcihp=on"
+ " -cpu cortex-a57"
+ " -m 512M"
+ /*
+ * We just pick address=0x04 for the root port to avoid
+ * collisions with other PCI devices on the root bus (pcie.0).
+ * It could be any other value that doesn't collide.
+ *
+ * The 'chassis' and 'slot' options equal to 1 have no special
+ * meaning here, could be any integer, but we set them to known
+ * values to keep the test consistent.
+ */
+ " -device pcie-root-port,bus=pcie.0,chassis=1,slot=1,addr=0x04.0x00",
+ &data);
+
+ free_test_data(&data);
+}
+
static void test_acpi_microvm_prepare(test_data *data)
{
data->machine = "microvm";
@@ -2584,6 +2615,7 @@ int main(int argc, char *argv[])
qtest_add_func("acpi/virt/numamem",
test_acpi_aarch64_virt_tcg_numamem);
qtest_add_func("acpi/virt/memhp", test_acpi_aarch64_virt_tcg_memhp);
+ qtest_add_func("acpi/virt/pcihp", test_acpi_aarch64_virt_pci_hotplug);
qtest_add_func("acpi/virt/pxb", test_acpi_aarch64_virt_tcg_pxb);
qtest_add_func("acpi/virt/oem-fields",
test_acpi_aarch64_virt_oem_fields);
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 5/5] qtest/bios-tables-test: Update aarch64/virt 'acpipcihp' variant blob
2025-05-26 5:31 [PATCH 0/5] ACPI tests for PCI Hotplug on ARM Gustavo Romero
` (3 preceding siblings ...)
2025-05-26 5:31 ` [PATCH 4/5] tests/qtest/bios-tables-test: Add aarch64 ACPI PCI hotplug test Gustavo Romero
@ 2025-05-26 5:31 ` Gustavo Romero
4 siblings, 0 replies; 15+ messages in thread
From: Gustavo Romero @ 2025-05-26 5:31 UTC (permalink / raw)
To: qemu-devel, eric.auger
Cc: qemu-arm, thuth, gustavo.romero, alex.bennee, mst, imammedo
Update the .acpipcihp blob variant for the aarch64 'virt' machine. Since
this is a new blob, the diff is large and not particularly useful, so
below is the diff against the base DSDT blob with ACPI PCI off.
Main changes include:
a) The _OSC method, which now allows the platform to control PCIe
hotplug (masking Local0 against 0x1E), whereas previously it was
controlled by the OS;
b) New regions in _SB.PCI0 to handle bus selection and device ejection;
c) Addition of a PDSM method (invoked by _DSM);
d) A new device PHPR, which reserves the memory regions used by QEMU's
acpi-pci-hotplug mechanism;
e) A new event in the GED device used to notify PCI device hotplug and
unplug.
DSDT diff against base aarch64/virt machine with acpi-pcihp=off:
DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPC ", 0x00000001)
{
Scope (\_SB)
{
Device (C000)
{
Name (_HID, "ACPI0007" /* Processor Device */) // _HID: Hardware ID
Name (_UID, Zero) // _UID: Unique ID
}
@@ -1795,33 +1795,33 @@
0x0000008000000000, // Range Minimum
0x000000FFFFFFFFFF, // Range Maximum
0x0000000000000000, // Translation Offset
0x0000008000000000, // Length
,, , AddressRangeMemory, TypeStatic)
})
Name (SUPP, Zero)
Name (CTRL, Zero)
Method (_OSC, 4, NotSerialized) // _OSC: Operating System Capabilities
{
CreateDWordField (Arg3, Zero, CDW1)
If ((Arg0 == ToUUID ("33db4d5b-1ff7-401c-9657-7441c03dd766") /* PCI Host Bridge Device */))
{
CreateDWordField (Arg3, 0x04, CDW2)
CreateDWordField (Arg3, 0x08, CDW3)
Local0 = CDW3 /* \_SB_.PCI0._OSC.CDW3 */
- Local0 &= 0x1F
+ Local0 &= 0x1E
If ((Arg1 != One))
{
CDW1 |= 0x08
}
If ((CDW3 != Local0))
{
CDW1 |= 0x10
}
CDW3 = Local0
}
Else
{
CDW1 |= 0x04
}
@@ -1852,53 +1852,217 @@
{
Name (_HID, "PNP0C02" /* PNP Motherboard Resources */) // _HID: Hardware ID
Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
{
QWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, NonCacheable, ReadWrite,
0x0000000000000000, // Granularity
0x0000004010000000, // Range Minimum
0x000000401FFFFFFF, // Range Maximum
0x0000000000000000, // Translation Offset
0x0000000010000000, // Length
,, , AddressRangeMemory, TypeStatic)
})
}
}
}
+ Scope (_SB.PCI0)
+ {
+ OperationRegion (PCST, SystemMemory, 0x090C0000, 0x08)
+ Field (PCST, DWordAcc, NoLock, WriteAsZeros)
+ {
+ PCIU, 32,
+ PCID, 32
+ }
+
+ OperationRegion (SEJ, SystemMemory, 0x090C0008, 0x04)
+ Field (SEJ, DWordAcc, NoLock, WriteAsZeros)
+ {
+ B0EJ, 32
+ }
+
+ OperationRegion (BNMR, SystemMemory, 0x090C0010, 0x08)
+ Field (BNMR, DWordAcc, NoLock, WriteAsZeros)
+ {
+ BNUM, 32,
+ PIDX, 32
+ }
+
+ Mutex (BLCK, 0x00)
+ Method (PCEJ, 2, NotSerialized)
+ {
+ Acquire (BLCK, 0xFFFF)
+ BNUM = Arg0
+ B0EJ = (One << Arg1)
+ Release (BLCK)
+ Return (Zero)
+ }
+
+ Method (AIDX, 2, NotSerialized)
+ {
+ Acquire (BLCK, 0xFFFF)
+ BNUM = Arg0
+ PIDX = (One << Arg1)
+ Local0 = PIDX /* \_SB_.PCI0.PIDX */
+ Release (BLCK)
+ Return (Local0)
+ }
+
+ Method (PDSM, 5, Serialized)
+ {
+ If ((Arg2 == Zero))
+ {
+ Local0 = Buffer (One)
+ {
+ 0x00 // .
+ }
+ If ((Arg0 != ToUUID ("e5c937d0-3553-4d7a-9117-ea4d19c3434d") /* Device Labeling Interface */))
+ {
+ Return (Local0)
+ }
+
+ If ((Arg1 < 0x02))
+ {
+ Return (Local0)
+ }
+
+ Local1 = Zero
+ Local2 = AIDX (DerefOf (Arg4 [Zero]), DerefOf (Arg4 [One]
+ ))
+ If (!((Local2 == Zero) | (Local2 == 0xFFFFFFFF)))
+ {
+ Local1 |= One
+ Local1 |= (One << 0x07)
+ }
+
+ Local0 [Zero] = Local1
+ Return (Local0)
+ }
+
+ If ((Arg2 == 0x07))
+ {
+ Local2 = AIDX (DerefOf (Arg4 [Zero]), DerefOf (Arg4 [One]
+ ))
+ Local0 = Package (0x02) {}
+ If (!((Local2 == Zero) || (Local2 == 0xFFFFFFFF)))
+ {
+ Local0 [Zero] = Local2
+ Local0 [One] = ""
+ }
+
+ Return (Local0)
+ }
+ }
+ }
+
+ Scope (\_SB.PCI0)
+ {
+ Method (EDSM, 5, Serialized)
+ {
+ If ((Arg2 == Zero))
+ {
+ Local0 = Buffer (One)
+ {
+ 0x00 // .
+ }
+ If ((Arg0 != ToUUID ("e5c937d0-3553-4d7a-9117-ea4d19c3434d") /* Device Labeling Interface */))
+ {
+ Return (Local0)
+ }
+
+ If ((Arg1 < 0x02))
+ {
+ Return (Local0)
+ }
+
+ Local0 [Zero] = 0x81
+ Return (Local0)
+ }
+
+ If ((Arg2 == 0x07))
+ {
+ Local0 = Package (0x02)
+ {
+ Zero,
+ ""
+ }
+ Local1 = DerefOf (Arg4 [Zero])
+ Local0 [Zero] = Local1
+ Return (Local0)
+ }
+ }
+
+ Device (PHPR)
+ {
+ Name (_HID, "PNP0A06" /* Generic Container Device */) // _HID: Hardware ID
+ Name (_UID, "PCI Hotplug resources") // _UID: Unique ID
+ Name (_STA, 0x0B) // _STA: Status
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ IO (Decode16,
+ 0x0000, // Range Minimum
+ 0x0000, // Range Maximum
+ 0x01, // Alignment
+ 0x00, // Length
+ )
+ })
+ }
+
+ Device (S00)
+ {
+ Name (_ADR, Zero) // _ADR: Address
+ }
+
+ Device (S08)
+ {
+ Name (_ADR, 0x00010000) // _ADR: Address
+ }
+
+ Method (PCNT, 0, NotSerialized)
+ {
+ }
+ }
+
Scope (\_SB)
{
Device (\_SB.GED)
{
Name (_HID, "ACPI0013" /* Generic Event Device */) // _HID: Hardware ID
Name (_UID, "GED") // _UID: Unique ID
Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
{
Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, ,, )
{
0x00000029,
}
})
OperationRegion (EREG, SystemMemory, 0x09080000, 0x04)
Field (EREG, DWordAcc, NoLock, WriteAsZeros)
{
ESEL, 32
}
Method (_EVT, 1, Serialized) // _EVT: Event
{
Local0 = ESEL /* \_SB_.GED_.ESEL */
If (((Local0 & 0x02) == 0x02))
{
Notify (PWRB, 0x80) // Status Change
}
+
+ If (((Local0 & 0x10) == 0x10))
+ {
+ Acquire (\_SB.PCI0.BLCK, 0xFFFF)
+ \_SB.PCI0.PCNT ()
+ Release (\_SB.PCI0.BLCK)
+ }
}
}
Device (PWRB)
{
Name (_HID, "PNP0C0C" /* Power Button Device */) // _HID: Hardware ID
Name (_UID, Zero) // _UID: Unique ID
}
}
}
Signed-off-by: Gustavo Romero <gustavo.romero@linaro.org>
---
tests/data/acpi/aarch64/virt/DSDT.acpipcihp | Bin 0 -> 5993 bytes
tests/qtest/bios-tables-test-allowed-diff.h | 1 -
2 files changed, 1 deletion(-)
diff --git a/tests/data/acpi/aarch64/virt/DSDT.acpipcihp b/tests/data/acpi/aarch64/virt/DSDT.acpipcihp
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..1ee2699d03dd24b7f56dc6e9f88334ab5aeb3d9f 100644
GIT binary patch
literal 5993
zcmb7|&u<&o5y#(>lt?Z~X-U!gWm#hCIBA;JT}rm3xK1i^m$D>_)Rs%x0cezz1GknP
zAVlmGa03If3b?Kh1!AH-vw;4P0zLKCTMs?wl7FDLvftTViZk)MWC1RB-kbTn_kBA{
z&Rf@aTgP)s#U51;oE^VZ{nT?xI1Hr}UDLPq=MCdt$FFwUr;Cnl+o{gZuA8ek-Y$#{
zmFgVsx~hG8!#Svr`kM6}+b)-*zEsC)`uRn3?qymLFs&@5{xqo!;~iMf5WBg3*Vzua
zzpB*_!CghH->R4y1UnTYMC8q>5D`nyN0F7po#tpt`;F!SLa&d9J&zm@ZmL)`xXlse
zaCC{FVc$Z;)EH5Y5LKGRst#esbc_UJta8ShmJ!!6CK+RmGp=bF2^}NF7}q%Cx|T7a
zW0;I_oio<8j7c3M%NXmNv7u!ob&M&-*x-y!EhD94Sd6jB86RmGX&s}$7#}f4IeIu`
zikYU4QDlr8oS{uq`H+lKeU>qP!5R8I&Fbbc&lop3L!YNP9b=I(KIRO4o=)i)ON{Xe
zXXx{ETE|#sj9+qwK2I$jqr@0noT1OtypHiB#;9<HK2Hle#=DGB<qUnE&gdBLF^0n!
ztNJ`G>KH#}43{(Xd3r&|_z7dwI76SOvpU948DpC>^m#g`V_ap7Tb!ZK(|H}kW{e%q
z(C6ubj<L!ZyPToV(?uQQ8e{BnhCWX(>KN;caho&rdAg)yY%<0^XXx|vl8$kMG3t!5
zrq9!59pffrG&n<_rz<+fCya3rF?JLC=LM11@NCE4J}*8z)I3vWCa7~R2mYYG)mEJB
z_)Xtvp9ZLCIs%0vgrnZopu)Cu)E><$dU^zkiV@DbqG5$?k`+Bgl7*s#v)<FN!nSkP
zcHeV$qq|0|ioJ=|a!^c$)*97(wOcq>tBvz@^jppRin-(|NA0Qys-$duTwMK59jnjq
ztq2m7X<oB6v;V|ADP$6v;ZV`NQQ@_L>#{0jsojjx@{Ei)j5SrrC9=bzp(qA^kwsB(
zoC^DbIJk~XiUdFKMNJv{MixbmTv0I6h;R)eVN&F1lz0$1nn7Gq<j6H1M#43Sgh`Q@
zQ7}p(h#buz5k!t$QD8<YgGiWM=Y-HX5k!u3PK1%8$;0G2CxuRw@R-lY6$L5R36twg
z3Y|%zGbwe#<T_JAXG-Wq0n2s5<T}$rCpI79>IF-ZmO5c_ou<%f3Y{o;xlWi|XGZAE
z2%Q<J6DHT06*{v*CkkY)6DHT06FPH3XHM#b$#qT%ol`<53TmzsCf7MFbWRJM(^4l)
zt`nQTFvo)|wuDX;;9Mt6t}`!m=7r9@)CrU8EC`(ip%Vo=*9nvBoDn)_gw7eM6DHSL
z6grDSCklM76DHSrLFl|7bY74;VRD_bLg%c|i46hQ36tx@OMviM4(`gF&^ae{!sI%!
z6=(NzUg*RIg6o9IbuI{<3qt3D)CrU8TogJNg-&cZxK5Z{=S89OqR@F!>V(O4E(x7W
zLMJvTTqjJf^ODecN$9*Jb;9I2mxaz{p%WV#t`jELxgvC~2%RfZC(KZ1(dszWiaNuu
zg0i;4KUP#MJ4y5DtDK7A2MWiKPR1XRFIoIw28T5q{*Sh0IEGizV`TBK79RK;#xX>%
zp<aK;VuJ1y>Z2pD#wTijrc(Z)=c$y_YVNDzezJ4mJBinimE+zm4;mBwhxr-PYS;g>
z_TQDIt-s!VTKW6O|NhPE$7TW!tN2dgd#y*O?$=#&xjV4l^pB0_6dv@I2QzQ_L3h|@
zQBSW+Eq}{~O@u0+Jud#N<NEc);GJ;He{KBpTmSm+>)*_MS6}#tQy--JkJMQ{ZWwgJ
z>#TaBS@T(;;{>m>sQ6nm?YCATSZS=m%GP)R=nB7+v<j9xdzIe4QSH<|@f^RUa3iv5
zGu3`!k?El4u!NIaYM=PEy^hMJs6Wwuks;Hm+O<7&RU7rD%37mPGM#GUuwL?Z-A_wx
zqq^_hR>doxQ`?KRFOxMK_8yW)@0oF|h|+$an$J}6!wO<_Uc~CrsT=uri>~Qm^>PDu
z63f)173vNa-{_a}tUE~l<=Bj!b$jZlM}z#~)#pm#WT^XydfvaU`u9<)A!VK)8As2L
zo*8Bmu1BxBN+Eiq|Hw>!Kd@Jb#c0fL#?ig|6wu45S6u^f*6sOw=c`=2Jy8p0y#9kG
zY`%!*uoTRpFcDKZ)$IiW&L`MD-Ai~oUNd~36xO}#VXd3PEiCPP@wE5(SHCTN`QXVH
zUw!%6gD2=4y$419<V^Ec@YET>d((_>+nrRW;x>_W)4shK8psby!>yFR8g-*3p;A@9
zwvYDO#5gQf@edoS_yHw&wpU1?knQ%!FIXPx3>Jv);KSobkGq%+`4>91J=>sEAzx}M
z7Ti0HR&0>@`k|p-(g4TS6&k;|;yI0$>M6=3@}YD!q6^oI7m>v1|MgXJrc2AsMX#H;
zGT}|RRdXS1{MNZlI|aOT&Y=TW<6TwU_#k*@+9$OpHWE;s3ZDZqof@WE!p-f}?zGZ9
zvhbVG$8Q5w=r6sy&8m4axJeDDJFNEQdq0nl9=z~rU=1|U_WP`XJldxVL>b>($9BS*
Gs{aE@PSiaB
literal 0
HcmV?d00001
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index dc3ab24d05..dfb8523c8b 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,2 +1 @@
/* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/aarch64/virt/DSDT.acpipcihp",
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread