* [PATCH 00/17] acpi:pc/q35: minor PCI refactoring/cleanups
@ 2022-07-01 13:34 Igor Mammedov
2022-07-01 13:34 ` [PATCH 01/17] tests: acpi: whitelist pc/q35 DSDT due to HPET AML move Igor Mammedov
` (17 more replies)
0 siblings, 18 replies; 25+ messages in thread
From: Igor Mammedov @ 2022-07-01 13:34 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani
Flushing out ACPI PCI cleanups that preceed conversion of
DSDT PCI slots ennumeration to AcpiDevAmlIf interface.
It's is mostly collection of patches thraet removes code
duplication, we've accumulated around PCI relaterd AML
in DSDT.
git:
https://gitlab.com/imammedo/qemu.git x86_pci_cleanups
Igor Mammedov (17):
tests: acpi: whitelist pc/q35 DSDT due to HPET AML move
acpi: x86: deduplicate HPET AML building
tests: acpi: update expected blobs after HPET move
tests: acpi: whitelist pc/q35 DSDT due to HPET AML move
acpi: x86: refactor PDSM method to reduce nesting
x86: acpi: _DSM: use Package to pass parameters
tests: acpi: update expected blobs
tests: acpi: whitelist pc/q35 DSDT before switching _DSM to use ASUN
x86: acpi: cleanup PCI device _DSM duplication
tests: acpi: update expected blobs
tests: acpi: whitelist pc/q35 DSDT before moving _ADR field
x86: pci: acpi: reorder Device's _ADR and _SUN fields
tests: acpi: update expected blobs
tests: acpi: whitelist pc/q35 DSDT before moving _ADR field
x86: pci: acpi: reorder Device's _DSM method
tests: acpi: update expected blobs
x86: pci: acpi: deduplate PCI slots creation
hw/i386/acpi-build.c | 302 ++++++++++++++------------
tests/data/acpi/pc/DSDT | Bin 5987 -> 6422 bytes
tests/data/acpi/pc/DSDT.acpierst | Bin 5954 -> 6382 bytes
tests/data/acpi/pc/DSDT.acpihmat | Bin 7312 -> 7747 bytes
tests/data/acpi/pc/DSDT.bridge | Bin 8653 -> 9496 bytes
tests/data/acpi/pc/DSDT.cphp | Bin 6451 -> 6886 bytes
tests/data/acpi/pc/DSDT.dimmpxm | Bin 7641 -> 8076 bytes
tests/data/acpi/pc/DSDT.hpbridge | Bin 5954 -> 6382 bytes
tests/data/acpi/pc/DSDT.hpbrroot | Bin 3069 -> 3069 bytes
tests/data/acpi/pc/DSDT.ipmikcs | Bin 6059 -> 6494 bytes
tests/data/acpi/pc/DSDT.memhp | Bin 7346 -> 7781 bytes
tests/data/acpi/pc/DSDT.nohpet | Bin 5845 -> 6280 bytes
tests/data/acpi/pc/DSDT.numamem | Bin 5993 -> 6428 bytes
tests/data/acpi/pc/DSDT.roothp | Bin 6195 -> 6656 bytes
tests/data/acpi/q35/DSDT | Bin 8274 -> 8320 bytes
tests/data/acpi/q35/DSDT.acpierst | Bin 8291 -> 8337 bytes
tests/data/acpi/q35/DSDT.acpihmat | Bin 9599 -> 9645 bytes
tests/data/acpi/q35/DSDT.applesmc | Bin 8320 -> 8366 bytes
tests/data/acpi/q35/DSDT.bridge | Bin 10988 -> 11449 bytes
tests/data/acpi/q35/DSDT.cphp | Bin 8738 -> 8784 bytes
tests/data/acpi/q35/DSDT.cxl | Bin 9600 -> 9646 bytes
tests/data/acpi/q35/DSDT.dimmpxm | Bin 9928 -> 9974 bytes
tests/data/acpi/q35/DSDT.ipmibt | Bin 8349 -> 8395 bytes
tests/data/acpi/q35/DSDT.ipmismbus | Bin 8363 -> 8409 bytes
tests/data/acpi/q35/DSDT.ivrs | Bin 8291 -> 8337 bytes
tests/data/acpi/q35/DSDT.memhp | Bin 9633 -> 9679 bytes
tests/data/acpi/q35/DSDT.mmio64 | Bin 9404 -> 9450 bytes
tests/data/acpi/q35/DSDT.multi-bridge | Bin 8568 -> 8640 bytes
tests/data/acpi/q35/DSDT.nohpet | Bin 8132 -> 8178 bytes
tests/data/acpi/q35/DSDT.numamem | Bin 8280 -> 8326 bytes
tests/data/acpi/q35/DSDT.pvpanic-isa | Bin 8375 -> 8421 bytes
tests/data/acpi/q35/DSDT.tis.tpm12 | Bin 8880 -> 8926 bytes
tests/data/acpi/q35/DSDT.tis.tpm2 | Bin 8906 -> 8952 bytes
tests/data/acpi/q35/DSDT.viot | Bin 9383 -> 9429 bytes
tests/data/acpi/q35/DSDT.xapic | Bin 35637 -> 35683 bytes
35 files changed, 161 insertions(+), 141 deletions(-)
--
2.31.1
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 01/17] tests: acpi: whitelist pc/q35 DSDT due to HPET AML move
2022-07-01 13:34 [PATCH 00/17] acpi:pc/q35: minor PCI refactoring/cleanups Igor Mammedov
@ 2022-07-01 13:34 ` Igor Mammedov
2022-07-01 13:35 ` [PATCH 02/17] acpi: x86: deduplicate HPET AML building Igor Mammedov
` (16 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: Igor Mammedov @ 2022-07-01 13:34 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
tests/qtest/bios-tables-test-allowed-diff.h | 32 +++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index dfb8523c8b..a7aa428fab 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1 +1,33 @@
/* List of comma-separated changed AML files to ignore */
+"tests/data/acpi/pc/DSDT",
+"tests/data/acpi/pc/DSDT.acpierst",
+"tests/data/acpi/pc/DSDT.acpihmat",
+"tests/data/acpi/pc/DSDT.bridge",
+"tests/data/acpi/pc/DSDT.cphp",
+"tests/data/acpi/pc/DSDT.dimmpxm",
+"tests/data/acpi/pc/DSDT.hpbridge",
+"tests/data/acpi/pc/DSDT.hpbrroot",
+"tests/data/acpi/pc/DSDT.ipmikcs",
+"tests/data/acpi/pc/DSDT.memhp",
+"tests/data/acpi/pc/DSDT.numamem",
+"tests/data/acpi/pc/DSDT.roothp",
+"tests/data/acpi/q35/DSDT",
+"tests/data/acpi/q35/DSDT.acpierst",
+"tests/data/acpi/q35/DSDT.acpihmat",
+"tests/data/acpi/q35/DSDT.applesmc",
+"tests/data/acpi/q35/DSDT.bridge",
+"tests/data/acpi/q35/DSDT.cphp",
+"tests/data/acpi/q35/DSDT.cxl",
+"tests/data/acpi/q35/DSDT.dimmpxm",
+"tests/data/acpi/q35/DSDT.ipmibt",
+"tests/data/acpi/q35/DSDT.ipmismbus",
+"tests/data/acpi/q35/DSDT.ivrs",
+"tests/data/acpi/q35/DSDT.memhp",
+"tests/data/acpi/q35/DSDT.mmio64",
+"tests/data/acpi/q35/DSDT.multi-bridge",
+"tests/data/acpi/q35/DSDT.numamem",
+"tests/data/acpi/q35/DSDT.pvpanic-isa",
+"tests/data/acpi/q35/DSDT.tis.tpm12",
+"tests/data/acpi/q35/DSDT.tis.tpm2",
+"tests/data/acpi/q35/DSDT.viot",
+"tests/data/acpi/q35/DSDT.xapic",
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 02/17] acpi: x86: deduplicate HPET AML building
2022-07-01 13:34 [PATCH 00/17] acpi:pc/q35: minor PCI refactoring/cleanups Igor Mammedov
2022-07-01 13:34 ` [PATCH 01/17] tests: acpi: whitelist pc/q35 DSDT due to HPET AML move Igor Mammedov
@ 2022-07-01 13:35 ` Igor Mammedov
2022-07-01 16:26 ` Michael S. Tsirkin
2022-07-01 13:35 ` [PATCH 03/17] tests: acpi: update expected blobs after HPET move Igor Mammedov
` (15 subsequent siblings)
17 siblings, 1 reply; 25+ messages in thread
From: Igor Mammedov @ 2022-07-01 13:35 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani
HPET AML doesn't depend on piix4 nor q35, move code buiding it
to common scope to avoid duplication.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
hw/i386/acpi-build.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index cad6f5ac41..69ead4b34a 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1467,9 +1467,6 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
aml_append(sb_scope, dev);
aml_append(dsdt, sb_scope);
- if (misc->has_hpet) {
- build_hpet_aml(dsdt);
- }
build_piix4_isa_bridge(dsdt);
if (pm->pcihp_bridge_en || pm->pcihp_root_en) {
build_x86_acpi_pci_hotplug(dsdt, pm->pcihp_io_base);
@@ -1515,9 +1512,6 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
aml_append(dsdt, sb_scope);
- if (misc->has_hpet) {
- build_hpet_aml(dsdt);
- }
build_q35_isa_bridge(dsdt);
if (pm->pcihp_bridge_en) {
build_x86_acpi_pci_hotplug(dsdt, pm->pcihp_io_base);
@@ -1528,6 +1522,10 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
}
}
+ if (misc->has_hpet) {
+ build_hpet_aml(dsdt);
+ }
+
if (vmbus_bridge) {
sb_scope = aml_scope("_SB");
aml_append(sb_scope, build_vmbus_device_aml(vmbus_bridge));
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 03/17] tests: acpi: update expected blobs after HPET move
2022-07-01 13:34 [PATCH 00/17] acpi:pc/q35: minor PCI refactoring/cleanups Igor Mammedov
2022-07-01 13:34 ` [PATCH 01/17] tests: acpi: whitelist pc/q35 DSDT due to HPET AML move Igor Mammedov
2022-07-01 13:35 ` [PATCH 02/17] acpi: x86: deduplicate HPET AML building Igor Mammedov
@ 2022-07-01 13:35 ` Igor Mammedov
2022-07-01 13:35 ` [PATCH 04/17] tests: acpi: whitelist pc/q35 DSDT due to HPET AML move Igor Mammedov
` (14 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: Igor Mammedov @ 2022-07-01 13:35 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani
HPET AML moved after PCI host bridge description (no functional change)
diff example for PC machine:
@@ -54,47 +54,6 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001)
}
}
- Scope (_SB)
- {
- Device (HPET)
- {
- Name (_HID, EisaId ("PNP0103") /* HPET System Timer */) // _HID: Hardware ID
- Name (_UID, Zero) // _UID: Unique ID
- OperationRegion (HPTM, SystemMemory, 0xFED00000, 0x0400)
- Field (HPTM, DWordAcc, Lock, Preserve)
- {
- VEND, 32,
- PRD, 32
- }
-
- Method (_STA, 0, NotSerialized) // _STA: Status
- {
- Local0 = VEND /* \_SB_.HPET.VEND */
- Local1 = PRD /* \_SB_.HPET.PRD_ */
- Local0 >>= 0x10
- If (((Local0 == Zero) || (Local0 == 0xFFFF)))
- {
- Return (Zero)
- }
-
- If (((Local1 == Zero) || (Local1 > 0x05F5E100)))
- {
- Return (Zero)
- }
-
- Return (0x0F)
- }
-
- Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
- {
- Memory32Fixed (ReadOnly,
- 0xFED00000, // Address Base
- 0x00000400, // Address Length
- )
- })
- }
- }
-
Scope (_SB.PCI0)
{
Device (ISA)
@@ -529,6 +488,47 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001)
}
}
+ Scope (_SB)
+ {
+ Device (HPET)
+ {
+ Name (_HID, EisaId ("PNP0103") /* HPET System Timer */) // _HID: Hardware ID
+ Name (_UID, Zero) // _UID: Unique ID
+ OperationRegion (HPTM, SystemMemory, 0xFED00000, 0x0400)
+ Field (HPTM, DWordAcc, Lock, Preserve)
+ {
+ VEND, 32,
+ PRD, 32
+ }
+
+ Method (_STA, 0, NotSerialized) // _STA: Status
+ {
+ Local0 = VEND /* \_SB_.HPET.VEND */
+ Local1 = PRD /* \_SB_.HPET.PRD_ */
+ Local0 >>= 0x10
+ If (((Local0 == Zero) || (Local0 == 0xFFFF)))
+ {
+ Return (Zero)
+ }
+
+ If (((Local1 == Zero) || (Local1 > 0x05F5E100)))
+ {
+ Return (Zero)
+ }
+
+ Return (0x0F)
+ }
+
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ Memory32Fixed (ReadOnly,
+ 0xFED00000, // Address Base
+ 0x00000400, // Address Length
+ )
+ })
+ }
+ }
+
Scope (_SB)
{
Device (\_SB.PCI0.PRES)
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
tests/qtest/bios-tables-test-allowed-diff.h | 32 --------------------
tests/data/acpi/pc/DSDT | Bin 5987 -> 5987 bytes
tests/data/acpi/pc/DSDT.acpierst | Bin 5954 -> 5954 bytes
tests/data/acpi/pc/DSDT.acpihmat | Bin 7312 -> 7312 bytes
tests/data/acpi/pc/DSDT.bridge | Bin 8653 -> 8653 bytes
tests/data/acpi/pc/DSDT.cphp | Bin 6451 -> 6451 bytes
tests/data/acpi/pc/DSDT.dimmpxm | Bin 7641 -> 7641 bytes
tests/data/acpi/pc/DSDT.hpbridge | Bin 5954 -> 5954 bytes
tests/data/acpi/pc/DSDT.hpbrroot | Bin 3069 -> 3069 bytes
tests/data/acpi/pc/DSDT.ipmikcs | Bin 6059 -> 6059 bytes
tests/data/acpi/pc/DSDT.memhp | Bin 7346 -> 7346 bytes
tests/data/acpi/pc/DSDT.numamem | Bin 5993 -> 5993 bytes
tests/data/acpi/pc/DSDT.roothp | Bin 6195 -> 6195 bytes
tests/data/acpi/q35/DSDT | Bin 8274 -> 8274 bytes
tests/data/acpi/q35/DSDT.acpierst | Bin 8291 -> 8291 bytes
tests/data/acpi/q35/DSDT.acpihmat | Bin 9599 -> 9599 bytes
tests/data/acpi/q35/DSDT.applesmc | Bin 8320 -> 8320 bytes
tests/data/acpi/q35/DSDT.bridge | Bin 10988 -> 10988 bytes
tests/data/acpi/q35/DSDT.cphp | Bin 8738 -> 8738 bytes
tests/data/acpi/q35/DSDT.cxl | Bin 9600 -> 9600 bytes
tests/data/acpi/q35/DSDT.dimmpxm | Bin 9928 -> 9928 bytes
tests/data/acpi/q35/DSDT.ipmibt | Bin 8349 -> 8349 bytes
tests/data/acpi/q35/DSDT.ipmismbus | Bin 8363 -> 8363 bytes
tests/data/acpi/q35/DSDT.ivrs | Bin 8291 -> 8291 bytes
tests/data/acpi/q35/DSDT.memhp | Bin 9633 -> 9633 bytes
tests/data/acpi/q35/DSDT.mmio64 | Bin 9404 -> 9404 bytes
tests/data/acpi/q35/DSDT.multi-bridge | Bin 8568 -> 8568 bytes
tests/data/acpi/q35/DSDT.numamem | Bin 8280 -> 8280 bytes
tests/data/acpi/q35/DSDT.pvpanic-isa | Bin 8375 -> 8375 bytes
tests/data/acpi/q35/DSDT.tis.tpm12 | Bin 8880 -> 8880 bytes
tests/data/acpi/q35/DSDT.tis.tpm2 | Bin 8906 -> 8906 bytes
tests/data/acpi/q35/DSDT.viot | Bin 9383 -> 9383 bytes
tests/data/acpi/q35/DSDT.xapic | Bin 35637 -> 35637 bytes
33 files changed, 32 deletions(-)
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index a7aa428fab..dfb8523c8b 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,33 +1 @@
/* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/pc/DSDT",
-"tests/data/acpi/pc/DSDT.acpierst",
-"tests/data/acpi/pc/DSDT.acpihmat",
-"tests/data/acpi/pc/DSDT.bridge",
-"tests/data/acpi/pc/DSDT.cphp",
-"tests/data/acpi/pc/DSDT.dimmpxm",
-"tests/data/acpi/pc/DSDT.hpbridge",
-"tests/data/acpi/pc/DSDT.hpbrroot",
-"tests/data/acpi/pc/DSDT.ipmikcs",
-"tests/data/acpi/pc/DSDT.memhp",
-"tests/data/acpi/pc/DSDT.numamem",
-"tests/data/acpi/pc/DSDT.roothp",
-"tests/data/acpi/q35/DSDT",
-"tests/data/acpi/q35/DSDT.acpierst",
-"tests/data/acpi/q35/DSDT.acpihmat",
-"tests/data/acpi/q35/DSDT.applesmc",
-"tests/data/acpi/q35/DSDT.bridge",
-"tests/data/acpi/q35/DSDT.cphp",
-"tests/data/acpi/q35/DSDT.cxl",
-"tests/data/acpi/q35/DSDT.dimmpxm",
-"tests/data/acpi/q35/DSDT.ipmibt",
-"tests/data/acpi/q35/DSDT.ipmismbus",
-"tests/data/acpi/q35/DSDT.ivrs",
-"tests/data/acpi/q35/DSDT.memhp",
-"tests/data/acpi/q35/DSDT.mmio64",
-"tests/data/acpi/q35/DSDT.multi-bridge",
-"tests/data/acpi/q35/DSDT.numamem",
-"tests/data/acpi/q35/DSDT.pvpanic-isa",
-"tests/data/acpi/q35/DSDT.tis.tpm12",
-"tests/data/acpi/q35/DSDT.tis.tpm2",
-"tests/data/acpi/q35/DSDT.viot",
-"tests/data/acpi/q35/DSDT.xapic",
diff --git a/tests/data/acpi/pc/DSDT b/tests/data/acpi/pc/DSDT
index e80bef30317b5ef3bf0d2fb7aaabd6def109adb6..2d543fbf94e42f03814019c146b49f94e76bf15d 100644
GIT binary patch
delta 19
bcmaE?_gHVjq|FM9s%#S{^=)=#mlFU0Q=bPS
delta 19
bcmaE?_gHVjq{-Xa`Zi8dW!vn^E++s0T|@`I
diff --git a/tests/data/acpi/pc/DSDT.acpierst b/tests/data/acpi/pc/DSDT.acpierst
index d5a2ca51652dfc3637a817bac4a02d6ff6dc8ac2..798349aa3f85e0803396471237e94604d00a1f90 100644
GIT binary patch
delta 19
bcmX@4cSvu-q|FM9s%#S{^=)=#|H}^mP`C%a
delta 19
bcmX@4cSvu-q{-Xa`Zi8dW!vn^{+AyBT3rZQ
diff --git a/tests/data/acpi/pc/DSDT.acpihmat b/tests/data/acpi/pc/DSDT.acpihmat
index f86c743c4d64041c7fbd9999cc700e88416770b7..2b0fd3433b586fd7665b9a0b5b2f8bb3fcc09b44 100644
GIT binary patch
delta 19
bcmbPWIl*$mq|FM9s%#S{^=)=#_Z9^JNyrAo
delta 19
bcmbPWIl*$mq{-Xa`Zi8dW!vn^?kx%cQ*8%e
diff --git a/tests/data/acpi/pc/DSDT.bridge b/tests/data/acpi/pc/DSDT.bridge
index 14ed0d995a9f6540deae5a25a7853ed4493a6e06..56398fc0147c9ab9d59947e24cddb08380b6a13e 100644
GIT binary patch
delta 19
bcmX@>eAaowq|FM9s%#S{^=)=#?~nojR4)gV
delta 19
bcmX@>eAaowq{-Xa`Zi8dW!vn^-XR45UDOCL
diff --git a/tests/data/acpi/pc/DSDT.cphp b/tests/data/acpi/pc/DSDT.cphp
index c653302a84a42d063a74a22c6adf910beeba7c60..38cb47c675edb6d4797b008d2deae656739230ef 100644
GIT binary patch
delta 19
bcmdmNwApCFq|FM9s%#S{^=)=#e<uh4PY4H_
delta 19
bcmdmNwApCFq{-Xa`Zi8dW!vn^{!S18Sgi;*
diff --git a/tests/data/acpi/pc/DSDT.dimmpxm b/tests/data/acpi/pc/DSDT.dimmpxm
index 247a1796b1cf31c24b1a981e48937609f84fe2cb..06a7aa59465238bfbf715ae83540f68b1f2f3ea5 100644
GIT binary patch
delta 19
bcmca<ebaivq|FM9s%#S{^=)=#pCSeTRO1Jv
delta 19
bcmca<ebaivq{-Xa`Zi8dW!vn^K1B=wUWf=l
diff --git a/tests/data/acpi/pc/DSDT.hpbridge b/tests/data/acpi/pc/DSDT.hpbridge
index d5a2ca51652dfc3637a817bac4a02d6ff6dc8ac2..798349aa3f85e0803396471237e94604d00a1f90 100644
GIT binary patch
delta 19
bcmX@4cSvu-q|FM9s%#S{^=)=#|H}^mP`C%a
delta 19
bcmX@4cSvu-q{-Xa`Zi8dW!vn^{+AyBT3rZQ
diff --git a/tests/data/acpi/pc/DSDT.hpbrroot b/tests/data/acpi/pc/DSDT.hpbrroot
index ec99b1622934a0fd8bc316291c33231e4c57dce0..dd2c8c0c8c5bf9895eb524e094d5597515b4803e 100644
GIT binary patch
delta 19
bcmew>{#Sg$q|FM9Y^)O}^=(#TyUq##Q{o4f
delta 19
bcmew>{#Sg$q{%Z_`!-HuW8JLAcAXUfTxbXq
diff --git a/tests/data/acpi/pc/DSDT.ipmikcs b/tests/data/acpi/pc/DSDT.ipmikcs
index f0d9e75841ea3d69fed9384e439bc4e94c7a4c4e..be7f22f1c29f25351bcb5620dcfe8f955bd083d7 100644
GIT binary patch
delta 19
bcmZ3jzgmC7q|FM9xoi_B^=<BDmlFU0PtgZN
delta 19
bcmZ3jzgmC7q{;u;`Zi9=W!v1#E++s0TmA?r
diff --git a/tests/data/acpi/pc/DSDT.memhp b/tests/data/acpi/pc/DSDT.memhp
index d0a7c462094fea9a457cbf537784735e74f7d7d5..b81e3dd8ecd89f4690d69a90096df095fe218425 100644
GIT binary patch
delta 19
bcmdmFxyf?Eq|FM9s%#S{^=)=#&lLp#PSgh~
delta 19
bcmdmFxyf?Eq{-Xa`Zi8dW!vn^o+}CfSa}D=
diff --git a/tests/data/acpi/pc/DSDT.numamem b/tests/data/acpi/pc/DSDT.numamem
index 2f512cfbe158f1739803c0c7009fe5e907bdec54..230aaae37169ec2f78ebeae735ccc905a112d284 100644
GIT binary patch
delta 19
bcmaE<_fl`dq|FM9s%#S{^=)=#R}laJRD%aJ
delta 19
bcmaE<_fl`dq{-Xa`Zi8dW!vn^t|9;cUML69
diff --git a/tests/data/acpi/pc/DSDT.roothp b/tests/data/acpi/pc/DSDT.roothp
index 46e03d39e00ea70e55d6a12333ca2b98c5e5bb53..7091ee019191d822869f9a9f35ebd635eea4a9eb 100644
GIT binary patch
delta 19
bcmdmNu-Rb3q|FM9s%#S{^=)=#e<uI{PQwS5
delta 19
bcmdmNu-Rb3q{-Xa`Zi8dW!vn^{!Rb@SZD|`
diff --git a/tests/data/acpi/q35/DSDT b/tests/data/acpi/q35/DSDT
index 2cd8d5fc470fc3159fbc464af97e76c8de2136e3..a85c608022b9e0878bcedc785b9bdf27e50a760b 100644
GIT binary patch
delta 21
dcmccQaLHjqDC6eGjEoYKLmB%vKatF10{~?<2zCGf
delta 21
dcmccQaLHjqDC6WX$-d2@jEoYSpGfAh0RUn62mt^9
diff --git a/tests/data/acpi/q35/DSDT.acpierst b/tests/data/acpi/q35/DSDT.acpierst
index 0bc5de80652ae7328fdc07ccda34afff39ade56f..f768380c1c2aa8fcd6ff6bc1048e0ccd2037eb2c 100644
GIT binary patch
delta 21
dcmaFt@YrEPDC6eGjEoYKLmB%vKas3w0|00M2&n)7
delta 21
dcmaFt@YrEPDC6WX$-d2@jEoYSpGelT0RUve2s8iy
diff --git a/tests/data/acpi/q35/DSDT.acpihmat b/tests/data/acpi/q35/DSDT.acpihmat
index af10345e8806c78a0074b3a8819b5cfca4d70c01..51e79b3b0754224aa6cd1e1257b404182506f1d1 100644
GIT binary patch
delta 21
dcmezG_1|klDC6eGjEoYKLmB%vKarfx4FGN#2^IhV
delta 21
dcmezG_1|klDC6WX$-d2@jEoYSpGeN;1^{Z?2%!J~
diff --git a/tests/data/acpi/q35/DSDT.applesmc b/tests/data/acpi/q35/DSDT.applesmc
index 00092aacc6ce44dd8792b00a0fa183e5b06d33c6..33ca7ee26fee6718c72dd63374bea98e858066c2 100644
GIT binary patch
delta 21
ccmZp0Y;fEV%DDM4qrSxCP{zK^LQ;8b09Qc=F#rGn
delta 21
ccmZp0Y;fEV$~d`2vTt)JqrSvuA*nnz09By|>Hq)$
diff --git a/tests/data/acpi/q35/DSDT.bridge b/tests/data/acpi/q35/DSDT.bridge
index d820098355e0b79dc69d714817fe906064852f4d..40457ec74d272f4ce971b66a1b19a397ed9af770 100644
GIT binary patch
delta 21
dcmaD8`X+QkDC6eGjEoYKLmB%vKau1R1ORKJ2zdYi
delta 21
dcmaD8`X+QkDC6WX$-d2@jEoYSpGa~D0sv@b2m}BC
diff --git a/tests/data/acpi/q35/DSDT.cphp b/tests/data/acpi/q35/DSDT.cphp
index ac8456a43d54209d77917163b282954d7429b331..fe87e060d5cf41b20cf1a37928ed31ca9b15ed66 100644
GIT binary patch
delta 21
dcmZ4FvdCpaDC6eGjEoYKLmB%vKasTK003R^2k-y@
delta 21
dcmZ4FvdCpaDC6WX$-d2@jEoYSpGewq003ID2YUbj
diff --git a/tests/data/acpi/q35/DSDT.cxl b/tests/data/acpi/q35/DSDT.cxl
index 369ae90196113ec666a4acec7bb7a93be5b60e75..82d7563a73f6b7a4ead15ca0933d0e57ae8be48e 100644
GIT binary patch
delta 21
dcmZqhZt&g^%DDM4BcsIRP{zK^PbBAX0{~iS2pa$Z
delta 21
ccmZqhZt&g^$~ZYpvTt)JBcsITCz5lx0aq&rrT_o{
diff --git a/tests/data/acpi/q35/DSDT.dimmpxm b/tests/data/acpi/q35/DSDT.dimmpxm
index bb0eadf869fe366fc139f8b0fd2ed811d3b16814..304c8229d81e333ed7564423cf50ad2b963b0a2e 100644
GIT binary patch
delta 21
dcmX@%d%|}^DC6eGjEoYKLmB%vKaqUG0{~`*2>1X1
delta 21
dcmX@%d%|}^DC6WX$-d2@jEoYSpGZF80RUr22!j9s
diff --git a/tests/data/acpi/q35/DSDT.ipmibt b/tests/data/acpi/q35/DSDT.ipmibt
index bb258279506e78b50545f6f9030bd25afe433c29..b9a5ae240c62f29d952d94a280bc97d608b3c2e5 100644
GIT binary patch
delta 21
dcmbR1IM;DQDC6eGj6M>RLmB%v>r3Ua0RUZm2c-Z2
delta 21
dcmbR1IM;DQDC6XXl6{*)8GR%+>r3Ua0RUX#2YUbj
diff --git a/tests/data/acpi/q35/DSDT.ipmismbus b/tests/data/acpi/q35/DSDT.ipmismbus
index 15000c357fdabf1bceef6f860bd35e9a33024927..a0eeae95c07fe3708509c3e652c3aeff9c21ac82 100644
GIT binary patch
delta 21
dcmZ4OxY}_;DC6eGj8PJkLmB%v+e+oJ0RUir2i*Vw
delta 21
dcmZ4OxY}_;DC6Yyl6{*)8KWdN+e+oJ0RUiO2f+XU
diff --git a/tests/data/acpi/q35/DSDT.ivrs b/tests/data/acpi/q35/DSDT.ivrs
index 0bc5de80652ae7328fdc07ccda34afff39ade56f..f768380c1c2aa8fcd6ff6bc1048e0ccd2037eb2c 100644
GIT binary patch
delta 21
dcmaFt@YrEPDC6eGjEoYKLmB%vKas3w0|00M2&n)7
delta 21
dcmaFt@YrEPDC6WX$-d2@jEoYSpGelT0RUve2s8iy
diff --git a/tests/data/acpi/q35/DSDT.memhp b/tests/data/acpi/q35/DSDT.memhp
index 663456fc0d3c71a51b541f5ab952e05c9dac01e6..b4a9f5a0fe5cf3b44ebe7659a2bf3687e1073482 100644
GIT binary patch
delta 21
dcmZ4Jz0i9@DC6eGjEoYKLmB%vKat$a4FF%$2z~$n
delta 21
dcmZ4Jz0i9@DC6WX$-d2@jEoYSpGfZI1^`@@2nhfH
diff --git a/tests/data/acpi/q35/DSDT.mmio64 b/tests/data/acpi/q35/DSDT.mmio64
index 91afd01d598c7c2c733387dfb5140d0fcad54adb..3af5ef2ea473322d8697281d3a20f7282f3238ac 100644
GIT binary patch
delta 21
dcmdnvxyN%uDC6eGjEoYKLmB%vKasq_1ps682+9Be
delta 21
dcmdnvxyN%uDC6WX$-d2@jEoYSpGe-|0svsP2vq<8
diff --git a/tests/data/acpi/q35/DSDT.multi-bridge b/tests/data/acpi/q35/DSDT.multi-bridge
index afde339a181628ae9153251eee026b437ab685bc..238668b95f33e831d66e2e2fa5e952f00ea7260b 100644
GIT binary patch
delta 21
dcmez2^uuXGDC6eGjEoYKLmB%vKarfm4ghPv2<-p>
delta 21
dcmez2^uuXGDC6WX$-d2@jEoYSpGZz&2LNb+2zUSh
diff --git a/tests/data/acpi/q35/DSDT.numamem b/tests/data/acpi/q35/DSDT.numamem
index e537669949a07adbaa4255021ea14bb4a9dc672f..37fa4c3a45b0d7db0d3d368df5e027e7e1acf9d2 100644
GIT binary patch
delta 21
dcmccNaKm9kDC6eGjEoYKLmB%vKanh90{~_+2#5dx
delta 21
dcmccNaKm9kDC6WX$-d2@jEoYSpGcOl0RUq32onGR
diff --git a/tests/data/acpi/q35/DSDT.pvpanic-isa b/tests/data/acpi/q35/DSDT.pvpanic-isa
index cc545b5d2505246d33f83d2482273968aa1be032..8705309748d1d7352c6623b32c28eab7fbbce2a4 100644
GIT binary patch
delta 21
dcmdn)xZQC>DC6eGjA;^+LmB%vdrIZ80RUqX2n_%L
delta 21
dcmdn)xZQC>DC6Yal6{*)8Pg;-drIZ80RUrR2mJs5
diff --git a/tests/data/acpi/q35/DSDT.tis.tpm12 b/tests/data/acpi/q35/DSDT.tis.tpm12
index a97d884c50485f848054c6ac95ecfa055ff59e5b..7408f03e4b571c352f9fdf2afc8718aa7b37da06 100644
GIT binary patch
delta 21
dcmdnsy1{irDC6eGjKNZqLmB%vo5@tM0RUmA2k`&^
delta 21
dcmdnsy1{irDC6W6(tVpl8H1%Zo5@tM0RUlJ2hacj
diff --git a/tests/data/acpi/q35/DSDT.tis.tpm2 b/tests/data/acpi/q35/DSDT.tis.tpm2
index 1f5392919b5ea69696b49ff13aab5c37d0615919..134c2fbccacd0e9383df094f9b4deb03b4e46abb 100644
GIT binary patch
delta 21
dcmX@*ddhV}DC6eGjJZ;iLmB%w2g+2k0RU%32wDID
delta 21
dcmX@*ddhV}DC6Wq(*2vm7;~gH2gp>h0RU&{2vYz6
diff --git a/tests/data/acpi/q35/DSDT.viot b/tests/data/acpi/q35/DSDT.viot
index e20e4ee5e92e11ccf890a18fbdd78181c43f3b5c..be4a254e93a9cb360f42a25121c5fcefbd47480f 100644
GIT binary patch
delta 21
dcmZ4Px!iL@DC6eGjEoYKLmB%vKao7l1pr`z2#Wv!
delta 21
dcmZ4Px!iL@DC6WX$-d2@jEoYSpGY3&0svh^2o?YU
diff --git a/tests/data/acpi/q35/DSDT.xapic b/tests/data/acpi/q35/DSDT.xapic
index 3cab5956eee60363251a6fab0cc981bbbda64443..2327152da1b7d777c1f3da358ae5ae1406384d11 100644
GIT binary patch
delta 23
fcmdlwjcMyNrVXKtn;$bWN=y!A?A!cAGO!Q;anuPq
delta 23
fcmdlwjcMyNrVXKtlfxwYHit4YN^E{28CVDaZk7ne
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 04/17] tests: acpi: whitelist pc/q35 DSDT due to HPET AML move
2022-07-01 13:34 [PATCH 00/17] acpi:pc/q35: minor PCI refactoring/cleanups Igor Mammedov
` (2 preceding siblings ...)
2022-07-01 13:35 ` [PATCH 03/17] tests: acpi: update expected blobs after HPET move Igor Mammedov
@ 2022-07-01 13:35 ` Igor Mammedov
2022-07-01 13:35 ` [PATCH 05/17] acpi: x86: refactor PDSM method to reduce nesting Igor Mammedov
` (13 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: Igor Mammedov @ 2022-07-01 13:35 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
tests/qtest/bios-tables-test-allowed-diff.h | 34 +++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index dfb8523c8b..452145badd 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1 +1,35 @@
/* List of comma-separated changed AML files to ignore */
+"tests/data/acpi/pc/DSDT",
+"tests/data/acpi/pc/DSDT.acpierst",
+"tests/data/acpi/pc/DSDT.acpihmat",
+"tests/data/acpi/pc/DSDT.bridge",
+"tests/data/acpi/pc/DSDT.cphp",
+"tests/data/acpi/pc/DSDT.dimmpxm",
+"tests/data/acpi/pc/DSDT.hpbridge",
+"tests/data/acpi/pc/DSDT.hpbrroot",
+"tests/data/acpi/pc/DSDT.ipmikcs",
+"tests/data/acpi/pc/DSDT.memhp",
+"tests/data/acpi/pc/DSDT.numamem",
+"tests/data/acpi/pc/DSDT.roothp",
+"tests/data/acpi/q35/DSDT",
+"tests/data/acpi/q35/DSDT.acpierst",
+"tests/data/acpi/q35/DSDT.acpihmat",
+"tests/data/acpi/q35/DSDT.applesmc",
+"tests/data/acpi/q35/DSDT.bridge",
+"tests/data/acpi/q35/DSDT.cphp",
+"tests/data/acpi/q35/DSDT.cxl",
+"tests/data/acpi/q35/DSDT.dimmpxm",
+"tests/data/acpi/q35/DSDT.ipmibt",
+"tests/data/acpi/q35/DSDT.ipmismbus",
+"tests/data/acpi/q35/DSDT.ivrs",
+"tests/data/acpi/q35/DSDT.memhp",
+"tests/data/acpi/q35/DSDT.mmio64",
+"tests/data/acpi/q35/DSDT.multi-bridge",
+"tests/data/acpi/q35/DSDT.numamem",
+"tests/data/acpi/q35/DSDT.pvpanic-isa",
+"tests/data/acpi/q35/DSDT.tis.tpm12",
+"tests/data/acpi/q35/DSDT.tis.tpm2",
+"tests/data/acpi/q35/DSDT.viot",
+"tests/data/acpi/q35/DSDT.xapic",
+"tests/data/acpi/q35/DSDT.nohpet",
+"tests/data/acpi/pc/DSDT.nohpet",
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 05/17] acpi: x86: refactor PDSM method to reduce nesting
2022-07-01 13:34 [PATCH 00/17] acpi:pc/q35: minor PCI refactoring/cleanups Igor Mammedov
` (3 preceding siblings ...)
2022-07-01 13:35 ` [PATCH 04/17] tests: acpi: whitelist pc/q35 DSDT due to HPET AML move Igor Mammedov
@ 2022-07-01 13:35 ` Igor Mammedov
2022-07-01 13:35 ` [PATCH 06/17] x86: acpi: _DSM: use Package to pass parameters Igor Mammedov
` (12 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: Igor Mammedov @ 2022-07-01 13:35 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani
.., it will help with code readability and make easier
to extend method in followup patches
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
hw/i386/acpi-build.c | 139 ++++++++++++++++++++++++-------------------
1 file changed, 77 insertions(+), 62 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 69ead4b34a..fe676b4831 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -574,9 +574,12 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
Aml *aml_pci_device_dsm(void)
{
- Aml *method, *UUID, *ifctx, *ifctx1, *ifctx2, *ifctx3, *elsectx;
- Aml *acpi_index = aml_local(0);
+ Aml *method, *UUID, *ifctx, *ifctx1;
+ Aml *ret = aml_local(0);
+ Aml *caps = aml_local(1);
+ Aml *acpi_index = aml_local(2);
Aml *zero = aml_int(0);
+ Aml *one = aml_int(1);
Aml *bnum = aml_arg(4);
Aml *func = aml_arg(2);
Aml *rev = aml_arg(1);
@@ -584,73 +587,85 @@ Aml *aml_pci_device_dsm(void)
method = aml_method("PDSM", 6, AML_SERIALIZED);
+ /* get supported functions */
+ ifctx = aml_if(aml_equal(func, zero));
+ {
+ uint8_t byte_list[1] = { 0 }; /* nothing supported yet */
+ aml_append(ifctx, aml_store(aml_buffer(1, byte_list), ret));
+ aml_append(ifctx, aml_store(zero, caps));
+
+ /*
+ * PCI Firmware Specification 3.1
+ * 4.6. _DSM Definitions for PCI
+ */
+ UUID = aml_touuid("E5C937D0-3553-4D7A-9117-EA4D19C3434D");
+ ifctx1 = aml_if(aml_lnot(aml_equal(aml_arg(0), UUID)));
+ {
+ /* call is for unsupported UUID, bail out */
+ aml_append(ifctx1, aml_return(ret));
+ }
+ aml_append(ifctx, ifctx1);
+
+ ifctx1 = aml_if(aml_lless(rev, aml_int(2)));
+ {
+ /* call is for unsupported REV, bail out */
+ aml_append(ifctx1, aml_return(ret));
+ }
+ aml_append(ifctx, ifctx1);
+
+ aml_append(ifctx,
+ aml_store(aml_call2("AIDX", bnum, sunum), acpi_index));
+ /*
+ * advertise function 7 if device has acpi-index
+ * acpi_index values:
+ * 0: not present (default value)
+ * FFFFFFFF: not supported (old QEMU without PIDX reg)
+ * other: device's acpi-index
+ */
+ ifctx1 = aml_if(aml_lnot(
+ aml_or(aml_equal(acpi_index, zero),
+ aml_equal(acpi_index, aml_int(0xFFFFFFFF)), NULL)
+ ));
+ {
+ /* have supported functions */
+ aml_append(ifctx1, aml_or(caps, one, caps));
+ /* support for function 7 */
+ aml_append(ifctx1,
+ aml_or(caps, aml_shiftleft(one, aml_int(7)), caps));
+ }
+ aml_append(ifctx, ifctx1);
+
+ aml_append(ifctx, aml_store(caps, aml_index(ret, zero)));
+ aml_append(ifctx, aml_return(ret));
+ }
+ aml_append(method, ifctx);
+
+ /* handle specific functions requests */
/*
* PCI Firmware Specification 3.1
- * 4.6. _DSM Definitions for PCI
+ * 4.6.7. _DSM for Naming a PCI or PCI Express Device Under
+ * Operating Systems
*/
- UUID = aml_touuid("E5C937D0-3553-4D7A-9117-EA4D19C3434D");
- ifctx = aml_if(aml_equal(aml_arg(0), UUID));
+ ifctx = aml_if(aml_equal(func, aml_int(7)));
{
- aml_append(ifctx, aml_store(aml_call2("AIDX", bnum, sunum), acpi_index));
- ifctx1 = aml_if(aml_equal(func, zero));
- {
- uint8_t byte_list[1];
+ Aml *pkg = aml_package(2);
- ifctx2 = aml_if(aml_equal(rev, aml_int(2)));
- {
- /*
- * advertise function 7 if device has acpi-index
- * acpi_index values:
- * 0: not present (default value)
- * FFFFFFFF: not supported (old QEMU without PIDX reg)
- * other: device's acpi-index
- */
- ifctx3 = aml_if(aml_lnot(
- aml_or(aml_equal(acpi_index, zero),
- aml_equal(acpi_index, aml_int(0xFFFFFFFF)), NULL)
- ));
- {
- byte_list[0] =
- 1 /* have supported functions */ |
- 1 << 7 /* support for function 7 */
- ;
- aml_append(ifctx3, aml_return(aml_buffer(1, byte_list)));
- }
- aml_append(ifctx2, ifctx3);
- }
- aml_append(ifctx1, ifctx2);
-
- byte_list[0] = 0; /* nothing supported */
- aml_append(ifctx1, aml_return(aml_buffer(1, byte_list)));
- }
- aml_append(ifctx, ifctx1);
- elsectx = aml_else();
- /*
- * PCI Firmware Specification 3.1
- * 4.6.7. _DSM for Naming a PCI or PCI Express Device Under
- * Operating Systems
- */
- ifctx1 = aml_if(aml_equal(func, aml_int(7)));
- {
- Aml *pkg = aml_package(2);
- Aml *ret = aml_local(1);
-
- aml_append(pkg, zero);
- /*
- * optional, if not impl. should return null string
- */
- aml_append(pkg, aml_string("%s", ""));
- aml_append(ifctx1, aml_store(pkg, ret));
- /*
- * update acpi-index to actual value
- */
- aml_append(ifctx1, aml_store(acpi_index, aml_index(ret, zero)));
- aml_append(ifctx1, aml_return(ret));
- }
- aml_append(elsectx, ifctx1);
- aml_append(ifctx, elsectx);
+ aml_append(pkg, zero);
+ /*
+ * optional, if not impl. should return null string
+ */
+ aml_append(pkg, aml_string("%s", ""));
+ aml_append(ifctx, aml_store(pkg, ret));
+
+ aml_append(ifctx, aml_store(aml_call2("AIDX", bnum, sunum), acpi_index));
+ /*
+ * update acpi-index to actual value
+ */
+ aml_append(ifctx, aml_store(acpi_index, aml_index(ret, zero)));
}
+
aml_append(method, ifctx);
+ aml_append(method, aml_return(ret));
return method;
}
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 06/17] x86: acpi: _DSM: use Package to pass parameters
2022-07-01 13:34 [PATCH 00/17] acpi:pc/q35: minor PCI refactoring/cleanups Igor Mammedov
` (4 preceding siblings ...)
2022-07-01 13:35 ` [PATCH 05/17] acpi: x86: refactor PDSM method to reduce nesting Igor Mammedov
@ 2022-07-01 13:35 ` Igor Mammedov
2022-07-01 13:35 ` [PATCH 07/17] tests: acpi: update expected blobs Igor Mammedov
` (11 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: Igor Mammedov @ 2022-07-01 13:35 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani
Numer of possible arguments to pass to a method is limited
in ACPI. The following patches will need to pass over more
parameters to PDSM method, will hit that limit.
Prepare for this by passing structure (Package) to method,
which let us workaround arguments limitation.
Pass to PDSM all standard arguments of _DSM as is, and
pack custom parameters into Package that is passed as
the last argument to PDSM.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
hw/i386/acpi-build.c | 40 +++++++++++++++++++++++++++-------------
1 file changed, 27 insertions(+), 13 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index fe676b4831..8700446f50 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -431,11 +431,17 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
);
aml_append(dev, method);
method = aml_method("_DSM", 4, AML_SERIALIZED);
- aml_append(method,
- aml_return(aml_call6("PDSM", aml_arg(0), aml_arg(1),
- aml_arg(2), aml_arg(3),
- aml_name("BSEL"), aml_name("_SUN")))
- );
+ {
+ Aml *params = aml_local(0);
+ Aml *pkg = aml_package(2);
+ aml_append(pkg, aml_name("BSEL"));
+ aml_append(pkg, aml_name("_SUN"));
+ aml_append(method, aml_store(pkg, params));
+ aml_append(method,
+ aml_return(aml_call5("PDSM", aml_arg(0), aml_arg(1),
+ aml_arg(2), aml_arg(3), params))
+ );
+ }
aml_append(dev, method);
aml_append(parent_scope, dev);
@@ -480,10 +486,17 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
*/
aml_append(dev, aml_name_decl("ASUN", aml_int(slot)));
method = aml_method("_DSM", 4, AML_SERIALIZED);
- aml_append(method, aml_return(
- aml_call6("PDSM", aml_arg(0), aml_arg(1), aml_arg(2),
- aml_arg(3), aml_name("BSEL"), aml_name("ASUN"))
- ));
+ {
+ Aml *params = aml_local(0);
+ Aml *pkg = aml_package(2);
+ aml_append(pkg, aml_name("BSEL"));
+ aml_append(pkg, aml_name("ASUN"));
+ aml_append(method, aml_store(pkg, params));
+ aml_append(method, aml_return(
+ aml_call5("PDSM", aml_arg(0), aml_arg(1), aml_arg(2),
+ aml_arg(3), params)
+ ));
+ }
aml_append(dev, method);
}
@@ -580,12 +593,13 @@ Aml *aml_pci_device_dsm(void)
Aml *acpi_index = aml_local(2);
Aml *zero = aml_int(0);
Aml *one = aml_int(1);
- Aml *bnum = aml_arg(4);
Aml *func = aml_arg(2);
Aml *rev = aml_arg(1);
- Aml *sunum = aml_arg(5);
+ Aml *params = aml_arg(4);
+ Aml *bnum = aml_derefof(aml_index(params, aml_int(0)));
+ Aml *sunum = aml_derefof(aml_index(params, aml_int(1)));
- method = aml_method("PDSM", 6, AML_SERIALIZED);
+ method = aml_method("PDSM", 5, AML_SERIALIZED);
/* get supported functions */
ifctx = aml_if(aml_equal(func, zero));
@@ -662,10 +676,10 @@ Aml *aml_pci_device_dsm(void)
* update acpi-index to actual value
*/
aml_append(ifctx, aml_store(acpi_index, aml_index(ret, zero)));
+ aml_append(ifctx, aml_return(ret));
}
aml_append(method, ifctx);
- aml_append(method, aml_return(ret));
return method;
}
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 07/17] tests: acpi: update expected blobs
2022-07-01 13:34 [PATCH 00/17] acpi:pc/q35: minor PCI refactoring/cleanups Igor Mammedov
` (5 preceding siblings ...)
2022-07-01 13:35 ` [PATCH 06/17] x86: acpi: _DSM: use Package to pass parameters Igor Mammedov
@ 2022-07-01 13:35 ` Igor Mammedov
2022-07-01 13:35 ` [PATCH 08/17] tests: acpi: whitelist pc/q35 DSDT before switching _DSM to use ASUN Igor Mammedov
` (10 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: Igor Mammedov @ 2022-07-01 13:35 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani
An intermediate blobs update to keep changes (last 2 patches)
reviewable.
Includes refactored PDSM that uses Package argument for custom
parameters.
===== PDSM taking package as arguments
Return (Local0)
}
- Method (PDSM, 6, Serialized)
+ Method (PDSM, 5, Serialized)
{
- If ((Arg0 == ToUUID ("e5c937d0-3553-4d7a-9117-ea4d19c3434d") /* Device Labeling Interface */))
+ If ((Arg2 == Zero))
{
- Local0 = AIDX (Arg4, Arg5)
- If ((Arg2 == Zero))
- {
- If ((Arg1 == 0x02))
+ Local0 = Buffer (One)
{
- If (!((Local0 == Zero) | (Local0 == 0xFFFFFFFF)))
- {
- Return (Buffer (One)
- {
- 0x81 // .
- })
- }
+ 0x00 // .
}
+ Local1 = Zero
+ If ((Arg0 != ToUUID ("e5c937d0-3553-4d7a-9117-ea4d19c3434d") /* Device Labeling Interface */))
+ {
+ Return (Local0)
+ }
- Return (Buffer (One)
- {
- 0x00 // .
- })
+ If ((Arg1 < 0x02))
+ {
+ Return (Local0)
}
- ElseIf ((Arg2 == 0x07))
+
+ Local2 = AIDX (DerefOf (Arg4 [Zero]), DerefOf (Arg4 [One]
+ ))
+ If (!((Local2 == Zero) | (Local2 == 0xFFFFFFFF)))
{
- Local1 = Package (0x02)
- {
- Zero,
- ""
- }
- Local1 [Zero] = Local0
- Return (Local1)
+ Local1 |= One
+ Local1 |= (One << 0x07)
}
+
+ Local0 [Zero] = Local1
+ Return (Local0)
+ }
+
+ If ((Arg2 == 0x07))
+ {
+ Local0 = Package (0x02)
+ {
+ Zero,
+ ""
+ }
+ Local2 = AIDX (DerefOf (Arg4 [Zero]), DerefOf (Arg4 [One]
+ ))
+ Local0 [Zero] = Local2
+ Return (Local0)
}
}
}
===== PCI slot using Package to pass arguments to _DSM
Name (ASUN, Zero)
Method (_DSM, 4, Serialized) // _DSM: Device-Specific Method
{
- Return (PDSM (Arg0, Arg1, Arg2, Arg3, BSEL, ASUN))
+ Local0 = Package (0x02)
+ {
+ BSEL,
+ ASUN
+ }
+ Return (PDSM (Arg0, Arg1, Arg2, Arg3, Local0))
}
}
===== hotpluggable PCI slot using Package to pass arguments to _DSM
Method (_DSM, 4, Serialized) // _DSM: Device-Specific Method
{
- Return (PDSM (Arg0, Arg1, Arg2, Arg3, BSEL, _SUN))
+ Local0 = Package (0x02)
+ {
+ BSEL,
+ _SUN
+ }
+ Return (PDSM (Arg0, Arg1, Arg2, Arg3, Local0))
}
}
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
tests/qtest/bios-tables-test-allowed-diff.h | 34 --------------------
tests/data/acpi/pc/DSDT | Bin 5987 -> 6219 bytes
tests/data/acpi/pc/DSDT.acpierst | Bin 5954 -> 6186 bytes
tests/data/acpi/pc/DSDT.acpihmat | Bin 7312 -> 7544 bytes
tests/data/acpi/pc/DSDT.bridge | Bin 8653 -> 9078 bytes
tests/data/acpi/pc/DSDT.cphp | Bin 6451 -> 6683 bytes
tests/data/acpi/pc/DSDT.dimmpxm | Bin 7641 -> 7873 bytes
tests/data/acpi/pc/DSDT.hpbridge | Bin 5954 -> 6186 bytes
tests/data/acpi/pc/DSDT.ipmikcs | Bin 6059 -> 6291 bytes
tests/data/acpi/pc/DSDT.memhp | Bin 7346 -> 7578 bytes
tests/data/acpi/pc/DSDT.nohpet | Bin 5845 -> 6077 bytes
tests/data/acpi/pc/DSDT.numamem | Bin 5993 -> 6225 bytes
tests/data/acpi/pc/DSDT.roothp | Bin 6195 -> 6434 bytes
tests/data/acpi/q35/DSDT | Bin 8274 -> 8320 bytes
tests/data/acpi/q35/DSDT.acpierst | Bin 8291 -> 8337 bytes
tests/data/acpi/q35/DSDT.acpihmat | Bin 9599 -> 9645 bytes
tests/data/acpi/q35/DSDT.applesmc | Bin 8320 -> 8366 bytes
tests/data/acpi/q35/DSDT.bridge | Bin 10988 -> 11227 bytes
tests/data/acpi/q35/DSDT.cphp | Bin 8738 -> 8784 bytes
tests/data/acpi/q35/DSDT.cxl | Bin 9600 -> 9646 bytes
tests/data/acpi/q35/DSDT.dimmpxm | Bin 9928 -> 9974 bytes
tests/data/acpi/q35/DSDT.ipmibt | Bin 8349 -> 8395 bytes
tests/data/acpi/q35/DSDT.ipmismbus | Bin 8363 -> 8409 bytes
tests/data/acpi/q35/DSDT.ivrs | Bin 8291 -> 8337 bytes
tests/data/acpi/q35/DSDT.memhp | Bin 9633 -> 9679 bytes
tests/data/acpi/q35/DSDT.mmio64 | Bin 9404 -> 9450 bytes
tests/data/acpi/q35/DSDT.multi-bridge | Bin 8568 -> 8628 bytes
tests/data/acpi/q35/DSDT.nohpet | Bin 8132 -> 8178 bytes
tests/data/acpi/q35/DSDT.numamem | Bin 8280 -> 8326 bytes
tests/data/acpi/q35/DSDT.pvpanic-isa | Bin 8375 -> 8421 bytes
tests/data/acpi/q35/DSDT.tis.tpm12 | Bin 8880 -> 8926 bytes
tests/data/acpi/q35/DSDT.tis.tpm2 | Bin 8906 -> 8952 bytes
tests/data/acpi/q35/DSDT.viot | Bin 9383 -> 9429 bytes
tests/data/acpi/q35/DSDT.xapic | Bin 35637 -> 35683 bytes
34 files changed, 34 deletions(-)
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index 452145badd..dfb8523c8b 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,35 +1 @@
/* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/pc/DSDT",
-"tests/data/acpi/pc/DSDT.acpierst",
-"tests/data/acpi/pc/DSDT.acpihmat",
-"tests/data/acpi/pc/DSDT.bridge",
-"tests/data/acpi/pc/DSDT.cphp",
-"tests/data/acpi/pc/DSDT.dimmpxm",
-"tests/data/acpi/pc/DSDT.hpbridge",
-"tests/data/acpi/pc/DSDT.hpbrroot",
-"tests/data/acpi/pc/DSDT.ipmikcs",
-"tests/data/acpi/pc/DSDT.memhp",
-"tests/data/acpi/pc/DSDT.numamem",
-"tests/data/acpi/pc/DSDT.roothp",
-"tests/data/acpi/q35/DSDT",
-"tests/data/acpi/q35/DSDT.acpierst",
-"tests/data/acpi/q35/DSDT.acpihmat",
-"tests/data/acpi/q35/DSDT.applesmc",
-"tests/data/acpi/q35/DSDT.bridge",
-"tests/data/acpi/q35/DSDT.cphp",
-"tests/data/acpi/q35/DSDT.cxl",
-"tests/data/acpi/q35/DSDT.dimmpxm",
-"tests/data/acpi/q35/DSDT.ipmibt",
-"tests/data/acpi/q35/DSDT.ipmismbus",
-"tests/data/acpi/q35/DSDT.ivrs",
-"tests/data/acpi/q35/DSDT.memhp",
-"tests/data/acpi/q35/DSDT.mmio64",
-"tests/data/acpi/q35/DSDT.multi-bridge",
-"tests/data/acpi/q35/DSDT.numamem",
-"tests/data/acpi/q35/DSDT.pvpanic-isa",
-"tests/data/acpi/q35/DSDT.tis.tpm12",
-"tests/data/acpi/q35/DSDT.tis.tpm2",
-"tests/data/acpi/q35/DSDT.viot",
-"tests/data/acpi/q35/DSDT.xapic",
-"tests/data/acpi/q35/DSDT.nohpet",
-"tests/data/acpi/pc/DSDT.nohpet",
diff --git a/tests/data/acpi/pc/DSDT b/tests/data/acpi/pc/DSDT
index 2d543fbf94e42f03814019c146b49f94e76bf15d..cb718f1a8a591b27ca841f70f40762562c15c837 100644
GIT binary patch
delta 1368
zcmaE?ciMo<CD<jzTY`asQEwxcJQI_T$YgD%9raF}0WQJ5ybD~|CTB4e2r@G=Bor_t
zE|8iuIYUsGOW=a}$)~}lRlXC&U-?QNcJ^J8uz-DPCKuC^gaSuTmx$($90mp;!N`yV
z)KWV+iD7aQ&wn6bs7+){tWB(B<YH$?EJ*A~U|;}hRh^v0#a<x9%EZ76v<75=Fp>!c
zNf2e5-I-aqJe}6Y#0NXY3wW&waP~Cda0+(yVTf+h4>mA}=ZJT731Z-I3=Z{U5Rr`s
zx}T>&h>HoN1SFQQ1mvZR%&hE$=q3l&$$h+HvUpWZ-pwn^=rQ>wua*L;x_ETcJSNNX
z5uqrN7)48oQS_1+MY{Y%xT%mBMO%qc^phAxwgN=BsgW2(M~P9yDM*BMzQib+NQ|PZ
z#3+&!BEn6v#3))wjH0K+DAE)r!cDovDB4JjqOZg#vJ@f0O|`@*I!KHnR#76X^Ay!W
OD>Kl_g3Vo`HyHuis-Nrt
delta 1204
zcmX?Y@K}$_CD<h-S)74^F@GbMJQI_j;ACy49rZ430WQJ5d<%S7Cuax>a|v89KlwD+
zw90p)_$yz@!_K}1j-D<NIk^c7lqY8~ERdX>$;Grlcv9`;1cu28JpX}!VTm9!V<U)Q
zSSY?gbaECKdw~!u69X?pVnISjA_K#cL;*ju_+Y1a0dKAVXHNqW7q0k#pb&-vA*P0e
z%@deka@Kn+i~%cfSO`+U;S}uZ!w}u18Ejw>&k^tF62!pa7#!-yAR-<QbSuvikc%@i
zv$8?zKoZeSUM#_eP_;Y^3``L9Tuit$h;YOQ8@ezoVE{3VT==0ZV~|jElhb5jJ}oIM
zcEyA3a+(~AUwS!y>5urOt@-iV-HKoOJbr0O0lbDM<Ck8GU-~<KX-7f4c6Z~KzKUO3
zUI?$@nfRqQ<Cp%6U)o(5uiX>zOW(#Xttx`o@O=EzJMl|1i{drh7r*p${L&BcOKXd1
OiQ~v)n~TJ5G6DeTf_9hy
diff --git a/tests/data/acpi/pc/DSDT.acpierst b/tests/data/acpi/pc/DSDT.acpierst
index 798349aa3f85e0803396471237e94604d00a1f90..aebb29c2a4ae67b732bef3eb8e72c5665bb3a7b3 100644
GIT binary patch
delta 1385
zcmX@4x5|LaCD<iIOM-!c(PSf+JQI_T$YgD%9raF}0WQJ5ybD~|CTB4e2r@G=Bor_t
zE|8iuIYUsGOW=a}$)~}lRlXC&U-?QNcJ^J8uz-DPCKuC^gaSuTmx$($90mp;!N`yV
z)KWV+iD7aQ&wn6bs7+){tWB(B<YH$?EJ*A~U|;}hRh^v0#a<x9%EZ76v<75=Fp>!c
zNf2e5-I-aqJRMiZ#0NXY3wW*yaP~Cda0+(yVTf+h4>mA}=ZJT731Z-I3=Z{U5Rr`s
zx}T>&h>HoN1SFQQ1mvZR%&hE$=q3l&$$h+HvUpWZ-pwm(ZW3&00Wq0}fq@xfIu|n`
z<2@#G@@XlcnjVkt29L?U#3-6bjH0W=D3atS!cDQnC|XF2qNl_t(i9-VO}WG<+DMF|
zuf!;_6ePk;wZteoNQ@#@AtJ2vBt}s$F^Vn{qexVk2scF%qi8NMiXIZ9NL7RgH)Rr|
aXe}{{J`$tIR8$MC5JAi4o6AJcFaiL0S)o4w
delta 1221
zcmZ2wa7d5KCD<jzNt}U!F>NE4JQI_j;ACy49rZ430WQJ5d<%S7Cuax>a|v89KlwD+
zw90p)_$yz@!_K}1j-D<NIk^c7lqY8~ERdX>$;Grlcv9`;1cu28JpX}!VTm9!V<U)Q
zSSY?gbaECKdw~!u69X?pVnISjA_K#cL;*ju_+Y1a0dKAVXHNqW7q0k#pb&-vA*P0e
z%@deka@M=gj{z(2p9fOF;S}uZ!w}u18Ejw>&k^tF62!pa7#!-yAR-<QbSuvikc%@i
zv$8?zKoZeSUM#_eP_;Y^3``L9Tuit$h;YOQ8@ezoVE{3VT<oDNV~|jElU}f)1;k#U
zS<Fzgm~ojE-Q+aclTS+ui`(MCZgZME8Nc*h{L<?DcnvSaFTESTG^+q!!~O9~&%`hN
z7{9cxAYQx6@k<}XFU>84*YHsM()004zr-(XER5IgTKv+-@k<Me;59rNzw}c4((mz0
bTZ-bfyBWXqS^U!CVp`%jGSTKZu``SSlAd?5
diff --git a/tests/data/acpi/pc/DSDT.acpihmat b/tests/data/acpi/pc/DSDT.acpihmat
index 2b0fd3433b586fd7665b9a0b5b2f8bb3fcc09b44..b7c5de46346d2777b33f7fc464d319bd762fda8d 100644
GIT binary patch
delta 1388
zcmbPW`NN9KCD<jTLY9Gn@%2V7c_t<wk;&RjJL;V{16+cAc^9~_P0nH{5M*X#NGM=P
zTp%@Ra)zKVm%s({lTU+9t9&Plzw(tl?CiTFVFCNpOfIG+2?dUxE)mTgISdRyf{`H!
zsHJvt62s&qp8r6=P@Bk@SesbM$i>c(SdiF}z`y|1syaD~i@iXIm5G5DXbs2!VI&g@
zk|4@9yE7Z|*E_9^i4S&)7w}pW;OuF@;S}uZ!w}u1A8cR{&k^tF62!pa7#!-yAR-$N
zbU#ml5Em0j2}mqq3CK$snOWHh(M=Al!G=&BJPZs>5M5kM__c{}#7}-LB*o}4nN3(r
z0o8_hbQ?S-dl93kj~GRlh*2aaLWG;5h*30;7)6hWQKTkHgqyO6QM8U2MW2XKWF|(0
zo2rOWw2v4?OyWdX=SGa8E@Bj&BSw*s1QBiuBSz6IViesYMv;;v5pGH&M$sx_6ul!x
Wk&zS;ZYq<~lEqsVY~C()lMw*;SEL>Q
delta 1186
zcmexiHNle0CD<iof(!!#qs~Syc_t=5!O7Z8JL+B70$hT9`4;%FPR<Y%<`TGIe)4Is
zX_fCp@mIc*hn;;396enka&i+EC{NB}SRgq$lZ$DA@TA(w2@I1Hc>V(c!xBMe#zqjq
zuuyz~=;SOe_5vYRCI()H#Dav5L<WW>i2{CR@xe~<0^VE!&YlJ$E?n^eK_LtULQD+_
zn<p@f@jH7gi~%cfSO`+U;S}uZ!w}u18Ejw>&k^tF62!pa7#!-yAR-<QbSuvikc%@i
zv$8?zKoZeSUM!Q}3yGQHkQd>I4>ojRSi%5e7{M6EAVzeP(_{x>Eh#KI<H067P42=k
zeFeX?oCsdSGw@4q!Y};?zqFeuUb`pYm%fExT15=6;d%I_ci@+1631(}4}R%s_@y7<
zm)4TNYj+8L>3#U6IVABK9)w?d4u0up_@xb`@Y-F4U-}4sX+CMZhDS(iiQ~v)o99d4
GWCQ>bvvXkp
diff --git a/tests/data/acpi/pc/DSDT.bridge b/tests/data/acpi/pc/DSDT.bridge
index 56398fc0147c9ab9d59947e24cddb08380b6a13e..e04b5b2035fb665b1e75075d4c47776a51fa77e2 100644
GIT binary patch
literal 9078
zcmeHL&2Jmm5ue8oY57P>OKNS&RvZ(ujW$hTla#-L0)@z3N}?rFYcA!aSfN~!3QD;K
zvT&jzvS5^^3r8_fpeduGhaMP%xmw2_TcD@j{3oP`UV2Q?*q26~+2x~TN>1cG^&kOS
z?aaLQo8QcPZ{DmlLo5I4902=oc1fK#65023HGw}20O+0m%K5+wm`yD^S7BjafSC`%
z&O1J`lJa9MyFADK*s%U!Ss#63v8oNVC-Qc!YCqhvYCwb5Yc}WfB2QI}Y{hI%>S{hI
zRp#?rB=d~>rAkICfmB(}Yaq{_x=4d)gxShZ<c&<lu}6?3vd}LlRUfx_z-(P!$ZBYF
zQT&Kvlrwx(s;DI+Ho;HKF$*kUY>utMD*m1F!3LPE^M$45{;bilmu5*kI0Z6|%1E=C
z+NU^-<Op?=Pt38e{a^bbFvp(zpZkGL&A^WW4sdFAQO}4_X0?1gAp;NcC7xt_hx_;i
z{EhQTzRU0MZ}=#eq{^(8i;Z)IlDz-Nhl1HkFY4u#2ruBKhrL8s=FvI!vHxSgBuzCP
z4rz6%(4P~;(U{Uh=DhH~@PjlZJ993S%4$C$;a;Q;v<)^eX$sf|$cxI}vNUzoD6=p;
z<&yb8CPBsJT2A0YOPEa~cLO(y^c2_VL6`(Jo6OxnL$+8bv9Rn;BSFm;mkS9!uf3Nr
zS$0uf0Of+N=5F}Rb0qEV+6@|EZ?H8W4D$!1?t=1m2Im|$im+^YSiP~9k`3vaQHXZ5
zq4sUCV}1sf4b{%+-?tmFF)ly5_V<4pSMC))8~<0~)Zf%X*Xj&!uW?`3vdPKAtvdkt
zU{J#;_uDmS*CM<41NW<}dcV5C_%KxM>Xrq7Q!lh{^I<z4^g$He3;@_Qca&VbN?TlB
z;IzvXjaT$i8SJ>PNz9&PL)%r}wC`294{G-2-D(ZEAL<>sUB^M80Kj5#L4(!K`F5Rk
zV(lsq^wkEeei7|U85|UA*SW8+$@Vn<zD9*r`~F6a%Miw(wpIb`%_{oaT4i9bZdp}W
zuXZi-!TC#mVoT?d&LGoEH<J=RQuIjEV_H(i@;7m3bV8fF*?=w&b$M91n!l-*LO7t5
zjE(T{r$Z2OHv9%WCLIsrGv5hsH!$V~y?04%wibsmOgvET`HtYhruraZu8i18KKAJd
zg#1A~DI9;p_`3nhD3t){5(%QG#41|efcx~$n~r9b&M}QpOO8BVF-it|+;Cag<ev0B
z@7V$Gc$ALpJ+;q!%JH5;e*3+rl*7HJ%vOP7R|mXv-)p!}?{lAa+@}ZJr(fYd-E*%E
zy2lE8<mjjOxu162PY<}CeuevKv$Yh!=#4@50oT3QLLqm_L++B}J{xitTM4^4CaS2S
z)s+iaHR;;PN%MNHEN~gdLp#cB&g<m@;QjLK+c03wl1U!Bl`Coqy`)tV3Z7QnRyJuY
z+#*_~de7pr)rox8wxDg{x#>b@<g<1aKCedLAO8t<aqssoq8J}}L{t$R@Z@48UHYlZ
zW}dHH@{6lZFXj3H^C5>=RMnRg^B;U<-&y}f;_mw&ez1PG{{DwxGF4w(=#}Xx=W`5p
zV24HU*1|3B)a4x>F(3SpgbXB9Jy&FEzGyJDRJg^kx+du{%fPRy1q~~BoJRUpBe$5q
z;aaAgP$HFlF)!IbO56_9D^Br8LN3W@M%DAlWGYEC+)F&D#MJWa&wL%;ZonfonM|%J
z^Fw$wWJ2b-l}myBfl>fe+XvO?%m%A-x;<#15Ntk*HT{5PaiMD|g&>9XdXCs26e1jo
zugsoQ4Yeq}A`D3_=H89_c5SHJZ1ss2Z?7^NYbtYU`C{aEZHsN!QDxcnL6=UzgGyYK
z&iMAA7MG>|WhaEieiz+*X&+|C3t>=A>u%S#h$9tpWc9_h&XohhoSlKoSLc5FKw{8{
z^VaLs*yRFlXGefFsMC^TY;`krcyI@>kk5MU@H7`f>XK28yduqq@0J7jm^^!JFbSAD
zoBIZ}H1zhM5{Dkj&U|>C_B0)206ZSJuca>SZae{nOgR?j5=hjcqIIN#afB%tXsq2<
zCh_ph>A6ZSnTFnpr-MX$N?r<($*D-aGnKpw$~!nV1(b+>eQ?{MeF|MII!s?0A*+ge
zQt764Th<xQ|FjhaAC@=#*`)_|#4jQ*B1}R(i}*?P9L+BxeL0Gq0KmUL83%Cfbj$AU
z(k)9rK5#6eZIyO+|MIPC`Rg~2-`<<!>S!4DOTQMwT`e@}FSXig08`+$+EKlzCo`A=
zw*ZoUU*&Uq->@5(Q~AEy`D%v+2;@dUpVv!nB3}l<R2))84`RVnc*-WQKEJhs?v3e6
zd?>(>GrnK0#H9ds@7R~4bcHNLUjE5mvdz}T*>}}hm%z<jVHr0|nnvR%$$rLiP!3Y9
zmVaAeD^wHZ-&B~hT3IXx7|10fnRGvRK*|`)MNrOEuzii#aqgobq_euz(c<3vrDe8e
zf<~%00~gWf&f>oBo~9tPlm^&I<4an+Ow)_m(*A6uuDcu%5kC~jC-;9hqD15vt)?3Q
zQFlLvlz4^i9O~<7Oa(0iP^5Y(ra1&52B^oD3qKB#2Llg4^8q(G2t?hJi{$f))T7k<
zV0CiijZ>Nyj5uLW<8lgk<dhbif&wY%5oua*!tTT6G~^XYa2gg!!yb_?3r_g0>~fO4
zA_-0*ffVwHbVYFD0*QM?5}dF=xY30@B3%`nA_6Jm6-jW43Z$q<q-%oHh(H?giX=E;
zOYP=q)FaY$!ATZKvR5R*DJGC&9+BP=oZ<p0?iERJ!hdSHc^dPGlo6cpdT@~xuSkN^
z34wINBT`myIw_D&dPNeP#s$*2M<i8nnh;16UXcW+Qv&IfM<h*fIxUb+dqonQCI!-@
zN2HwK^oBrs!z+^DbVeYZ@rX1lIK3&5-t>wjIGq(pXI~#lDW1`870bR(c(cLa5j9b3
zoycYbn@$w2_k;in*zLI%i3DMhQNXsswIoOomKhZAa(69F637zWY=p6=dSu`o+mp!C
z<-Uzv;a%6Wk*_O#8#%)}r)MK?SNk?{hqb?FBY)S(HoDnxnmClP3JV!KYLxfv*jGO?
zup$aOeo~>lXO~IF>Llz5N8Yo~kc^c=*qe^LXLlmTQ!DJ)FF!KWeRhf(Pf*`ZacleR
z6glqZzCA(mKKl&HxU>59Cdp`5&e8`P*o^+4O$&`Z|1#^nXxwkMuvI;73$Z8uzHbA}
z({WpPv^*WRg-6TNaa(w_JRP@%N6XW3TX?iQ9k+$wn<r)AwA&U^D|p=FQ4jh5+vC0E
R_IU7$9`ENDsa>Zr{{!R>?|A?K
delta 2214
zcmez7cGj88CD<k8tRe#gW9&vQc_t=5!O7Z8JL+B70$hT9`4;%FPR<Y%<`TGIe)4Is
zX_fCp@mIc*hn;;396enka&i+EC{NB}SRgq$lZ$DA@TA(w2@I1Hc>V(c!xBMe#zqjq
zuuyz~=;SOe_5vYRCI()H#Dav5L<WW>i2{CR@xe~<0^VE!&YlJ$E?n^eK_LtULQD+_
zn<p^8<g9P<V2lB)=yYcUDdBJmcJ*P1Zqf`kFo@@fcXSD2;BX8M^<xkbj|aMzX9>v7
z8JStxAax*#=q4|gU_+={9tH*`h<Yw2TpC0;;)4xc7?v=A7?WA}1T1`41shsGECU+A
z3^jlmmjPfWGDbJqOb+H#k;3Avc(Ah^Cr{_o#4YVK`2n96K4~p}ywcs0c%}E@*DWuF
zS9d0U={W*;b^pb$+dvSn?upWPrElYx<`crJJ6{H`^iKTJZ}1!LD~s3g24TF?5Ao~P
zmcy$%P6V&?e*C&Q<?-sa5ydM#7r*Wc_;nj9;5ED&zw|mWyt?@n@k&Q3YKh~>z?(b8
l8JQTJCXePblp+^WwmD56&1YDHWi+2*4HkU)Y=Po6MgUdmwrT(X
diff --git a/tests/data/acpi/pc/DSDT.cphp b/tests/data/acpi/pc/DSDT.cphp
index 38cb47c675edb6d4797b008d2deae656739230ef..3e8a202b0f32d585b38d4f8c85247124de5ec73d 100644
GIT binary patch
delta 1368
zcmdmNG~0yBCD<iIT8e>zaneREc_t<wk;&RjJL;V{16+cAc^9~_P0nH{5M*X#NGM=P
zTp%@Ra)zKVm%s({lTU+9t9&Plzw(tl?CiTFVFCNpOfIG+2?dUxE)mTgISdRyf{`H!
zsHJvt62s&qp8r6=P@Bk@SesbM$i>c(SdiF}z`y|1syaD~i@iXIm5G5DXbs2!VI&g@
zk|4@9yE9+m_H<es6CdmpFW|K%z}eG)!ztL+hatL2KiI$^o+IATC5VB;F*wwZK}0ql
z=zg98AucA65|CKJ5|EcNGPAN1qMIC8C&%%N$>LQtxtm{>(PQ#Tek}!5b@Aw?c}#vw
zj3Pq;B1|eJM$t}U6#XSek)t3HZfYe)(Me(y@d^=PT_7=vrV^v*CNYX+g^6%eA~A}V
z5~JuPF^Y6Wh;UOOF^aYlqv$6wifl!Ra8n~OijESah*OLR>wJk(G?5rZSBX(1DXxW9
OW}uY?o1?^UG6Dd56QI=q
delta 1204
zcmbPjve}5sCD<jzSdxK(@$yD4c_t=5!O7Z8JL+B70$hT9`4;%FPR<Y%<`TGIe)4Is
zX_fCp@mIc*hn;;396enka&i+EC{NB}SRgq$lZ$DA@TA(w2@I1Hc>V(c!xBMe#zqjq
zuuyz~=;SOe_5vYRCI()H#Dav5L<WW>i2{CR@xe~<0^VE!&YlJ$E?n^eK_LtULQD+_
zn<p^u<gWKv7z0+|un?qx!ztL+hatL2GuXf&o+IATC5VB;F*wwZK}0+r=vJO3AQxw3
zW@Urafh3}vyjX$_p=x;;7?>dHxtMTi5aEaqHgsWF!T@3zx$r|-#vq~SCa1}d`L(35
z*cA`9%W1N%0AA^G{L%;UOLGh2H9Qo*^nCo%FY!wo3*oi97Qggy{L+HLcny!nFTE7M
z^n3i$mLhoVZpJTt7QeK(C|<)8@k_79FZ~t2w7nQ!yF2kqU&b#jD~{Ljbo|mA@k{>}
P*AmB($2L1j+++j*x9fJ^
diff --git a/tests/data/acpi/pc/DSDT.dimmpxm b/tests/data/acpi/pc/DSDT.dimmpxm
index 06a7aa59465238bfbf715ae83540f68b1f2f3ea5..f7d6ca1448cf0ae3c609fc1e1391cccc2d7221fc 100644
GIT binary patch
delta 1387
zcmca<ebAQ6CD<k8pd14OW6ee`c_t<wk;&RjJL;V{16+cAc^9~_P0nH{5M*X#NGM=P
zTp%@Ra)zKVm%s({lTU+9t9&Plzw(tl?CiTFVFCNpOfIG+2?dUxE)mTgISdRyf{`H!
zsHJvt62s&qp8r6=P@Bk@SesbM$i>c(SdiF}z`y|1syaD~i@iXIm5G5DXbs2!VI&g@
zk|4@9yE9h_)H|(>i4S&)7w}pW;OuF@;S}uZ!w}u1A8cR{&k^tF62!pa7#!-yAR-$N
zbU#ml5Em0j2}mqq3CK$snOWHh(M=Al!G=&BJPZs>5M5kM__c{}#7{O6kz(|i>@T9F
zfNDcLx(yzaCljOSIx&i*MTxL3o)|@oiBa^N7)9D*M7SxR7)6_jQS_Y{Mb_d(xT&5P
zMTdz|#4bUEb>74%>L*6gWnvVGOA_IxXkrx2Cq~g@Vic)M5#gq6Vic_>M$u<t6q!pC
V;ihV06z!MRlEqsVY?8Uj2mtE`q*wp|
delta 1194
zcmX?Td()cBCD<k8rYr*k<KB&2@=Q#Af|IqGcGSDD1-JzJ@-6UTotz;k%q4Ka{N&SM
z(<<MI;;(!q4?Fu7IC{E7<m4tSP@bH{ut0KhCKuBJ;YqcV6Bs5Z@cah?h9!c`jEx|I
zVWIc}(aBj{>;*!sObomXi3JHAi3|)&5(WIs;)9*y1-!WeoIMRhT)5%`f<hPygqRu<
zHcw!V7pV7G7z0+|un?qx!ztL+hatL2GuXf&o+IATC5VB;F*wwZK}0+r=vJO3AQxw3
zW@Urafh3}vyjX$_p=x;;7?>dHxtMTi5aEaqHgsWF!T@3zxlFDS;bU}~+$o|Zg~f(=
zunkU=FXNY%6~(JN9l!KO{L;ViOS_8UwYwj`^iBNI%Hntp&&4mj9ltcA1YX0v@k>v|
zFMS`sw5B9pyNmHl@5L|8E``_dK>X6P@k>9&FRd?)*X~OE(ueU&^UB~gJRHCDLK!V_
M9C>W>3z?gY07V3KG5`Po
diff --git a/tests/data/acpi/pc/DSDT.hpbridge b/tests/data/acpi/pc/DSDT.hpbridge
index 798349aa3f85e0803396471237e94604d00a1f90..aebb29c2a4ae67b732bef3eb8e72c5665bb3a7b3 100644
GIT binary patch
delta 1385
zcmX@4x5|LaCD<iIOM-!c(PSf+JQI_T$YgD%9raF}0WQJ5ybD~|CTB4e2r@G=Bor_t
zE|8iuIYUsGOW=a}$)~}lRlXC&U-?QNcJ^J8uz-DPCKuC^gaSuTmx$($90mp;!N`yV
z)KWV+iD7aQ&wn6bs7+){tWB(B<YH$?EJ*A~U|;}hRh^v0#a<x9%EZ76v<75=Fp>!c
zNf2e5-I-aqJRMiZ#0NXY3wW*yaP~Cda0+(yVTf+h4>mA}=ZJT731Z-I3=Z{U5Rr`s
zx}T>&h>HoN1SFQQ1mvZR%&hE$=q3l&$$h+HvUpWZ-pwm(ZW3&00Wq0}fq@xfIu|n`
z<2@#G@@XlcnjVkt29L?U#3-6bjH0W=D3atS!cDQnC|XF2qNl_t(i9-VO}WG<+DMF|
zuf!;_6ePk;wZteoNQ@#@AtJ2vBt}s$F^Vn{qexVk2scF%qi8NMiXIZ9NL7RgH)Rr|
aXe}{{J`$tIR8$MC5JAi4o6AJcFaiL0S)o4w
delta 1221
zcmZ2wa7d5KCD<jzNt}U!F>NE4JQI_j;ACy49rZ430WQJ5d<%S7Cuax>a|v89KlwD+
zw90p)_$yz@!_K}1j-D<NIk^c7lqY8~ERdX>$;Grlcv9`;1cu28JpX}!VTm9!V<U)Q
zSSY?gbaECKdw~!u69X?pVnISjA_K#cL;*ju_+Y1a0dKAVXHNqW7q0k#pb&-vA*P0e
z%@deka@M=gj{z(2p9fOF;S}uZ!w}u18Ejw>&k^tF62!pa7#!-yAR-<QbSuvikc%@i
zv$8?zKoZeSUM#_eP_;Y^3``L9Tuit$h;YOQ8@ezoVE{3VT<oDNV~|jElU}f)1;k#U
zS<Fzgm~ojE-Q+aclTS+ui`(MCZgZME8Nc*h{L<?DcnvSaFTESTG^+q!!~O9~&%`hN
z7{9cxAYQx6@k<}XFU>84*YHsM()004zr-(XER5IgTKv+-@k<Me;59rNzw}c4((mz0
bTZ-bfyBWXqS^U!CVp`%jGSTKZu``SSlAd?5
diff --git a/tests/data/acpi/pc/DSDT.ipmikcs b/tests/data/acpi/pc/DSDT.ipmikcs
index be7f22f1c29f25351bcb5620dcfe8f955bd083d7..a7b4760817e07cb36e13c835d04abd7bedcabe7a 100644
GIT binary patch
delta 1410
zcmZ3jKiQDWCD<iovIGMI<F<`l=}b&MB9n`mcGNp@2Dk+K@-A>;o1Dc^Ajr(fkWj#o
zxIk*s<P1S!E`bZ?C!YqJR{2g8f8{HA*x7eU!UFcGnOsau5(*qWT_T!0au^tZ1S3Nd
zP)qIPB!<aJJpX}!p*E2*u{N=ik&B%nu^_P{fq?<2RdsR}7khyaD-#1R&>D~d!bm0*
zBtevI?q_D<s&`r&6CdmpFW|K%z}eG)!ztL+hatL2KiI$^o+IATC5VB;F*wwZK}0ql
z=zg98AucA65|CKJ5|EcNGPAN1qMIC8gAJiNco-O%AiB7i@M{y{h?fpFbYWP+0AvLl
z!5GFMMs$<MWJNwL1yp<E(e3q^oJx$MmBc7|ON=5zej?mdN{phN#3=epj3P$?BHYwU
zjG~joDB=|)!n#0W6ip>Y(M@6$$qEtSrbJ>CEhR?LOJWr13KQX`LShtcB}UOtViehm
i5aFgqViX-EMiHkd5!U$<qiCY2mMq?~VDlx>n~VTXH>qd<
delta 1167
zcmbPixLTjfCD<iowKxL<<M)kR=}b(1f|HAxcBHtl1-JzJ@-6UTotz;k%q4Ka{N&SM
z(<<MI;;(!q4?Fu7IC{E7<m4tSP@bH{ut0KhCKuBJ;YqcV6Bs5Z@cah?h9!c`jEx|I
zVWIc}(aBj{>;*!sObomXi3JHAi3|)&5;yN<X5p&$SQrx@>=ZBHurR>c(}2S%*wu$2
zx=AzGz#yI@-q9t9fx|I4)Q>?#JRayEo+Th>Wn^Y$gVcc}qMN)}f(@Z+c^DX&AnLi8
zaA^?Xhz~Y&VOYWdVi>th_Tl4WbebH^rzM5OhIp_IPLr47mwu05+L9ly;m!D^&*GOB
z7r<+HB7W)B_@%$%m$nzgYj-Dp>C5<~Wrgq>o{nF7BYx@M_@!Ni@!H*wU-~9~X=M?-
qhUem!-i}|IQ53J?-uR`b;+MXUUs_WPuieFBTH-kJ*ydegHyHsB4Q@aH
diff --git a/tests/data/acpi/pc/DSDT.memhp b/tests/data/acpi/pc/DSDT.memhp
index b81e3dd8ecd89f4690d69a90096df095fe218425..63fdfe8c025f8b2f19411792817cd21b506fa984 100644
GIT binary patch
delta 1387
zcmdmFIm?>MCD<iomMjAUqryfmc_t<wk;&RjJL;V{16+cAc^9~_P0nH{5M*X#NGM=P
zTp%@Ra)zKVm%s({lTU+9t9&Plzw(tl?CiTFVFCNpOfIG+2?dUxE)mTgISdRyf{`H!
zsHJvt62s&qp8r6=P@Bk@SesbM$i>c(SdiF}z`y|1syaD~i@iXIm5G5DXbs2!VI&g@
zk|4@9yE6y#*E_9^i4S&)7w}pW;OuF@;S}uZ!w}u1A8cR{&k^tF62!pa7#!-yAR-$N
zbU#ml5Em0j2}mqq3CK$snOWHh(M=Al!G=&BJPZs>5M5kM__c{}#82iGmSXgntRbwW
zfNDcLx(yzabBIy2ffz+!h*4xALWG-Yh*5Na7)30iL|ErRjG`W56kQ-jk%$-(Zi*mA
z(HvqFJs?JriZ~H&${<G38e$ZEAV!gi1QBkkAV$$1A{0%MB*HcqVia`{qv#AViUg#H
Wa8n2|ie^Y@$>J>vHs6%G$p`@bk)nP8
delta 1186
zcmbPby~&cxCD<iolMDj`W8y|Gc_t=5!O7Z8JL+B70$hT9`4;%FPR<Y%<`TGIe)4Is
zX_fCp@mIc*hn;;396enka&i+EC{NB}SRgq$lZ$DA@TA(w2@I1Hc>V(c!xBMe#zqjq
zuuyz~=;SOe_5vYRCI()H#Dav5L<WW>i2{CR@xe~<0^VE!&YlJ$E?n^eK_LtULQD+_
zn<p?^@H=}fi~%cfSO`+U;S}uZ!w}u18Ejw>&k^tF62!pa7#!-yAR-<QbSuvikc%@i
zv$8?zKoZeSUM!OZg~d#9$cu2q2OGLDEMWjKj9?675F@(DX>yXVmJ}A9@nDmkCa=LS
z{SCjgg9u*3yYNe2!7nW*ir4TA{L-87OaH+y?IwoT?g{v%Z{e3#5yxwI9)9T^_@$X7
z@EY!eUwRsT=?D0wwIuP{U4mbFAAV^LDZGXU;g_C+U-}t-X#;7zc2`MjiQ~v)n-5Cg
GWCQ@s6m!7<
diff --git a/tests/data/acpi/pc/DSDT.nohpet b/tests/data/acpi/pc/DSDT.nohpet
index cb7bf7d850f340e12a7237c987f570300fd9c92b..281b0955ca223a1bd2c24f5e58fb8b73ae37a957 100644
GIT binary patch
delta 1367
zcmcbryH}sfCD<iouQ&q(<ByG8@=Q!VB9pb5cGNp@2Dk+K@-A>;o1Dc^Ajr(fkWj#o
zxIk*s<P1S!E`bZ?C!YqJR{2g8f8{HA*x7eU!UFcGnOsau5(*qWT_T!0au^tZ1S3Nd
zP)qIPB!<aJJpX}!p*E2*u{N=ik&B%nu^_P{fq?<2RdsR}7khyaD-#1R&>D~d!bm0*
zBtevIc4sc*^mJMq6CdmpFW|K%z}eG)!ztL+hatL2KiI$^o+IATC5VB;F*wwZK}0ql
z=zg98AucA65|CKJ5|EcNGPAN1qMIC8C-I8O;#D+Rmsgh2W3o4|mIA7}cyz-&CifGg
z=rS>i#QBJ@E}9rc^NCUPm>5Os{6x4Zn;1pwiBa^K7)9m+M7XJ%7)ASuQN%1rgmv!3
zDC#Cg(RpGN2@4V7rf^~u%_c_CePR?T3lrg{bYc{(CPvYFViXyR5aFhBVifHb(LyUT
N(8_|%e?)FF0syVjpr`-<
delta 1194
zcmdn1e^r;uCD<k8su%+Uqvb{}c_t=5!O7Z8JL+B70$hT9`4;%FPR<Y%<`TGIe)4Is
zX_fCp@mIc*hn;;396enka&i+EC{NB}SRgq$lZ$DA@TA(w2@I1Hc>V(c!xBMe#zqjq
zuuyz~=;SOe_5vYRCI()H#Dav5L<WW>i2{CR@xe~<0^VE!&YlJ$E?n^eK_LtULQD+_
zn<p?wbJlw-i~%cfSO`+U;S}uZ!w}u18Ejw>&k^tF62!pa7#!-yAR-<QbSuvikc%@i
zv$8?zKoZeSUM#_eP_;Y^3``L9Tuit$h;YOQ8@ezoVE{3VTqc+C@-aG1ZspaI!eT=_
z*aoM`=kZHR^5NB;j9+>!e(CS{r5*Y4+TD#``YL{Dc>%nJXX2OMj9>aMerb0>ymn8-
zFMS)ow5kwZ!}IY=@5C?7ER5H1U;NV3@k>9%FRd+t*X~mM();mCbBf|MJQ%<9Tv07?
M9C>W>6VaQD0Dwkx9smFU
diff --git a/tests/data/acpi/pc/DSDT.numamem b/tests/data/acpi/pc/DSDT.numamem
index 230aaae37169ec2f78ebeae735ccc905a112d284..34914bf1ed362ebd07f0dbc22434dfddd26d9a82 100644
GIT binary patch
delta 1388
zcmaE<chP{$CD<h-P=bMh@y13jc_t<wk;&RjJL;V{16+cAc^9~_P0nH{5M*X#NGM=P
zTp%@Ra)zKVm%s({lTU+9t9&Plzw(tl?CiTFVFCNpOfIG+2?dUxE)mTgISdRyf{`H!
zsHJvt62s&qp8r6=P@Bk@SesbM$i>c(SdiF}z`y|1syaD~i@iXIm5G5DXbs2!VI&g@
zk|4@9yEAif)jO??i4S&)7w}pW;OuF@;S}uZ!w}u1A8cR{&k^tF62!pa7#!-yAR-$N
zbU#ml5Em0j2}mqq3CK$snOWHh(M=Al!G=&BJPZs>5M5kM__c{}#7{oLE5+zB`980f
z0;&!1=r(vvR^}r@Q93b-RuiM>Ju!-m`H65-IWdZM6Qk%qF^Zf8h;UOoF^WzTqljOS
z2<w80Q8b+xMYoAjBrimSo05r9w44}4uZdBlFHD4+iiuIQoft*GiBV)PLWG-|iBWW%
X7)9KoL|Er9swIoJEZ96j^d=(!3GJkI
delta 1194
zcmca;@KTS<CD<h-Q=EZ;QF0@fJQI_j;ACy49rZ430WQJ5d<%S7Cuax>a|v89KlwD+
zw90p)_$yz@!_K}1j-D<NIk^c7lqY8~ERdX>$;Grlcv9`;1cu28JpX}!VTm9!V<U)Q
zSSY?gbaECKdw~!u69X?pVnISjA_K#cL;*ju_+Y1a0dKAVXHNqW7q0k#pb&-vA*P0e
z%@dg4bJlw-i~%cfSO`+U;S}uZ!w}u18Ejw>&k^tF62!pa7#!-yAR-<QbSuvikc%@i
zv$8?zKoZeSUM#_eP_;Y^3``L9Tuit$h;YOQ8@ezoVE{3VTqbkz@i970mgLit!eT=_
z*aoM`$@rz$;+Ou8U)qr$uif4FrLW?bmKVTlcqV@7&G@DN;+J+8#B29N{L;7aOREau
zH9Q}`^iKTJ%))pL_r)(g9l!KL{L<PYc<nC5FTEeXG^Z$D!-Mfl&&4nO9KW=on3gz>
LJhr()>?R`sl%I1@
diff --git a/tests/data/acpi/pc/DSDT.roothp b/tests/data/acpi/pc/DSDT.roothp
index 7091ee019191d822869f9a9f35ebd635eea4a9eb..bba1612c972948911ca5f5b301b10a380b8d83b7 100644
GIT binary patch
delta 1407
zcmdmNu*itZCD<iINs@tqF=8W^JQI_T$YgD%9raF}0WQJ5ybD~|CTB4e2r@G=Bor_t
zE|8iuIYUsGOW=a}$)~}lRlXC&U-?QNcJ^J8uz-DPCKuC^gaSuTmx$($90mp;!N`yV
z)KWV+iD7aQ&wn6bs7+){tWB(B<YH$?EJ*A~U|;}hRh^v0#a<x9%EZ76v<75=Fp>!c
zNf2e5-I-aqxIA~o#0NXY3pnnY9Lj4i<-aA^&?25A-q9t9hk=2afx{`-)rTRv$(d#H
zT3!_e*?6EYcnXBLm_Xw3!J&Q$OF$mW$jr)4h;DM9{F+yjkRp%CdVE@h6%`SqXd5w#
zei5U{j-LoOH4&re7%_^t1c<QCj~GRhh*5Nn7)4ToM7SxA7)6VSQS^)$MOs2cxG9eq
zMVp9G^o<xrR>DNMsg4*$hlo+cCPIXDUc@NsBSz6BVibvq65*yOVie6IM$sctEm^!p
K&t_#Y0VV)Uf2(8w
delta 1194
zcmZ2vwAp~mCD<jzSb~9pQEDTXJQI_j;ACy49rZ430WQJ5d<%S7Cuax>a|v89KlwD+
zw90p)_$yz@!_K}1j-D<NIk^c7lqY8~ERdX>$;Grlcv9`;1cu28JpX}!VTm9!V<U)Q
zSSY?gbaECKdw~!u69X?pVnISjA_K#cL;*ju_+Y1a0dKAVXHNqW7q0k#pb&-vA*P0e
z%@deka&mdBivcTeSU0(u*Iv?ZMX;eoJV(5vOArqO12Y4MQ?RQKLv)kP<U717QsVJI
z2lFfeIXfdWD;p#i9~|lz-Q+k~flm{+wA18FJ}rFGoAFEk#V_s7kJs>t_@!^-msS<P
zYj{3>>7DqcnFaA0?u%b~I)3Sg_@%Xl@Y-F9UwS`&X-;9hh6m%9o{L}lIeuwF5xjO+
r<Ci{)Uz%SOui=sSr5EFuev4n)Tnw+>jrgTci)o4D$iSP0#08iDx-NI%
diff --git a/tests/data/acpi/q35/DSDT b/tests/data/acpi/q35/DSDT
index a85c608022b9e0878bcedc785b9bdf27e50a760b..3870958969b1c0e29f9dd26a1256359e90897d3e 100644
GIT binary patch
delta 179
zcmccQ(BR1B66_MvpuoVu=(Le5o{7mvWO6psj(R7~0GD82-UTjfld~8K1eqBb5(*d+
z7f4N-oFOR8C2+y~<kMi&D&L9XuY4sBJNqt4Sin9tlZ$CdLV=^FOGI-=4g&*_U}Q)F
zYN?%^#4tID=RXiI)Fv_})+Sama<MZc79@5gFfahMs!q=0VlNP4Wn$n3S_3jb7|Dc!
MB#5%j?aZfT0OS!lX#fBK
delta 159
zcmZp0yyU>;66_KZq`<(ycx@wBJQI_j;N)zk9rZ430WQJ5d<%S7Cuax>a|v89KlwD+
zw90p)_$yz@!_K}1j-D<NIk^c7lqY8~ERdX>$;Grlcv9`;1cu28JpX}!VTm9!V<U)Q
zSSY?gbaECKdw~!u69X?pVnISjA_K#cM2-MYXEz2Bo_HY5SdanY3G_uW#s@paZ@$31
GK?VQ|Y%)&(
diff --git a/tests/data/acpi/q35/DSDT.acpierst b/tests/data/acpi/q35/DSDT.acpierst
index f768380c1c2aa8fcd6ff6bc1048e0ccd2037eb2c..c9c18fa4e45288fb6c2182a793a8e6aff72b33d9 100644
GIT binary patch
delta 179
zcmaFtFwv3ACD<ioq5=a0<D-pS@k~rUB9pV3cGNp@2Dk+K@-A>;o1Dc^Ajr(fkWj#o
zxIk*s<P1S!E`bZ?C!YqJR{2g8f8{HA*x7eU!UFcGnOsau5(*qWT_T!0au^tZ1S3Nd
zP)qIPB!<aJJpX}!p*E2*u{N=ik&B%nu^_P{fq?<2RdsR}7khyaD-#1R&>D~d!bm0*
NBtevIZfCwD0|0JNI!yoo
delta 159
zcmbQ}_}GEVCD<h-S%HCpv1}t(JQI_j;N)zk9rZ430WQJ5d<%S7Cuax>a|v89KlwD+
zw90p)_$yz@!_K}1j-D<NIk^c7lqY8~ERdX>$;Grlcv9`;1cu28JpX}!VTm9!V<U)Q
zSSY?gbaECKdw~!u69X?pVnISjA_K#cM2-MYXEz2Bo_HY5SdanY3G_uW#s@paZ@$2M
GPzC_>5i&CX
diff --git a/tests/data/acpi/q35/DSDT.acpihmat b/tests/data/acpi/q35/DSDT.acpihmat
index 51e79b3b0754224aa6cd1e1257b404182506f1d1..a32e90b5d913d07bc9ed9aca521420305559f357 100644
GIT binary patch
delta 179
zcmezGwbq-<CD<iotttZp<Nu9Z@k~rUB9pV3cGNp@2Dk+K@-A>;o1Dc^Ajr(fkWj#o
zxIk*s<P1S!E`bZ?C!YqJR{2g8f8{HA*x7eU!UFcGnOsau5(*qWT_T!0au^tZ1S3Nd
zP)qIPB!<aJJpX}!p*E2*u{N=ik&B%nu^_P{fq?<2RdsR}7khyaD-#1R&>D~d!bm0*
NBtevIZfE|X2ms6HI`{wp
delta 159
zcmZ4M{ojkrCD<jTUX_7?aq>p4cqS%4!O7W7JL+B70$hT9`4;%FPR<Y%<`TGIe)4Is
zX_fCp@mIc*hn;;396enka&i+EC{NB}SRgq$lZ$DA@TA(w2@I1Hc>V(c!xBMe#zqjq
zuuyz~=;SOe_5vYRCI()H#Dav5L<WW>i5vl*&Tb4MJn=x9u^<D)6X=U%j1P8--+Y1j
Gt|9<N?=s#1
diff --git a/tests/data/acpi/q35/DSDT.applesmc b/tests/data/acpi/q35/DSDT.applesmc
index 33ca7ee26fee6718c72dd63374bea98e858066c2..5507b6b8f5e6ae4fd4275601eb85caf29bddc352 100644
GIT binary patch
delta 179
zcmZp0T<6H;66_MPPJw}e(Rd?QFB6lG$mE$!JL;V{16+cAc^9~_P0nH{5M*X#NGM=P
zTp%@Ra)zKVm%s({lTU+9t9&Plzw(tl?CiTFVFCNpOfIG+2?dUxE)mTgISdRyf{`H!
zsHJvt62s&qp8r6=P@Bk@SesbM$i>c(SdiF}z`y|1syaD~i@iXIm5G5DXbs2!VI&g@
Nk|4@9Z)H9$0{|KaIqv`f
delta 159
zcmZ4I*x<<J66_MvpuoVuczh#QFB6lW;N+Q1JL+B70$hT9`4;%FPR<Y%<`TGIe)4Is
zX_fCp@mIc*hn;;396enka&i+EC{NB}SRgq$lZ$DA@TA(w2@I1Hc>V(c!xBMe#zqjq
zuuyz~=;SOe_5vYRCI()H#Dav5L<WW>i5vl*&Tb4MJn=x9u^<D)6X=U%j1P8--~5kx
GgA4#WaWd5a
diff --git a/tests/data/acpi/q35/DSDT.bridge b/tests/data/acpi/q35/DSDT.bridge
index 40457ec74d272f4ce971b66a1b19a397ed9af770..d03e14b24d0841b4003e7954b70cd7601e571902 100644
GIT binary patch
delta 1390
zcmaD8dOMuUCD<k8wl)I;qufTWcqS$vk;&OiJL;V{16+cAc^9~_P0nH{5M*X#NGM=P
zTp%@Ra)zKVm%s({lTU+9t9&Plzw(tl?CiTFVFCNpOfIG+2?dUxE)mTgISdRyf{`H!
zsHJvt62s&qp8r6=P@Bk@SesbM$i>c(SdiF}z`y|1syaD~i@iXIm5G5DXbs2!VI&g@
zk|4@9w=>tuaCz>Ei4S&)7jWD)nNPu<$$!gae+4lnXO_un3MvY+@jyrO6bNxKIR(4=
z#0Q7^B`g8?BO@~_J0ZHseex0oO+t!1CO=ouBCJSTkqAZk#3<TKjH2(vD6&=}!cFzW
zC^}4xB6ejWtn(&DQ9m(?E)%0jT!jcXMH8cFJ~4_O6Qf97l?XRw6QgK7F^WDDqsUy1
w2sc#|qi8=dikQ`ju+E(rMcu?GI!}xuVGSbO6i$qy*&151c#EFRcQgc;0IdwHng9R*
delta 1193
zcmcZ|{w9>mCD<k8jTQp~<AaS{@k~s9f|IkEcGSDD1-JzJ@-6UTotz;k%q4Ka{N&SM
z(<<MI;;(!q4?Fu7IC{E7<m4tSP@bH{ut0KhCKuBJ;YqcV6Bs5Z@cah?h9!c`jEx|I
zVWIc}(aBj{>;*!sObomXi3JHAi3|)&5;+1qo!uBjc;bOHV?hRpC(swk7$58uzxe`l
zk_?x}x)=~gz+v5F8wGnwzZJoT2Jsy6jxIqw3=B*R98STmJ`B-KHj}3+s7Q&&10Bq>
z1mx_D%&csXTzqh-Uv!h><eLhbxTT#YD=BK>lg_~}y$!GQBqh9Nd*PR!f?xU`erXM5
zymlAim)?V4noR|-;Q{!iXW^HAf?rxs6|dbD_@xiwm*!E!Yj_xb=>_<uU*VTFQO9d{
p9e(K(_@#w3@ERV2UwRpS=@0m&tu*o4-J+=_jwAnWKCLOh1OP7veAWN}
diff --git a/tests/data/acpi/q35/DSDT.cphp b/tests/data/acpi/q35/DSDT.cphp
index fe87e060d5cf41b20cf1a37928ed31ca9b15ed66..2d8cb603c9c937501247d32e6a5b2e79bb01eea3 100644
GIT binary patch
delta 179
zcmZ4Fa>0emCD<h-K#75YaoI+$cqS$vk;&OiJL;V{16+cAc^9~_P0nH{5M*X#NGM=P
zTp%@Ra)zKVm%s({lTU+9t9&Plzw(tl?CiTFVFCNpOfIG+2?dUxE)mTgISdRyf{`H!
zsHJvt62s&qp8r6=P@Bk@SesbM$i>c(SdiF}z`y|1syaD~i@iXIm5G5DXbs2!VI&g@
Nk|4@9w=>U{0{|dEIhX(d
delta 159
zcmccMvdD$YCD<iINr{1h(P|@CJQI_j;N)zk9rZ430WQJ5d<%S7Cuax>a|v89KlwD+
zw90p)_$yz@!_K}1j-D<NIk^c7lqY8~ERdX>$;Grlcv9`;1cu28JpX}!VTm9!V<U)Q
zSSY?gbaECKdw~!u69X?pVnISjA_K#cM2-MYXEz2Bo_HY5SdanY3G_uW#s@paZ@$3X
GAO`@jH!*$y
diff --git a/tests/data/acpi/q35/DSDT.cxl b/tests/data/acpi/q35/DSDT.cxl
index 82d7563a73f6b7a4ead15ca0933d0e57ae8be48e..20d0fb64ea52b2f4979105c934aadb6f416e2b71 100644
GIT binary patch
delta 179
zcmZqhUgyo_66_MPPL+Xy(Q6}DJQI_T$mDFM9raF}0WQJ5ybD~|CTB4e2r@G=Bor_t
zE|8iuIYUsGOW=a}$)~}lRlXC&U-?QNcJ^J8uz-DPCKuC^gaSuTmx$($90mp;!N`yV
z)KWV+iD7aQ&wn6bs7+){tWB(B<YH$?EJ*A~U|;}hRh^v0#a<x9%EZ76v<75=Fp>!c
NNf2e5+nIkV0ssJjImiG2
delta 159
zcmZ4I-QdmT66_Mvpvu6&cyA+DJQI_j;N)zk9rZ430WQJ5d<%S7Cuax>a|v89KlwD+
zw90p)_$yz@!_K}1j-D<NIk^c7lqY8~ERdX>$;Grlcv9`;1cu28JpX}!VTm9!V<U)Q
zSSY?gbaECKdw~!u69X?pVnISjA_K#cM2-MYXEz2Bo_HY5SdanY3G_uW#s@paZ@$2M
GPZ0nmS~9Kx
diff --git a/tests/data/acpi/q35/DSDT.dimmpxm b/tests/data/acpi/q35/DSDT.dimmpxm
index 304c8229d81e333ed7564423cf50ad2b963b0a2e..b23339513af3be457c1974e0288fc4c6720690d8 100644
GIT binary patch
delta 179
zcmX@%`^}fjCD<k8n;HWH<AjY|@k~rUB9pV3cGNp@2Dk+K@-A>;o1Dc^Ajr(fkWj#o
zxIk*s<P1S!E`bZ?C!YqJR{2g8f8{HA*x7eU!UFcGnOsau5(*qWT_T!0au^tZ1S3Nd
zP)qIPB!<aJJpX}!p*E2*u{N=ik&B%nu^_P{fq?<2RdsR}7khyaD-#1R&>D~d!bm0*
NBtevIZfAB>1^~m2IyC?Q
delta 159
zcmez7d%~B?CD<k8gc<__qsm6EcqS%4!O7W7JL+B70$hT9`4;%FPR<Y%<`TGIe)4Is
zX_fCp@mIc*hn;;396enka&i+EC{NB}SRgq$lZ$DA@TA(w2@I1Hc>V(c!xBMe#zqjq
zuuyz~=;SOe_5vYRCI()H#Dav5L<WW>i5vl*&Tb4MJn=x9u^<D)6X=U%j1P8--+X~t
GO&I_{t1=q^
diff --git a/tests/data/acpi/q35/DSDT.ipmibt b/tests/data/acpi/q35/DSDT.ipmibt
index b9a5ae240c62f29d952d94a280bc97d608b3c2e5..8af2695edeeadbde2a1e8f04ab567f5c00b76945 100644
GIT binary patch
delta 179
zcmbR1c-oQ6CD<k8v;qSIWBNv}RZL7iB9pf<?WlL+3~&kd<z3*yHaUx-K#-Y{A)$aF
zae>sN$r*yeTml!&Pd*Jct@52H{>oSKu(R)ygazzVGr5?SBosJ$x<oX0<S;M*2}Xt_
zpqARnNeq*dc>V(cLv12sVr^n2BNsbEVnJd@0s{k3tLo$|F7^T;Rwf2spfw-^gpo`r
NNP;Nae2MwA3;>&(I?(_C
delta 131
zcmX@@IM<QOCD<iot^xxC<L`}JtC*Pl1SfA}+L7YI7T^->%eTOXb#jKFFqgmu^OH}5
zO{;t-iof!eJnZaS;OOZRk&~OSKzVW&!ve|4nOsZ@geTQbPGFdv!1Esn7?ub!Gd6+<
ihK1q_L?>r)u@?xjGBNNnBo-ueBr-58N!-M8S_S}whAYtk
diff --git a/tests/data/acpi/q35/DSDT.ipmismbus b/tests/data/acpi/q35/DSDT.ipmismbus
index a0eeae95c07fe3708509c3e652c3aeff9c21ac82..479df48cd37af888317d63eac8f565f370201490 100644
GIT binary patch
delta 179
zcmZ4Oc+-)~CD<k8rUC;4<H3zw@k~rUB9pV3cGNp@2Dk+K@-A>;o1Dc^Ajr(fkWj#o
zxIk*s<P1S!E`bZ?C!YqJR{2g8f8{HA*x7eU!UFcGnOsau5(*qWT_T!0au^tZ1S3Nd
zP)qIPB!<aJJpX}!p*E2*u{N=ik&B%nu^_P{fq?<2RdsR}7khyaD-#1R&>D~d!bm0*
NBtevIZf91J1pt!1InDq8
delta 159
zcmccVxZ07+CD<iowE_bJW9UY%cqS%4!O7W7JL+B70$hT9`4;%FPR<Y%<`TGIe)4Is
zX_fCp@mIc*hn;;396enka&i+EC{NB}SRgq$lZ$DA@TA(w2@I1Hc>V(c!xBMe#zqjq
zuuyz~=;SOe_5vYRCI()H#Dav5L<WW>i5vl*&Tb4MJn=x9u^<D)6X=U%j1P8--+Y0Y
GQx*UfEHShI
diff --git a/tests/data/acpi/q35/DSDT.ivrs b/tests/data/acpi/q35/DSDT.ivrs
index f768380c1c2aa8fcd6ff6bc1048e0ccd2037eb2c..c9c18fa4e45288fb6c2182a793a8e6aff72b33d9 100644
GIT binary patch
delta 179
zcmaFtFwv3ACD<ioq5=a0<D-pS@k~rUB9pV3cGNp@2Dk+K@-A>;o1Dc^Ajr(fkWj#o
zxIk*s<P1S!E`bZ?C!YqJR{2g8f8{HA*x7eU!UFcGnOsau5(*qWT_T!0au^tZ1S3Nd
zP)qIPB!<aJJpX}!p*E2*u{N=ik&B%nu^_P{fq?<2RdsR}7khyaD-#1R&>D~d!bm0*
NBtevIZfCwD0|0JNI!yoo
delta 159
zcmbQ}_}GEVCD<h-S%HCpv1}t(JQI_j;N)zk9rZ430WQJ5d<%S7Cuax>a|v89KlwD+
zw90p)_$yz@!_K}1j-D<NIk^c7lqY8~ERdX>$;Grlcv9`;1cu28JpX}!VTm9!V<U)Q
zSSY?gbaECKdw~!u69X?pVnISjA_K#cM2-MYXEz2Bo_HY5SdanY3G_uW#s@paZ@$2M
GPzC_>5i&CX
diff --git a/tests/data/acpi/q35/DSDT.memhp b/tests/data/acpi/q35/DSDT.memhp
index b4a9f5a0fe5cf3b44ebe7659a2bf3687e1073482..a5730b8ab8abb2602334633cd6c760f79915e564 100644
GIT binary patch
delta 179
zcmZ4JecqePCD<k8yeb0&qsd0DcqS$vk;&OiJL;V{16+cAc^9~_P0nH{5M*X#NGM=P
zTp%@Ra)zKVm%s({lTU+9t9&Plzw(tl?CiTFVFCNpOfIG+2?dUxE)mTgISdRyf{`H!
zsHJvt62s&qp8r6=P@Bk@SesbM$i>c(SdiF}z`y|1syaD~i@iXIm5G5DXbs2!VI&g@
Nk|4@9w=+vA0RS{(IX3_R
delta 159
zcmX@_z0jM>CD<iop(+Cd<B5%2@k~s9f|IkEcGSDD1-JzJ@-6UTotz;k%q4Ka{N&SM
z(<<MI;;(!q4?Fu7IC{E7<m4tSP@bH{ut0KhCKuBJ;YqcV6Bs5Z@cah?h9!c`jEx|I
zVWIc}(aBj{>;*!sObomXi3JHAi3|)&5;+1qo!uBjc;bOHV?hRpC(swk7$58uzxe|5
Ge?<UQI5Qjo
diff --git a/tests/data/acpi/q35/DSDT.mmio64 b/tests/data/acpi/q35/DSDT.mmio64
index 3af5ef2ea473322d8697281d3a20f7282f3238ac..a4293c20fed04d1ccfc4f4fc1ccf46ca81453854 100644
GIT binary patch
delta 179
zcmdnv`O1^aCD<k8l?np`<A;r0@k~rUB9pV3cGNp@2Dk+K@-A>;o1Dc^Ajr(fkWj#o
zxIk*s<P1S!E`bZ?C!YqJR{2g8f8{HA*x7eU!UFcGnOsau5(*qWT_T!0au^tZ1S3Nd
zP)qIPB!<aJJpX}!p*E2*u{N=ik&B%nu^_P{fq?<2RdsR}7khyaD-#1R&>D~d!bm0*
NBtevIZf7=C1OVaDI#~b!
delta 159
zcmaFmxyO^sCD<ioj|u|=W6MUacqS%4!O7W7JL+B70$hT9`4;%FPR<Y%<`TGIe)4Is
zX_fCp@mIc*hn;;396enka&i+EC{NB}SRgq$lZ$DA@TA(w2@I1Hc>V(c!xBMe#zqjq
zuuyz~=;SOe_5vYRCI()H#Dav5L<WW>i5vl*&Tb4MJn=x9u^<D)6X=U%j1P8--+X~t
GN)Z5C2QohZ
diff --git a/tests/data/acpi/q35/DSDT.multi-bridge b/tests/data/acpi/q35/DSDT.multi-bridge
index 238668b95f33e831d66e2e2fa5e952f00ea7260b..ae47b004e39f9f78f3c98093727fb92a0c6c74cb 100644
GIT binary patch
delta 310
zcmez2w8fdrCD<ioiy{L9<G+nu@k~rUB9pV3cGNp@2Dk+K@-A>;o1Dc^Ajr(fkWj#o
zxIk*s<P1S!E`bZ?C!YqJR{2g8f8{HA*x7eU!UFcGnOsau5(*qWT_T!0au^tZ1S3Nd
zP)qIPB!<aJJpX}!p*E2*u{N=ik&B%nu^_P{fq?<2RdsR}7khyaD-#1R&>D~d!bm0*
zBtevIZfCBQ;c}9Qi4S&)7w{6F%%@<_=r`F<L7d5%W%7Fk6<OJMpqqILgt(ZTf?a*$
zgG2oimVmsGk(rg9FnOVZsgxf_u%Tr<N4%p;5Dy~*GXn=mAwzT%kp@Ulc2zV60C7HE
A8UO$Q
delta 290
zcmdnu{KJXMCD<jTLXm-iF>51NJQI_j;N)zk9rZ430WQJ5d<%S7Cuax>a|v89KlwD+
zw90p)_$yz@!_K}1j-D<NIk^c7lqY8~ERdX>$;Grlcv9`;1cu28JpX}!VTm9!V<U)Q
zSSY?gbaECKdw~!u69X?pVnISjA_K#cM2-MYXEz2Bo_HY5SdanY3G_uW#s@paZ@$2s
zB*Wz*9s}YC_=rumQLvYE=Lj}5i06oRbP3{NU|?e4a0+(yVT^9FnLJfNMO-`{=wO~D
lAZKS}W@Urq;)6r|CSOx91?#kg>SSbKhUjD<q%%#?4*)MbRNw#r
diff --git a/tests/data/acpi/q35/DSDT.nohpet b/tests/data/acpi/q35/DSDT.nohpet
index 0fb09121cf8f6ad8810587c8b77df9552dd31f42..6feed2ee106087d24d51f468df1b4d44e65143f0 100644
GIT binary patch
delta 179
zcmX?N|H+=qCD<k8lRN_hBhN;zcqS$vk;&OiJL;V{16+cAc^9~_P0nH{5M*X#NGM=P
zTp%@Ra)zKVm%s({lTU+9t9&Plzw(tl?CiTFVFCNpOfIG+2?dUxE)mTgISdRyf{`H!
zsHJvt62s&qp8r6=P@Bk@SesbM$i>c(SdiF}z`y|1syaD~i@iXIm5G5DXbs2!VI&g@
Nk|4@9w=>(y002%mId=d6
delta 159
zcmexlf5e{4CD<k8h&%%W<ARM`@k~s9f|IkEcGSDD1-JzJ@-6UTotz;k%q4Ka{N&SM
z(<<MI;;(!q4?Fu7IC{E7<m4tSP@bH{ut0KhCKuBJ;YqcV6Bs5Z@cah?h9!c`jEx|I
zVWIc}(aBj{>;*!sObomXi3JHAi3|)&5;+1qo!uBjc;bOHV?hRpC(swk7$58uzxe{Q
Gk_-T9Q8HZs
diff --git a/tests/data/acpi/q35/DSDT.numamem b/tests/data/acpi/q35/DSDT.numamem
index 37fa4c3a45b0d7db0d3d368df5e027e7e1acf9d2..414b8af67bdf79238915de0d609ce45e150eb958 100644
GIT binary patch
delta 179
zcmccN(B{bH66_Mvroh0!_+}$lJQI_T$mDFM9raF}0WQJ5ybD~|CTB4e2r@G=Bor_t
zE|8iuIYUsGOW=a}$)~}lRlXC&U-?QNcJ^J8uz-DPCKuC^gaSuTmx$($90mp;!N`yV
z)KWV+iD7aQ&wn6bs7+){tWB(B<YH$?EJ*A~U|;}hRh^v0#a<x9%EZ76v<75=Fp>!c
NNf2e5+nF!Q003SRIx7GG
delta 159
zcmZp3yy3v*66_KZp}@ev*szf+o{7m%aB?=&j(Qii0GD82z6Cz4lQRT`xdbklpL`l@
zTID-Y{FSfdVQ1e0M^BfCoZN&3%9FDg7D!Ic<YHPNJgIha0>k74p8r6=utboVu@OWt
zEEHcLIysAry+DYSiGi0Pu^^!%k%3`JB1eFyvm1j5Pdt!jEXV-y1o|Qw<Aa^zH(y}h
GCIbNFpE3~u
diff --git a/tests/data/acpi/q35/DSDT.pvpanic-isa b/tests/data/acpi/q35/DSDT.pvpanic-isa
index 8705309748d1d7352c6623b32c28eab7fbbce2a4..7277a0105035f984dc0a0f09747d441c21e62d1c 100644
GIT binary patch
delta 179
zcmdn)_|%chCD<k8sR9E7<HwC$N0^v=L?&Ng+EMSs8Q>D^%e%mZZE_Yvfgm#@LqY*V
z;sU8jlQRT`xdbklpL`l@TID-Y{FSfdVQ1eZ2@BY#W^yqtNhomibcty0$YEdr5{wK<
zKrOYClNcr^@%#q@hT25N#M;D4MlN=S#Dc_*1O^76R@KQ_T<irxtV|5NKx;q-2qT$L
NkOWb-`3>`F830PWJNEzp
delta 115
zcmaFrxZRP<CD<ioy8;6PW9vq)BTP(wf|D;W?cj1@3vdbc<y+vxI(Z?pm`j19r%Oam
zZo&fP$yp2wBqwKbF)a|DR699=VR8b`e;{C3BFN0x2qG93iZ2kIoW;dnAjHbVz{`+W
RkkFCHz_287vlPo|832BhB&PrX
diff --git a/tests/data/acpi/q35/DSDT.tis.tpm12 b/tests/data/acpi/q35/DSDT.tis.tpm12
index 7408f03e4b571c352f9fdf2afc8718aa7b37da06..253a66e65818d1df67b13d4b70f68add78adff98 100644
GIT binary patch
delta 161
zcmdnsde4>1CD<k8o)QBC<E)Kb8(ElqL?-WL*&*q~8Q>D^%e%mZZE_Yvfgm#@LqY*V
z;sU8jlj~W<l9wbbV4s@F#k3@$z|qqsqPZi7fdNP`G9&?2)J{%fn4HA(9|#y~6B!e0
s6Dt|H*clQF5<3zY7=T(;Cuec77YMO3G4KLSMKhov38HHAP1fr&08&;n{Qv*}
delta 115
zcmccTy1|vpCD<iogAxM+quxfYjVw%lf|K{M?BH@?3vdbc<y+vxI=PQk%%#B5(<LG&
zH(`PD<Sd2-l9MyJm=*|6s-2v`FgbzeKM*i15oBg;1Q84i#TST9&f;P(5MpIw;AKcG
RNa#ppU|5p4nVs#r3;;!mBn<!n
diff --git a/tests/data/acpi/q35/DSDT.tis.tpm2 b/tests/data/acpi/q35/DSDT.tis.tpm2
index 134c2fbccacd0e9383df094f9b4deb03b4e46abb..76bd4661e6655d2a8f246f4bf38490df14da82ad 100644
GIT binary patch
delta 179
zcmX@*`oopWCD<k8hY|w=qvJ-d(=1FrB9pJP?5KC*3~&kd<z3*yHaUx-K#-Y{A)$aF
zae>sN$r*yeTml!&Pd*Jct@52H{>oSKu(R)ygazzVGr5?SBosJ$x<oX0<S;M*2}Xt_
zpqARnNeq*dc>V(cLv12sVr^n2BNsbEVnJd@0s{k3tLo$|F7^T;Rwf2spfw-^gpo`r
NNP;Na{F(K-3;+_8JFx%&
delta 132
zcmez2ddii{CD<k8loA62<JFB^r&*Z%1Sel-*^%PH7T^->%eTOXb#jKFFqgmu^OH}5
zO{;t-iof!eJnZaS;OOZRk&~OSKzVW&!ve|4nOsZ@geTQbPGFdv!1Esn7?ub!Gd6+<
jhK1q_L?>r)u@?xjGBNNnBo-ueBr-58N!+Z+c3lPl1?w!b
diff --git a/tests/data/acpi/q35/DSDT.viot b/tests/data/acpi/q35/DSDT.viot
index be4a254e93a9cb360f42a25121c5fcefbd47480f..3f14b57f0797ab13fc4c90dd2949cf4bd6c30896 100644
GIT binary patch
delta 179
zcmZ4PdDWB4CD<k8stN-G<NJ+V@k~rUB9pV3cGNp@2Dk+K@-A>;o1Dc^Ajr(fkWj#o
zxIk*s<P1S!E`bZ?C!YqJR{2g8f8{HA*x7eU!UFcGnOsau5(*qWT_T!0au^tZ1S3Nd
zP)qIPB!<aJJpX}!p*E2*u{N=ik&B%nu^_P{fq?<2RdsR}7khyaD-#1R&>D~d!bm0*
NBtevIZf90d1OT<%Is^a!
delta 159
zcmccWx!jY>CD<ioxe5aVWAjF?cqS%4!O7W7JL+B70$hT9`4;%FPR<Y%<`TGIe)4Is
zX_fCp@mIc*hn;;396enka&i+EC{NB}SRgq$lZ$DA@TA(w2@I1Hc>V(c!xBMe#zqjq
zuuyz~=;SOe_5vYRCI()H#Dav5L<WW>i5vl*&Tb4MJn=x9u^<D)6X=U%j1P8--+Y0Y
GRS^I*5;5uk
diff --git a/tests/data/acpi/q35/DSDT.xapic b/tests/data/acpi/q35/DSDT.xapic
index 2327152da1b7d777c1f3da358ae5ae1406384d11..baa88f6f219a2a47fe20ee0c08b92371cc7e2aa7 100644
GIT binary patch
delta 181
zcmdlwjp^|;CN7s?myqOc1_s6-8@b|{n0!PgXEW`ncj63i3HIe(;KDXJi=jY}nUNu(
zfFW^#)TGH7g2G$^7tBvS4K}UvohbgwSMsp4?~;TC>{Bzjn3g0IIC{E7G<W1MFaQZg
zh9sbt+Q~@_laqM<0|7&AB4c80VkILNJ40eYVn+f415m5#<SZ`s0wGo=240{wAOnPv
POejc#DBIl5ysjMpI!-&V
delta 161
zcmaDnjcMyNCN7s?mk`r#1_s8Sja>0eOn!osvzd0(yRZeg1pD$W@L`>tAt=lxaKZfK
z(_qso--+U{d?gP%`xZEQx<usUCM-~%oW-y}a&jgY(*og1wUZMVCMWRx2LgsAg3OGK
zAcA3`_yW<%SzPP|Laa;-ybOs22_1<H3`-I@0z94F7({sDfiz=528bun7s(hO>=eKG
I0`uf{0IEYXmH+?%
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 08/17] tests: acpi: whitelist pc/q35 DSDT before switching _DSM to use ASUN
2022-07-01 13:34 [PATCH 00/17] acpi:pc/q35: minor PCI refactoring/cleanups Igor Mammedov
` (6 preceding siblings ...)
2022-07-01 13:35 ` [PATCH 07/17] tests: acpi: update expected blobs Igor Mammedov
@ 2022-07-01 13:35 ` Igor Mammedov
2022-07-01 13:35 ` [PATCH 09/17] x86: acpi: cleanup PCI device _DSM duplication Igor Mammedov
` (9 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: Igor Mammedov @ 2022-07-01 13:35 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
tests/qtest/bios-tables-test-allowed-diff.h | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index dfb8523c8b..1983fa596b 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1 +1,15 @@
/* List of comma-separated changed AML files to ignore */
+"tests/data/acpi/pc/DSDT",
+"tests/data/acpi/pc/DSDT.acpierst",
+"tests/data/acpi/pc/DSDT.acpihmat",
+"tests/data/acpi/pc/DSDT.bridge",
+"tests/data/acpi/pc/DSDT.cphp",
+"tests/data/acpi/pc/DSDT.dimmpxm",
+"tests/data/acpi/pc/DSDT.hpbridge",
+"tests/data/acpi/pc/DSDT.ipmikcs",
+"tests/data/acpi/pc/DSDT.memhp",
+"tests/data/acpi/pc/DSDT.nohpet",
+"tests/data/acpi/pc/DSDT.numamem",
+"tests/data/acpi/pc/DSDT.roothp",
+"tests/data/acpi/q35/DSDT.bridge",
+"tests/data/acpi/q35/DSDT.multi-bridge",
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 09/17] x86: acpi: cleanup PCI device _DSM duplication
2022-07-01 13:34 [PATCH 00/17] acpi:pc/q35: minor PCI refactoring/cleanups Igor Mammedov
` (7 preceding siblings ...)
2022-07-01 13:35 ` [PATCH 08/17] tests: acpi: whitelist pc/q35 DSDT before switching _DSM to use ASUN Igor Mammedov
@ 2022-07-01 13:35 ` Igor Mammedov
2022-07-01 13:35 ` [PATCH 10/17] tests: acpi: update expected blobs Igor Mammedov
` (8 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: Igor Mammedov @ 2022-07-01 13:35 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani
add ASUN variable to hotpluggable slots and use it
instead of _SUN which has the same value to reuse
_DMS code on both branches (hot- and non-hotpluggable).
No functional change.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
hw/i386/acpi-build.c | 56 +++++++++++++++++++++-----------------------
1 file changed, 27 insertions(+), 29 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 8700446f50..36fe43c52f 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -374,6 +374,25 @@ build_facs(GArray *table_data)
g_array_append_vals(table_data, reserved, 40); /* Reserved */
}
+Aml *aml_pci_device_dsm(void)
+{
+ Aml *method;
+
+ method = aml_method("_DSM", 4, AML_SERIALIZED);
+ {
+ Aml *params = aml_local(0);
+ Aml *pkg = aml_package(2);
+ aml_append(pkg, aml_name("BSEL"));
+ aml_append(pkg, aml_name("ASUN"));
+ aml_append(method, aml_store(pkg, params));
+ aml_append(method,
+ aml_return(aml_call5("PDSM", aml_arg(0), aml_arg(1),
+ aml_arg(2), aml_arg(3), params))
+ );
+ }
+ return method;
+}
+
static void build_append_pcihp_notify_entry(Aml *method, int slot)
{
Aml *if_ctx;
@@ -423,26 +442,17 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
break;
}
dev = aml_device("S%.02X", devfn);
- aml_append(dev, aml_name_decl("_SUN", aml_int(slot)));
+ aml_append(dev, aml_name_decl("ASUN", aml_int(slot)));
aml_append(dev, aml_name_decl("_ADR", aml_int(adr)));
+ aml_append(dev, aml_name_decl("_SUN", aml_int(slot)));
method = aml_method("_EJ0", 1, AML_NOTSERIALIZED);
aml_append(method,
aml_call2("PCEJ", aml_name("BSEL"), aml_name("_SUN"))
);
aml_append(dev, method);
- method = aml_method("_DSM", 4, AML_SERIALIZED);
- {
- Aml *params = aml_local(0);
- Aml *pkg = aml_package(2);
- aml_append(pkg, aml_name("BSEL"));
- aml_append(pkg, aml_name("_SUN"));
- aml_append(method, aml_store(pkg, params));
- aml_append(method,
- aml_return(aml_call5("PDSM", aml_arg(0), aml_arg(1),
- aml_arg(2), aml_arg(3), params))
- );
- }
- aml_append(dev, method);
+
+ aml_append(dev, aml_pci_device_dsm());
+
aml_append(parent_scope, dev);
build_append_pcihp_notify_entry(notify_method, slot);
@@ -485,19 +495,7 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
* enumeration order in linux kernel, so use another variable for it
*/
aml_append(dev, aml_name_decl("ASUN", aml_int(slot)));
- method = aml_method("_DSM", 4, AML_SERIALIZED);
- {
- Aml *params = aml_local(0);
- Aml *pkg = aml_package(2);
- aml_append(pkg, aml_name("BSEL"));
- aml_append(pkg, aml_name("ASUN"));
- aml_append(method, aml_store(pkg, params));
- aml_append(method, aml_return(
- aml_call5("PDSM", aml_arg(0), aml_arg(1), aml_arg(2),
- aml_arg(3), params)
- ));
- }
- aml_append(dev, method);
+ aml_append(dev, aml_pci_device_dsm());
}
if (pc->class_id == PCI_CLASS_DISPLAY_VGA) {
@@ -585,7 +583,7 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
qobject_unref(bsel);
}
-Aml *aml_pci_device_dsm(void)
+static Aml *aml_pci_pdsm(void)
{
Aml *method, *UUID, *ifctx, *ifctx1;
Aml *ret = aml_local(0);
@@ -1368,7 +1366,7 @@ static void build_x86_acpi_pci_hotplug(Aml *table, uint64_t pcihp_addr)
aml_append(method, aml_return(aml_local(0)));
aml_append(scope, method);
- aml_append(scope, aml_pci_device_dsm());
+ aml_append(scope, aml_pci_pdsm());
aml_append(table, scope);
}
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 10/17] tests: acpi: update expected blobs
2022-07-01 13:34 [PATCH 00/17] acpi:pc/q35: minor PCI refactoring/cleanups Igor Mammedov
` (8 preceding siblings ...)
2022-07-01 13:35 ` [PATCH 09/17] x86: acpi: cleanup PCI device _DSM duplication Igor Mammedov
@ 2022-07-01 13:35 ` Igor Mammedov
2022-07-01 13:35 ` [PATCH 11/17] tests: acpi: whitelist pc/q35 DSDT before moving _ADR field Igor Mammedov
` (7 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: Igor Mammedov @ 2022-07-01 13:35 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani
It's expected that hotpluggable slots will, get ASUN variable
and use that instead of _SUN with its _DSM method.
For example:
@@ -979,8 +979,9 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001)
Device (S18)
{
- Name (_SUN, 0x03) // _SUN: Slot User Number
+ Name (ASUN, 0x03)
Name (_ADR, 0x00030000) // _ADR: Address
+ Name (_SUN, 0x03) // _SUN: Slot User Number
Method (_EJ0, 1, NotSerialized) // _EJx: Eject Device
{
PCEJ (BSEL, _SUN)
@@ -991,7 +992,7 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001)
Local0 = Package (0x02)
{
BSEL,
- _SUN
+ ASUN
}
Return (PDSM (Arg0, Arg1, Arg2, Arg3, Local0))
}
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
tests/qtest/bios-tables-test-allowed-diff.h | 14 --------------
tests/data/acpi/pc/DSDT | Bin 6219 -> 6422 bytes
tests/data/acpi/pc/DSDT.acpierst | Bin 6186 -> 6382 bytes
tests/data/acpi/pc/DSDT.acpihmat | Bin 7544 -> 7747 bytes
tests/data/acpi/pc/DSDT.bridge | Bin 9078 -> 9496 bytes
tests/data/acpi/pc/DSDT.cphp | Bin 6683 -> 6886 bytes
tests/data/acpi/pc/DSDT.dimmpxm | Bin 7873 -> 8076 bytes
tests/data/acpi/pc/DSDT.hpbridge | Bin 6186 -> 6382 bytes
tests/data/acpi/pc/DSDT.ipmikcs | Bin 6291 -> 6494 bytes
tests/data/acpi/pc/DSDT.memhp | Bin 7578 -> 7781 bytes
tests/data/acpi/pc/DSDT.nohpet | Bin 6077 -> 6280 bytes
tests/data/acpi/pc/DSDT.numamem | Bin 6225 -> 6428 bytes
tests/data/acpi/pc/DSDT.roothp | Bin 6434 -> 6656 bytes
tests/data/acpi/q35/DSDT.bridge | Bin 11227 -> 11449 bytes
tests/data/acpi/q35/DSDT.multi-bridge | Bin 8628 -> 8640 bytes
15 files changed, 14 deletions(-)
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index 1983fa596b..dfb8523c8b 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,15 +1 @@
/* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/pc/DSDT",
-"tests/data/acpi/pc/DSDT.acpierst",
-"tests/data/acpi/pc/DSDT.acpihmat",
-"tests/data/acpi/pc/DSDT.bridge",
-"tests/data/acpi/pc/DSDT.cphp",
-"tests/data/acpi/pc/DSDT.dimmpxm",
-"tests/data/acpi/pc/DSDT.hpbridge",
-"tests/data/acpi/pc/DSDT.ipmikcs",
-"tests/data/acpi/pc/DSDT.memhp",
-"tests/data/acpi/pc/DSDT.nohpet",
-"tests/data/acpi/pc/DSDT.numamem",
-"tests/data/acpi/pc/DSDT.roothp",
-"tests/data/acpi/q35/DSDT.bridge",
-"tests/data/acpi/q35/DSDT.multi-bridge",
diff --git a/tests/data/acpi/pc/DSDT b/tests/data/acpi/pc/DSDT
index cb718f1a8a591b27ca841f70f40762562c15c837..8282d449ceaefd914b419f507a13f3fb7b318aaf 100644
GIT binary patch
delta 1170
zcmY++OHRU207l^w3Y0==%cD>pC2<9aFC2o!nHsImOu7UUx8MRCkhlsHV;r#tSKw}p
z=0C~3(~~dfd-1mP^CG`bQpc&hfBH{>f3<%si%l7A_q&(iHM?<(!&T|6i-&8!>XqyK
zuI)Hg$1DHC?lwHweFX6zTQ0<0m@DR5j9U#>6RVl*h+7?27pq&0TLab*Ynbeqn+Nm6
zJd1H_!kS`Dlbvw$VZNAeF>WnbORQzGQ*LcoTdZv{ZUHP13ru##tpn?bbu7j$goR?E
z$yVGVSR@u%j9Uzg#bT44bL+yoVqJ@I>%n?rJ(I1u^<jOnzQwo=U<0v%$u`^)SR$5K
zjN1@46dRiCg4+l-5*t~JTMA3XQj_J}#;~#2*kar!u!-2jWLs`i*i>w4F>W*1Ol)Sd
YOKuq~6U!{dZ4R4@&Bem6=j5mI3(bW3jsO4v
delta 1329
zcmaLPIZnd>6aZ0MaT3R|9cQ((OR1<Jge{aY1|bj#VW>cIN|u5%00*Fm#0e;&KpcaE
za19nQ<^S#IX`UyaV<$<Iv%|<R%;k6I&U50o%Pftv;NW%f=skt|R=PUP>?}P$c5-$$
zOHN(G$Qg@!f3)-)=PxHodUSPtb34Cy_`#F$KeoV@f;s2Gc^R*9E`SRP=3E39WxUSW
z2HOheTmqM5yusN4I|}Ap2A5^L$=L<F3g+yAJsEFt_QAe_Iak0H8BaL};6TBgtKh1P
zw>j6qH3f67gX=P$ac+Pc3g+AdH)R}iZh>10<{W}U8Sik8z>$JEx4~^0C!9Orj)FON
k!Ce{ea_)h93g+Ag_hr1tc>o?LnDY=k{KIDUu@Zin-wNzyDF6Tf
diff --git a/tests/data/acpi/pc/DSDT.acpierst b/tests/data/acpi/pc/DSDT.acpierst
index aebb29c2a4ae67b732bef3eb8e72c5665bb3a7b3..9520f3b7303a43091e8c77b64d1f76407e85f1f4 100644
GIT binary patch
delta 1131
zcmY++OG?8~07l^y`bck+Cg~$hUn#hP`mV#))R_uKXJVG%B3wdu;Y38x6*zO^M!E(;
z{sZ?;4<F}sxj!^TS={e4&#Ud<&2wnBUyoI}sp9L;-AnkL-`2~cW#zBShZ|G(t95Y~
zcwXJ}tN*b3jShBiVe-#bVhvbBtYNcbZcSKItm!arEm%veWwR4*KFk;M9mcH<Ym2pQ
zcFN7bjF@p4w+^f$*0I?cw*VH11rFmD!a}joX6M|xu&!9wVca5EBo^6h#Vv-#VzI-x
zC9p&+vDpQ;9;_$Ua~QWitS{EL*_zt`HV_*)jN1@46dT%X!!3oSVyVNpjbJ0Ok<Bi-
zWw1;va~QWVY%DgmS;1`rn}|&u#%&6licM{{<u-%O#AXiTHiyl{<~F<Hmcw$f++o}n
Ou!Yz{Ec$p#e`<d~%mMfS
delta 1284
zcmaLPJx;=K7=ZCMDNsra6bdchiIZ_cMa8jLjSd=Pb<*U|C^~otJpxy7!pV3BFX83|
zJcGgbjPJWX`Q`c9UX8sh&#t!;%d#i$-c#VEZ+9l2nflpk`4W7_r%t{zHm=EUE<DFI
zX?EpXmSZiy!;Q^#oWEXX`T70g;c<TZyvEaiTmTnjyvw-=E-ILF30#u#gtH5F70kH|
zF3Wh2vj_GR%(()t$atT#5B3$zIRFPTKHyvhR~5{;2Cm6?%DE1%E0}W#4rP4ExdCn{
zm~#`{lyS;A0!Iqw+yb{`JmcI3w-wAe2FEf!;+%jJ1#|9zJ2K8Vcfnl+bMAqAGCt<q
e2lo}sc>o^B_=NKiJXA2}5qR{6ZSxVuU-mC@|70cr
diff --git a/tests/data/acpi/pc/DSDT.acpihmat b/tests/data/acpi/pc/DSDT.acpihmat
index b7c5de46346d2777b33f7fc464d319bd762fda8d..33169838bed50710495d45e0d9486ac59b4e504c 100644
GIT binary patch
delta 1170
zcmY++yGp}g07vl@dr8x@x%Hkl1)spXRb1MpZYmhvgv>sTLsvl`L2>HrQwTnYqbUCa
z-?tuqoS*a03okG7yH(~mmB)AQIrgr$4`s0|!}WIa7C&V-)nb2Mx{Koe+S_r<MSkl$
z&W_`j|6%i*>~6l}=#L%jiB(}$v8u(m)nGNTn#m5i)nRq9y2ZFPU=6W`$&R?WFjvgA
z7`G;@Db_UEF*gt9iFp>|)`GRfS|&T;=EHn3-(uX_u(nv+WT)IZu#Q;AV%!2)AQqTx
z&Mkz6Vxh&jMX*RLGT9lo7#54g7UPz{60yW&3vOLlSFCF>Zar8}tY@+%w?3>d*0&h9
z0c;>PFxiUR5H=JWT8!HWHWC||Eax_cjm5?m<CelwvD9R1ZWGu<Y+^BPQ`l5&YO+gi
W87vdaEXHjHn~BZDf{&N<tMUu^%?hCa
delta 1329
zcmaLPyGp|V7(n5K-qJK}(==^*Nm_7n^llZG#wa2vVsx^Qj#Xd4*%xr=>LNHQC_aJ@
z<KPQ8dciaP|9bd1?>k@Hc9JG%H<4kOpRe}4XUETzER8ew@M-?y-315vba|9nS$ckK
z=d5g;oH~Y)Gv*Ke!s2h7KAt4$(d_c-dU|pDgIAXRaUPskFy{ieAmdfeMQ~BUoJ-)6
zjMq3@U`xTA%iyw%*E!o@Tfv+w;EIelI6GiR!JMn$s*E=|*T6LebFPEyG9Gbu!LEWi
zH^2=UZ*lg(o`N|y!A%*DIs0H=!JJ#*mW*T0ZE#z`oC9zm<6X`ja7V$MyWp;j6V5$w
oPr;n~;J%FaIEUa+!JH#-B;$R~1Mon>oQL4yA2zeMN%&!Y1Jnj<Y5)KL
diff --git a/tests/data/acpi/pc/DSDT.bridge b/tests/data/acpi/pc/DSDT.bridge
index e04b5b2035fb665b1e75075d4c47776a51fa77e2..407066e1ac46922751969b823000e4fdfa542662 100644
GIT binary patch
delta 2499
zcmeI!IZnes7>424aS~^|X7iH8VG(`U15^nn5=elAp$d|ZK%F*1NK_!XfewxkaR#oy
zQK*@a|C5-hDbtLmc=T4*H~t>IoUu5GuY-+TPI;ZNJIi>QD7R@cOx=e`c5gka!_UmK
zkNi_D>Ge{5klbA4^mGtk@sr=PnY*4H+D<f{o^#P(2<2Cpytz<H_8zXy*~)l&sU@2f
zVk(@va7>jT^;jM-PcSdSEfh6Cji4q$6bpa_f&~$7qgVti5-ds(#S&nNU`d2KDC&SZ
zL0y6<mI2EI%Oc!GkpVJ-OoAvHfCfQBgnKBOfF?mxf+$*m7C}pd`zYFgHbGm0C^~=+
zK}Upr6kR}<pesQXD}WV(6%ihwSOu&StV$5Y8eolJO@sp!>wtBFbqS)_0BjI!h;WFa
z2j~&>B#5F9=o9osc#L8I7!V93h++sB5)4Hcqu2y&5^PEk#TH<TU`vE2D7FFH1ltls
zu>;s4*b(6f#RxDW7)cPtE?}2n7x3fJSJa3P+H!vQgTUv0IX{11xjsIi<^0V56xecp
N_)`4q{JgDxDL<$GC>sC(
literal 9078
zcmeHL&2Jmm5ue8oY57P>OKNS&RvZ(ujW$hTla#-L0)@z3N}?rFYcA!aSfN~!3QD;K
zvT&jzvS5^^3r8_fpeduGhaMP%xmw2_TcD@j{3oP`UV2Q?*q26~+2x~TN>1cG^&kOS
z?aaLQo8QcPZ{DmlLo5I4902=oc1fK#65023HGw}20O+0m%K5+wm`yD^S7BjafSC`%
z&O1J`lJa9MyFADK*s%U!Ss#63v8oNVC-Qc!YCqhvYCwb5Yc}WfB2QI}Y{hI%>S{hI
zRp#?rB=d~>rAkICfmB(}Yaq{_x=4d)gxShZ<c&<lu}6?3vd}LlRUfx_z-(P!$ZBYF
zQT&Kvlrwx(s;DI+Ho;HKF$*kUY>utMD*m1F!3LPE^M$45{;bilmu5*kI0Z6|%1E=C
z+NU^-<Op?=Pt38e{a^bbFvp(zpZkGL&A^WW4sdFAQO}4_X0?1gAp;NcC7xt_hx_;i
z{EhQTzRU0MZ}=#eq{^(8i;Z)IlDz-Nhl1HkFY4u#2ruBKhrL8s=FvI!vHxSgBuzCP
z4rz6%(4P~;(U{Uh=DhH~@PjlZJ993S%4$C$;a;Q;v<)^eX$sf|$cxI}vNUzoD6=p;
z<&yb8CPBsJT2A0YOPEa~cLO(y^c2_VL6`(Jo6OxnL$+8bv9Rn;BSFm;mkS9!uf3Nr
zS$0uf0Of+N=5F}Rb0qEV+6@|EZ?H8W4D$!1?t=1m2Im|$im+^YSiP~9k`3vaQHXZ5
zq4sUCV}1sf4b{%+-?tmFF)ly5_V<4pSMC))8~<0~)Zf%X*Xj&!uW?`3vdPKAtvdkt
zU{J#;_uDmS*CM<41NW<}dcV5C_%KxM>Xrq7Q!lh{^I<z4^g$He3;@_Qca&VbN?TlB
z;IzvXjaT$i8SJ>PNz9&PL)%r}wC`294{G-2-D(ZEAL<>sUB^M80Kj5#L4(!K`F5Rk
zV(lsq^wkEeei7|U85|UA*SW8+$@Vn<zD9*r`~F6a%Miw(wpIb`%_{oaT4i9bZdp}W
zuXZi-!TC#mVoT?d&LGoEH<J=RQuIjEV_H(i@;7m3bV8fF*?=w&b$M91n!l-*LO7t5
zjE(T{r$Z2OHv9%WCLIsrGv5hsH!$V~y?04%wibsmOgvET`HtYhruraZu8i18KKAJd
zg#1A~DI9;p_`3nhD3t){5(%QG#41|efcx~$n~r9b&M}QpOO8BVF-it|+;Cag<ev0B
z@7V$Gc$ALpJ+;q!%JH5;e*3+rl*7HJ%vOP7R|mXv-)p!}?{lAa+@}ZJr(fYd-E*%E
zy2lE8<mjjOxu162PY<}CeuevKv$Yh!=#4@50oT3QLLqm_L++B}J{xitTM4^4CaS2S
z)s+iaHR;;PN%MNHEN~gdLp#cB&g<m@;QjLK+c03wl1U!Bl`Coqy`)tV3Z7QnRyJuY
z+#*_~de7pr)rox8wxDg{x#>b@<g<1aKCedLAO8t<aqssoq8J}}L{t$R@Z@48UHYlZ
zW}dHH@{6lZFXj3H^C5>=RMnRg^B;U<-&y}f;_mw&ez1PG{{DwxGF4w(=#}Xx=W`5p
zV24HU*1|3B)a4x>F(3SpgbXB9Jy&FEzGyJDRJg^kx+du{%fPRy1q~~BoJRUpBe$5q
z;aaAgP$HFlF)!IbO56_9D^Br8LN3W@M%DAlWGYEC+)F&D#MJWa&wL%;ZonfonM|%J
z^Fw$wWJ2b-l}myBfl>fe+XvO?%m%A-x;<#15Ntk*HT{5PaiMD|g&>9XdXCs26e1jo
zugsoQ4Yeq}A`D3_=H89_c5SHJZ1ss2Z?7^NYbtYU`C{aEZHsN!QDxcnL6=UzgGyYK
z&iMAA7MG>|WhaEieiz+*X&+|C3t>=A>u%S#h$9tpWc9_h&XohhoSlKoSLc5FKw{8{
z^VaLs*yRFlXGefFsMC^TY;`krcyI@>kk5MU@H7`f>XK28yduqq@0J7jm^^!JFbSAD
zoBIZ}H1zhM5{Dkj&U|>C_B0)206ZSJuca>SZae{nOgR?j5=hjcqIIN#afB%tXsq2<
zCh_ph>A6ZSnTFnpr-MX$N?r<($*D-aGnKpw$~!nV1(b+>eQ?{MeF|MII!s?0A*+ge
zQt764Th<xQ|FjhaAC@=#*`)_|#4jQ*B1}R(i}*?P9L+BxeL0Gq0KmUL83%Cfbj$AU
z(k)9rK5#6eZIyO+|MIPC`Rg~2-`<<!>S!4DOTQMwT`e@}FSXig08`+$+EKlzCo`A=
zw*ZoUU*&Uq->@5(Q~AEy`D%v+2;@dUpVv!nB3}l<R2))84`RVnc*-WQKEJhs?v3e6
zd?>(>GrnK0#H9ds@7R~4bcHNLUjE5mvdz}T*>}}hm%z<jVHr0|nnvR%$$rLiP!3Y9
zmVaAeD^wHZ-&B~hT3IXx7|10fnRGvRK*|`)MNrOEuzii#aqgobq_euz(c<3vrDe8e
zf<~%00~gWf&f>oBo~9tPlm^&I<4an+Ow)_m(*A6uuDcu%5kC~jC-;9hqD15vt)?3Q
zQFlLvlz4^i9O~<7Oa(0iP^5Y(ra1&52B^oD3qKB#2Llg4^8q(G2t?hJi{$f))T7k<
zV0CiijZ>Nyj5uLW<8lgk<dhbif&wY%5oua*!tTT6G~^XYa2gg!!yb_?3r_g0>~fO4
zA_-0*ffVwHbVYFD0*QM?5}dF=xY30@B3%`nA_6Jm6-jW43Z$q<q-%oHh(H?giX=E;
zOYP=q)FaY$!ATZKvR5R*DJGC&9+BP=oZ<p0?iERJ!hdSHc^dPGlo6cpdT@~xuSkN^
z34wINBT`myIw_D&dPNeP#s$*2M<i8nnh;16UXcW+Qv&IfM<h*fIxUb+dqonQCI!-@
zN2HwK^oBrs!z+^DbVeYZ@rX1lIK3&5-t>wjIGq(pXI~#lDW1`870bR(c(cLa5j9b3
zoycYbn@$w2_k;in*zLI%i3DMhQNXsswIoOomKhZAa(69F637zWY=p6=dSu`o+mp!C
z<-Uzv;a%6Wk*_O#8#%)}r)MK?SNk?{hqb?FBY)S(HoDnxnmClP3JV!KYLxfv*jGO?
zup$aOeo~>lXO~IF>Llz5N8Yo~kc^c=*qe^LXLlmTQ!DJ)FF!KWeRhf(Pf*`ZacleR
z6glqZzCA(mKKl&HxU>59Cdp`5&e8`P*o^+4O$&`Z|1#^nXxwkMuvI;73$Z8uzHbA}
z({WpPv^*WRg-6TNaa(w_JRP@%N6XW3TX?iQ9k+$wn<r)AwA&U^D|p=FQ4jh5+vC0E
R_IU7$9`ENDsa>Zr{{!R>?|A?K
diff --git a/tests/data/acpi/pc/DSDT.cphp b/tests/data/acpi/pc/DSDT.cphp
index 3e8a202b0f32d585b38d4f8c85247124de5ec73d..013de154913063ed1ce3f154444b9e11f4608eac 100644
GIT binary patch
delta 1170
zcmY++OHRU207l^w3bdurmS-tYqATzLiX#ISXKG?~X40j&1P2UVg>l4E+yLt^n*SvC
zPEWp^&*gCy6lL*p%p9kdd<C~r@Njsm%54?z4*N3t$e-Nud|i2)^7S#Od)20R4jrfN
zc-4Q{pCqUI_bB;e7iVHF%oTGj#;pNsh&4=h$*l=%iZw09tp#g|wM@3;=D|EM&tlws
zm@np=Y{e~r1!954xV2$zv9`&sxP`D#EVLN64y+^AG1)b@F03oowHUVu7KueBTXTzH
zu~=*|ZV4<AOH6jdtq1Fg^(@A%59^EdO}61SfDOb37UMRA4aJ5g+j1MhMq(q2aT~+N
zVq=rtaZ6#TSZXnD6WBy-VzPo;2Ft`Ui*cL6reaf*?YPZgGqIV)xXod6vAN0ax#h52
TEVmf91#BU<5R1OI=}+w!HXZNv
delta 1329
zcmaLPyH3IY7(n4R6ey+8a&2k3Bu<WAKyfnEYK)0StxlSh5%n#60TUTr9d$6ilRk#G
zc*g%<PrjUw$<x?Lv-Bd448weUb9Ox^dA-iFB=?VAmYMeu99r4>G`I8Y^290F`7Awm
z4WnQz&-|6u-#C9hO|#?0&F$U%>i!3Bto>sPY$=#?5nPn<Cg&2kq+rfva9PG<&NkRq
zFy{)mBI5~X2ka=Aa}`{b@fK$n>?)XZ4P2A)Hs?CHu3*j{*pu;;vk&$a%(($>$asfy
z6WmlV=N7mn;~D2RxUFE$9dJj+3Fj`jt6<InIFRuk=MWq!m~#)@lX1#90!Iqw9D`#S
h?{n^h`wHef01sq*z<CHBDwy*KJo>|C{{9tyn%@v~V8s9c
diff --git a/tests/data/acpi/pc/DSDT.dimmpxm b/tests/data/acpi/pc/DSDT.dimmpxm
index f7d6ca1448cf0ae3c609fc1e1391cccc2d7221fc..289ec07c07734f6fb10e1f1f3de7b3de2a4642fd 100644
GIT binary patch
delta 1226
zcmZ9^y-vbl7>3~z3Y3pRTUyFrX^ltVzc?5J7B@AqI!V%VaVBBtkr*dN&%zUM@DOy;
znCBVZcfE7ve!tvYnY_p!H<@MCeqPOIXl{4wvRIb>YFB-S+w|Tp4(Fw_D4y<2-6<FO
zgKJrJ%PIdu6~z11I`a0OU;g0H0iaE21KJAm*dS~GHY7aeu}RnjY%0iOi?9XQlJJB_
zhtL6Z6y&i@*amD%c*>(8G=N4y9y^2`z>b7xJi3G~psOH{UBWJ4SHg21dxSl}o`O7j
zgdU(L;haaG&<FGt<S`%&00Rjxc<dAQ0s9K_7!rnnp@a(_Bf<zUQjo_1;Q(+T;gZLg
zFb0ej<Z(zi1RP3u&Etr01UOQV$1&j;a4ccY<AiVmI8l(tDd7}wD&dO9gfIb26y$M6
dI0KwXc*A2#m;$B>@|Y23fEl3w_LY3pegScr1^oa3
delta 1329
zcmaLPyH3IY7(n4R6ey)Yp+L)}5S$#ni-R%LYK)1-Se-N}qnB53ayD_`6?D_V_yjzR
z@fqB_#54Z?dh+Ew?98{FBu&od1H&-y-kcBLiC-_XG|s%km)V#97#vvX@;I}z^!(V#
z+1VsHbqynD%tqnD;%}Tjoh0ee)%DHo^y2;puPpsz3v4Nva~_<R@hay6xS(LpMQ~BZ
zYn*Mctzgb2a7o7NoE@;EV9sT5S;iZjU9hWQ&J}P)#+#h0;HrW-*T6Lyk2!l_Pr;n)
z;JS>rI5)rz1#|YnzKkcFo8YE`Ik&(q8ONO4;I@J}2jD=)yPQLCs9??=a7V@o=PtOb
nV9q^oPsV$k`{2HUIY;0~#`~NH;DLfU55dDfY-aDz(Wm(h&iY-i
diff --git a/tests/data/acpi/pc/DSDT.hpbridge b/tests/data/acpi/pc/DSDT.hpbridge
index aebb29c2a4ae67b732bef3eb8e72c5665bb3a7b3..9520f3b7303a43091e8c77b64d1f76407e85f1f4 100644
GIT binary patch
delta 1131
zcmY++OG?8~07l^y`bck+Cg~$hUn#hP`mV#))R_uKXJVG%B3wdu;Y38x6*zO^M!E(;
z{sZ?;4<F}sxj!^TS={e4&#Ud<&2wnBUyoI}sp9L;-AnkL-`2~cW#zBShZ|G(t95Y~
zcwXJ}tN*b3jShBiVe-#bVhvbBtYNcbZcSKItm!arEm%veWwR4*KFk;M9mcH<Ym2pQ
zcFN7bjF@p4w+^f$*0I?cw*VH11rFmD!a}joX6M|xu&!9wVca5EBo^6h#Vv-#VzI-x
zC9p&+vDpQ;9;_$Ua~QWitS{EL*_zt`HV_*)jN1@46dT%X!!3oSVyVNpjbJ0Ok<Bi-
zWw1;va~QWVY%DgmS;1`rn}|&u#%&6licM{{<u-%O#AXiTHiyl{<~F<Hmcw$f++o}n
Ou!Yz{Ec$p#e`<d~%mMfS
delta 1284
zcmaLPJx;=K7=ZCMDNsra6bdchiIZ_cMa8jLjSd=Pb<*U|C^~otJpxy7!pV3BFX83|
zJcGgbjPJWX`Q`c9UX8sh&#t!;%d#i$-c#VEZ+9l2nflpk`4W7_r%t{zHm=EUE<DFI
zX?EpXmSZiy!;Q^#oWEXX`T70g;c<TZyvEaiTmTnjyvw-=E-ILF30#u#gtH5F70kH|
zF3Wh2vj_GR%(()t$atT#5B3$zIRFPTKHyvhR~5{;2Cm6?%DE1%E0}W#4rP4ExdCn{
zm~#`{lyS;A0!Iqw+yb{`JmcI3w-wAe2FEf!;+%jJ1#|9zJ2K8Vcfnl+bMAqAGCt<q
e2lo}sc>o^B_=NKiJXA2}5qR{6ZSxVuU-mC@|70cr
diff --git a/tests/data/acpi/pc/DSDT.ipmikcs b/tests/data/acpi/pc/DSDT.ipmikcs
index a7b4760817e07cb36e13c835d04abd7bedcabe7a..59a6d5860887b511b7ce5f17d7044a08c14f0f60 100644
GIT binary patch
delta 1226
zcmZ9^O-{mK6h`3^3Y3rjQA(lw6ypMnASw>Q;!I7fjx=@+Zov&O=t_(OLtKIzaO7Gv
z=6whEPEVekYW}k@d6C~gr<PS)zL^itT<@RCVpE3Oef8z-vRk{DuS#cKJlvSNQ?Bzn
z*RtxCQ~rnQ#Xqc${NUj6^$#wN0c}DX&{mMg24MrRA>j#+O~NK%Q$ZeEge}09gi9VB
zLI==MkjFM*8?Y_mDUXKG02&2(>=1SUI})Dp=n}esu7W&zgdU(L;W>{!p%3UQ$YVel
z00t7Scnk?cz)(RRyM$f9u7npnMuZVyq#%zy!X98x!ZnXEVGI~6$YY<d57?J*!(&32
z0456ZI3OGV4kWzfaY#4>94g3TN|*ws66QRP2uFY;1$i73jseFKZh4##P5>tg@;D`&
c0!}5o;xQx405b)7oDt3dXMo}RXYyV91&d7xh5!Hn
delta 1329
zcmaLPIZnd>6aZ0MaT3R|6FZxoU815SVGCu9K?n&17%GsQGQa`oxd4T)KnVpxf<tfz
zTCTw&ru@GhJ<aDdpEyaHoad2Ym~Su6yXVBuS6Lco{^3*p;XQ;0Ryvtwc9vcoI|VzN
zCugo<6pZ{dSXupzi^r2BJz8Gh+%7KffADneA6sBc!JLcWqKwx$m%t?jb1s9+GTz{9
zgKY(Ku7E2t-sJ3n9R+i)f~zv#;_QN51#|Ymo{YCS*T6LebFPEyGM;hv!M=hy2jD=)
zJDeNfhJraa!A%*@Ik&(q1#@nL+cJ(hcfcJ5a}L3wjCVOl;7GxoyWp;j6V5$wPr;n~
k;J%FaI1j)B1#=#Phce#hJOYmt%y|qR|6wzGy$iq0Z?SP<$p8QV
diff --git a/tests/data/acpi/pc/DSDT.memhp b/tests/data/acpi/pc/DSDT.memhp
index 63fdfe8c025f8b2f19411792817cd21b506fa984..47d63dec8f997417d7512a694a4825fee874d995 100644
GIT binary patch
delta 1170
zcmY++Jx;=40Eh7s3zSlzE#<RN5>Mc_7+t{PrY2T5lTMz;fz82q1>?kG;uYLHfY&fa
z^M8`}U7!5&Je_`@`FWAwK4gwld4BcZWB+n<Ulz+UTy55$@nd%F7Q6G(TNHO!{+3rR
z@|(bMwj8hg59^m?d;Jqfe{63@%!RpPuEn@jVO6oJ$@aO`U^TIt#kkdBb+Nk14!C(R
zPt3Czw+5^s)-c&2Hy`GU`4;2Wgf+#QCOhI5zyh(rV%%D=mRQSV$K2YmwpiO@+&Zw1
zSjS{@ZXqlb3oXVif<<DH$xgV%uvjd%7`HC0E7mpHf?EPh#1e~f>%n?rJ(DfD^<jOn
zzQwo=U<0v%$<DbAVMDQ@#kh@NBe9Xma&BYTSZr)DZYeAkOHH=oHi1pVCKls1g-yk#
aCcEI4!7{PTV%%o1nb=IM^Y)Q`Rek|G+7B84
delta 1329
zcmaLPyH3IY7(n4R6ey+KN}*g@P$x(4VsxQaV@x#0>Lf`Sy}W~iFW|t&?5Klr_aS@-
z<7;?{XZ-*5<jeWoo9{YFnq15y!!Q?Kop;ZPUnW@^XZ7Rf*@yQS99ik=D6_Nl^3=)M
z**H0O4I^jF7X78=-#C3bOVX3;o7=nT)x!^7TlvQp*ita(JUB1ob<PEFLBX7h;G&E-
zINM-b!JJFrl8iSwJ77n_oXg;{jJG(uU{}GME8vQZw>ekARRwddfon1zajt{w3g+AZ
zH)OoS*#mnD=G+7~WjyBWgM9^aZh>1ejybo%Z3S}<z=4eSId{Mv1#|9#yE0BV_rN^`
mbMAxtGCtrOf<py!j=+(O4>=FO0|j#)f`@<D%--(9FY_B$=3Hz5
diff --git a/tests/data/acpi/pc/DSDT.nohpet b/tests/data/acpi/pc/DSDT.nohpet
index 281b0955ca223a1bd2c24f5e58fb8b73ae37a957..47e4bf62ebe742304783e76984045d7322c3a421 100644
GIT binary patch
delta 1226
zcmZ9^IZne+00v=4aT3R|V`p*p1#tlgYbX;OIzYl8A%WyuZ~&@w6gdG$KvXHX2Q39h
zpa-FUiuc;lr}@}h&-^q?Z`VD?DLlRTUx9zQeay3E9<R2WpWtP3?Pjxi?k%#rE5GRF
zi}WUNoTB69|6%hQ?QZVFXy@Vi4<76bx<FUZwIIh5uq0SA;UUK|uq;@%Ajb-@B3Lou
z5l0W`33?XfSOr!Et0p|==mUL0-+~-#z?xvqgeM#WU?3P+kYfl81w#{_a;yXEf^`dW
zjDV3~WWqVe7#Iu27Ub9fHUt|cJmc5|HU*m&<k$kX1Y0ItaBKtHf^7?OOn`}CV!|cI
z4zMHGu^`7Tuq)U#;W@`1uqW8FAjdwiFW5I>%5eZ32o5aBaR?j=4o$e?I0B9YM;7Eb
e295>CCcNM{0Zs%b7UVbuP6ele@%wl3S@;EQTN7^p
delta 1329
zcmaLPyGp}w7(nra-qJK})3i-`FF3hrz1FcYiU^7rofQ7<=H)G%+#LD@f};-N+=p@U
z2?R$kc*gHr4?oWRXtClZX>zuREX)3Sb>BTVez`PhZ2ZIL`KR{~9c0td*f=IVKXx;Y
znIxy4Wo4}SELd9pjnk)-Bt5#izPX)V-2LFS)qk7?XBEsj2hPcOopT<XS1{)SxFF*V
z&JNg7Fy|t;DC14eF4$Et=MuOi<1Nk}*i$g)GPo?`ZO#>NMZuh_;Hr$roPDsbV9qsg
zO~yN%18|^V&UJ8I#uLsBa6`eIo8YF5W6mKsR50fV9Lac>a|_&3Fy}V7E#ri92i#FG
m=PtM_<2}wja8JRU`{2He_c;&10|j#)f`@<DHgAvNhy4v#7-Ve#
diff --git a/tests/data/acpi/pc/DSDT.numamem b/tests/data/acpi/pc/DSDT.numamem
index 34914bf1ed362ebd07f0dbc22434dfddd26d9a82..1c4e0c80216b53463fbec8fc548007f0326c1829 100644
GIT binary patch
delta 1226
zcmZ9^yH3Jj07vl>3zX8*ax1q2#wS3$;RqHtHL>cVNuR>O)y>I))x}3JPCSO258*>-
z%>NAEx1RiRzGiQ8Kg+Y5bl^CpyAS^{^e?s#MZPNH^>*_TzD};(e1B1R%l!7z-|>oN
zb{#m*j^h>oVe=mCZGOUN_x|}0&S!!y&=qto$gvD83zkiIz_9|X2v#h}u?nmTR!w-w
z(F1ydo&`D9fHlFI36D7XKwr?eAjdkeE?76=F~<NH2nH797y?7V(1a%(8^DHO!-5<m
zU?dosaKSMK#)7d0IW~b!!KMjMIktc;!IlL%wt;QIwh5OUJHU=$$ATQYz^-7|ge#5-
zFcC~F$gv0P3HD5Q#<36V3-&F@aR3|$4osMF90G@eLkn^o0Y`!(6RtU?z*I1`AjdIq
cEI2mdImZcbA~>-i$0=|sI2DXPpOWv=FViF<kpKVy
delta 1329
zcmaLPyH3IY7(n4R6ey*ImRrj`adJcy#gST#G0~{iNs}_7&c1+~lLM=xqYlI;aq|s)
z4KMMG|G%DmInU#dk&~p!#aUz+=I6?}_ni3cI!oisKYCq0dQah@m2ONkJ4-K5oSdD_
zl5^KEa>jBMtgZjX`O9gN9xrZg@8(wzKX^R)#}?R9Fy}ltFXK(l1#m&ZoQvS1jJG)3
zU|YeQOW=}>C!8IyqhQWua9PINoL#W1V9p-clkpDc3b>+R&Q)+###7Ed*jF&;03678
zmvaqVQ!wW`xGv)v=LWc;V9rf&Q^qmp7PzHg&LKFI@gC<094VM{8{C$0!np(PD425>
k+?DY@=N`DHV9tGTU&aTV2jGE%IS;|ZKWt|2lkm&@27uLTz5oCK
diff --git a/tests/data/acpi/pc/DSDT.roothp b/tests/data/acpi/pc/DSDT.roothp
index bba1612c972948911ca5f5b301b10a380b8d83b7..f9a5164e0cba7c209bd3e52020cb855e8688f682 100644
GIT binary patch
delta 1703
zcmZ|JO-{l<7{>8wDNu%%md`?glIT{$hp4zR#iB70F;-WYl%*dFuVC;9+`xDN;|<*C
zar6eZ@;)o`ZYGnN`Mv*n89WVT5C&Jm6++p1laHo6`MQb1ab(XvSI_2Qclr_bN0A=+
z!KEQYO6cQoawg`>Q!VWEBHa(K&&A(uyvF<0x3#&Q94=ljf^d3!cmJ@MFQ@V2ct~=t
zV3e{3%Ie43=>8KkE$q{Hse-6$B30f{MW$flA1D8kDb@_o(O@((8gI}^!=%ZiS+j#q
z1|~x$!y9z6Fj+EL)(p|nVRSM&Z_vrX<jCY$vx|;|kz^!q(8<H($>dqHhmHYbkTH0J
zjtOIuF<G;ZP64JsrobC?EEtQ7#hMX1HjGWi<_$VUm?D`XYYxyU!Ia39c!N$Erc9>H
z8XuhsOodE^H|SJhs${CH8KYB!sgbGi1|0{+A>**-2%S1iolKoK=rmv&WE!jq&~ag0
zGA?h>X~HzgG+8r2rv=j@)8Y*}ZJ0KhHfxU2@nAeM9&ga;z;wuT5~KL<n&YXzKF-7S
delta 1450
zcmZ|HNlpS$5P;#=bOTL8GtXn9iN+luDy|IBI3!N-X<~v&vvgQ^1%pT62F42*U2z<5
z;0>e=|H{;|s=oSPdT(9F)86%3MJeO<!+Ca{lf|8{hkkmnn7_IQTNhut)AwzE;9Vt@
zGL=2l<5M-6jV#@6FZcT9T>V|=KkoWQFizhuJ$-in@c1;H%#M~Ucwg=fB1S+r|IuSh
zcUDCwgbm4dm32(4DcUYw3v0=iZWtRD?Ka&AHX>WPQEXJSJ-Rm5mMz^FHYVB~x(?Qn
zE!{XaF4|qX32Z{PbX}|~+C92SY*My#Q`nSf`*hRTv~1~Suo=<r)6HVDvZb5D=0rQ7
zo5$v5OSgb6h;~S~h%L&NZV6iw?TBs}Tb3=|3brCzk8TxPl`Y*GwkFy!-8!}|Te=Nw
YL$rr<o7kpo>9(+~z#9JNcc~fr1)C(Bwg3PC
diff --git a/tests/data/acpi/q35/DSDT.bridge b/tests/data/acpi/q35/DSDT.bridge
index d03e14b24d0841b4003e7954b70cd7601e571902..f8a0bc150f5a249bd5d09be6949c97160de1ef82 100644
GIT binary patch
delta 1703
zcmZ|KNlpSm7>40)XrL(?Xy$nkH=1a`850u&wi*)=V{44T1eOk`kSlNnFJN4;aN|br
z;4M6X4Se6q{F_SUuX^fD{oGFPl;b+r(=|=gf8W$fU7dd458dw2?te`V>W9tVr@PS_
zn!}EBWoepEGrR8bxi%P|8E(s)cifu`ZGP&l-hT43w7fnWj$SVvxA*Y)^gJ4jd*0>t
z;<C=C^aao-qei3oPxOs>b~aZ&60bgMD4%RlQGOafj9)aH_=YlQ3>ZT;>;z~6FagnQ
zu@j^T!USc*PKYK16B5lfJ0^_@W6Fk|FijXHESep56peyWvSBAe6M>0{W|tj{#)7eA
z!%mbY3KJF09y>9b7)(qy?8Ir}Fmche*|BMC7+W^%Bxn*a3DNAclcY()BxS=+iY5h<
z5>1DlG))>NEgN<+G#QwTXu9lVX|ga`*|3wN$-(4AbHq-bCJ&RB4Lb#z0!%?P4m(Af
zB1};>?38FqFeT9(vs0!i!<1#iPKBldQxVMxJ5`!0OjS1Q)M#ojwVBa7?;opG-yboi
Bw*3GA
delta 1482
zcmaLRNlpSm6oBFCrh%rJ=eZ%ekl+R!F)=Yf<B&MT))<3HvvjxxS77PZ3mDzVRk(~y
z|H@P?>%A}ktKX;Dqvg2H{cKwZ&Hl0)b?ajK?72NJ(Vb3?>nF{dAGh7|Ot0(QMTF3W
z*>eY%VmR&_Zfh}jAFjo6D<<vDjjhFd^m*&JS1+$`@1x=PZ0<TMr%}<Cw(-xN8>?IM
zhNXjb1zv|OAJ`|yJL}(C2G~$w%6_n4j&~^szySrO90UjDc#pCPHWiq12pp2*eaaTt
zQeetqa9EBHC`Z5%1*RMYN9FjCats_(V9IfDT#h@G6X1jbQ%-`Da(qNN1x_h2<uo`g
z$6d-9a7KYCXTe!H?orNxa|%p356;VRpK<|QP+-bMa8ZsO$|Z0~fhm{4WjP*Du7E2F
bOt}iK%JC^>8*D2u<r=uQ#G3d0(X{nHb~%S0
diff --git a/tests/data/acpi/q35/DSDT.multi-bridge b/tests/data/acpi/q35/DSDT.multi-bridge
index ae47b004e39f9f78f3c98093727fb92a0c6c74cb..df91b798f79d4564b049e8a7dbeaa5bb99abe635 100644
GIT binary patch
delta 150
zcmdnue88E@CD<k8fFc6}<Jyf}8VX!~5;5_?PVoY65|eEd?DbtZgAEPhIpQ5%f_NAh
zm>4*mf?a(WqnkWgf(?M;j=`aR3}9Ix31m-RqM*#^IQfKvGgzl3R3{??Gejo?A)OJ5
FF#zFGBxwKu
delta 142
zcmX@$yv3QzCD<ioiy{L9<G+nu8VX!a5;5_?PVoX>;*)I@>^1#3f(;GgIpQ5%f_NAh
zm>4*mf?a(Wqnn&rf(=08!J&Q(VA;tIipq@flg}wQgY{TK^)NCpL-a7<)1x`LSJ4;%
D?2jW;
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 11/17] tests: acpi: whitelist pc/q35 DSDT before moving _ADR field
2022-07-01 13:34 [PATCH 00/17] acpi:pc/q35: minor PCI refactoring/cleanups Igor Mammedov
` (9 preceding siblings ...)
2022-07-01 13:35 ` [PATCH 10/17] tests: acpi: update expected blobs Igor Mammedov
@ 2022-07-01 13:35 ` Igor Mammedov
2022-07-01 13:35 ` [PATCH 12/17] x86: pci: acpi: reorder Device's _ADR and _SUN fields Igor Mammedov
` (6 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: Igor Mammedov @ 2022-07-01 13:35 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
tests/qtest/bios-tables-test-allowed-diff.h | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index dfb8523c8b..1983fa596b 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1 +1,15 @@
/* List of comma-separated changed AML files to ignore */
+"tests/data/acpi/pc/DSDT",
+"tests/data/acpi/pc/DSDT.acpierst",
+"tests/data/acpi/pc/DSDT.acpihmat",
+"tests/data/acpi/pc/DSDT.bridge",
+"tests/data/acpi/pc/DSDT.cphp",
+"tests/data/acpi/pc/DSDT.dimmpxm",
+"tests/data/acpi/pc/DSDT.hpbridge",
+"tests/data/acpi/pc/DSDT.ipmikcs",
+"tests/data/acpi/pc/DSDT.memhp",
+"tests/data/acpi/pc/DSDT.nohpet",
+"tests/data/acpi/pc/DSDT.numamem",
+"tests/data/acpi/pc/DSDT.roothp",
+"tests/data/acpi/q35/DSDT.bridge",
+"tests/data/acpi/q35/DSDT.multi-bridge",
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 12/17] x86: pci: acpi: reorder Device's _ADR and _SUN fields
2022-07-01 13:34 [PATCH 00/17] acpi:pc/q35: minor PCI refactoring/cleanups Igor Mammedov
` (10 preceding siblings ...)
2022-07-01 13:35 ` [PATCH 11/17] tests: acpi: whitelist pc/q35 DSDT before moving _ADR field Igor Mammedov
@ 2022-07-01 13:35 ` Igor Mammedov
2022-07-01 13:35 ` [PATCH 13/17] tests: acpi: update expected blobs Igor Mammedov
` (5 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: Igor Mammedov @ 2022-07-01 13:35 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani
no functional change, align order of fields in empty slot
descriptor with a populated slot ordering.
Expected diff:
- Name (_SUN, 0x0X) // _SUN: Slot User Number
Name (_ADR, 0xY) // _ADR: Address
...
+ Name (_SUN, 0xX) // _SUN: Slot User Number
that will eliminate contextual changes (causing test failures)
when follow up patches merge code generating populated and empty
slots descriptors.
Put mandatory _ADR as the 1st field, then ASUN as it can be
present for both pupulated and empty slots and only then _SUN
which is present only when slot is hotpluggable.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
hw/i386/acpi-build.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 36fe43c52f..fd7f3253e5 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -442,8 +442,8 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
break;
}
dev = aml_device("S%.02X", devfn);
- aml_append(dev, aml_name_decl("ASUN", aml_int(slot)));
aml_append(dev, aml_name_decl("_ADR", aml_int(adr)));
+ aml_append(dev, aml_name_decl("ASUN", aml_int(slot)));
aml_append(dev, aml_name_decl("_SUN", aml_int(slot)));
method = aml_method("_EJ0", 1, AML_NOTSERIALIZED);
aml_append(method,
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 13/17] tests: acpi: update expected blobs
2022-07-01 13:34 [PATCH 00/17] acpi:pc/q35: minor PCI refactoring/cleanups Igor Mammedov
` (11 preceding siblings ...)
2022-07-01 13:35 ` [PATCH 12/17] x86: pci: acpi: reorder Device's _ADR and _SUN fields Igor Mammedov
@ 2022-07-01 13:35 ` Igor Mammedov
2022-07-01 13:35 ` [PATCH 14/17] tests: acpi: whitelist pc/q35 DSDT before moving _ADR field Igor Mammedov
` (4 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: Igor Mammedov @ 2022-07-01 13:35 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani
Expected change:
- Name (_SUN, 0x0X) // _SUN: Slot User Number
Name (_ADR, 0xY) // _ADR: Address
...
+ Name (_SUN, 0xX) // _SUN: Slot User Number
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
tests/qtest/bios-tables-test-allowed-diff.h | 14 --------------
tests/data/acpi/pc/DSDT | Bin 6422 -> 6422 bytes
tests/data/acpi/pc/DSDT.acpierst | Bin 6382 -> 6382 bytes
tests/data/acpi/pc/DSDT.acpihmat | Bin 7747 -> 7747 bytes
tests/data/acpi/pc/DSDT.bridge | Bin 9496 -> 9496 bytes
tests/data/acpi/pc/DSDT.cphp | Bin 6886 -> 6886 bytes
tests/data/acpi/pc/DSDT.dimmpxm | Bin 8076 -> 8076 bytes
tests/data/acpi/pc/DSDT.hpbridge | Bin 6382 -> 6382 bytes
tests/data/acpi/pc/DSDT.ipmikcs | Bin 6494 -> 6494 bytes
tests/data/acpi/pc/DSDT.memhp | Bin 7781 -> 7781 bytes
tests/data/acpi/pc/DSDT.nohpet | Bin 6280 -> 6280 bytes
tests/data/acpi/pc/DSDT.numamem | Bin 6428 -> 6428 bytes
tests/data/acpi/pc/DSDT.roothp | Bin 6656 -> 6656 bytes
tests/data/acpi/q35/DSDT.bridge | Bin 11449 -> 11449 bytes
tests/data/acpi/q35/DSDT.multi-bridge | Bin 8640 -> 8640 bytes
15 files changed, 14 deletions(-)
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index 1983fa596b..dfb8523c8b 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,15 +1 @@
/* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/pc/DSDT",
-"tests/data/acpi/pc/DSDT.acpierst",
-"tests/data/acpi/pc/DSDT.acpihmat",
-"tests/data/acpi/pc/DSDT.bridge",
-"tests/data/acpi/pc/DSDT.cphp",
-"tests/data/acpi/pc/DSDT.dimmpxm",
-"tests/data/acpi/pc/DSDT.hpbridge",
-"tests/data/acpi/pc/DSDT.ipmikcs",
-"tests/data/acpi/pc/DSDT.memhp",
-"tests/data/acpi/pc/DSDT.nohpet",
-"tests/data/acpi/pc/DSDT.numamem",
-"tests/data/acpi/pc/DSDT.roothp",
-"tests/data/acpi/q35/DSDT.bridge",
-"tests/data/acpi/q35/DSDT.multi-bridge",
diff --git a/tests/data/acpi/pc/DSDT b/tests/data/acpi/pc/DSDT
index 8282d449ceaefd914b419f507a13f3fb7b318aaf..fd79a602a2aaac0f7d91d2ee2b1af8f2e6cdd4b3 100644
GIT binary patch
delta 758
zcmYk(y-LGi6vpvN(>6`>{pO=-zHY!lJG6Ch2&kij;v8>4a26a~os<Key#&Qwa2DLf
zo3YJ#`W~mi|CeVt$$Gw?zh-XQHYXQ$uh;LH&E?g()i>MjK@aXy9keFc02_4YHa_A2
zaX?=ZhloQeJpJYfaYQ!~O+=GEB#sfs<oSATAzE}Tae_FZH^14PVI$gnhP^pskuO&I
z4hQbAJ6orxz}W3wxXbQ#`=#tXxX12wzLM|c!+mz2UG@PyU=KP!l6?pd*+X{OE4X4;
z^sN5>rU)F-qtah5MvUoKVuF~^ex%<_5mUOCI7OV&x5NxFqdL~}8RCp?CFY1Zea8AX
s6^I3&QFLdX%9$m+WG}Z)FNyw56})1vy8W5#Yk19GZ~XB6IQ`lC1Mb_IlmGw#
delta 758
zcmYMxJ5Iw;5QX7EaT3R|uOHWsIDTz_0#YQQps)m#6d-D|0VHZ93R)`ANU2!@h#rX=
zi5{^TlIuC5{Xd^#d^d~D;x$)UdwF&44D7Bwxp0XFWOpX;gIei>&Ngg;E#f=X1||*>
zhs0lqBg7GL>C2a6#4+&=qK#-1e;`f}C&Ydra|h8OzDArPPKn=wwm-u~bma_pd&aU@
zuH_C7?umOl=cmx>_X@7WmD#Vb_u;;{Z+wma6u<-Vpm*#;cqkqkKf*qON8(ZM*lV~J
z*Zi#ipD6~%#E)A3UV@kq|01S{De-<RUuK9I@jc=UaYp=&m?P%IO(OF-;+*&vu|O<{
vKNEST60wvsN^|BZ&aB{-c(rqWN#&Vpcr9L={TcQRyb*7<e)xWz{p|e#W3`!-
diff --git a/tests/data/acpi/pc/DSDT.acpierst b/tests/data/acpi/pc/DSDT.acpierst
index 9520f3b7303a43091e8c77b64d1f76407e85f1f4..bcaebed6837b0ffafe1128e1f8c2e55d4c66679c 100644
GIT binary patch
delta 772
zcmYMx%T2>T6ouh{ocR5o_-&_vY={I2TZ@n-NFdfOfd=T}HWG;jXn+P-!Init3CMF#
ze7FCnGt$hQHmA+;F^GnK|K!bP#?0!UUmhHThM+&kIpUm-5*LUIx(NFma}&|DhVc}W
ze&TI?eKlBc3vRJnqtkb2ocA`|X1DeJM)nTeVRzVXr}JI7%kFC5%HD%}>>j)9eYnr=
zYv0K}fCucs=xQhX5FXN3JUw587|}YJVvHEmo5Tb$p-+h^VoF^)%@v}eSBXo+C4ETD
z5HpI^^iMfr&iBamJ@4e61-xJ{MyEeD{Zk1q*-O3O%f5nF>=nDbQw^`#Ywh>4Z{Q7k
e!!G+4-m<sa53=vz9eX#rI>>$nU%mfk#^pcHH={rR
delta 772
zcmXxhyG;W@6ougnT6^E`@xFImfD<f%O}fH31PMgECC~s}+(s<X01eOp5u^kbC7_+T
zC;dO2k!I$+J#SBsQ8GTiJb0Efjfbaz$ReJi(ZmJfg7}2EL|hVI#AB)FHlj_=G@obl
zPr7TbuO>&k19!xo+4(!R%-)5&;;!D`VDG^_anJazobSVZabNom`v4w@2gb1v;h}h_
zeUE(vkHn+d)gJp89ut41@_Y$mLcGZ&ridx=8)Al-5q~1)h&l0)%UmHU;#b5K;)?hK
zu|O<{QzidYB9?NGQs46q_pIQRcr`o!Dfy=wUW?ayf55(hH{y+Pyi*Hr#ar$7*mv+w
fyfcn{5AVf$?MLhf_#i&au8!ER;cI&TEv(CbKs2L3
diff --git a/tests/data/acpi/pc/DSDT.acpihmat b/tests/data/acpi/pc/DSDT.acpihmat
index 33169838bed50710495d45e0d9486ac59b4e504c..973320cb25120818a45ddb3d8e3b3211f0c00adc 100644
GIT binary patch
delta 760
zcmYMxy-LGS7{>8PlQvC1@^z9lP1;<79|frpkQ8we2gSL&SK$o^!n+9$u1*Cnp;yq+
zMQ|3p0T<1ApPqLL{C{}}=VV)N>&<1Ht(%LRp=EU}x4FH$_B!rbKj>AR7AHq*7jDCC
zcAI@^+<`mnj`oG@yYMc1w{^9UeGlHFXVnDwsEg>*x5PeTpX$WC=^=XbC~<%|pihZI
z#33D~W<Ek3(SyV>;+S@6v%e=F(dTpc`kYHSX8;e_gVt%2+53G657|S#Ka+g~kJux2
zxu+N&v&Y&S*(<nWSM0J+;0b%8eI@%8p0cN{tCj3Cct&rzxxNYFgnlLFh&f$N&6`ui
tDZNN65DWT|SR$5mUYPj|aYj!P=ZJIqD$IYX5Gy`M^?#1z_xtkW;13f0o_hcQ
delta 760
zcmXxhy-LGi6vpu*P0}<?o3A%X^U>xKsurX|KvKj>92Dp5UWGRx2xk)<T%8JDLa(5s
zi{LDH11>dh&a?i1c_`=YuHMz#t0-;m?r)rd-8PrEF42JORtJ7lXT|ApYil>)hPcuD
zTHJ)2;->Z$_7>a{w>noV?1%6n@r!DF{i8ObP5gs6LL3p-v3%(uI>b+iW5hA>7ov;k
z5-$^(PY@@>kBC#mDe*pO`gigWJ-Nfvcdl`#5BJ6W&Uu>}{XT#P;(^|uV;{mp@vwKi
zQv{F1Bkc|L3a-Re@7TxiSUlFg!9IZ};z{RfgMA85iQhAMz8T_-_zy8d%!sdZ`7%e$
uiC+;5#De%2u|zD1FAAB@5$D9uhzrC8@pmErQ-xT`9o7FGCm#>x=g|R&$ew!u
diff --git a/tests/data/acpi/pc/DSDT.bridge b/tests/data/acpi/pc/DSDT.bridge
index 407066e1ac46922751969b823000e4fdfa542662..9583da4e4f558cb0bf6912733fbe8db7c1ad255f 100644
GIT binary patch
delta 1438
zcmeIyOG?8~6vpu+O`9}*B~6>8P1;zT3T;t*fQX@v3OcX|&bkFRAkGExaVEu?I}o}8
zHy}<N3F2JbgH7(&dt8B|PCEGg?@7bqwzKhU{Cr+@rpeK%VkVQb6UCgSpLFkRM#uVO
zusb!=SXLBO98j|Z>f*q5I2_2TiE3$CwlvXsI)|PUJ(qU6tLZkLuA}R8)lQa}2j=OG
zu>dSkFHC%l8$d%m-pIawi(k(~H$^wo{t)TQ@gj0j<l-XlxIAqkTXgNnmn#8F^ubsL
zmT99dPgZ~xx@4>ZtMtlP1J)>Z<+u&B>4MP#I`qO=2iEDQE5}`+O9!#U2CzZ5j7?yZ
zz8F2AN5eI_ZXf82efinCN4&5AJrF%eJJ~(C?-qJX^cFpNfA`%+ZquVDUpWMZ^vxIn
yBii@n$qukXH;i3imp&O|U_9>!huZSmt?pv_dtcqf>~HV??;`bsz4>VUUHt`{a3nzh
delta 1438
zcmeIwOG?8~6vpwBG;Pz{SJJde+N6!esn8b12Z$KzsGtLj;H+D41L9l|A7@gWxdWjq
za0BARks!{+J=i4Y!zDQBq?F(Pp5$`Kd@`RrpV#bodUitQEIvA2{wDwV-rfw4jp=ZA
zW+qWfV}(e|4rt2*+rem<Riz{ASyp=1Wm@IXbJBB3=exRLB~Modx<P!^i8IUt^Tcn!
z0<b{b4`MGJF9M75_+t9{EnLq;H>I0Ne+Z3iyo6kmTw3NG2h$2!5ntPKxiYX!`~j>0
zE5sWOIavi(i7$aQV2$_{SO?aLBS*$9phbKEw1GD93$Ouf5dZXK+yOeo2a#YC*d)FM
zwty|-FQ5x_iAQU)ZV%|mzPxnZV=T-^_oe$uXR9y!ZlkxQxB1Ea+jj@KL;UE<l>=Zv
w{0$6&A@RN^C%eEd@eQyC>=AzgBVa^}fq$s4zQxtIsQ&+3<bl7p7_Yx;zlqi)K>z>%
diff --git a/tests/data/acpi/pc/DSDT.cphp b/tests/data/acpi/pc/DSDT.cphp
index 013de154913063ed1ce3f154444b9e11f4608eac..27d1fc90f5f51c48a44bace866a19a42d7170129 100644
GIT binary patch
delta 758
zcmYk(J4yp#6o%nQCdp(n_sQHcw=KjX7Yo4wwGb3kY-~n%;1=9~Ag2`EfK9;FSlI;x
z!3|iL%=z*ktAY37E6)7u*?PA6a^j{wzA`(VZbz@LZ!V0k-n1XObQi(2(ZL#6qcgX5
z5qpR|dXd;i?9;cz0pfrTJvG-6b$XIGL>$tmL<7;FsjucE#1TFE_3jK4(d0AC%^CA-
zzEpQuaEsmAI^6}@Zg0bFcDvm#WbeQocBl2F{3jRgvb*fE_uwA8*ZP6%eYnr=v&%k!
z2kZgehyR~x3?9>MsD4z47}A@>2r;5xi7{eK=aHHxhzY$)Oc7K1kvKt|&{3@B8Dd7y
uv3jN)G3PV#_RJGGvw#=u#n$N|QO{JuOZKwepUS?1SM1fs_usAbWA6{Dl9@*U
delta 758
zcmYMxJ4ypl6vpu*nIx0RJnqb7UYXYxVv&c1;DA~P3Mw`>qdRa5Za|Pz3U0tA;A*Vw
z0)pTMEKKg458MBbuQ>N^=9~HY%S)Q;n+vOFw$1UCP1GZ^)qyY7GMu%hW&>;xpQ%Ra
z*hlOWzaS0}2gKiqL&PERp)Ye2(IkFC93hT~KM^fNi+C2ue2h3IehixK3>(pwGwkgd
zi+r(?I~=$p?(CfJLZjQea97;b`z7`s+!Ob-ukcO^uEbU6*!yr_+}D19eE<){gU+!J
z;h}iQ_tF11O~4c4+ejWNLX3#t5M#uc_!lujOo-28nWu;;@hf76m=XUVP7$ZXM~TdH
x#GLp!k#8yx3pu0EXP)595?+dzJLiW~zNvy&;+5W?Vqe2+@p|j~?@soy_Xi(rnMVKs
diff --git a/tests/data/acpi/pc/DSDT.dimmpxm b/tests/data/acpi/pc/DSDT.dimmpxm
index 289ec07c07734f6fb10e1f1f3de7b3de2a4642fd..efa46bc7860f0b026f23175ccf3ef1e1eba59c15 100644
GIT binary patch
delta 790
zcmYk(J5Iwu6op}nIDR{^<M%6pmMRDcbde#nNPuX`0$2iDh=jyl080RgmPN4y@Z6KR
zwEw3w(#-7EyY=U58g2W{eP9?P!|5L$Z@m${r~N*fh$j6=93zgY&-wy$3(<16!zmUW
zm8<6Ta_hitxXo@4PKUX<-#c)J-BJ59*}HI;-Bo_R)aQF}kKJRJy$|=<edR0J2k?MB
zV3&Oe581;%zer?00Z*td_3KR$r}Qi_LX7BJVvHD5Sn2r;aYj!P6U2l*B&LYzTdmg_
zT1I!Z{-qo-=Ue3JmREAi0$#8egVVCnzf{6Y_EPPyWnaN7_DcCio~ee{>@~aW8+gOs
mD8G??3vbz5cG-9Ej=iIk?*A{%!E-w9^g}HW7hf-3eDDj{aG22m
delta 790
zcmYMxJ5Iwu6oug{;@IO?V#n{Xoj^+!1O&Rs5LzTaw0Hq5fh|Nr;x2$CfJDopSOR!_
zk7)l-XQY|gZ};2J*EH%L9&f#g>bu>2Kr|tKPrET%h!*h=;uLX8++|&1<~E{Dsvpj?
z`Ka8~r<c7l?!X;!XK+5ut#Pm5N?e)!8TKyR6?cuFujPCX?umP&WADR#ao_j``v4w@
z2cu&j!b9=!&o2_pXW$vJF6H&+h;!m+#0W7W{zi-uW8$!q`2ul4{DhbwCd40zDPl@*
zTGkm_MtrB`mvY2hZjqZ?Ug4Gnybv!2=XEW=RKiQ~((JFXui%w<WqgNc(r_)VN5{T~
p*W$JD8|)i+Bi@XTeG6~JTRv(3e`yI`5+AqnP%Fe0eZ92t!7oipn9%?L
diff --git a/tests/data/acpi/pc/DSDT.hpbridge b/tests/data/acpi/pc/DSDT.hpbridge
index 9520f3b7303a43091e8c77b64d1f76407e85f1f4..bcaebed6837b0ffafe1128e1f8c2e55d4c66679c 100644
GIT binary patch
delta 772
zcmYMx%T2>T6ouh{ocR5o_-&_vY={I2TZ@n-NFdfOfd=T}HWG;jXn+P-!Init3CMF#
ze7FCnGt$hQHmA+;F^GnK|K!bP#?0!UUmhHThM+&kIpUm-5*LUIx(NFma}&|DhVc}W
ze&TI?eKlBc3vRJnqtkb2ocA`|X1DeJM)nTeVRzVXr}JI7%kFC5%HD%}>>j)9eYnr=
zYv0K}fCucs=xQhX5FXN3JUw587|}YJVvHEmo5Tb$p-+h^VoF^)%@v}eSBXo+C4ETD
z5HpI^^iMfr&iBamJ@4e61-xJ{MyEeD{Zk1q*-O3O%f5nF>=nDbQw^`#Ywh>4Z{Q7k
e!!G+4-m<sa53=vz9eX#rI>>$nU%mfk#^pcHH={rR
delta 772
zcmXxhyG;W@6ougnT6^E`@xFImfD<f%O}fH31PMgECC~s}+(s<X01eOp5u^kbC7_+T
zC;dO2k!I$+J#SBsQ8GTiJb0Efjfbaz$ReJi(ZmJfg7}2EL|hVI#AB)FHlj_=G@obl
zPr7TbuO>&k19!xo+4(!R%-)5&;;!D`VDG^_anJazobSVZabNom`v4w@2gb1v;h}h_
zeUE(vkHn+d)gJp89ut41@_Y$mLcGZ&ridx=8)Al-5q~1)h&l0)%UmHU;#b5K;)?hK
zu|O<{QzidYB9?NGQs46q_pIQRcr`o!Dfy=wUW?ayf55(hH{y+Pyi*Hr#ar$7*mv+w
fyfcn{5AVf$?MLhf_#i&au8!ER;cI&TEv(CbKs2L3
diff --git a/tests/data/acpi/pc/DSDT.ipmikcs b/tests/data/acpi/pc/DSDT.ipmikcs
index 59a6d5860887b511b7ce5f17d7044a08c14f0f60..67b60cc44a6ebff029524abc27ef48f90868f948 100644
GIT binary patch
delta 791
zcmYk(IZnes6vlCjcz5D`ca|$eW^E`8sgOV{qM<Q40!QEiG_T|cG)TEmxBy3>fXw^i
zNBjTj8);^??Y8|~`(fX$?#G%o((LZx@x~p|i{BN9I-+j(JJabdI%(Ro-i8}+gWcFU
z-3I!8Z^BJ>Q|%9BZ^12gOZm}qINyfb>^8gX9k|2pC_k3H3wPOFcG-JykKOz8(?sTD
z@R+WmZvRjd#0kAi^bvjfmKY!gbRG}$5HX}Ti4kH%UlL=)n3l;fPY@G&O@?nu5mUZK
zs;=3|H8Xg|p6#5T)8U(Pc+Q@y{e|occ)?yMzm#_>;U#;?F8c~zu~*7hvajJad(AHU
m2HvnYw9fy3(-b_Vr+j#*8RCpSB+e1%^doVBxY%45(ZMh8bDdxS
delta 791
zcmYMxIZnes6vpu<VmsdAeRq~CL}qO$45^SnETW+?IRZ!E0yMAW2sB8!Pq+X_pa9Rj
zPqhD^KT9*S@Alp2Hi-I%#~XKI5B=ueCz=qy1bwNZfoPCDj9(di7oW7<*<dR-;ikAb
zI^Twd-dk`>+*12P?5FUl_*D7PTK;dtZE;&W_72<;ca$Gv@4{ViS3C9|+!Ocy{4~Yf
z2m8cVaj!3GhBzaBM+^`H;%~$dF(f`uWF8?##BYc(Vodynm>?#^>s00`VoLm)$}?q%
znH(ci$Lw*;9G;8kqw{kn&s4w*@j~q{urJ}Ic&Ypn_f)|v@k%@PHM|zDm2a?b;Ei~r
q9s3sEinqKi{-0?Mo)bS6a#0J!1@Q;s5^+iVgSbLm(eAp84}Jk;O`Tu>
diff --git a/tests/data/acpi/pc/DSDT.memhp b/tests/data/acpi/pc/DSDT.memhp
index 47d63dec8f997417d7512a694a4825fee874d995..084957e53fb51e313dc824e5a8733f02ff77542c 100644
GIT binary patch
delta 759
zcmYMxO-jR16o%nS(>6`>pPQul$El;*fmZ0ifH)LXoEn@7f*WuPjywxda4NU~H{b%g
z4^7V3dq#ox;TxQr-FCPAc#P7ny|}SQqw&aWZ||<GvDpnDI#egcdexb518%Szy{q*`
z`vg9rT(v$%Q^YAfNt_|h=u4uBXp$4_`5bXh_Yy5ci{2$J5EpNWUfXCkT_^4SOb5~7
zGo0bfQ#sRxyX<c7v`UTr-h+GW-mu@u-iQ0_KD#_q01w!M!OvtL!bA3uUG@<?Vvh!I
zWv}3hUG=V7*~jphjxzmH31UJo5>v#Kek3jtmsI6?o*`!REHOvS>04rfSdd@nd5Kuk
nL!tjug;?<&)o|yf+*!kG_PTdEFZF+F;0=58@5i67<?q2CR<o2j
delta 759
zcmXxhJ5Iwu6oui7;v|max5sw;7A;js0YOT^NQe>%5G@uR5)vC=3sl^NfJBSL2G{@#
z$Uea1d)oigDelaEx8Hp{Cb_=7yK*LWuP<&~q6yi(34Ewds?EB$jazU_+!|bMw&GLx
zl(<wnG@}{fjQ9z0jyNa&LbMTWVlS2X0&zinkLVye#P5hp#3j9DvUbs2;_FP0XL^X9
zoZ*=>PjRLX_r?9ed7WG1K7a?}f!S}d58<JBI69swf=A+!@iXjWcq|@|j(q}8#1rEh
zdj(hGYH+2oPvI%?Q6VptA!fuch&f_T{DZhcToE^=%nQVV_!+T8EQ!AnE5wR8tYlsz
p*2E8${8NM2$Q_Nj^AdNq@K(GXoX>0drw-nUcmIC;`C9)T`~k~;lsNzZ
diff --git a/tests/data/acpi/pc/DSDT.nohpet b/tests/data/acpi/pc/DSDT.nohpet
index 47e4bf62ebe742304783e76984045d7322c3a421..46827e285421d4fb38160f6c15dc9134d7da5446 100644
GIT binary patch
delta 770
zcmYMxO-{m46o%m%3Y7l;(LxJ!3osCvnAilJ=|JPeNp%Nq!5N8(i8(_PH{d`LSL4VH
zn79E4(tAGcnZ8fIruTNc*e-TYUf9%|E7veOhE-qRT-qIa_3A@35l#A$*hTEpiLamR
zA@=B5Vjr<j-x4iEi{^oz4-g0R7}PmF$wsuTru{OT?&D>7ylyPG19#Y+*6A)Z4|^Bx
zvb$=(l)VS{*gfT|xqiP7_t|}R*$41|Jy5=ueFzWPLw4Cm@Q6Ly`zn!n436nG))$o^
zCiE^bMNH{W;t+927m1!{h#9>}%n@_?l{i8i(P^sZW5hANr201%hy@>`P{-WJF-v&K
vUbapTL;ag3@Co}w?ayRCg-_Y1%FpGVX7CyNj9vB>ykf8RzWDsezK;F@Q0JT}
delta 770
zcmXxhOG?8~6vpu*P1`i@ciKF+&<t!l5e!skI#8TAiSEEHI4cN(oT1<b99VEQj@*FY
z1{~PjoNxO7<qNqtyJpwypKPzazPU6;de?5RETR$dtKAM!L)3_W5XXpP;uA-noFGn!
zpAn~sQ{rz#9Z@G<x-y?3&WIn~HdUWwAR451{WltXAFT4@O{Xh2;ikCRJKuTQu(#lr
zxTW?h>}|L$ZYy6e<^2xa5qAd1-i5p3uJR4`9^4c62FKoq`{Mq=*CFNsI3T_a<f1~v
zkoX-jLX3$25M#uc_#%{ff|wA$A*P5a@h{>WaZY?1$$WvhAbyGDH)V*K93xZ5+~Sxy
vJQvS<=Z9E+Qvol;3$;JPzJ!<JrSfy!Qw6WYtHH6a;k9^u@aFR)`8xUs#j>0!
diff --git a/tests/data/acpi/pc/DSDT.numamem b/tests/data/acpi/pc/DSDT.numamem
index 1c4e0c80216b53463fbec8fc548007f0326c1829..ebdccc880def932fcba0cef8a7cf47ff7cc67f53 100644
GIT binary patch
delta 791
zcmYk(J5Iwu6op}nIF8@(D}KaDyaZ5yK!*&WLlhutZ-pfw-8O81Du|AXEP*Ak0X9Gb
zo_jKv_Wyh=&CF)GS#Fy!>e}_4Zx{o^Ztov%-2okj?LL}_COt|VA`a;@YzxdSM9c2_
zzgYAduj=FT&W4ZRBlc16v>luKy$!e7ZM8p<y#sgH9p$G-`u{H6Wp~+S@4-EGPx(sr
zKHO*b*<~NV1NPw0&r+F(;E-NoeS2fXG5tu45F@%t^p`PWOwSS%#Du;jridwBq<Wqq
zX7nU+f;geCR6kRWnDa4mb<9gSW&tnQi{9xY)6Z1GOZHOjuVi1rEA~qHTJC8IpR!Nc
rWnaT<_FDP1>}T*9`;1-obNHNnPP_d7GcCXide8OkHHgidSHuUuW5%QY
delta 791
zcmYMxJ5Iwu6oug{;`sfx<G14_1O*6m$PhY20iyO+SOU^*!v?5==%`=`EP)NM0UGf5
z9?|}vkENN}t#|8v=ZF2>{f#{{hkkqO63vKLem_MGQ6qjpoFmSOKm9&ea~)A9a~S`p
z^Gmd;kIn{DxdAuCjnR1@Xw%+=o8qS0A7gL9Epbcv$)Wt;hTG!y<k&lKN8C}q!QO?t
z;_l?wdvH(O`}5NTb06#zKSy$V0b)S>gBT))#MiNW86if*Plz#MO#F?QAST4;iOf^P
zl=u;Gfw&<4O5~X`#7vHnsbgN?m^nNb&qwF?RGz7T7vhE5Ut(XvOYu_q7WY)aEAeV_
r>}z-}UMs)CzJWL5&E(j(@K(I#kL>@Mmf$7vTPC;HA$IiY<k7(|*pZ|D
diff --git a/tests/data/acpi/pc/DSDT.roothp b/tests/data/acpi/pc/DSDT.roothp
index f9a5164e0cba7c209bd3e52020cb855e8688f682..f9aacee095bbb62251fc8231532f0d6e9f555a58 100644
GIT binary patch
delta 838
zcmYMxOG?8~6vpxNou+x*v`N#vS~nn6s5Kyhf$G44h~l_z!3{_q3r^0kn-E-x8xX{?
z4qSpw&ewZ}`Tz2T++?%ZEZ)8yYhA8x4YRzvzos9j^r}nSFdCd1bn2cfv?e#JNiS}>
zk1fO&eM)R2w&~E*cXkjv^dzy1*rgANJ;WXzC_Oh3O?p&igjeb#_RaO~09Kz$cbOi~
z*CyP8TkKZlbmO=8`vH8wKB)Ig+1qfN-DWTJ^BuUu?$mxFdl&AqyX>;};2yhIdm(!T
zSL~|tppd-}_vvb+ztj+MNLz^`#1Z{U3=ji43-mlh4Cz(k7;#Kr5+lTj=AoWX5GV8;
z>i-lY#(a*rKIcl#nZOhFq;h%~>;II(Q}(ppU&ua#XY3ife5V|qv*)#6%6<x;vQOD%
QKZDQMXFET7|BF=fA6I&(EdT%j
delta 838
zcmXxhOG?8~6vpw>^p)q$ZJRVr(}x=nD%2Vf!9aE3Ktyp|x8Me(js+)Y*i8s7#0?1I
zSO+e_-kb9c^Z(@wxyg39UA}!sesy<$P41>z-||mX#pbeMFGHdR@u@o3ruhz{L;Rwu
zIyMoT#Gi;Q#1`>kEO)jM+r&?Z9mEdt2VxhoOMIYZ?jpLxkGjh2D|v|C{s873J+9QM
zI9_aA>pt8U_l@&SuT}2@cpx6w{R;aK9*T#xm-74w9*IZRPq0^TC9Z16K8DBQvGo#r
z4cFq@cv52DgZGH92J)r)h<)N6;s9|#{EL_%Cd6ln%u~da_!V)8I3)f;%n&o;MJn?V
z;)wV;mH(6@=5mhQo^y?Jj^ShRv2lJF%6}^0g?M527uZkW6Y)vy_)b&!RD5dv68jl^
UCO)ej`#F3rKHvM%`(LJ=f7IirEdT%j
diff --git a/tests/data/acpi/q35/DSDT.bridge b/tests/data/acpi/q35/DSDT.bridge
index f8a0bc150f5a249bd5d09be6949c97160de1ef82..37ef245f673bcbd5385cb332cc0ccf06d5355485 100644
GIT binary patch
delta 846
zcmYk(y-vbV7{>9o6k5txODW|W3}Uc}2}q*oWQ~K9gT{f0cmpKPCf<PKyLlBRPE6i_
zi8o-p7U_8(&+F3R|I3r~oU>hRS8uPQV4Ysw8g6=be`C1o>`U|Uf__F$lu6kzOjc8=
zxziJx?b$KZV)ZP=o|SobzFfQT96ZOKQ+_<tZo_SMn_c#Kc%D74d?EV+yue;ym%Rgb
z*qxo9hB9}-E+ymC$3GVli}WPXL-goVVhOQC{e3+zBbI3+v4U8k4~bR8D)|#VuOZgx
zVUqq`vybTWF?@B*r5rPW2kb%Sba9}csSdBR*VX<^_8~lE50$5KPYrm3y}>T~2p+LV
z$}eT#gg4on?6QyHF?&qu^#3!pz%4qT>WgY4w&_J;2eCun61#|9Iy%(z9%7H4CH4{f
V^d)hCIG|CY=R?Hd`(tu#{Q@-vsJZ|E
delta 846
zcmYMxOG?8~6vpw>Jeo9pB~8=x-AJv}fY4gd>d1%#M-CJR9ThhqI2PQ1!!vUgf}@Vy
zfZztiwV2#{KAeQ`|M5ZY&2F>XyuT$uc6Wb6?l!x+&7Z|PFQ+U1O`NEZl9C!xNoy(B
z6JG3DaiN|8HZ*%i;e+LR>nb<lrnss6cp+}VEpbab_BPxWx0SE3FT=~?W$oBIa7Wz9
z{WQef1-r!QH1pLrR}d@2&xjtPNBo6YMXVB!_GMl}tPwvV))DK(pNI{_2C+Yrc@wco
z{4mS(HT#IZ9K%<~T;rGlJP;2G=ZgdRO)Yp!yruSM*oW{?JXD_Hp4#xXcw0O65j+x)
zlwV@sfp^3^+Odz}v3Shc{Qoy~!Cm6>xm;8au}A!h*hlOW{~!(!2gFB*G9MxiiC+*$
Yh$G@}#4+NSI7wwbL7dRXQ+jRu0kUnVx&QzG
diff --git a/tests/data/acpi/q35/DSDT.multi-bridge b/tests/data/acpi/q35/DSDT.multi-bridge
index df91b798f79d4564b049e8a7dbeaa5bb99abe635..e9b67e9ebe1e3b4de513b68129f719018ebeeb2f 100644
GIT binary patch
delta 41
lcmX@$e873bECsH3N0%T54#(h7zsXjL!IQr$SfUEG0RSXw4F>=K
delta 41
lcmX@$e873bECnvd;7~sXj(A6xpvhK>!IQr$SfUEG0RSX+4F>=K
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 14/17] tests: acpi: whitelist pc/q35 DSDT before moving _ADR field
2022-07-01 13:34 [PATCH 00/17] acpi:pc/q35: minor PCI refactoring/cleanups Igor Mammedov
` (12 preceding siblings ...)
2022-07-01 13:35 ` [PATCH 13/17] tests: acpi: update expected blobs Igor Mammedov
@ 2022-07-01 13:35 ` Igor Mammedov
2022-07-01 13:35 ` [PATCH 15/17] x86: pci: acpi: reorder Device's _DSM method Igor Mammedov
` (3 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: Igor Mammedov @ 2022-07-01 13:35 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
tests/qtest/bios-tables-test-allowed-diff.h | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index dfb8523c8b..1983fa596b 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1 +1,15 @@
/* List of comma-separated changed AML files to ignore */
+"tests/data/acpi/pc/DSDT",
+"tests/data/acpi/pc/DSDT.acpierst",
+"tests/data/acpi/pc/DSDT.acpihmat",
+"tests/data/acpi/pc/DSDT.bridge",
+"tests/data/acpi/pc/DSDT.cphp",
+"tests/data/acpi/pc/DSDT.dimmpxm",
+"tests/data/acpi/pc/DSDT.hpbridge",
+"tests/data/acpi/pc/DSDT.ipmikcs",
+"tests/data/acpi/pc/DSDT.memhp",
+"tests/data/acpi/pc/DSDT.nohpet",
+"tests/data/acpi/pc/DSDT.numamem",
+"tests/data/acpi/pc/DSDT.roothp",
+"tests/data/acpi/q35/DSDT.bridge",
+"tests/data/acpi/q35/DSDT.multi-bridge",
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 15/17] x86: pci: acpi: reorder Device's _DSM method
2022-07-01 13:34 [PATCH 00/17] acpi:pc/q35: minor PCI refactoring/cleanups Igor Mammedov
` (13 preceding siblings ...)
2022-07-01 13:35 ` [PATCH 14/17] tests: acpi: whitelist pc/q35 DSDT before moving _ADR field Igor Mammedov
@ 2022-07-01 13:35 ` Igor Mammedov
2022-07-01 13:35 ` [PATCH 16/17] tests: acpi: update expected blobs Igor Mammedov
` (2 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: Igor Mammedov @ 2022-07-01 13:35 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani
align _DSM method in empty slot descriptor with
a populated slot position.
Expected change:
+ Device (SE8)
+ {
+ Name (_ADR, 0x001D0000) // _ADR: Address
+ Name (ASUN, 0x1D)
Method (_DSM, 4, Serialized) // _DSM: Device-Specific Method
{
Local0 = Package (0x02)
{
BSEL,
ASUN
}
Return (PDSM (Arg0, Arg1, Arg2, Arg3, Local0))
}
- }
- Device (SE8)
- {
- Name (_ADR, 0x001D0000) // _ADR: Address
- Name (ASUN, 0x1D)
Name (_SUN, 0x1D) // _SUN: Slot User Number
Method (_EJ0, 1, NotSerialized) // _EJx: Eject Device
{
PCEJ (BSEL, _SUN)
}
+ }
i.e. put _DSM right after ASUN, with _SUN/_EJ0 following it.
that will eliminate contextual changes (causing test failures)
when follow up patches merge code generating populated and empty
slots descriptors.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
hw/i386/acpi-build.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index fd7f3253e5..406bbac1c7 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -444,15 +444,13 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
dev = aml_device("S%.02X", devfn);
aml_append(dev, aml_name_decl("_ADR", aml_int(adr)));
aml_append(dev, aml_name_decl("ASUN", aml_int(slot)));
+ aml_append(dev, aml_pci_device_dsm());
aml_append(dev, aml_name_decl("_SUN", aml_int(slot)));
method = aml_method("_EJ0", 1, AML_NOTSERIALIZED);
aml_append(method,
aml_call2("PCEJ", aml_name("BSEL"), aml_name("_SUN"))
);
aml_append(dev, method);
-
- aml_append(dev, aml_pci_device_dsm());
-
aml_append(parent_scope, dev);
build_append_pcihp_notify_entry(notify_method, slot);
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 16/17] tests: acpi: update expected blobs
2022-07-01 13:34 [PATCH 00/17] acpi:pc/q35: minor PCI refactoring/cleanups Igor Mammedov
` (14 preceding siblings ...)
2022-07-01 13:35 ` [PATCH 15/17] x86: pci: acpi: reorder Device's _DSM method Igor Mammedov
@ 2022-07-01 13:35 ` Igor Mammedov
2022-07-01 13:35 ` [PATCH 17/17] x86: pci: acpi: deduplate PCI slots creation Igor Mammedov
2022-09-06 11:41 ` [PATCH 00/17] acpi:pc/q35: minor PCI refactoring/cleanups Igor Mammedov
17 siblings, 0 replies; 25+ messages in thread
From: Igor Mammedov @ 2022-07-01 13:35 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani
Expected change:
+ Device (SE8)
+ {
+ Name (_ADR, 0x001D0000) // _ADR: Address
+ Name (ASUN, 0x1D)
Method (_DSM, 4, Serialized) // _DSM: Device-Specific Method
{
Local0 = Package (0x02)
{
BSEL,
ASUN
}
Return (PDSM (Arg0, Arg1, Arg2, Arg3, Local0))
}
- }
- Device (SE8)
- {
- Name (_ADR, 0x001D0000) // _ADR: Address
- Name (ASUN, 0x1D)
Name (_SUN, 0x1D) // _SUN: Slot User Number
Method (_EJ0, 1, NotSerialized) // _EJx: Eject Device
{
PCEJ (BSEL, _SUN)
}
+ }
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
tests/qtest/bios-tables-test-allowed-diff.h | 14 --------------
tests/data/acpi/pc/DSDT | Bin 6422 -> 6422 bytes
tests/data/acpi/pc/DSDT.acpierst | Bin 6382 -> 6382 bytes
tests/data/acpi/pc/DSDT.acpihmat | Bin 7747 -> 7747 bytes
tests/data/acpi/pc/DSDT.bridge | Bin 9496 -> 9496 bytes
tests/data/acpi/pc/DSDT.cphp | Bin 6886 -> 6886 bytes
tests/data/acpi/pc/DSDT.dimmpxm | Bin 8076 -> 8076 bytes
tests/data/acpi/pc/DSDT.hpbridge | Bin 6382 -> 6382 bytes
tests/data/acpi/pc/DSDT.ipmikcs | Bin 6494 -> 6494 bytes
tests/data/acpi/pc/DSDT.memhp | Bin 7781 -> 7781 bytes
tests/data/acpi/pc/DSDT.nohpet | Bin 6280 -> 6280 bytes
tests/data/acpi/pc/DSDT.numamem | Bin 6428 -> 6428 bytes
tests/data/acpi/pc/DSDT.roothp | Bin 6656 -> 6656 bytes
tests/data/acpi/q35/DSDT.bridge | Bin 11449 -> 11449 bytes
tests/data/acpi/q35/DSDT.multi-bridge | Bin 8640 -> 8640 bytes
15 files changed, 14 deletions(-)
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index 1983fa596b..dfb8523c8b 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,15 +1 @@
/* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/pc/DSDT",
-"tests/data/acpi/pc/DSDT.acpierst",
-"tests/data/acpi/pc/DSDT.acpihmat",
-"tests/data/acpi/pc/DSDT.bridge",
-"tests/data/acpi/pc/DSDT.cphp",
-"tests/data/acpi/pc/DSDT.dimmpxm",
-"tests/data/acpi/pc/DSDT.hpbridge",
-"tests/data/acpi/pc/DSDT.ipmikcs",
-"tests/data/acpi/pc/DSDT.memhp",
-"tests/data/acpi/pc/DSDT.nohpet",
-"tests/data/acpi/pc/DSDT.numamem",
-"tests/data/acpi/pc/DSDT.roothp",
-"tests/data/acpi/q35/DSDT.bridge",
-"tests/data/acpi/q35/DSDT.multi-bridge",
diff --git a/tests/data/acpi/pc/DSDT b/tests/data/acpi/pc/DSDT
index fd79a602a2aaac0f7d91d2ee2b1af8f2e6cdd4b3..da2a3e5c0551ac2d1d8a0a40b92d3235d5757475 100644
GIT binary patch
delta 864
zcmY+?y-LGS90l-*wn@``wE1k(q;(Y(B-P?1MB7!t;^Yv006|wlL088>7hl5SE;tLi
z3i=2>gx-Ho@=w;o@1A=($vl}S&l^U*um-Y{%}$Th)%@PD^9v&oS$<=L!P&#{+AP`2
zlq{W`Xp+>BlvKzDiT6T`woB23Xp)Fbbd0z|hLA~I7Gj4x6bOaHYbm&+1<@j5c5urs
zcc>65iStr$M;oF|Vo``OcW4lr5ZFi)8!dMkbC(XOSENpBK6YtMoHi)?sbwZ*TUOO|
zD7&j=UCKUdnMK*UT|H}4c3sOHku6`H@~d6E+NA})ZLD~}3wRJ7iA|>v+~Gs`ByJ0F
z$Q?b19*K`qa7O^K{O^V?ZkcdL2oX}pRVlcm578&_R){HgL=ce>_#P4OGUcuqGOoy&
XR(<lSOAjdft!2ai%z4@OzgGSL?0V1k
delta 861
zcmY+>%}&BV5C`xYDJ`Y+gVL6k4}0}MLaGvD!l4LPO(dQ?G(G|^K%!R?FOzWLB{V(=
zXA=@%fQK-+GdtVsKfnF&?#wpd=AW02VV2A12kRUPH-Im12(M0pS&g#n<^8d?%x_Dx
zEap$Prs<kloKETDuud@fhgV|>>j>*`=ccE66kKJXFkqvKYwj>nm~f~F?r5NBz{pc>
zx#12Ag$3)1;EpDWChS!);SL*x4VkapGU1LEiWaPdfQ?VXbZAC!keMs9QJb76v$f28
zneAoPmRT0i*+6D1nRO@=ODy=cA-*;gOAM=U#vhLmMgm3z#V%*u7$b~f*HI>P&sAL%
zT{u<*cO)nhn1)KnoI6q!DST7}cl1#7;8zt3?&zcF!#GlIS#ZYy#Q@%ffL%m$9?}Hh
ND6<R7zNhie*&o-A%ys|(
diff --git a/tests/data/acpi/pc/DSDT.acpierst b/tests/data/acpi/pc/DSDT.acpierst
index bcaebed6837b0ffafe1128e1f8c2e55d4c66679c..abcd6d9d309a8f9a9080edc64df7a6c195b5885f 100644
GIT binary patch
delta 766
zcmY+>y-LGS7{>7gY;&wN&B=GFrh}t`);d&hNp)7RI634J^a2#b-Ray&!5h$76kHVq
zXQ9`idGaRjIqRQao|Bv`$IJ1ebd@c0Rl39M>fwB4elRUXS)5+<EvsXRVt#qn>p(0T
zG1+fLmqZuB9?-^wHyjd9B^*&!dye{%L4DdGZwZn@lcJL9YmjMe6>ZnkTMzBdXlrQi
zM(d-Er2gzW+Ktg%w3oW6Pf6c3<+t_dZ9RPXj^7CWa!Eo$+&1EfH+&L4#9J$PBOnn#
z<N=*h@J2`?gt%@6Z$u;_i04Mkcq1keL&%U$nej$KBB=!Z#iY8U`Y)dFR!TC}WQyDT
r4fR{k(2gU$4bdKrwt@C-v`w_VSbug4?cQiP+K16b|1EslPG0RlrVOx+
delta 749
zcmY+Ay-osA5Js0o*cEaAe^^x3SeqbXu_iQ&)|yDHEcO+60TN<Q^>uc>0SQk)Z%C+3
zcmWcg!QjrFxwI$eo|!xQ{=UB`ZA|SBYEC!(_<TJX-{+-O7SC@j!>AipF@Aq(*0I)&
z!5te7G8)Jntuc^>Nrs7uZahfCBE!O}GVtr9rd1v$pW@pO4!hyjRjkQu%Iu8Unpulk
z=Bc;m%qGliW-DfnV%PsS$z@xYwsoroT_sk>%jM%9i5|Xu?KF>)^2zYAJ2IpZkP%=Q
zXpKS|AsHd&M}{;aG9qksV<e53j2OL8n=+C{LPmm_Zahh&O-37=%D^sEM^Dv_FpL!I
gFq<>GV76s;$*dQvw^z(&%(~1r%reE6H_1=!59yMsfB*mh
diff --git a/tests/data/acpi/pc/DSDT.acpihmat b/tests/data/acpi/pc/DSDT.acpihmat
index 973320cb25120818a45ddb3d8e3b3211f0c00adc..884d4871a2a0b87db2c0dd7e6f32486ba9b7e424 100644
GIT binary patch
delta 842
zcmY+>ze>YU7zOZ(Rns(WqDkBQYw`$o(ApuOrLB{Hz@m#o9>AAScSX6Ipy2Ex_yp1?
zaC1_e1$_V=^qzdlce5UTIp5`EmdujJBU?P%(UO)<5BKzWaqrmT()N_BitN3VEg<VT
zs#`>MmSy6`@x9~o{pxhBmul&7d|*^6T16YmE1GN<pM@9{qDG<yk+i5|ojY_AI>bdG
zxT8*@4)K<YK6e--42ab>UFma2gG2-3G#4A((InA?cqs&Tm?TUoXkSxql<hL$E{mk4
zNDFH|bkv2Hk^Ppk6=b`v>TG0prOZM0UCLU>wmkLQHnQtd){$BE>Jh)%rB}OH;K!pC
zN4$VX0{vpgCo$#@pM;N&+d^<hKq7$n%Eg2`LJ}dwW<Xaa+|eb`g}BPaHg`lMB8ZPd
Va7RocmV*9f{J)FybP~SK{Q>oY)Cm9p
delta 847
zcmZ9}KTZNc6vy#3q72LON0<FG`wx#mp-4diakWE@L<^1C*m?^+fC+g$7a%bvmX@4A
zJ1dXC1xPex-n=(!`^|^nEHlgDa`<-RRz)$rKDW2w!E@o$&)~(C*ecY1sO?beb+p^1
z_C&3!+ri!QMP+)}D?~BQuN=z~mKbkN6zX81p;T}{u!gV(w_ddQG$oFB%0^+sq9k~u
zj-n20Q}lVmLE*r}H%{sEMgv6y=B7C2jV6jFtV)76S}0mD3XD?*ywOI{hM5wu2=oQ-
z={tfowS8)nP&=2}oLYz4ike4lB=v87YBOqqZt4+F_-jM_+E6`W_z&_Qmk6bTQbYBY
zIWI;CBlw7n8_IbqMiGM(8{(8V5)=vCmjrL5C{lPe#Tjp8C^Gmh3Et?U=)z?Z!<V1F
IKPKN>e+E?3EC2ui
diff --git a/tests/data/acpi/pc/DSDT.bridge b/tests/data/acpi/pc/DSDT.bridge
index 9583da4e4f558cb0bf6912733fbe8db7c1ad255f..31a79aa47673c14f7e564475c39bd38c872f8165 100644
GIT binary patch
delta 1069
zcmbQ?HN$H|GT-DyymD+D@xh^f43j4c3QI&c`LYBXSj2P0JGun%FfcGOa5w@b87FTP
zfU08zsbh(5@@JWRgx8oIte1-kAt=UY!Ui&riy0&~xtm`Sq<3<?l+@%qQ1%5NTUP)g
zt|%=vxemgHn#B&*cOFHI11zQ>2-X8t#|aiIgosV<5|o-eR|aC{Z6Ny{l&vEqHQ8Pk
zB3=t*Pk^$|0of0sY<XcRNsxzvEezlu7l3%2O91Tp0=No9&<H|R2!d4{gsHGZm>~pJ
zAp}<ORt{>5CBh70s0v}Q3OjkJ$+JZuZtVxM-$2<9fNWb)h`6DG)Z{)08yXJc;BdH)
zA|?SAGY|vofvS@Pi#4K%NrA=IDniVDEhaVjACzq)E;ZR-2_oJLWG{fS?*Z8#p=^B#
W>CG7u;!I%2k4EtDj9_QwtBe5r@-&P9
delta 1082
zcmeH^u}Z^G6o!+uV2sixxm9zMRBN4uxV1wm6{kQA8k{<0aB%Jm2<a-6!dVKX&|M0G
zPoOWLlao-omqK?b-g-}N;wy;T$Ir)q?m2hp5B;ax0>lLhFXYhb^xFB*t3_(my13qz
zBw12h;mxHC?_8jrUXTyZJRvAt&=jZ??M($5X+;i=9CWz>4@C-N`^Sb)#!KW=okG*$
z`90$S@*Cqha>bxqYQ&zTZNrsGHWQ&MGEHP-H}Q5vwsa}@Chu>SDU6T@j2Fmr#to9$
zq?Ycg<0d-ve;Mhn1{wy;vPM1aFwro<D`lqC(++|LftVXGDp8mo@pms6uaO&j6oLxR
z`-~^ZGsY`qZ$G&M6?ce5W{YfkoOq7N)*^F77E~!b9`KnH#$U)Q#%;@iS5khyvn=KR
Mga7acpPzil-&s66RR910
diff --git a/tests/data/acpi/pc/DSDT.cphp b/tests/data/acpi/pc/DSDT.cphp
index 27d1fc90f5f51c48a44bace866a19a42d7170129..8b0cae4dbfbd083a43751a7c94dc5c76f89084a7 100644
GIT binary patch
delta 864
zcmY+?y-LGS90l-*woTKdO`GpDsjpB!Qd|V1=^|Ls;?yAz;8WBG5G12eA3z7e)dz8N
z>m=wZDCqs?B>!YR{O-AzldPk4^!(k+mgcA>r}L|svYB1zMz*7SBFj#7-&@?AZ_RfP
zQaO#2OI4B@k{k=!AaP%ay>Tg;5KR&vrQnVhM2o~>AGhpthYTT;xGe>Dv?1Cg-U|_N
zhXSFH7!Pnu#2p=o4vA$UCfuPys6t>PRcw^+GT|-_QmaUf)?660CQf%Ld#YtU%6@B^
zPT9<?p6yfiP|F6Cebq99ve>GgHAR-cI_6hfc(p|fJX+Z3m=~}iY!W}E;0_1EA#rA-
z<Agh02$#gF6x`uK<p14gArkKJA$;mMa&Sw+9YcsAiMv8fxg&rGguwR*c$X=6g^*!I
YhP3LnTU~WT*=sG^{?E*puJ^X_2TT;p0RR91
delta 860
zcmY+>O-{l<6bJAcDJ`WH+R{%x^ay^{xE+LTjS^Q)>;X819>I42E<mCQTQ1@SShICO
zVqo5zH{Jg8d;ghvvnzJR&tK27>&08?oP+O&@DWVlrk`QfqU@^rd~PjnA8Wf7vsc$J
zOv4t(DN_!c1hW&oyH>D`unmr%AL~(Ym4(8BN*DLsVWY5N-4NW-LD7MOE(-2&P&iNq
z+C2*H=%VPtN*52@;i7P1-w@p4q3}S2r&FK`X_*(aBUr1fr?P{}`YJ02H0!HurLsU}
zdzFPM6A{f0D3hNk__h(=Hj<whHQ|&W9wUq;j0wuWoN{A=Fo9*PZTX3-QWPm{8-hDB
z6d8Dl)-mIb97PWA4Z$5l6hrvd#hg1vC`MnYcF3G7#t6pnA_Xi{TIqxq09%z^QnvB3
G-?M)mx5a`0
diff --git a/tests/data/acpi/pc/DSDT.dimmpxm b/tests/data/acpi/pc/DSDT.dimmpxm
index efa46bc7860f0b026f23175ccf3ef1e1eba59c15..38865fb66747a6ee1cf2066b925be6eba064625a 100644
GIT binary patch
delta 799
zcmY+BJ5Iw;5Jeryu}w%w9RKau5j71W1)+*wgeXA}Q6b?4fW!izqE3YukR=c)lpwJI
zdX~Ww(7PUc-fNG}-1)5+>&15CS0XB^jh`lWuUF>k<hXQ7aemV`4AXGL>h`i{!uV^A
zd24jZ=)w>IWz0CkBEyn~?UXXlst#kX?l$8rn@n3VZE03nm?+Evd(_w-*q6q7U<Z*}
zyAM`stPi%;*Z`~(qqa(8+Uu039n!QzZ2r&~bKZPJ#t6n|YjB23h6`hmP?s~#7?UxE
zao-x8;gR9NcyA2B89o{K^IJ+y1V;oU1c<n9j3q~eWQ5Y7Cx-Gw^%Iwz6_FV!W`tuN
zW$GhhuosObU_Tm5!HS7mn}I!PYy$SJu^i0J)!IU`dg=?FdP-AIae?PN+kND}oqut6
Bv2y?b
delta 790
zcmY+BJx;?w5JqjuiA@N09RJ&~O`irO1*VFO5G6=NR1|vwq+B2sb-FnKSFn^iQZA4K
zK*vo`va>Vm_UX;H-_Gn-yH)oc!XeC|jjHV9>(yE>?t~-Sr?;_TSccQC-(N-+xRGu&
zWDL+4fY6O4XAIF8Lf11m!$!jfGrqh6MV#4=IKS+`UmBdd!6&gRVh3U)Vs4^luZam_
zV`3e#8)9avW?jW@FFU#CwjQ?iWI<1fa(NAZe1hTxep79E4M+KC_%P2j<AF1#XiQ<-
zGdLqaBY=}`w44#55ki$~ue6*Ip%KAGHy$}7Mk9t}&)|#%jRgEc9&ui%Wu|IJuqBoe
rI}yu?RWmhP5Ze%&5jzqqiTS0PtrU|-eCD<_wyot6YbEaY<&XIflB&Ev
diff --git a/tests/data/acpi/pc/DSDT.hpbridge b/tests/data/acpi/pc/DSDT.hpbridge
index bcaebed6837b0ffafe1128e1f8c2e55d4c66679c..abcd6d9d309a8f9a9080edc64df7a6c195b5885f 100644
GIT binary patch
delta 766
zcmY+>y-LGS7{>7gY;&wN&B=GFrh}t`);d&hNp)7RI634J^a2#b-Ray&!5h$76kHVq
zXQ9`idGaRjIqRQao|Bv`$IJ1ebd@c0Rl39M>fwB4elRUXS)5+<EvsXRVt#qn>p(0T
zG1+fLmqZuB9?-^wHyjd9B^*&!dye{%L4DdGZwZn@lcJL9YmjMe6>ZnkTMzBdXlrQi
zM(d-Er2gzW+Ktg%w3oW6Pf6c3<+t_dZ9RPXj^7CWa!Eo$+&1EfH+&L4#9J$PBOnn#
z<N=*h@J2`?gt%@6Z$u;_i04Mkcq1keL&%U$nej$KBB=!Z#iY8U`Y)dFR!TC}WQyDT
r4fR{k(2gU$4bdKrwt@C-v`w_VSbug4?cQiP+K16b|1EslPG0RlrVOx+
delta 749
zcmY+Ay-osA5Js0o*cEaAe^^x3SeqbXu_iQ&)|yDHEcO+60TN<Q^>uc>0SQk)Z%C+3
zcmWcg!QjrFxwI$eo|!xQ{=UB`ZA|SBYEC!(_<TJX-{+-O7SC@j!>AipF@Aq(*0I)&
z!5te7G8)Jntuc^>Nrs7uZahfCBE!O}GVtr9rd1v$pW@pO4!hyjRjkQu%Iu8Unpulk
z=Bc;m%qGliW-DfnV%PsS$z@xYwsoroT_sk>%jM%9i5|Xu?KF>)^2zYAJ2IpZkP%=Q
zXpKS|AsHd&M}{;aG9qksV<e53j2OL8n=+C{LPmm_Zahh&O-37=%D^sEM^Dv_FpL!I
gFq<>GV76s;$*dQvw^z(&%(~1r%reE6H_1=!59yMsfB*mh
diff --git a/tests/data/acpi/pc/DSDT.ipmikcs b/tests/data/acpi/pc/DSDT.ipmikcs
index 67b60cc44a6ebff029524abc27ef48f90868f948..e819ce69461a36b6fab5e2ffeba90dfe558724a7 100644
GIT binary patch
delta 800
zcmY+CJ5Iwu5QdFp6BCHv51f$X3c*E43Xm)T1&APss8aY0J^~b!P`Css2Y>>J%TOg8
z03;3o687)0XSZ8@`sUx6*<Hn}_$@Q?%o^mG(Tx^&m+CworFxniU+*Z2s_4o5X4Y0q
zqot?S`O0?5oHV9JrY4wLUYPm083}9?>{((huy2X!U`Li%y9M?ru{PMJ#J0iqZPeyx
zHqABWZadU%2a`Y5#sN=mkWuaCt1&pkB*R3;p+mP!IKv{tg7MH8oMDq;!&ukGlrtPM
z92g^)Zkck1ONI;Mwl)&Z@W}8=gI>`qcT~M%!dX6<zF_*;=E4(SA^>}pSP1qfv0bp4
zFV;q2ONn*Cek9fdO9HWWuVhu%C){<Py6$5GF9Gf7ls7OSqxj{;PycNU&KQz0gmDq}
J-tWVYjemqBysrQN
delta 797
zcmY+BPfEj35QihAHpb@Ve`8vcdIXz=Z8t(dyAdK-TxF31xT;4GTz4^Bp%>^v@HB2p
zFCg>+1!>>BnV0RyH$Q$evn{s8_fo)03}7kpwElQD7sYL3HRZ!g&oE5GDi^PnZNjc)
zOv&h=(Sfmh%77;~?OM%o>KyzaJm$g|u`aPcVivJ`Pt9HsTM@H~?TB3x8~bXur`XMD
zpF3{rU|UBPbd)F;pYY-WMFDo8oo2#OE*dV>x-sPp4-F4CErT<BG<-Pd#*8xpGy<qX
zt;dWrLNr2H>qf~L5gHNfTLx#uXv9!P@`-h%j@ef?f(@~R*n!v;u_{)xDX}%N0kJ)?
zA+fTrX0H{KPkiLI8Me*j6SKBB=f!grb1CLZl;56n;t0hNyd^_;7unBe@_Y6VYPGlp
diff --git a/tests/data/acpi/pc/DSDT.memhp b/tests/data/acpi/pc/DSDT.memhp
index 084957e53fb51e313dc824e5a8733f02ff77542c..03a9decdc1563f5e759e34dffdab4bb34645d9b3 100644
GIT binary patch
delta 863
zcmY+?y-LGS90l+eOOvKaY)zW)M4Vj&>j&7SA37?vI0*)4L03Vi?k?s*EVv5#0J{4E
zeGk3=oZSD-didRQFDF@#)}z&<Q_O=*)APmExv^2~xK6QhLM3Za)^sT=A~y=Jmlv(Y
z{$8%<<JqOzXtW#pSe$N)Q^lPW$5Lnz8i|ie47o#x&`DSW+%n{j4n&8<O(hPv!+<bI
zyh*_wU5Ks_uO2Qr<O&nOq>8x|Twy_2LSQyaOjOQt#9cO|tw@{3-1XIgHz|9rWj)G%
zYFVGMEKtvGQT9;F9Lm0GnM+weRL>4XR=#?|ulDe2j}~|evC)JV@F9E>-<6nhM*tC!
zNF#Jixg&%qf2#XR%(x?hh^XUJ3hsy@ViLU=x14fE0+Eoom4Z7`h*SuC&6IaJ<E{)c
VQ)EV~o+Rq3+y9yS{*wGQ{{Yt$zl#6>
delta 861
zcmZ9}y-vbl6b9fDu`Q*bwWa@5oJov{zX>b|I%<?SIrI`(9Y{=^+0KoScmv!3iK`|K
z4%~;q@BDmqee?7^U(eYLH^b$NZ`tMa>CV}KpTLKQuz;nXU{>d>7ErcJS?~GnzCJxY
zDeZDJd2|iKH0;r~$y9|V!9>9;h898#zJhc+Qi(IEvQgO3@90808Ymht*TuPXI4B%g
zSA=vlQ8b|lwJ8_U;i7P1RuR(CLeYYiE-s~`jiL=+^fv|i5iN6%b_8?I_BmT~=5bcU
z^z8v>GtPX@R-6T#c?o^np-dg|T3#FCYeRL!@E?>Pj}S%*Mg-L@$I=)hjA4*!TOLbQ
zf+B&1E+*2EqDbMpBBUcjk->4MO}UYd97PVV6(Jp66kYhx#jSJ{C<-{r)h!1(?evf~
J@V>}DYrlC)%KZQU
diff --git a/tests/data/acpi/pc/DSDT.nohpet b/tests/data/acpi/pc/DSDT.nohpet
index 46827e285421d4fb38160f6c15dc9134d7da5446..b413d9f31d483eca02f45ad09af2f556581ec381 100644
GIT binary patch
delta 842
zcmY+>PfEi;6bA4JX_F>R+cbaLBwDY~Y74p$jLp^x7B?0Qu02IvbtOoag?a#86x@0c
zcV0ly11M;|yyVSnKYsJgym_n9YP4Nj+0q_lYby*E_ZRB?V3_J@oLn{)MOE~8el;^x
zh|fwKRiZ|s2657&jzjLKlc+;HRDwG+5*oxuDaPEPlh7fCZMtR59Ssr<h-E1z++mO~
za-r#IK9`Z*cAaAC33r(!O+lKu%od$M$ePGrq|8G0D`hQYGg~~{M)o9S9c159W+RKc
zIGbH}Y4T%!twXPMF!^&SVxHV3;X?dWf;&7C9>lprx14c@Pr`@TRDwHtBzh2ErI>O@
zpF|(x)TLXd+!2r{rhP0$!W|)rFz=u(hWQ^ATTHksA{hxX!f)Pr;wE;Hy-C>~GRqg;
R0NIU{?f+-)>(+nY`2!^e#-IQI
delta 839
zcmY+>Pfo%>6bA4b3oV8IW7<NCqDK(LM3<vo*C=t-gdTuX=!&&(>4FQ8K;o8*cndB-
zLZENnn{L1S=9`)KmXqaV`|DbEHTx`_O9(vyU;a2Pzu(N+{as~OGXLlqhH2RHBusF;
zOcPHeS}0mj>f(Vr+9=wvZV2wMP*`x##gsd26gCvT_KqocbWn6)rHe=Ia8Nj~ZwT(_
zqUeGQ&bL4rq&TCVnh~rib16Ge=22FJ>a0)Min4&RJ!K(fvaineRd##c%`?AN;A=&_
zMA3wjKOP~BY8WY4Z(DL>j4+0U(5C#tRSAj&b`8ND0~7;rBdz0=JBBERFmDL%NKvG)
x(M8T38H(&D)-K7pVuWA>@3nwMtVVjJ1^_$Ct|@a9<;IlFDZ5eG-zNFLI09ThzxDtC
diff --git a/tests/data/acpi/pc/DSDT.numamem b/tests/data/acpi/pc/DSDT.numamem
index ebdccc880def932fcba0cef8a7cf47ff7cc67f53..9e701b2983f9ec45af9c26d801545c2b5d112a10 100644
GIT binary patch
delta 800
zcmY+>O-_SA7{>9MP{0<;H%P1P5o+i{Tq#ZC%CFeCGKQ-dPoQC2P2ASRXk2=V?%a9-
zJ%A>fd3fQS+5Yq6VHg(aB7GV6%9S%L$Gv`Xd2_1G)1AUB^4Yo7YH2MqpI@AGG>Gd)
zWQ}N(XhW=OG2soJgf4_(7Gh5?UtPa?+l03al7=J=A<HK_k(!D2tF(2rV@Gx!v<Ibi
z(Y}>tp&hvLvm0o4RV$Y+-OVna)~3_i`0}4xWc=k02?yfHqm7I=ToNwCeJ%EQ!z1BA
zd^LhMd=fsyzE5w-c_SbZK-@NhH$oC2#Ahw0yb+OzgrL6|i94$P;*_^ylCdOX+~#{A
z-|!}y70N9^yHZ*o?OAC9v_GY7p`AtY-Zt8!(uSf{r#|FUkLc7R+(0)Tyv^c|wSNky
B%^&~(
delta 790
zcmY+B&rZTX5Ql40Xu;a;|5{Y)8)(YGa-(Rxp+w@zklwxd3cdlED<R=*LP$LF6drvF
zUcdx`J3F&nzkK_f-_Fd7d9l86VdQq;$L(fspU>u`xUKEFdU$aR!!+z_^7_;^VR2-X
zWHiudz*aYUoY6$12?L=`>2ZdIh6OWez?aA@yFN^|;UfqS-QbT{i`d9hUYpp0*eS6s
zF^AZ|S8vaV&4{^*UH|Xoj@t@sD`Y{TM7g|@KklLE!F!;6yyPe!4IehT(dUc+jR2fb
z%jk1Ph(-ug-KaPtLL-9Jk--@;8Zqp2W5^i^8VQUet;divQZ!OnN&_~LTJX8r5je48
t8L=s`4zU%n3t~HBm&C@2%DW=AB-T|-9`TXe=GZouN6eM@eV_iG>;Xco#{2*P
diff --git a/tests/data/acpi/pc/DSDT.roothp b/tests/data/acpi/pc/DSDT.roothp
index f9aacee095bbb62251fc8231532f0d6e9f555a58..8c3956c9ecc63133cc800f1d2d07a1392a35d548 100644
GIT binary patch
delta 937
zcmY+>O-{l<7{+lv3X}>h^pjRaFJJ<QiNt79WoN`h;)(@l-~tBOlIWsKO}u~$6A$7A
zO!NSC;Q>sfPv7>P+5YpJr^B!uE{AV%Gg_G4C~o?l+3HG}_KxT3JRILN3WZ`p4X3x0
zBEX66`?J-xGVS+rP)dPTf>`ST37#mEC_{W^V!#^;2?gT7pp5}<R7g}H?lN)68&wij
zh>u+GMvX)bV!uUS8S;ioLWNl5f;Z|U>WQeS^Uc#}^(fS>^j9D8mPS$&q?X9&vh53P
z3+-8I4YVJrHPOyY@vM&aC^ZA^TWT$|z9pV*CoR48h;MDutxdeZlSOYd;uo+;SP*e0
zLf)`R*bt{SZG^nxkZ>R#GI7ouE(sUnD;K=sk?<gT4t?c<H##Ib5cj#@4WESgE<V4@
tn70CwL9#{vdw^G+x#H<<v{$L^p#4d07j5E+XS--GQrp`!`~BB5O8+xX*Gd2Y
delta 939
zcmZ9}Pfo%>6bA6N6k00Kf6&sZ=n<%5q8pMbJ0d0$S6%cB-hglc7H><!1z4DPAr2r3
zYZDTcdGp@X?U&ztZ|2Qnv>1JSwHtOhf17EbyCJ-LgF&%;Hs{0p(k}DKYfIB~&CY*;
zeqy?0*TwS1oM%H~hG33ya*iQkA|UtG5Z2(klm1N<;)bhC6edhvRd7cgMIF|vxaE!p
ziU#Z}f;%h}7K}Y*%7{B`6gI3Xf;*Zhny^#F9d|e=9LW6B6qx#nC3bWscLZz7T9oZ6
zYg0B3<k=2oE6QBTc9eOPWuZLl%S?RY1K&2l+Xmu-!9U0k4-tj}h7yXu%(=0PunR?3
z*>cWRJrq6Is^XD5A`}rED}p;>6fw+t%9JPW=%eVvrXsi_L6N{g6%+1AQKXPZ;xCIx
g?(|%40JfA}P<Ev3lCoJW&kiWtP<AD=&qM4PKZ5Agt^fc4
diff --git a/tests/data/acpi/q35/DSDT.bridge b/tests/data/acpi/q35/DSDT.bridge
index 37ef245f673bcbd5385cb332cc0ccf06d5355485..a42eb674fa3469a815b1c91ba99b2d4cf85c9380 100644
GIT binary patch
delta 878
zcmY+>y-vbV7{>962&EKg#Sds{`KTXQqtQgAi4zeSHA)<a1Mvnl&KgZzb?Y^_IGH#x
z=>=%?0`Ok6Pv7?KS^xQ+rzfZ5;duD^-0)9Yc19iz&W<F1+bR2#MupQ9(t5KRq%4$@
zLc0~(G}@QY(r9)od3FZvN@y9h520nzbO&dB*D<Q+569`jjyIA=-QKAxNjXXG{@+>2
z1vm3=BC)#_3x$LN@fi!=$dkxJSWEPkJ>F1Bs1TR2;Ee)_0>pbHI=oRNQH0Qz=_?)H
zD3K^ZTtvd-4UL2r2>K6N@J8Xgc)X>P)Du$2YwoWk|HLfXlhDd&ze1Zs+gweaokzPD
z+5*~-&=%2}?c~`?(860E@U5$K>+pX+w&{&}`~n6E18+2m1#g%nOo)v&+BoEm8i^Xj
lT`YLRB4I&%N21RgHVGS|;nG+7yiq4nhq!jlw->jR`UCcd%hdn?
delta 891
zcmY+By-LGS6o6x`ZIY%xvHmnkleX4Wtxz1)779W!b`caT9g0KI7w`pyf^)&)tga4j
zf>SqNK<ES57Z4nL12sAKoSXIIJKsI`-q~n2dVQ{@)bU_=p}<eQ2sge5pVd-?mI&?F
ztaNDU31auemWh23OA_<8#Ow;OJ7Otf@5Iu?%(|FW1*={^TqXyHov}LZ1y_cmXo}kV
z+h5nB1vMdBp?GvaqK={tUv>Ncrf6^~gGL6r+mdn24Fe4WrZIyXSv0b+kc~Dsa%kkB
z<x8iuxsgXB4-?twaHD`m0p>A-8zvei)EeO_&~1pvTorEwQ({G83u0@;T03HPo!Erf
z2C+G@O=7iOF<TNW`ovS-*1~PA=o78D81Thy6zxc~g&6&1z(of|2hR7TS3cuZ8I3YL
n#SCt^Xt?k#8+~qgXn1haluqe$qk={S9-9u_`tI9Hvyk`&Hv`}D
diff --git a/tests/data/acpi/q35/DSDT.multi-bridge b/tests/data/acpi/q35/DSDT.multi-bridge
index e9b67e9ebe1e3b4de513b68129f719018ebeeb2f..88bf47ab1805e4ef1dd8039933c5aa8144da37ac 100644
GIT binary patch
delta 35
icmX@$e873bQiaL;6yzpbD@skis}P68mYUqFXbb=f{tdVQ
delta 79
zcmX@$e873bQUytl_~1}K1`(lnS1$v`0B2V(r(jnfkl18vMY+j$6ygc0ke=MDXbb?Y
Cnio<4
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 17/17] x86: pci: acpi: deduplate PCI slots creation
2022-07-01 13:34 [PATCH 00/17] acpi:pc/q35: minor PCI refactoring/cleanups Igor Mammedov
` (15 preceding siblings ...)
2022-07-01 13:35 ` [PATCH 16/17] tests: acpi: update expected blobs Igor Mammedov
@ 2022-07-01 13:35 ` Igor Mammedov
2022-09-06 11:41 ` [PATCH 00/17] acpi:pc/q35: minor PCI refactoring/cleanups Igor Mammedov
17 siblings, 0 replies; 25+ messages in thread
From: Igor Mammedov @ 2022-07-01 13:35 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani
No functional change nor AML bytcode change.
Consolidate code that generates empty and populated slots
descriptors. Beside of eliminating duplication,
it helps to consolidate conditions for generating
parts of Device{} desriptor in one place, which makes
code more compact and easier to read.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
hw/i386/acpi-build.c | 111 +++++++++++++++++++++----------------------
1 file changed, 54 insertions(+), 57 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 406bbac1c7..9d0512666d 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -427,13 +427,41 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
int func = PCI_FUNC(devfn);
/* ACPI spec: 1.0b: Table 6-2 _ADR Object Bus Types, PCI type */
int adr = slot << 16 | func;
- bool hotplug_enabled_dev;
- bool bridge_in_acpi;
- bool cold_plugged_bridge;
+ bool hotpluggbale_slot = false;
+ bool bridge_in_acpi = false;
+ bool cold_plugged_bridge = false;
+ bool is_vga = false;
+
+ if (pdev) {
+ pc = PCI_DEVICE_GET_CLASS(pdev);
+ dc = DEVICE_GET_CLASS(pdev);
+
+ if (pc->class_id == PCI_CLASS_BRIDGE_ISA) {
+ continue;
+ }
+
+ is_vga = pc->class_id == PCI_CLASS_DISPLAY_VGA;
- if (!pdev) {
/*
- * add hotplug slots for non present devices.
+ * Cold plugged bridges aren't themselves hot-pluggable.
+ * Hotplugged bridges *are* hot-pluggable.
+ */
+ cold_plugged_bridge = pc->is_bridge && !DEVICE(pdev)->hotplugged;
+ bridge_in_acpi = cold_plugged_bridge && pcihp_bridge_en;
+
+ hotpluggbale_slot = bsel && dc->hotpluggable &&
+ !cold_plugged_bridge;
+
+ /*
+ * allow describing coldplugged bridges in ACPI even if they are not
+ * on function 0, as they are not unpluggable, for all other devices
+ * generate description only for function 0 per slot
+ */
+ if (func && !bridge_in_acpi) {
+ continue;
+ }
+ } else {
+ /*
* hotplug is supported only for non-multifunction device
* so generate device description only for function 0
*/
@@ -441,46 +469,11 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
if (pci_bus_is_express(bus) && slot > 0) {
break;
}
- dev = aml_device("S%.02X", devfn);
- aml_append(dev, aml_name_decl("_ADR", aml_int(adr)));
- aml_append(dev, aml_name_decl("ASUN", aml_int(slot)));
- aml_append(dev, aml_pci_device_dsm());
- aml_append(dev, aml_name_decl("_SUN", aml_int(slot)));
- method = aml_method("_EJ0", 1, AML_NOTSERIALIZED);
- aml_append(method,
- aml_call2("PCEJ", aml_name("BSEL"), aml_name("_SUN"))
- );
- aml_append(dev, method);
- aml_append(parent_scope, dev);
-
- build_append_pcihp_notify_entry(notify_method, slot);
+ /* mark it as empty hotpluggable slot */
+ hotpluggbale_slot = true;
+ } else {
+ continue;
}
- continue;
- }
-
- pc = PCI_DEVICE_GET_CLASS(pdev);
- dc = DEVICE_GET_CLASS(pdev);
-
- /*
- * Cold plugged bridges aren't themselves hot-pluggable.
- * Hotplugged bridges *are* hot-pluggable.
- */
- cold_plugged_bridge = pc->is_bridge && !DEVICE(pdev)->hotplugged;
- bridge_in_acpi = cold_plugged_bridge && pcihp_bridge_en;
-
- hotplug_enabled_dev = bsel && dc->hotpluggable && !cold_plugged_bridge;
-
- if (pc->class_id == PCI_CLASS_BRIDGE_ISA) {
- continue;
- }
-
- /*
- * allow describing coldplugged bridges in ACPI even if they are not
- * on function 0, as they are not unpluggable, for all other devices
- * generate description only for function 0 per slot
- */
- if (func && !bridge_in_acpi) {
- continue;
}
/* start to compose PCI device descriptor */
@@ -496,7 +489,7 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
aml_append(dev, aml_pci_device_dsm());
}
- if (pc->class_id == PCI_CLASS_DISPLAY_VGA) {
+ if (is_vga) {
/* add VGA specific AML methods */
int s3d;
@@ -517,19 +510,10 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
method = aml_method("_S3D", 0, AML_NOTSERIALIZED);
aml_append(method, aml_return(aml_int(s3d)));
aml_append(dev, method);
- } else if (hotplug_enabled_dev) {
- aml_append(dev, aml_name_decl("_SUN", aml_int(slot)));
- /* add _EJ0 to make slot hotpluggable */
- method = aml_method("_EJ0", 1, AML_NOTSERIALIZED);
- aml_append(method,
- aml_call2("PCEJ", aml_name("BSEL"), aml_name("_SUN"))
- );
- aml_append(dev, method);
+ }
- if (bsel) {
- build_append_pcihp_notify_entry(notify_method, slot);
- }
- } else if (bridge_in_acpi) {
+ bridge_in_acpi = cold_plugged_bridge && pcihp_bridge_en;
+ if (bridge_in_acpi) {
/*
* device is coldplugged bridge,
* add child device descriptions into its scope
@@ -538,6 +522,19 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
build_append_pci_bus_devices(dev, sec_bus, pcihp_bridge_en);
}
+
+ if (hotpluggbale_slot) {
+ aml_append(dev, aml_name_decl("_SUN", aml_int(slot)));
+ /* add _EJ0 to make slot hotpluggable */
+ method = aml_method("_EJ0", 1, AML_NOTSERIALIZED);
+ aml_append(method,
+ aml_call2("PCEJ", aml_name("BSEL"), aml_name("_SUN"))
+ );
+ aml_append(dev, method);
+
+ build_append_pcihp_notify_entry(notify_method, slot);
+ }
+
/* device descriptor has been composed, add it into parent context */
aml_append(parent_scope, dev);
}
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* Re: [PATCH 02/17] acpi: x86: deduplicate HPET AML building
2022-07-01 13:35 ` [PATCH 02/17] acpi: x86: deduplicate HPET AML building Igor Mammedov
@ 2022-07-01 16:26 ` Michael S. Tsirkin
2022-07-07 9:16 ` Igor Mammedov
0 siblings, 1 reply; 25+ messages in thread
From: Michael S. Tsirkin @ 2022-07-01 16:26 UTC (permalink / raw)
To: Igor Mammedov; +Cc: qemu-devel, ani
On Fri, Jul 01, 2022 at 09:35:00AM -0400, Igor Mammedov wrote:
> HPET AML doesn't depend on piix4 nor q35, move code buiding it
> to common scope to avoid duplication.
>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Apropos, tests/data/acpi/rebuild-expected-aml.sh ignores the
fact that some tables might be identical. Also, there's no
way to reuse expected files between machines. And so we have:
[qemu]$ find tests/data/acpi -type f -exec sha256sum '{}' ';'|sort
01fefc161dcd26564d86826df5c000b080a3442912165a1432dddd3fe9d1b78a tests/data/acpi/virt/APIC
01fefc161dcd26564d86826df5c000b080a3442912165a1432dddd3fe9d1b78a tests/data/acpi/virt/APIC.memhp
01fefc161dcd26564d86826df5c000b080a3442912165a1432dddd3fe9d1b78a tests/data/acpi/virt/APIC.numamem
034be54fda2de6c07e7568b0c2ed6e0a0936c235f1a4ae42dbad0771b8b451db tests/data/acpi/pc/NFIT.dimmpxm
034be54fda2de6c07e7568b0c2ed6e0a0936c235f1a4ae42dbad0771b8b451db tests/data/acpi/q35/NFIT.dimmpxm
0ecccad48c22fc54f86756ef5e9dbf5360544bcd50970e277a13422c5831b67c tests/data/acpi/q35/DSDT.memhp
10341f3d4e6822e578f0759e9c2cdf3ed24267e5a427cb2a31b63a028e208147 tests/data/acpi/virt/FACP
10341f3d4e6822e578f0759e9c2cdf3ed24267e5a427cb2a31b63a028e208147 tests/data/acpi/virt/FACP.memhp
10341f3d4e6822e578f0759e9c2cdf3ed24267e5a427cb2a31b63a028e208147 tests/data/acpi/virt/FACP.numamem
1a93fe13736fb8d51277ab086f7d7a3bbc6bcf946c68229c785ba8257ec8d865 tests/data/acpi/pc/SRAT.memhp
1a93fe13736fb8d51277ab086f7d7a3bbc6bcf946c68229c785ba8257ec8d865 tests/data/acpi/q35/SRAT.memhp
3f0fe229cae8032140af80d8e84105e1b3cc2307b5daa60548d0a00c3b5c0649 tests/data/acpi/pc/SLIT.cphp
3f0fe229cae8032140af80d8e84105e1b3cc2307b5daa60548d0a00c3b5c0649 tests/data/acpi/pc/SLIT.memhp
3f0fe229cae8032140af80d8e84105e1b3cc2307b5daa60548d0a00c3b5c0649 tests/data/acpi/q35/SLIT.cphp
3f0fe229cae8032140af80d8e84105e1b3cc2307b5daa60548d0a00c3b5c0649 tests/data/acpi/q35/SLIT.memhp
3f0fe229cae8032140af80d8e84105e1b3cc2307b5daa60548d0a00c3b5c0649 tests/data/acpi/virt/SLIT.memhp
3fb3115e2c3c626603dbb20ab49825295d952f171ed7901a7f464cead2f40800 tests/data/acpi/pc/FACS
3fb3115e2c3c626603dbb20ab49825295d952f171ed7901a7f464cead2f40800 tests/data/acpi/q35/FACS
43b225e2dc8f37c4a7d5af6452187097a4417b0aaa102a5a7000c4ba683946cb tests/data/acpi/virt/SPCR
43b225e2dc8f37c4a7d5af6452187097a4417b0aaa102a5a7000c4ba683946cb tests/data/acpi/virt/SPCR.memhp
43b225e2dc8f37c4a7d5af6452187097a4417b0aaa102a5a7000c4ba683946cb tests/data/acpi/virt/SPCR.numamem
48831ff36e0e0c1916a0a637854a44f861aee551fff75d486da31605caebd16f tests/data/acpi/rebuild-expected-aml.sh
498a52d92d615ba2c5c69d62296f4f21792543c8d52ccb9fade1c69cfd83fae8 tests/data/acpi/pc/APIC.cphp
498a52d92d615ba2c5c69d62296f4f21792543c8d52ccb9fade1c69cfd83fae8 tests/data/acpi/q35/APIC.cphp
49906fead65caf8e2b093dc193ec082772c7559a9a8fe2d20914bc44dc811716 tests/data/acpi/q35/DSDT.dimmpxm
5307211b50c65c8c05e4efb81b1d320e9208b5d3aac5a3d6bd37b9f47ef3bc4c tests/data/acpi/pc/DSDT.ipmikcs
532089625245db3aeb4bf3a88c13d054be1fb21a24599b9d1bc17832a416937a tests/data/acpi/pc/DSDT
5d3803c3e90296d0a4ea3b9501b0af926196f7288b1ff9160c5294141113e396 tests/data/acpi/q35/DSDT.numamem
5e4c0a107998d58be1ff10ffa08bff225f7f6efe3027095135d2e55bc15512fe tests/data/acpi/pc/DSDT.cphp
61402328e4de16de4b7409564225268ae522ad913d9ef92276611ef22d9013a0 tests/data/acpi/virt/SRAT.numamem
645efebd748df15bd2cf7f0186cc7aeaaf8b40ac4adea29d871ac323360fc82c tests/data/acpi/q35/FACP
6608617b0a5df135a12a3866e4e4239fbe77e3004ff4d6ea42f16879e69cf10f tests/data/acpi/pc/DSDT.dimmpxm
6bc5f8fb421eff6f00de89743a56a88c951f47180b5ad83ceaad69aaf9fad984 tests/data/acpi/q35/DSDT.ipmibt
73d031ef66864988d9be337684317128c2e45c75a2af4fc35f20d216d83a2efd tests/data/acpi/virt/DSDT
73d031ef66864988d9be337684317128c2e45c75a2af4fc35f20d216d83a2efd tests/data/acpi/virt/DSDT.numamem
79fd95d6904b66b0a99982c64a0d54ea75bfa0568e8f02e1dcd9cdca404a758f tests/data/acpi/pc/APIC
79fd95d6904b66b0a99982c64a0d54ea75bfa0568e8f02e1dcd9cdca404a758f tests/data/acpi/q35/APIC
836514ed3adca20b1085838a37688dc1427811b648a7cc4e2a0a0f2d0cc6c99f tests/data/acpi/pc/DSDT.numamem
84d4fd8e55b1785e8c22d1ea17a542266ca14af0c747115316cc7201df338e03 tests/data/acpi/q35/MCFG
879dd52ff293ddbc4d1f589482f882619b99816c4e362f19dab099d1a0e42da9 tests/data/acpi/pc/SRAT.numamem
879dd52ff293ddbc4d1f589482f882619b99816c4e362f19dab099d1a0e42da9 tests/data/acpi/q35/SRAT.numamem
87ec0a685c6bcb1e33af3e558431f038ecd33e4243dd68a4b14d4e97c3d5fb6d tests/data/acpi/q35/SSDT.dimmpxm
8b28d0ce160bf42a812871210141f5d509932682a959b579c0d4f8f43b03fb42 tests/data/acpi/virt/SRAT.memhp
90a603d2f099cc3e3c9bd9de2f8f1cdad5307a6d2f6d2e7951f5418c7f422908 tests/data/acpi/q35/DSDT.cphp
95d9002674201957e58be516daf29729c2ac8e926bfb7256c1bc56fb8dc6eb01 tests/data/acpi/virt/MCFG
95d9002674201957e58be516daf29729c2ac8e926bfb7256c1bc56fb8dc6eb01 tests/data/acpi/virt/MCFG.memhp
95d9002674201957e58be516daf29729c2ac8e926bfb7256c1bc56fb8dc6eb01 tests/data/acpi/virt/MCFG.numamem
9aa0f3568a9f1c25d4c12257831974af88236bcc4b21b90df78ebe95bbb97475 tests/data/acpi/pc/HPET
9aa0f3568a9f1c25d4c12257831974af88236bcc4b21b90df78ebe95bbb97475 tests/data/acpi/q35/HPET
ac64d624eb666028565f4d508a80ae04ed7b48232c60c320de1beba4999ecb69 tests/data/acpi/virt/DSDT.memhp
b65c1b10bc565814f0c0950abd40712fd098b88c88f37f9bb20355356dd2b04f tests/data/acpi/pc/DSDT.bridge
bb1c9e9e87bf9c1f8c96eb1deb201abb8a177296f1daa4dd53a9450c94307b7f tests/data/acpi/pc/SRAT.cphp
bb1c9e9e87bf9c1f8c96eb1deb201abb8a177296f1daa4dd53a9450c94307b7f tests/data/acpi/q35/SRAT.cphp
c9864027de5fed8169f5a283f64f15b799f34d26f66e3f4131da5c5ce1ec6d5d tests/data/acpi/q35/DSDT
ca48a8cf471fcdde73f0997700cb99a39e738257eb26b5509dfb81005a694b83 tests/data/acpi/pc/SSDT.dimmpxm
ddfb6d6b50dd4645efac8358d86c7d2f310cbf0300823b68ef0d996e31f01c44 tests/data/acpi/virt/GTDT
ddfb6d6b50dd4645efac8358d86c7d2f310cbf0300823b68ef0d996e31f01c44 tests/data/acpi/virt/GTDT.memhp
ddfb6d6b50dd4645efac8358d86c7d2f310cbf0300823b68ef0d996e31f01c44 tests/data/acpi/virt/GTDT.numamem
e641d8505ab15bfd7ec399431eb3cb709cf0e06e15c528cc7d5da389392c89da tests/data/acpi/q35/SRAT.mmio64
e7274a622cf4be3d991a8cedf4437c1976334a1332fac78aaeaa47a94d6e2697 tests/data/acpi/pc/DSDT.memhp
e93a393836970c4f32fff86a1931b8e45ee4634e5c99168491f2c55823647fda tests/data/acpi/pc/APIC.dimmpxm
e93a393836970c4f32fff86a1931b8e45ee4634e5c99168491f2c55823647fda tests/data/acpi/q35/APIC.dimmpxm
ee7b4e121c41519501119b4b7bd52edcf1124fcf271b7dd3086f0038b182b947 tests/data/acpi/q35/DSDT.bridge
f089eb8441987367f223fa5e5e9fec8c12d9557cf0c6d68d0e8372be4c39fa7c tests/data/acpi/pc/FACP
fabfa7d0ed2367bf1499b1a1d0b7253cd08a298e2aa0be3ca8f0dae5150e71a9 tests/data/acpi/q35/DSDT.mmio64
fb7675409f2264b14e5859e9187e7d05811bcc0570444b18cded8ff49a3514c5 tests/data/acpi/pc/SRAT.dimmpxm
fb7675409f2264b14e5859e9187e7d05811bcc0570444b18cded8ff49a3514c5 tests/data/acpi/q35/SRAT.dimmpxm
It's easy to fix up duplications within virt. But I am not 100% sure how
fix up duplication between q35 and pc. I think we should really
fix qemu to allow pc-i440fx and pc-q35 as machine types. Right now:
microvm microvm (i386)
xenfv-4.2 Xen Fully-virtualized PC
xenfv Xen Fully-virtualized PC (alias of xenfv-3.1)
xenfv-3.1 Xen Fully-virtualized PC
pc Standard PC (i440FX + PIIX, 1996) (alias of pc-i440fx-7.1)
pc-i440fx-7.1 Standard PC (i440FX + PIIX, 1996) (default)
pc-i440fx-7.0 Standard PC (i440FX + PIIX, 1996)
pc-i440fx-6.2 Standard PC (i440FX + PIIX, 1996)
pc-i440fx-6.1 Standard PC (i440FX + PIIX, 1996)
pc-i440fx-6.0 Standard PC (i440FX + PIIX, 1996)
pc-i440fx-5.2 Standard PC (i440FX + PIIX, 1996)
pc-i440fx-5.1 Standard PC (i440FX + PIIX, 1996)
pc-i440fx-5.0 Standard PC (i440FX + PIIX, 1996)
pc-i440fx-4.2 Standard PC (i440FX + PIIX, 1996)
pc-i440fx-4.1 Standard PC (i440FX + PIIX, 1996)
pc-i440fx-4.0 Standard PC (i440FX + PIIX, 1996)
pc-i440fx-3.1 Standard PC (i440FX + PIIX, 1996)
pc-i440fx-3.0 Standard PC (i440FX + PIIX, 1996)
pc-i440fx-2.9 Standard PC (i440FX + PIIX, 1996)
pc-i440fx-2.8 Standard PC (i440FX + PIIX, 1996)
pc-i440fx-2.7 Standard PC (i440FX + PIIX, 1996)
pc-i440fx-2.6 Standard PC (i440FX + PIIX, 1996)
pc-i440fx-2.5 Standard PC (i440FX + PIIX, 1996)
pc-i440fx-2.4 Standard PC (i440FX + PIIX, 1996)
pc-i440fx-2.3 Standard PC (i440FX + PIIX, 1996)
pc-i440fx-2.2 Standard PC (i440FX + PIIX, 1996)
pc-i440fx-2.12 Standard PC (i440FX + PIIX, 1996)
pc-i440fx-2.11 Standard PC (i440FX + PIIX, 1996)
pc-i440fx-2.10 Standard PC (i440FX + PIIX, 1996)
pc-i440fx-2.1 Standard PC (i440FX + PIIX, 1996)
pc-i440fx-2.0 Standard PC (i440FX + PIIX, 1996)
pc-i440fx-1.7 Standard PC (i440FX + PIIX, 1996) (deprecated)
pc-i440fx-1.6 Standard PC (i440FX + PIIX, 1996) (deprecated)
pc-i440fx-1.5 Standard PC (i440FX + PIIX, 1996) (deprecated)
pc-i440fx-1.4 Standard PC (i440FX + PIIX, 1996) (deprecated)
q35 Standard PC (Q35 + ICH9, 2009) (alias of pc-q35-7.1)
pc-q35-7.1 Standard PC (Q35 + ICH9, 2009)
pc-q35-7.0 Standard PC (Q35 + ICH9, 2009)
pc-q35-6.2 Standard PC (Q35 + ICH9, 2009)
pc-q35-6.1 Standard PC (Q35 + ICH9, 2009)
pc-q35-6.0 Standard PC (Q35 + ICH9, 2009)
pc-q35-5.2 Standard PC (Q35 + ICH9, 2009)
pc-q35-5.1 Standard PC (Q35 + ICH9, 2009)
pc-q35-5.0 Standard PC (Q35 + ICH9, 2009)
pc-q35-4.2 Standard PC (Q35 + ICH9, 2009)
pc-q35-4.1 Standard PC (Q35 + ICH9, 2009)
pc-q35-4.0.1 Standard PC (Q35 + ICH9, 2009)
pc-q35-4.0 Standard PC (Q35 + ICH9, 2009)
pc-q35-3.1 Standard PC (Q35 + ICH9, 2009)
pc-q35-3.0 Standard PC (Q35 + ICH9, 2009)
pc-q35-2.9 Standard PC (Q35 + ICH9, 2009)
pc-q35-2.8 Standard PC (Q35 + ICH9, 2009)
pc-q35-2.7 Standard PC (Q35 + ICH9, 2009)
pc-q35-2.6 Standard PC (Q35 + ICH9, 2009)
pc-q35-2.5 Standard PC (Q35 + ICH9, 2009)
pc-q35-2.4 Standard PC (Q35 + ICH9, 2009)
pc-q35-2.12 Standard PC (Q35 + ICH9, 2009)
pc-q35-2.11 Standard PC (Q35 + ICH9, 2009)
pc-q35-2.10 Standard PC (Q35 + ICH9, 2009)
isapc ISA-only PC
none empty machine
x-remote Experimental remote machine
xenpv Xen Para-virtualized PC
which IMHO is a bit of a mess.
Then we could maybe use the directory "pc" for files common to i440fx
and q35. Maybe just teach the test to look under tests/data/acpi/x86
too? And I think we should teach tests/data/acpi/rebuild-expected-aml.sh
to check for duplicates and at least warn the user.
--
MST
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 02/17] acpi: x86: deduplicate HPET AML building
2022-07-01 16:26 ` Michael S. Tsirkin
@ 2022-07-07 9:16 ` Igor Mammedov
2022-07-07 10:08 ` Michael S. Tsirkin
0 siblings, 1 reply; 25+ messages in thread
From: Igor Mammedov @ 2022-07-07 9:16 UTC (permalink / raw)
To: Michael S. Tsirkin; +Cc: qemu-devel, ani
On Fri, 1 Jul 2022 12:26:16 -0400
"Michael S. Tsirkin" <mst@redhat.com> wrote:
> On Fri, Jul 01, 2022 at 09:35:00AM -0400, Igor Mammedov wrote:
> > HPET AML doesn't depend on piix4 nor q35, move code buiding it
> > to common scope to avoid duplication.
> >
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
>
> Apropos, tests/data/acpi/rebuild-expected-aml.sh ignores the
> fact that some tables might be identical. Also, there's no
> way to reuse expected files between machines. And so we have:
>
>
> [qemu]$ find tests/data/acpi -type f -exec sha256sum '{}' ';'|sort
[...]
>
>
> It's easy to fix up duplications within virt. But I am not 100% sure how
> fix up duplication between q35 and pc.
[...]
> Then we could maybe use the directory "pc" for files common to i440fx
> and q35. Maybe just teach the test to look under tests/data/acpi/x86
> too? And I think we should teach tests/data/acpi/rebuild-expected-aml.sh
> to check for duplicates and at least warn the user.
Probably duplicates in 'virt' mostly due to combination of not knowing
that there is a fallback lookup (which is hidden in the code)
and simplistic way tests/data/acpi/rebuild-expected-aml.sh rebuilds tables.
As you suggest, rebuild-expected-aml.sh can be improved to warn or even
better drop duplicates if found.
As for reusing tables between different machine types, alternatively
we can add explicit remapping rules (possibly auto-generated) versus
currently used implicit fallback approach.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 02/17] acpi: x86: deduplicate HPET AML building
2022-07-07 9:16 ` Igor Mammedov
@ 2022-07-07 10:08 ` Michael S. Tsirkin
2022-07-07 10:55 ` Igor Mammedov
0 siblings, 1 reply; 25+ messages in thread
From: Michael S. Tsirkin @ 2022-07-07 10:08 UTC (permalink / raw)
To: Igor Mammedov; +Cc: qemu-devel, ani
On Thu, Jul 07, 2022 at 11:16:16AM +0200, Igor Mammedov wrote:
> On Fri, 1 Jul 2022 12:26:16 -0400
> "Michael S. Tsirkin" <mst@redhat.com> wrote:
>
> > On Fri, Jul 01, 2022 at 09:35:00AM -0400, Igor Mammedov wrote:
> > > HPET AML doesn't depend on piix4 nor q35, move code buiding it
> > > to common scope to avoid duplication.
> > >
> > > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> >
> > Apropos, tests/data/acpi/rebuild-expected-aml.sh ignores the
> > fact that some tables might be identical. Also, there's no
> > way to reuse expected files between machines. And so we have:
> >
> >
> > [qemu]$ find tests/data/acpi -type f -exec sha256sum '{}' ';'|sort
> [...]
>
> >
> >
> > It's easy to fix up duplications within virt. But I am not 100% sure how
> > fix up duplication between q35 and pc.
> [...]
>
> > Then we could maybe use the directory "pc" for files common to i440fx
> > and q35. Maybe just teach the test to look under tests/data/acpi/x86
> > too? And I think we should teach tests/data/acpi/rebuild-expected-aml.sh
> > to check for duplicates and at least warn the user.
>
> Probably duplicates in 'virt' mostly due to combination of not knowing
> that there is a fallback lookup (which is hidden in the code)
> and simplistic way tests/data/acpi/rebuild-expected-aml.sh rebuilds tables.
>
> As you suggest, rebuild-expected-aml.sh can be improved to warn or even
> better drop duplicates if found.
Want to try?
> As for reusing tables between different machine types, alternatively
> we can add explicit remapping rules (possibly auto-generated) versus
> currently used implicit fallback approach.
My worry with this is that if a specific table needs to be split from
the generic variant then user would have to hack the test code as opposed
to just updating the tables, so the update can not be done
automatically. Thoughts?
--
MST
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 02/17] acpi: x86: deduplicate HPET AML building
2022-07-07 10:08 ` Michael S. Tsirkin
@ 2022-07-07 10:55 ` Igor Mammedov
0 siblings, 0 replies; 25+ messages in thread
From: Igor Mammedov @ 2022-07-07 10:55 UTC (permalink / raw)
To: Michael S. Tsirkin; +Cc: qemu-devel, ani
On Thu, 7 Jul 2022 06:08:35 -0400
"Michael S. Tsirkin" <mst@redhat.com> wrote:
> On Thu, Jul 07, 2022 at 11:16:16AM +0200, Igor Mammedov wrote:
> > On Fri, 1 Jul 2022 12:26:16 -0400
> > "Michael S. Tsirkin" <mst@redhat.com> wrote:
> >
> > > On Fri, Jul 01, 2022 at 09:35:00AM -0400, Igor Mammedov wrote:
> > > > HPET AML doesn't depend on piix4 nor q35, move code buiding it
> > > > to common scope to avoid duplication.
> > > >
> > > > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > >
> > > Apropos, tests/data/acpi/rebuild-expected-aml.sh ignores the
> > > fact that some tables might be identical. Also, there's no
> > > way to reuse expected files between machines. And so we have:
> > >
> > >
> > > [qemu]$ find tests/data/acpi -type f -exec sha256sum '{}' ';'|sort
> > [...]
> >
> > >
> > >
> > > It's easy to fix up duplications within virt. But I am not 100% sure how
> > > fix up duplication between q35 and pc.
> > [...]
> >
> > > Then we could maybe use the directory "pc" for files common to i440fx
> > > and q35. Maybe just teach the test to look under tests/data/acpi/x86
> > > too? And I think we should teach tests/data/acpi/rebuild-expected-aml.sh
> > > to check for duplicates and at least warn the user.
> >
> > Probably duplicates in 'virt' mostly due to combination of not knowing
> > that there is a fallback lookup (which is hidden in the code)
> > and simplistic way tests/data/acpi/rebuild-expected-aml.sh rebuilds tables.
> >
> > As you suggest, rebuild-expected-aml.sh can be improved to warn or even
> > better drop duplicates if found.
>
> Want to try?
I'll put it on my queue, after PCI refactorings
>
> > As for reusing tables between different machine types, alternatively
> > we can add explicit remapping rules (possibly auto-generated) versus
> > currently used implicit fallback approach.
>
> My worry with this is that if a specific table needs to be split from
> the generic variant then user would have to hack the test code as opposed
> to just updating the tables, so the update can not be done
> automatically. Thoughts?
I'll try to implement it and see if it's possible.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 00/17] acpi:pc/q35: minor PCI refactoring/cleanups
2022-07-01 13:34 [PATCH 00/17] acpi:pc/q35: minor PCI refactoring/cleanups Igor Mammedov
` (16 preceding siblings ...)
2022-07-01 13:35 ` [PATCH 17/17] x86: pci: acpi: deduplate PCI slots creation Igor Mammedov
@ 2022-09-06 11:41 ` Igor Mammedov
2022-09-06 13:10 ` Michael S. Tsirkin
17 siblings, 1 reply; 25+ messages in thread
From: Igor Mammedov @ 2022-09-06 11:41 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani
On Fri, 1 Jul 2022 09:34:58 -0400
Igor Mammedov <imammedo@redhat.com> wrote:
> Flushing out ACPI PCI cleanups that preceed conversion of
> DSDT PCI slots ennumeration to AcpiDevAmlIf interface.
> It's is mostly collection of patches thraet removes code
> duplication, we've accumulated around PCI relaterd AML
> in DSDT.
ping,
it still applies cleanly to master.
Michael can you pick it up?
>
> git:
> https://gitlab.com/imammedo/qemu.git x86_pci_cleanups
>
> Igor Mammedov (17):
> tests: acpi: whitelist pc/q35 DSDT due to HPET AML move
> acpi: x86: deduplicate HPET AML building
> tests: acpi: update expected blobs after HPET move
> tests: acpi: whitelist pc/q35 DSDT due to HPET AML move
> acpi: x86: refactor PDSM method to reduce nesting
> x86: acpi: _DSM: use Package to pass parameters
> tests: acpi: update expected blobs
> tests: acpi: whitelist pc/q35 DSDT before switching _DSM to use ASUN
> x86: acpi: cleanup PCI device _DSM duplication
> tests: acpi: update expected blobs
> tests: acpi: whitelist pc/q35 DSDT before moving _ADR field
> x86: pci: acpi: reorder Device's _ADR and _SUN fields
> tests: acpi: update expected blobs
> tests: acpi: whitelist pc/q35 DSDT before moving _ADR field
> x86: pci: acpi: reorder Device's _DSM method
> tests: acpi: update expected blobs
> x86: pci: acpi: deduplate PCI slots creation
>
> hw/i386/acpi-build.c | 302 ++++++++++++++------------
> tests/data/acpi/pc/DSDT | Bin 5987 -> 6422 bytes
> tests/data/acpi/pc/DSDT.acpierst | Bin 5954 -> 6382 bytes
> tests/data/acpi/pc/DSDT.acpihmat | Bin 7312 -> 7747 bytes
> tests/data/acpi/pc/DSDT.bridge | Bin 8653 -> 9496 bytes
> tests/data/acpi/pc/DSDT.cphp | Bin 6451 -> 6886 bytes
> tests/data/acpi/pc/DSDT.dimmpxm | Bin 7641 -> 8076 bytes
> tests/data/acpi/pc/DSDT.hpbridge | Bin 5954 -> 6382 bytes
> tests/data/acpi/pc/DSDT.hpbrroot | Bin 3069 -> 3069 bytes
> tests/data/acpi/pc/DSDT.ipmikcs | Bin 6059 -> 6494 bytes
> tests/data/acpi/pc/DSDT.memhp | Bin 7346 -> 7781 bytes
> tests/data/acpi/pc/DSDT.nohpet | Bin 5845 -> 6280 bytes
> tests/data/acpi/pc/DSDT.numamem | Bin 5993 -> 6428 bytes
> tests/data/acpi/pc/DSDT.roothp | Bin 6195 -> 6656 bytes
> tests/data/acpi/q35/DSDT | Bin 8274 -> 8320 bytes
> tests/data/acpi/q35/DSDT.acpierst | Bin 8291 -> 8337 bytes
> tests/data/acpi/q35/DSDT.acpihmat | Bin 9599 -> 9645 bytes
> tests/data/acpi/q35/DSDT.applesmc | Bin 8320 -> 8366 bytes
> tests/data/acpi/q35/DSDT.bridge | Bin 10988 -> 11449 bytes
> tests/data/acpi/q35/DSDT.cphp | Bin 8738 -> 8784 bytes
> tests/data/acpi/q35/DSDT.cxl | Bin 9600 -> 9646 bytes
> tests/data/acpi/q35/DSDT.dimmpxm | Bin 9928 -> 9974 bytes
> tests/data/acpi/q35/DSDT.ipmibt | Bin 8349 -> 8395 bytes
> tests/data/acpi/q35/DSDT.ipmismbus | Bin 8363 -> 8409 bytes
> tests/data/acpi/q35/DSDT.ivrs | Bin 8291 -> 8337 bytes
> tests/data/acpi/q35/DSDT.memhp | Bin 9633 -> 9679 bytes
> tests/data/acpi/q35/DSDT.mmio64 | Bin 9404 -> 9450 bytes
> tests/data/acpi/q35/DSDT.multi-bridge | Bin 8568 -> 8640 bytes
> tests/data/acpi/q35/DSDT.nohpet | Bin 8132 -> 8178 bytes
> tests/data/acpi/q35/DSDT.numamem | Bin 8280 -> 8326 bytes
> tests/data/acpi/q35/DSDT.pvpanic-isa | Bin 8375 -> 8421 bytes
> tests/data/acpi/q35/DSDT.tis.tpm12 | Bin 8880 -> 8926 bytes
> tests/data/acpi/q35/DSDT.tis.tpm2 | Bin 8906 -> 8952 bytes
> tests/data/acpi/q35/DSDT.viot | Bin 9383 -> 9429 bytes
> tests/data/acpi/q35/DSDT.xapic | Bin 35637 -> 35683 bytes
> 35 files changed, 161 insertions(+), 141 deletions(-)
>
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 00/17] acpi:pc/q35: minor PCI refactoring/cleanups
2022-09-06 11:41 ` [PATCH 00/17] acpi:pc/q35: minor PCI refactoring/cleanups Igor Mammedov
@ 2022-09-06 13:10 ` Michael S. Tsirkin
2022-09-27 10:20 ` Igor Mammedov
0 siblings, 1 reply; 25+ messages in thread
From: Michael S. Tsirkin @ 2022-09-06 13:10 UTC (permalink / raw)
To: Igor Mammedov; +Cc: qemu-devel, ani
On Tue, Sep 06, 2022 at 01:41:08PM +0200, Igor Mammedov wrote:
> On Fri, 1 Jul 2022 09:34:58 -0400
> Igor Mammedov <imammedo@redhat.com> wrote:
>
> > Flushing out ACPI PCI cleanups that preceed conversion of
> > DSDT PCI slots ennumeration to AcpiDevAmlIf interface.
> > It's is mostly collection of patches thraet removes code
> > duplication, we've accumulated around PCI relaterd AML
> > in DSDT.
>
> ping,
> it still applies cleanly to master.
>
> Michael can you pick it up?
yes, thanks for the ping!
> >
> > git:
> > https://gitlab.com/imammedo/qemu.git x86_pci_cleanups
> >
> > Igor Mammedov (17):
> > tests: acpi: whitelist pc/q35 DSDT due to HPET AML move
> > acpi: x86: deduplicate HPET AML building
> > tests: acpi: update expected blobs after HPET move
> > tests: acpi: whitelist pc/q35 DSDT due to HPET AML move
> > acpi: x86: refactor PDSM method to reduce nesting
> > x86: acpi: _DSM: use Package to pass parameters
> > tests: acpi: update expected blobs
> > tests: acpi: whitelist pc/q35 DSDT before switching _DSM to use ASUN
> > x86: acpi: cleanup PCI device _DSM duplication
> > tests: acpi: update expected blobs
> > tests: acpi: whitelist pc/q35 DSDT before moving _ADR field
> > x86: pci: acpi: reorder Device's _ADR and _SUN fields
> > tests: acpi: update expected blobs
> > tests: acpi: whitelist pc/q35 DSDT before moving _ADR field
> > x86: pci: acpi: reorder Device's _DSM method
> > tests: acpi: update expected blobs
> > x86: pci: acpi: deduplate PCI slots creation
> >
> > hw/i386/acpi-build.c | 302 ++++++++++++++------------
> > tests/data/acpi/pc/DSDT | Bin 5987 -> 6422 bytes
> > tests/data/acpi/pc/DSDT.acpierst | Bin 5954 -> 6382 bytes
> > tests/data/acpi/pc/DSDT.acpihmat | Bin 7312 -> 7747 bytes
> > tests/data/acpi/pc/DSDT.bridge | Bin 8653 -> 9496 bytes
> > tests/data/acpi/pc/DSDT.cphp | Bin 6451 -> 6886 bytes
> > tests/data/acpi/pc/DSDT.dimmpxm | Bin 7641 -> 8076 bytes
> > tests/data/acpi/pc/DSDT.hpbridge | Bin 5954 -> 6382 bytes
> > tests/data/acpi/pc/DSDT.hpbrroot | Bin 3069 -> 3069 bytes
> > tests/data/acpi/pc/DSDT.ipmikcs | Bin 6059 -> 6494 bytes
> > tests/data/acpi/pc/DSDT.memhp | Bin 7346 -> 7781 bytes
> > tests/data/acpi/pc/DSDT.nohpet | Bin 5845 -> 6280 bytes
> > tests/data/acpi/pc/DSDT.numamem | Bin 5993 -> 6428 bytes
> > tests/data/acpi/pc/DSDT.roothp | Bin 6195 -> 6656 bytes
> > tests/data/acpi/q35/DSDT | Bin 8274 -> 8320 bytes
> > tests/data/acpi/q35/DSDT.acpierst | Bin 8291 -> 8337 bytes
> > tests/data/acpi/q35/DSDT.acpihmat | Bin 9599 -> 9645 bytes
> > tests/data/acpi/q35/DSDT.applesmc | Bin 8320 -> 8366 bytes
> > tests/data/acpi/q35/DSDT.bridge | Bin 10988 -> 11449 bytes
> > tests/data/acpi/q35/DSDT.cphp | Bin 8738 -> 8784 bytes
> > tests/data/acpi/q35/DSDT.cxl | Bin 9600 -> 9646 bytes
> > tests/data/acpi/q35/DSDT.dimmpxm | Bin 9928 -> 9974 bytes
> > tests/data/acpi/q35/DSDT.ipmibt | Bin 8349 -> 8395 bytes
> > tests/data/acpi/q35/DSDT.ipmismbus | Bin 8363 -> 8409 bytes
> > tests/data/acpi/q35/DSDT.ivrs | Bin 8291 -> 8337 bytes
> > tests/data/acpi/q35/DSDT.memhp | Bin 9633 -> 9679 bytes
> > tests/data/acpi/q35/DSDT.mmio64 | Bin 9404 -> 9450 bytes
> > tests/data/acpi/q35/DSDT.multi-bridge | Bin 8568 -> 8640 bytes
> > tests/data/acpi/q35/DSDT.nohpet | Bin 8132 -> 8178 bytes
> > tests/data/acpi/q35/DSDT.numamem | Bin 8280 -> 8326 bytes
> > tests/data/acpi/q35/DSDT.pvpanic-isa | Bin 8375 -> 8421 bytes
> > tests/data/acpi/q35/DSDT.tis.tpm12 | Bin 8880 -> 8926 bytes
> > tests/data/acpi/q35/DSDT.tis.tpm2 | Bin 8906 -> 8952 bytes
> > tests/data/acpi/q35/DSDT.viot | Bin 9383 -> 9429 bytes
> > tests/data/acpi/q35/DSDT.xapic | Bin 35637 -> 35683 bytes
> > 35 files changed, 161 insertions(+), 141 deletions(-)
> >
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 00/17] acpi:pc/q35: minor PCI refactoring/cleanups
2022-09-06 13:10 ` Michael S. Tsirkin
@ 2022-09-27 10:20 ` Igor Mammedov
0 siblings, 0 replies; 25+ messages in thread
From: Igor Mammedov @ 2022-09-27 10:20 UTC (permalink / raw)
To: Michael S. Tsirkin; +Cc: qemu-devel, ani
On Tue, 6 Sep 2022 09:10:32 -0400
"Michael S. Tsirkin" <mst@redhat.com> wrote:
> On Tue, Sep 06, 2022 at 01:41:08PM +0200, Igor Mammedov wrote:
> > On Fri, 1 Jul 2022 09:34:58 -0400
> > Igor Mammedov <imammedo@redhat.com> wrote:
> >
> > > Flushing out ACPI PCI cleanups that preceed conversion of
> > > DSDT PCI slots ennumeration to AcpiDevAmlIf interface.
> > > It's is mostly collection of patches thraet removes code
> > > duplication, we've accumulated around PCI relaterd AML
> > > in DSDT.
> >
> > ping,
> > it still applies cleanly to master.
> >
> > Michael can you pick it up?
>
> yes, thanks for the ping!
ping?
>
> > >
> > > git:
> > > https://gitlab.com/imammedo/qemu.git x86_pci_cleanups
> > >
> > > Igor Mammedov (17):
> > > tests: acpi: whitelist pc/q35 DSDT due to HPET AML move
> > > acpi: x86: deduplicate HPET AML building
> > > tests: acpi: update expected blobs after HPET move
> > > tests: acpi: whitelist pc/q35 DSDT due to HPET AML move
> > > acpi: x86: refactor PDSM method to reduce nesting
> > > x86: acpi: _DSM: use Package to pass parameters
> > > tests: acpi: update expected blobs
> > > tests: acpi: whitelist pc/q35 DSDT before switching _DSM to use ASUN
> > > x86: acpi: cleanup PCI device _DSM duplication
> > > tests: acpi: update expected blobs
> > > tests: acpi: whitelist pc/q35 DSDT before moving _ADR field
> > > x86: pci: acpi: reorder Device's _ADR and _SUN fields
> > > tests: acpi: update expected blobs
> > > tests: acpi: whitelist pc/q35 DSDT before moving _ADR field
> > > x86: pci: acpi: reorder Device's _DSM method
> > > tests: acpi: update expected blobs
> > > x86: pci: acpi: deduplate PCI slots creation
> > >
> > > hw/i386/acpi-build.c | 302 ++++++++++++++------------
> > > tests/data/acpi/pc/DSDT | Bin 5987 -> 6422 bytes
> > > tests/data/acpi/pc/DSDT.acpierst | Bin 5954 -> 6382 bytes
> > > tests/data/acpi/pc/DSDT.acpihmat | Bin 7312 -> 7747 bytes
> > > tests/data/acpi/pc/DSDT.bridge | Bin 8653 -> 9496 bytes
> > > tests/data/acpi/pc/DSDT.cphp | Bin 6451 -> 6886 bytes
> > > tests/data/acpi/pc/DSDT.dimmpxm | Bin 7641 -> 8076 bytes
> > > tests/data/acpi/pc/DSDT.hpbridge | Bin 5954 -> 6382 bytes
> > > tests/data/acpi/pc/DSDT.hpbrroot | Bin 3069 -> 3069 bytes
> > > tests/data/acpi/pc/DSDT.ipmikcs | Bin 6059 -> 6494 bytes
> > > tests/data/acpi/pc/DSDT.memhp | Bin 7346 -> 7781 bytes
> > > tests/data/acpi/pc/DSDT.nohpet | Bin 5845 -> 6280 bytes
> > > tests/data/acpi/pc/DSDT.numamem | Bin 5993 -> 6428 bytes
> > > tests/data/acpi/pc/DSDT.roothp | Bin 6195 -> 6656 bytes
> > > tests/data/acpi/q35/DSDT | Bin 8274 -> 8320 bytes
> > > tests/data/acpi/q35/DSDT.acpierst | Bin 8291 -> 8337 bytes
> > > tests/data/acpi/q35/DSDT.acpihmat | Bin 9599 -> 9645 bytes
> > > tests/data/acpi/q35/DSDT.applesmc | Bin 8320 -> 8366 bytes
> > > tests/data/acpi/q35/DSDT.bridge | Bin 10988 -> 11449 bytes
> > > tests/data/acpi/q35/DSDT.cphp | Bin 8738 -> 8784 bytes
> > > tests/data/acpi/q35/DSDT.cxl | Bin 9600 -> 9646 bytes
> > > tests/data/acpi/q35/DSDT.dimmpxm | Bin 9928 -> 9974 bytes
> > > tests/data/acpi/q35/DSDT.ipmibt | Bin 8349 -> 8395 bytes
> > > tests/data/acpi/q35/DSDT.ipmismbus | Bin 8363 -> 8409 bytes
> > > tests/data/acpi/q35/DSDT.ivrs | Bin 8291 -> 8337 bytes
> > > tests/data/acpi/q35/DSDT.memhp | Bin 9633 -> 9679 bytes
> > > tests/data/acpi/q35/DSDT.mmio64 | Bin 9404 -> 9450 bytes
> > > tests/data/acpi/q35/DSDT.multi-bridge | Bin 8568 -> 8640 bytes
> > > tests/data/acpi/q35/DSDT.nohpet | Bin 8132 -> 8178 bytes
> > > tests/data/acpi/q35/DSDT.numamem | Bin 8280 -> 8326 bytes
> > > tests/data/acpi/q35/DSDT.pvpanic-isa | Bin 8375 -> 8421 bytes
> > > tests/data/acpi/q35/DSDT.tis.tpm12 | Bin 8880 -> 8926 bytes
> > > tests/data/acpi/q35/DSDT.tis.tpm2 | Bin 8906 -> 8952 bytes
> > > tests/data/acpi/q35/DSDT.viot | Bin 9383 -> 9429 bytes
> > > tests/data/acpi/q35/DSDT.xapic | Bin 35637 -> 35683 bytes
> > > 35 files changed, 161 insertions(+), 141 deletions(-)
> > >
>
^ permalink raw reply [flat|nested] 25+ messages in thread
end of thread, other threads:[~2022-09-27 10:42 UTC | newest]
Thread overview: 25+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-01 13:34 [PATCH 00/17] acpi:pc/q35: minor PCI refactoring/cleanups Igor Mammedov
2022-07-01 13:34 ` [PATCH 01/17] tests: acpi: whitelist pc/q35 DSDT due to HPET AML move Igor Mammedov
2022-07-01 13:35 ` [PATCH 02/17] acpi: x86: deduplicate HPET AML building Igor Mammedov
2022-07-01 16:26 ` Michael S. Tsirkin
2022-07-07 9:16 ` Igor Mammedov
2022-07-07 10:08 ` Michael S. Tsirkin
2022-07-07 10:55 ` Igor Mammedov
2022-07-01 13:35 ` [PATCH 03/17] tests: acpi: update expected blobs after HPET move Igor Mammedov
2022-07-01 13:35 ` [PATCH 04/17] tests: acpi: whitelist pc/q35 DSDT due to HPET AML move Igor Mammedov
2022-07-01 13:35 ` [PATCH 05/17] acpi: x86: refactor PDSM method to reduce nesting Igor Mammedov
2022-07-01 13:35 ` [PATCH 06/17] x86: acpi: _DSM: use Package to pass parameters Igor Mammedov
2022-07-01 13:35 ` [PATCH 07/17] tests: acpi: update expected blobs Igor Mammedov
2022-07-01 13:35 ` [PATCH 08/17] tests: acpi: whitelist pc/q35 DSDT before switching _DSM to use ASUN Igor Mammedov
2022-07-01 13:35 ` [PATCH 09/17] x86: acpi: cleanup PCI device _DSM duplication Igor Mammedov
2022-07-01 13:35 ` [PATCH 10/17] tests: acpi: update expected blobs Igor Mammedov
2022-07-01 13:35 ` [PATCH 11/17] tests: acpi: whitelist pc/q35 DSDT before moving _ADR field Igor Mammedov
2022-07-01 13:35 ` [PATCH 12/17] x86: pci: acpi: reorder Device's _ADR and _SUN fields Igor Mammedov
2022-07-01 13:35 ` [PATCH 13/17] tests: acpi: update expected blobs Igor Mammedov
2022-07-01 13:35 ` [PATCH 14/17] tests: acpi: whitelist pc/q35 DSDT before moving _ADR field Igor Mammedov
2022-07-01 13:35 ` [PATCH 15/17] x86: pci: acpi: reorder Device's _DSM method Igor Mammedov
2022-07-01 13:35 ` [PATCH 16/17] tests: acpi: update expected blobs Igor Mammedov
2022-07-01 13:35 ` [PATCH 17/17] x86: pci: acpi: deduplate PCI slots creation Igor Mammedov
2022-09-06 11:41 ` [PATCH 00/17] acpi:pc/q35: minor PCI refactoring/cleanups Igor Mammedov
2022-09-06 13:10 ` Michael S. Tsirkin
2022-09-27 10:20 ` Igor Mammedov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.