* [PATCH 0/5] hw/acpi: Fixes + tests for ACPI Generic Port Affinity Struturs
@ 2024-11-07 12:34 Jonathan Cameron via
2024-11-07 12:34 ` [PATCH 1/5] hw/acpi: Fix size of HID in build_append_srat_acpi_device_handle() Jonathan Cameron via
` (4 more replies)
0 siblings, 5 replies; 8+ messages in thread
From: Jonathan Cameron via @ 2024-11-07 12:34 UTC (permalink / raw)
To: Michael S . Tsirkin, Daniel P . Berrangé, qemu-devel; +Cc: linuxarm
A couple of issues have been reported on this code that has been merged
for 9.2.
A) Missed a version number update in the qapi/qom.json docs when rebasing
for 9.2.
B) A test failure on i686 (32bit) bios tables test for x86_64.
This second one was a refactoring mistake where visibility of the size
of an array of 8 characters had been replaced with a pointer which on 64
bit hosts is also 8 bytes, but not on 32 bits, leading to a miss-alignment
of the final structure in the table and a test failure. Fix by hard coding
the size as 8 given it is always this size for the relevant ACPI HIDs.
For completeness the tests are also included. Some reference tables
needed an update to incorporate other changes.
Jonathan Cameron (5):
hw/acpi: Fix size of HID in build_append_srat_acpi_device_handle()
qapi/qom: Change Since entry for AcpiGenericPortProperties to 9.2
bios-tables-test: Allow for new acpihmat-generic-x test data.
bios-tables-test: Add complex SRAT / HMAT test for GI GP
bios-tables-test: Add data for complex numa test (GI, GP etc)
qapi/qom.json | 2 +-
hw/acpi/aml-build.c | 2 +-
tests/qtest/bios-tables-test.c | 97 ++++++++++++++++++
.../data/acpi/x86/q35/APIC.acpihmat-generic-x | Bin 0 -> 136 bytes
.../data/acpi/x86/q35/CEDT.acpihmat-generic-x | Bin 0 -> 68 bytes
.../data/acpi/x86/q35/DSDT.acpihmat-generic-x | Bin 0 -> 12599 bytes
.../data/acpi/x86/q35/HMAT.acpihmat-generic-x | Bin 0 -> 360 bytes
.../data/acpi/x86/q35/SRAT.acpihmat-generic-x | Bin 0 -> 520 bytes
8 files changed, 99 insertions(+), 2 deletions(-)
create mode 100644 tests/data/acpi/x86/q35/APIC.acpihmat-generic-x
create mode 100644 tests/data/acpi/x86/q35/CEDT.acpihmat-generic-x
create mode 100644 tests/data/acpi/x86/q35/DSDT.acpihmat-generic-x
create mode 100644 tests/data/acpi/x86/q35/HMAT.acpihmat-generic-x
create mode 100644 tests/data/acpi/x86/q35/SRAT.acpihmat-generic-x
--
2.43.0
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 1/5] hw/acpi: Fix size of HID in build_append_srat_acpi_device_handle() 2024-11-07 12:34 [PATCH 0/5] hw/acpi: Fixes + tests for ACPI Generic Port Affinity Struturs Jonathan Cameron via @ 2024-11-07 12:34 ` Jonathan Cameron via 2024-11-07 12:37 ` Daniel P. Berrangé 2024-11-07 12:34 ` [PATCH 2/5] qapi/qom: Change Since entry for AcpiGenericPortProperties to 9.2 Jonathan Cameron via ` (3 subsequent siblings) 4 siblings, 1 reply; 8+ messages in thread From: Jonathan Cameron via @ 2024-11-07 12:34 UTC (permalink / raw) To: Michael S . Tsirkin, Daniel P . Berrangé, qemu-devel; +Cc: linuxarm The size should always be 8 so hard code that. By coincidience the incorrect use of sizeof(char *) is 8 on 64 bit hosts, but was caught by CI testing with i686 as the host. Reported-by: Michael S. Tsirkin <mst@redhat.com> Closes: https://lore.kernel.org/qemu-devel/20241104110025-mutt-send-email-mst@kernel.org/ Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> --- hw/acpi/aml-build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 6a76626177..72282b173e 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -1960,7 +1960,7 @@ static void build_append_srat_acpi_device_handle(GArray *table_data, { assert(strlen(hid) == 8); /* Device Handle - ACPI */ - for (int i = 0; i < sizeof(hid); i++) { + for (int i = 0; i < 8; i++) { build_append_int_noprefix(table_data, hid[i], 1); } build_append_int_noprefix(table_data, uid, 4); -- 2.43.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/5] hw/acpi: Fix size of HID in build_append_srat_acpi_device_handle() 2024-11-07 12:34 ` [PATCH 1/5] hw/acpi: Fix size of HID in build_append_srat_acpi_device_handle() Jonathan Cameron via @ 2024-11-07 12:37 ` Daniel P. Berrangé 0 siblings, 0 replies; 8+ messages in thread From: Daniel P. Berrangé @ 2024-11-07 12:37 UTC (permalink / raw) To: Jonathan Cameron; +Cc: Michael S . Tsirkin, qemu-devel, linuxarm On Thu, Nov 07, 2024 at 12:34:42PM +0000, Jonathan Cameron wrote: > The size should always be 8 so hard code that. By coincidience the > incorrect use of sizeof(char *) is 8 on 64 bit hosts, but was caught > by CI testing with i686 as the host. > > Reported-by: Michael S. Tsirkin <mst@redhat.com> > Closes: https://lore.kernel.org/qemu-devel/20241104110025-mutt-send-email-mst@kernel.org/ > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > hw/acpi/aml-build.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :| ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/5] qapi/qom: Change Since entry for AcpiGenericPortProperties to 9.2 2024-11-07 12:34 [PATCH 0/5] hw/acpi: Fixes + tests for ACPI Generic Port Affinity Struturs Jonathan Cameron via 2024-11-07 12:34 ` [PATCH 1/5] hw/acpi: Fix size of HID in build_append_srat_acpi_device_handle() Jonathan Cameron via @ 2024-11-07 12:34 ` Jonathan Cameron via 2024-11-07 12:36 ` Daniel P. Berrangé 2024-11-07 12:34 ` [PATCH 3/5] bios-tables-test: Allow for new acpihmat-generic-x test data Jonathan Cameron via ` (2 subsequent siblings) 4 siblings, 1 reply; 8+ messages in thread From: Jonathan Cameron via @ 2024-11-07 12:34 UTC (permalink / raw) To: Michael S . Tsirkin, Daniel P . Berrangé, qemu-devel; +Cc: linuxarm This feature was only applied during the 9.2 cycle, so reflect that rather than 9.1. Reported-by: Daniel P. Berrangé <berrange@redhat.com> Closes: https://lore.kernel.org/qemu-devel/ZyngEiwmYeZ-DvCy@redhat.com/ Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> --- qapi/qom.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qapi/qom.json b/qapi/qom.json index a8beeabf1f..28ce24cd8d 100644 --- a/qapi/qom.json +++ b/qapi/qom.json @@ -877,7 +877,7 @@ # complex as there may be interleaving across multiple devices # and shared links in the path. # -# Since: 9.1 +# Since: 9.2 ## { 'struct': 'AcpiGenericPortProperties', 'data': { 'pci-bus': 'str', -- 2.43.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 2/5] qapi/qom: Change Since entry for AcpiGenericPortProperties to 9.2 2024-11-07 12:34 ` [PATCH 2/5] qapi/qom: Change Since entry for AcpiGenericPortProperties to 9.2 Jonathan Cameron via @ 2024-11-07 12:36 ` Daniel P. Berrangé 0 siblings, 0 replies; 8+ messages in thread From: Daniel P. Berrangé @ 2024-11-07 12:36 UTC (permalink / raw) To: Jonathan Cameron; +Cc: Michael S . Tsirkin, qemu-devel, linuxarm On Thu, Nov 07, 2024 at 12:34:43PM +0000, Jonathan Cameron wrote: > This feature was only applied during the 9.2 cycle, so reflect > that rather than 9.1. > > Reported-by: Daniel P. Berrangé <berrange@redhat.com> > Closes: https://lore.kernel.org/qemu-devel/ZyngEiwmYeZ-DvCy@redhat.com/ > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > qapi/qom.json | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :| ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/5] bios-tables-test: Allow for new acpihmat-generic-x test data. 2024-11-07 12:34 [PATCH 0/5] hw/acpi: Fixes + tests for ACPI Generic Port Affinity Struturs Jonathan Cameron via 2024-11-07 12:34 ` [PATCH 1/5] hw/acpi: Fix size of HID in build_append_srat_acpi_device_handle() Jonathan Cameron via 2024-11-07 12:34 ` [PATCH 2/5] qapi/qom: Change Since entry for AcpiGenericPortProperties to 9.2 Jonathan Cameron via @ 2024-11-07 12:34 ` Jonathan Cameron via 2024-11-07 12:34 ` [PATCH 4/5] bios-tables-test: Add complex SRAT / HMAT test for GI GP Jonathan Cameron via 2024-11-07 12:34 ` [PATCH 5/5] bios-tables-test: Add data for complex numa test (GI, GP etc) Jonathan Cameron via 4 siblings, 0 replies; 8+ messages in thread From: Jonathan Cameron via @ 2024-11-07 12:34 UTC (permalink / raw) To: Michael S . Tsirkin, Daniel P . Berrangé, qemu-devel; +Cc: linuxarm The test to be added exercises many corner cases of the SRAT and HMAT table generation. Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> --- tests/qtest/bios-tables-test-allowed-diff.h | 5 +++++ tests/data/acpi/x86/q35/APIC.acpihmat-generic-x | 0 tests/data/acpi/x86/q35/CEDT.acpihmat-generic-x | 0 tests/data/acpi/x86/q35/DSDT.acpihmat-generic-x | 0 tests/data/acpi/x86/q35/HMAT.acpihmat-generic-x | 0 tests/data/acpi/x86/q35/SRAT.acpihmat-generic-x | 0 6 files 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..3c0967078f 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/x86/q35/APIC.acpihmat-generic-x", +"tests/data/acpi/x86/q35/CEDT.acpihmat-generic-x", +"tests/data/acpi/x86/q35/DSDT.acpihmat-generic-x", +"tests/data/acpi/x86/q35/HMAT.acpihmat-generic-x", +"tests/data/acpi/x86/q35/SRAT.acpihmat-generic-x", diff --git a/tests/data/acpi/x86/q35/APIC.acpihmat-generic-x b/tests/data/acpi/x86/q35/APIC.acpihmat-generic-x new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/data/acpi/x86/q35/CEDT.acpihmat-generic-x b/tests/data/acpi/x86/q35/CEDT.acpihmat-generic-x new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/data/acpi/x86/q35/DSDT.acpihmat-generic-x b/tests/data/acpi/x86/q35/DSDT.acpihmat-generic-x new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/data/acpi/x86/q35/HMAT.acpihmat-generic-x b/tests/data/acpi/x86/q35/HMAT.acpihmat-generic-x new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/data/acpi/x86/q35/SRAT.acpihmat-generic-x b/tests/data/acpi/x86/q35/SRAT.acpihmat-generic-x new file mode 100644 index 0000000000..e69de29bb2 -- 2.43.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 4/5] bios-tables-test: Add complex SRAT / HMAT test for GI GP 2024-11-07 12:34 [PATCH 0/5] hw/acpi: Fixes + tests for ACPI Generic Port Affinity Struturs Jonathan Cameron via ` (2 preceding siblings ...) 2024-11-07 12:34 ` [PATCH 3/5] bios-tables-test: Allow for new acpihmat-generic-x test data Jonathan Cameron via @ 2024-11-07 12:34 ` Jonathan Cameron via 2024-11-07 12:34 ` [PATCH 5/5] bios-tables-test: Add data for complex numa test (GI, GP etc) Jonathan Cameron via 4 siblings, 0 replies; 8+ messages in thread From: Jonathan Cameron via @ 2024-11-07 12:34 UTC (permalink / raw) To: Michael S . Tsirkin, Daniel P . Berrangé, qemu-devel; +Cc: linuxarm Add a test with 6 nodes to exercise most interesting corner cases of SRAT and HMAT generation including the new Generic Initiator and Generic Port Affinity structures. More details of the set up in the following patch adding the table data. Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> --- tests/qtest/bios-tables-test.c | 97 ++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index e79f3a03df..16d0ffbdf6 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1936,6 +1936,101 @@ static void test_acpi_q35_tcg_acpi_hmat_noinitiator(void) free_test_data(&data); } +/* Test intended to hit corner cases of SRAT and HMAT */ +static void test_acpi_q35_tcg_acpi_hmat_generic_x(void) +{ + test_data data = {}; + + data.machine = MACHINE_Q35; + data.arch = "x86"; + data.variant = ".acpihmat-generic-x"; + test_acpi_one(" -machine hmat=on,cxl=on" + " -smp 3,sockets=3" + " -m 128M,maxmem=384M,slots=2" + " -device pcie-root-port,chassis=1,id=pci.1" + " -device pci-testdev,bus=pci.1," + "multifunction=on,addr=00.0" + " -device pci-testdev,bus=pci.1,addr=00.1" + " -device pci-testdev,bus=pci.1,id=gidev,addr=00.2" + " -device pxb-cxl,bus_nr=64,bus=pcie.0,id=cxl.1" + " -object memory-backend-ram,size=64M,id=ram0" + " -object memory-backend-ram,size=64M,id=ram1" + " -numa node,nodeid=0,cpus=0,memdev=ram0" + " -numa node,nodeid=1" + " -object acpi-generic-initiator,id=gi0,pci-dev=gidev,node=1" + " -numa node,nodeid=2" + " -object acpi-generic-port,id=gp0,pci-bus=cxl.1,node=2" + " -numa node,nodeid=3,cpus=1" + " -numa node,nodeid=4,memdev=ram1" + " -numa node,nodeid=5,cpus=2" + " -numa hmat-lb,initiator=0,target=0,hierarchy=memory," + "data-type=access-latency,latency=10" + " -numa hmat-lb,initiator=0,target=0,hierarchy=memory," + "data-type=access-bandwidth,bandwidth=800M" + " -numa hmat-lb,initiator=0,target=2,hierarchy=memory," + "data-type=access-latency,latency=100" + " -numa hmat-lb,initiator=0,target=2,hierarchy=memory," + "data-type=access-bandwidth,bandwidth=200M" + " -numa hmat-lb,initiator=0,target=4,hierarchy=memory," + "data-type=access-latency,latency=100" + " -numa hmat-lb,initiator=0,target=4,hierarchy=memory," + "data-type=access-bandwidth,bandwidth=200M" + " -numa hmat-lb,initiator=0,target=5,hierarchy=memory," + "data-type=access-latency,latency=200" + " -numa hmat-lb,initiator=0,target=5,hierarchy=memory," + "data-type=access-bandwidth,bandwidth=400M" + " -numa hmat-lb,initiator=1,target=0,hierarchy=memory," + "data-type=access-latency,latency=500" + " -numa hmat-lb,initiator=1,target=0,hierarchy=memory," + "data-type=access-bandwidth,bandwidth=100M" + " -numa hmat-lb,initiator=1,target=2,hierarchy=memory," + "data-type=access-latency,latency=50" + " -numa hmat-lb,initiator=1,target=2,hierarchy=memory," + "data-type=access-bandwidth,bandwidth=400M" + " -numa hmat-lb,initiator=1,target=4,hierarchy=memory," + "data-type=access-latency,latency=50" + " -numa hmat-lb,initiator=1,target=4,hierarchy=memory," + "data-type=access-bandwidth,bandwidth=800M" + " -numa hmat-lb,initiator=1,target=5,hierarchy=memory," + "data-type=access-latency,latency=500" + " -numa hmat-lb,initiator=1,target=5,hierarchy=memory," + "data-type=access-bandwidth,bandwidth=100M" + " -numa hmat-lb,initiator=3,target=0,hierarchy=memory," + "data-type=access-latency,latency=20" + " -numa hmat-lb,initiator=3,target=0,hierarchy=memory," + "data-type=access-bandwidth,bandwidth=400M" + " -numa hmat-lb,initiator=3,target=2,hierarchy=memory," + "data-type=access-latency,latency=80" + " -numa hmat-lb,initiator=3,target=2,hierarchy=memory," + "data-type=access-bandwidth,bandwidth=200M" + " -numa hmat-lb,initiator=3,target=4,hierarchy=memory," + "data-type=access-latency,latency=80" + " -numa hmat-lb,initiator=3,target=4,hierarchy=memory," + "data-type=access-bandwidth,bandwidth=200M" + " -numa hmat-lb,initiator=3,target=5,hierarchy=memory," + "data-type=access-latency,latency=20" + " -numa hmat-lb,initiator=3,target=5,hierarchy=memory," + "data-type=access-bandwidth,bandwidth=400M" + " -numa hmat-lb,initiator=5,target=0,hierarchy=memory," + "data-type=access-latency,latency=20" + " -numa hmat-lb,initiator=5,target=0,hierarchy=memory," + "data-type=access-bandwidth,bandwidth=400M" + " -numa hmat-lb,initiator=5,target=2,hierarchy=memory," + "data-type=access-latency,latency=80" + " -numa hmat-lb,initiator=5,target=4,hierarchy=memory," + "data-type=access-bandwidth,bandwidth=200M" + " -numa hmat-lb,initiator=5,target=4,hierarchy=memory," + "data-type=access-latency,latency=80" + " -numa hmat-lb,initiator=5,target=2,hierarchy=memory," + "data-type=access-bandwidth,bandwidth=200M" + " -numa hmat-lb,initiator=5,target=5,hierarchy=memory," + "data-type=access-latency,latency=10" + " -numa hmat-lb,initiator=5,target=5,hierarchy=memory," + "data-type=access-bandwidth,bandwidth=800M", + &data); + free_test_data(&data); +} + #ifdef CONFIG_POSIX static void test_acpi_erst(const char *machine, const char *arch) { @@ -2414,6 +2509,8 @@ int main(int argc, char *argv[]) qtest_add_func("acpi/q35/nohpet", test_acpi_q35_tcg_nohpet); qtest_add_func("acpi/q35/acpihmat-noinitiator", test_acpi_q35_tcg_acpi_hmat_noinitiator); + qtest_add_func("acpi/q35/acpihmat-genericx", + test_acpi_q35_tcg_acpi_hmat_generic_x); /* i386 does not support memory hotplug */ if (strcmp(arch, "i386")) { -- 2.43.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 5/5] bios-tables-test: Add data for complex numa test (GI, GP etc) 2024-11-07 12:34 [PATCH 0/5] hw/acpi: Fixes + tests for ACPI Generic Port Affinity Struturs Jonathan Cameron via ` (3 preceding siblings ...) 2024-11-07 12:34 ` [PATCH 4/5] bios-tables-test: Add complex SRAT / HMAT test for GI GP Jonathan Cameron via @ 2024-11-07 12:34 ` Jonathan Cameron via 4 siblings, 0 replies; 8+ messages in thread From: Jonathan Cameron via @ 2024-11-07 12:34 UTC (permalink / raw) To: Michael S . Tsirkin, Daniel P . Berrangé, qemu-devel; +Cc: linuxarm Given this is a new configuration, there are affects on APIC, CEDT and DSDT, but the key elements are in SRAT (plus related data in HMAT). The configuration has node to exercise many different combinations. 0) CPUs + Memory 1) GI only 2) GP only 3) CPUS only 4) Memory only 5) CPUs + HP memory GI node, GP Node, Memory only node, hotplug memory only node, latency and bandwidth such that in Linux Access0 (any initiator) and Access1 (CPU initiators only) given different answers. Following cropped to remove details of each entry. [000h 0000 004h] Signature : "SRAT" [System Resource Affinity Table] ... [030h 0048 001h] Subtable Type : 00 [Processor Local APIC/SAPIC Affinity] ... [032h 0050 001h] Proximity Domain Low(8) : 00 [033h 0051 001h] Apic ID : 00 ... [040h 0064 001h] Subtable Type : 00 [Processor Local APIC/SAPIC Affinity] ... [042h 0066 001h] Proximity Domain Low(8) : 03 [043h 0067 001h] Apic ID : 01 ... [050h 0080 001h] Subtable Type : 00 [Processor Local APIC/SAPIC Affinity] ... [052h 0082 001h] Proximity Domain Low(8) : 05 [053h 0083 001h] Apic ID : 02 ... [060h 0096 001h] Subtable Type : 01 [Memory Affinity] ... [062h 0098 004h] Proximity Domain : 00000000 ... [068h 0104 008h] Base Address : 0000000000000000 [070h 0112 008h] Address Length : 00000000000A0000 ... [088h 0136 001h] Subtable Type : 01 [Memory Affinity] ... [08Ah 0138 004h] Proximity Domain : 00000000 ... [090h 0144 008h] Base Address : 0000000000100000 [098h 0152 008h] Address Length : 0000000003F00000 ... [0B0h 0176 001h] Subtable Type : 01 [Memory Affinity] ... [0B2h 0178 004h] Proximity Domain : 00000004 ... [0B8h 0184 008h] Base Address : 0000000004000000 [0C0h 0192 008h] Address Length : 0000000004000000 ... some zero length entries follow... [1A0h 0416 001h] Subtable Type : 05 [Generic Initiator Affinity] [1A1h 0417 001h] Length : 20 [1A2h 0418 001h] Reserved1 : 00 [1A3h 0419 001h] Device Handle Type : 01 [1A4h 0420 004h] Proximity Domain : 00000001 [1A8h 0424 010h] Device Handle : 00 00 01 02 00 00 00 00 00 00 00 00 00 00 00 00 [1B8h 0440 004h] Flags (decoded below) : 00000001 Enabled : 1 Architectural Transactions : 0 [1BCh 0444 004h] Reserved2 : 00000000 [1C0h 0448 001h] Subtable Type : 06 [Generic Port Affinity] [1C1h 0449 001h] Length : 20 [1C2h 0450 001h] Reserved1 : 00 [1C3h 0451 001h] Device Handle Type : 00 [1C4h 0452 004h] Proximity Domain : 00000002 [1C8h 0456 010h] Device Handle : 41 43 50 49 30 30 31 36 40 00 00 00 00 00 00 00 [1D8h 0472 004h] Flags (decoded below) : 00000001 Enabled : 1 Architectural Transactions : 0 [1DCh 0476 004h] Reserved2 : 00000000 [1E0h 0480 001h] Subtable Type : 01 [Memory Affinity] ... [1E2h 0482 004h] Proximity Domain : 00000005 ... [1E8h 0488 008h] Base Address : 0000000100000000 [1F0h 0496 008h] Address Length : 0000000090000000 Example block from HMAT: [0F0h 0240 002h] Structure Type : 0001 [System Locality Latency and Bandwidth Information] [0F2h 0242 002h] Reserved : 0000 [0F4h 0244 004h] Length : 00000078 [0F8h 0248 001h] Flags (decoded below) : 00 Memory Hierarchy : 0 Use Minimum Transfer Size : 0 Non-sequential Transfers : 0 [0F9h 0249 001h] Data Type : 03 [0FAh 0250 001h] Minimum Transfer Size : 00 [0FBh 0251 001h] Reserved1 : 00 [0FCh 0252 004h] Initiator Proximity Domains # : 00000004 [100h 0256 004h] Target Proximity Domains # : 00000006 [104h 0260 004h] Reserved2 : 00000000 [108h 0264 008h] Entry Base Unit : 0000000000000004 [110h 0272 004h] Initiator Proximity Domain List : 00000000 [114h 0276 004h] Initiator Proximity Domain List : 00000001 [118h 0280 004h] Initiator Proximity Domain List : 00000003 [11Ch 0284 004h] Initiator Proximity Domain List : 00000005 [120h 0288 004h] Target Proximity Domain List : 00000000 [124h 0292 004h] Target Proximity Domain List : 00000001 [128h 0296 004h] Target Proximity Domain List : 00000002 [12Ch 0300 004h] Target Proximity Domain List : 00000003 [130h 0304 004h] Target Proximity Domain List : 00000004 [134h 0308 004h] Target Proximity Domain List : 00000005 [138h 0312 002h] Entry : 00C8 [13Ah 0314 002h] Entry : 0000 [13Ch 0316 002h] Entry : 0032 [13Eh 0318 002h] Entry : 0000 [140h 0320 002h] Entry : 0032 [142h 0322 002h] Entry : 0064 [144h 0324 002h] Entry : 0019 [146h 0326 002h] Entry : 0000 [148h 0328 002h] Entry : 0064 [14Ah 0330 002h] Entry : 0000 [14Ch 0332 002h] Entry : 00C8 [14Eh 0334 002h] Entry : 0019 [150h 0336 002h] Entry : 0064 [152h 0338 002h] Entry : 0000 [154h 0340 002h] Entry : 0032 [156h 0342 002h] Entry : 0000 [158h 0344 002h] Entry : 0032 [15Ah 0346 002h] Entry : 0064 [15Ch 0348 002h] Entry : 0064 [15Eh 0350 002h] Entry : 0000 [160h 0352 002h] Entry : 0032 [162h 0354 002h] Entry : 0000 [164h 0356 002h] Entry : 0032 [166h 0358 002h] Entry : 00C8 Note the zeros represent entries where the target node has no memory. These could be surpressed but it isn't 'wrong' to provide them and it is (probably) permissible under ACPI to hotplug memory into these nodes later. Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> --- Since v6: Rebased - required data update. --- tests/qtest/bios-tables-test-allowed-diff.h | 5 ----- tests/data/acpi/x86/q35/APIC.acpihmat-generic-x | Bin 0 -> 136 bytes tests/data/acpi/x86/q35/CEDT.acpihmat-generic-x | Bin 0 -> 68 bytes tests/data/acpi/x86/q35/DSDT.acpihmat-generic-x | Bin 0 -> 12599 bytes tests/data/acpi/x86/q35/HMAT.acpihmat-generic-x | Bin 0 -> 360 bytes tests/data/acpi/x86/q35/SRAT.acpihmat-generic-x | Bin 0 -> 520 bytes 6 files changed, 5 deletions(-) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index 3c0967078f..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/x86/q35/APIC.acpihmat-generic-x", -"tests/data/acpi/x86/q35/CEDT.acpihmat-generic-x", -"tests/data/acpi/x86/q35/DSDT.acpihmat-generic-x", -"tests/data/acpi/x86/q35/HMAT.acpihmat-generic-x", -"tests/data/acpi/x86/q35/SRAT.acpihmat-generic-x", diff --git a/tests/data/acpi/x86/q35/APIC.acpihmat-generic-x b/tests/data/acpi/x86/q35/APIC.acpihmat-generic-x index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..317ddb3fbed94e4f49a87976fdc7f23b1a6c3fdc 100644 GIT binary patch literal 136 zcmZ<^@O18AU|?WQaPoKd2v%^42yj*a0!E-1hz+6{7#{os(;N&85Soz@LNhUeXht58 ongjnpBoh}9gBTzdD=U!Z1+h3eVJt470*DwlH<-o3_8({j09efo0RR91 literal 0 HcmV?d00001 diff --git a/tests/data/acpi/x86/q35/CEDT.acpihmat-generic-x b/tests/data/acpi/x86/q35/CEDT.acpihmat-generic-x index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..31c9011663639b4a0f4816f3b2b06398f94682f7 100644 GIT binary patch literal 68 zcmZ>EbqR4{U|?Xhb@F%i2v%^42yj*a0!E-1hz+6{7!(*BfFy(s;xkNuupuM>Q<et- literal 0 HcmV?d00001 diff --git a/tests/data/acpi/x86/q35/DSDT.acpihmat-generic-x b/tests/data/acpi/x86/q35/DSDT.acpihmat-generic-x index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..c4ecc4fda26c5083d256ecadda8ec900d67470c6 100644 GIT binary patch literal 12599 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 G8vh5ccNMh& literal 0 HcmV?d00001 diff --git a/tests/data/acpi/x86/q35/HMAT.acpihmat-generic-x b/tests/data/acpi/x86/q35/HMAT.acpihmat-generic-x index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0e5765f6ee4c07638c70647ae145e968718b67cd 100644 GIT binary patch literal 360 zcmeb9bqvX1WME+Ock*}k2v%^42yj*a0-z8Bhz+7)Km*7?=EKC%X^=V)XaHgs5CaPU znNtB32dQC$vIW$k3?Kzk!wkf%P$3YX2`UEC0}=;`ae=W2gAr7W703dq;{anOBsL>h pJ=k8L!N~R^yOS7uPXNsZ*=NL%!XOExQ-JsckOiV);t2K$1^{D&4*>uG literal 0 HcmV?d00001 diff --git a/tests/data/acpi/x86/q35/SRAT.acpihmat-generic-x b/tests/data/acpi/x86/q35/SRAT.acpihmat-generic-x index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..b45838adb7d304f8a36c38c90d89f3629ec48353 100644 GIT binary patch literal 520 zcmWFzatz^MVqjn_cJg=j2v%^42yj*a0!9V~1`r!WgD@Njp!1m-QRP{gkok-naGg*F z7hC|lI-mt$@PQeo5LF!uOc=(1(J1c3v=^ogl^*QsSQQwc;mZh&B?N$l37Y}~14zQr eIl$Avz|hPAsstv_sKE*qfydhfm;gM0fdT+OoeTj0 literal 0 HcmV?d00001 -- 2.43.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-11-07 12:38 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2024-11-07 12:34 [PATCH 0/5] hw/acpi: Fixes + tests for ACPI Generic Port Affinity Struturs Jonathan Cameron via 2024-11-07 12:34 ` [PATCH 1/5] hw/acpi: Fix size of HID in build_append_srat_acpi_device_handle() Jonathan Cameron via 2024-11-07 12:37 ` Daniel P. Berrangé 2024-11-07 12:34 ` [PATCH 2/5] qapi/qom: Change Since entry for AcpiGenericPortProperties to 9.2 Jonathan Cameron via 2024-11-07 12:36 ` Daniel P. Berrangé 2024-11-07 12:34 ` [PATCH 3/5] bios-tables-test: Allow for new acpihmat-generic-x test data Jonathan Cameron via 2024-11-07 12:34 ` [PATCH 4/5] bios-tables-test: Add complex SRAT / HMAT test for GI GP Jonathan Cameron via 2024-11-07 12:34 ` [PATCH 5/5] bios-tables-test: Add data for complex numa test (GI, GP etc) Jonathan Cameron via
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).