[PATCH 00/11] x86: clean up ACPI PCI code part 2

qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed

* [PATCH 00/11] x86: clean up ACPI PCI code part 2
@ 2022-10-17 10:21 Igor Mammedov
  2022-10-17 10:21 ` [PATCH 01/11] acpi: pc: vga: use AcpiDevAmlIf interface to build VGA device descriptors Igor Mammedov
                   ` (11 more replies)
  0 siblings, 12 replies; 18+ messages in thread
From: Igor Mammedov @ 2022-10-17 10:21 UTC (permalink / raw)
  To: qemu-devel; +Cc: mst, ani

Series continues refactoring started at recently merged [1].
It replaces special cases/quirks for ISA/SMB bridges and PCI
attached VGA devices with generic AcpiDevAmlIf interface,
which allows device to provide its own AML description
without need for adhoc plumbing in generic DSDT or PCI
enumeration code.

PS:
at the end, \_GPE clean up patches which are not part of
AcpiDevAmlIf refactoring but iti's still related to PCI,
so I've included them there as well.

 1)
  https://patchwork.ozlabs.org/project/qemu-devel/list/?series=303856

Igor Mammedov (11):
  acpi: pc: vga: use AcpiDevAmlIf interface to build VGA device
    descriptors
  tests: acpi: whitelist DSDT before generating PCI-ISA bridge AML
    automatically
  acpi: pc/q35: drop ad-hoc PCI-ISA bridge AML routines and let bus
    ennumeration generate AML
  tests: acpi: update expected DSDT after ISA bridge is moved directly
    under PCI host bridge
  tests: acpi: whitelist DSDT before generating ICH9_SMB AML
    automatically
  acpi: add get_dev_aml_func() helper
  acpi: enumerate SMB bridge automatically along with other PCI devices
  tests: acpi: update expected blobs
  tests: acpi: pc/q35 whitelist DSDT before \_GPE cleanup
  acpi: pc/35: sanitize _GPE declaration order
  tests: acpi: update expected blobs

 hw/display/vga_int.h                  |   2 +
 include/hw/acpi/acpi_aml_interface.h  |  13 +-
 hw/display/acpi-vga-stub.c            |   7 ++
 hw/display/acpi-vga.c                 |  26 ++++
 hw/display/meson.build                |  17 +++
 hw/display/vga-pci.c                  |   4 +
 hw/i386/acpi-build.c                  | 175 +++++---------------------
 hw/isa/lpc_ich9.c                     |  23 ++++
 hw/isa/piix3.c                        |  17 ++-
 tests/data/acpi/pc/DSDT               | Bin 6422 -> 6501 bytes
 tests/data/acpi/pc/DSDT.acpierst      | Bin 6382 -> 6461 bytes
 tests/data/acpi/pc/DSDT.acpihmat      | Bin 7747 -> 7826 bytes
 tests/data/acpi/pc/DSDT.bridge        | Bin 9496 -> 9575 bytes
 tests/data/acpi/pc/DSDT.cphp          | Bin 6886 -> 6965 bytes
 tests/data/acpi/pc/DSDT.dimmpxm       | Bin 8076 -> 8155 bytes
 tests/data/acpi/pc/DSDT.hpbridge      | Bin 6382 -> 6461 bytes
 tests/data/acpi/pc/DSDT.hpbrroot      | Bin 3069 -> 3107 bytes
 tests/data/acpi/pc/DSDT.ipmikcs       | Bin 6494 -> 6573 bytes
 tests/data/acpi/pc/DSDT.memhp         | Bin 7781 -> 7860 bytes
 tests/data/acpi/pc/DSDT.nohpet        | Bin 6280 -> 6359 bytes
 tests/data/acpi/pc/DSDT.numamem       | Bin 6428 -> 6507 bytes
 tests/data/acpi/pc/DSDT.roothp        | Bin 6656 -> 6699 bytes
 tests/data/acpi/q35/DSDT              | Bin 8320 -> 8412 bytes
 tests/data/acpi/q35/DSDT.acpierst     | Bin 8337 -> 8429 bytes
 tests/data/acpi/q35/DSDT.acpihmat     | Bin 9645 -> 9737 bytes
 tests/data/acpi/q35/DSDT.applesmc     | Bin 8366 -> 8458 bytes
 tests/data/acpi/q35/DSDT.bridge       | Bin 11449 -> 11541 bytes
 tests/data/acpi/q35/DSDT.cphp         | Bin 8784 -> 8876 bytes
 tests/data/acpi/q35/DSDT.cxl          | Bin 9646 -> 9738 bytes
 tests/data/acpi/q35/DSDT.dimmpxm      | Bin 9974 -> 10066 bytes
 tests/data/acpi/q35/DSDT.ipmibt       | Bin 8395 -> 8487 bytes
 tests/data/acpi/q35/DSDT.ipmismbus    | Bin 8409 -> 8500 bytes
 tests/data/acpi/q35/DSDT.ivrs         | Bin 8337 -> 8429 bytes
 tests/data/acpi/q35/DSDT.memhp        | Bin 9679 -> 9771 bytes
 tests/data/acpi/q35/DSDT.mmio64       | Bin 9450 -> 9542 bytes
 tests/data/acpi/q35/DSDT.multi-bridge | Bin 8640 -> 8732 bytes
 tests/data/acpi/q35/DSDT.nohpet       | Bin 8178 -> 8270 bytes
 tests/data/acpi/q35/DSDT.numamem      | Bin 8326 -> 8418 bytes
 tests/data/acpi/q35/DSDT.pvpanic-isa  | Bin 8421 -> 8513 bytes
 tests/data/acpi/q35/DSDT.tis.tpm12    | Bin 8926 -> 9018 bytes
 tests/data/acpi/q35/DSDT.tis.tpm2     | Bin 8952 -> 9044 bytes
 tests/data/acpi/q35/DSDT.viot         | Bin 9429 -> 9521 bytes
 tests/data/acpi/q35/DSDT.xapic        | Bin 35683 -> 35775 bytes
 43 files changed, 135 insertions(+), 149 deletions(-)
 create mode 100644 hw/display/acpi-vga-stub.c
 create mode 100644 hw/display/acpi-vga.c

-- 
2.31.1



^ permalink raw reply	[flat|nested] 18+ messages in thread

* [PATCH 01/11] acpi: pc: vga: use AcpiDevAmlIf interface to build VGA device descriptors
  2022-10-17 10:21 [PATCH 00/11] x86: clean up ACPI PCI code part 2 Igor Mammedov
@ 2022-10-17 10:21 ` Igor Mammedov
  2022-10-17 11:02   ` Ani Sinha
  2022-10-17 10:21 ` [PATCH 02/11] tests: acpi: whitelist DSDT before generating PCI-ISA bridge AML automatically Igor Mammedov
                   ` (10 subsequent siblings)
  11 siblings, 1 reply; 18+ messages in thread
From: Igor Mammedov @ 2022-10-17 10:21 UTC (permalink / raw)
  To: qemu-devel; +Cc: mst, ani

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 hw/display/vga_int.h       |  2 ++
 hw/display/acpi-vga-stub.c |  7 +++++++
 hw/display/acpi-vga.c      | 26 ++++++++++++++++++++++++++
 hw/display/meson.build     | 17 +++++++++++++++++
 hw/display/vga-pci.c       |  4 ++++
 hw/i386/acpi-build.c       | 26 +-------------------------
 6 files changed, 57 insertions(+), 25 deletions(-)
 create mode 100644 hw/display/acpi-vga-stub.c
 create mode 100644 hw/display/acpi-vga.c

diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h
index 305e700014..330406ad9c 100644
--- a/hw/display/vga_int.h
+++ b/hw/display/vga_int.h
@@ -30,6 +30,7 @@
 #include "ui/console.h"
 
 #include "hw/display/bochs-vbe.h"
+#include "hw/acpi/acpi_aml_interface.h"
 
 #define ST01_V_RETRACE      0x08
 #define ST01_DISP_ENABLE    0x01
@@ -195,4 +196,5 @@ void pci_std_vga_mmio_region_init(VGACommonState *s,
                                   MemoryRegion *subs,
                                   bool qext, bool edid);
 
+void build_vga_aml(AcpiDevAmlIf *adev, Aml *scope);
 #endif
diff --git a/hw/display/acpi-vga-stub.c b/hw/display/acpi-vga-stub.c
new file mode 100644
index 0000000000..a9b0ecf76d
--- /dev/null
+++ b/hw/display/acpi-vga-stub.c
@@ -0,0 +1,7 @@
+#include "qemu/osdep.h"
+#include "hw/acpi/acpi_aml_interface.h"
+#include "vga_int.h"
+
+void build_vga_aml(AcpiDevAmlIf *adev, Aml *scope)
+{
+}
diff --git a/hw/display/acpi-vga.c b/hw/display/acpi-vga.c
new file mode 100644
index 0000000000..f0e9ef1fcf
--- /dev/null
+++ b/hw/display/acpi-vga.c
@@ -0,0 +1,26 @@
+#include "qemu/osdep.h"
+#include "hw/acpi/acpi_aml_interface.h"
+#include "hw/pci/pci.h"
+#include "vga_int.h"
+
+void build_vga_aml(AcpiDevAmlIf *adev, Aml *scope)
+{
+    int s3d = 0;
+    Aml *method;
+
+    if (object_dynamic_cast(OBJECT(adev), "qxl-vga")) {
+        s3d = 3;
+    }
+
+    method = aml_method("_S1D", 0, AML_NOTSERIALIZED);
+    aml_append(method, aml_return(aml_int(0)));
+    aml_append(scope, method);
+
+    method = aml_method("_S2D", 0, AML_NOTSERIALIZED);
+    aml_append(method, aml_return(aml_int(0)));
+    aml_append(scope, method);
+
+    method = aml_method("_S3D", 0, AML_NOTSERIALIZED);
+    aml_append(method, aml_return(aml_int(s3d)));
+    aml_append(scope, method);
+}
diff --git a/hw/display/meson.build b/hw/display/meson.build
index adc53dd8b6..7a725ed80e 100644
--- a/hw/display/meson.build
+++ b/hw/display/meson.build
@@ -38,10 +38,21 @@ softmmu_ss.add(when: 'CONFIG_NEXTCUBE', if_true: files('next-fb.c'))
 
 specific_ss.add(when: 'CONFIG_VGA', if_true: files('vga.c'))
 
+if (config_all_devices.has_key('CONFIG_VGA_CIRRUS') or
+    config_all_devices.has_key('CONFIG_VGA_PCI') or
+    config_all_devices.has_key('CONFIG_VMWARE_VGA') or
+    config_all_devices.has_key('CONFIG_ATI_VGA')
+   )
+  softmmu_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-vga.c'),
+                                      if_false: files('acpi-vga-stub.c'))
+endif
+
 if config_all_devices.has_key('CONFIG_QXL')
   qxl_ss = ss.source_set()
   qxl_ss.add(when: 'CONFIG_QXL', if_true: [files('qxl.c', 'qxl-logger.c', 'qxl-render.c'),
                                            pixman, spice])
+  qxl_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-vga.c'),
+                                  if_false: files('acpi-vga-stub.c'))
   hw_display_modules += {'qxl': qxl_ss}
 endif
 
@@ -52,6 +63,7 @@ softmmu_ss.add(when: 'CONFIG_ARTIST', if_true: files('artist.c'))
 
 softmmu_ss.add(when: [pixman, 'CONFIG_ATI_VGA'], if_true: files('ati.c', 'ati_2d.c', 'ati_dbg.c'))
 
+
 if config_all_devices.has_key('CONFIG_VIRTIO_GPU')
   virtio_gpu_ss = ss.source_set()
   virtio_gpu_ss.add(when: 'CONFIG_VIRTIO_GPU',
@@ -87,14 +99,19 @@ if config_all_devices.has_key('CONFIG_VIRTIO_VGA')
                     if_true: [files('virtio-vga.c'), pixman])
   virtio_vga_ss.add(when: 'CONFIG_VHOST_USER_VGA',
                     if_true: files('vhost-user-vga.c'))
+  virtio_vga_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-vga.c'),
+                                         if_false: files('acpi-vga-stub.c'))
   hw_display_modules += {'virtio-vga': virtio_vga_ss}
 
   virtio_vga_gl_ss = ss.source_set()
   virtio_vga_gl_ss.add(when: ['CONFIG_VIRTIO_VGA', virgl, opengl],
                        if_true: [files('virtio-vga-gl.c'), pixman])
+  virtio_vga_gl_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-vga.c'),
+                                            if_false: files('acpi-vga-stub.c'))
   hw_display_modules += {'virtio-vga-gl': virtio_vga_gl_ss}
 endif
 
 specific_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_lcdc.c'))
 
+softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('acpi-vga-stub.c'))
 modules += { 'hw-display': hw_display_modules }
diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c
index 3e5bc259f7..9a91de7ed1 100644
--- a/hw/display/vga-pci.c
+++ b/hw/display/vga-pci.c
@@ -35,6 +35,7 @@
 #include "hw/loader.h"
 #include "hw/display/edid.h"
 #include "qom/object.h"
+#include "hw/acpi/acpi_aml_interface.h"
 
 enum vga_pci_flags {
     PCI_VGA_FLAG_ENABLE_MMIO = 1,
@@ -354,11 +355,13 @@ static void vga_pci_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
     PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
+    AcpiDevAmlIfClass *adevc = ACPI_DEV_AML_IF_CLASS(klass);
 
     k->vendor_id = PCI_VENDOR_ID_QEMU;
     k->device_id = PCI_DEVICE_ID_QEMU_VGA;
     dc->vmsd = &vmstate_vga_pci;
     set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);
+    adevc->build_dev_aml = build_vga_aml;
 }
 
 static const TypeInfo vga_pci_type_info = {
@@ -369,6 +372,7 @@ static const TypeInfo vga_pci_type_info = {
     .class_init = vga_pci_class_init,
     .interfaces = (InterfaceInfo[]) {
         { INTERFACE_CONVENTIONAL_PCI_DEVICE },
+        { TYPE_ACPI_DEV_AML_IF },
         { },
     },
 };
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 4f54b61904..26932b4e2c 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -430,7 +430,6 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
         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);
@@ -440,8 +439,6 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
                 continue;
             }
 
-            is_vga = pc->class_id == PCI_CLASS_DISPLAY_VGA;
-
             /*
              * Cold plugged bridges aren't themselves hot-pluggable.
              * Hotplugged bridges *are* hot-pluggable.
@@ -489,28 +486,7 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
             aml_append(dev, aml_pci_device_dsm());
         }
 
-        if (is_vga) {
-            /* add VGA specific AML methods */
-            int s3d;
-
-            if (object_dynamic_cast(OBJECT(pdev), "qxl-vga")) {
-                s3d = 3;
-            } else {
-                s3d = 0;
-            }
-
-            method = aml_method("_S1D", 0, AML_NOTSERIALIZED);
-            aml_append(method, aml_return(aml_int(0)));
-            aml_append(dev, method);
-
-            method = aml_method("_S2D", 0, AML_NOTSERIALIZED);
-            aml_append(method, aml_return(aml_int(0)));
-            aml_append(dev, method);
-
-            method = aml_method("_S3D", 0, AML_NOTSERIALIZED);
-            aml_append(method, aml_return(aml_int(s3d)));
-            aml_append(dev, method);
-        }
+        call_dev_aml_func(DEVICE(pdev), dev);
 
         bridge_in_acpi =  cold_plugged_bridge && pcihp_bridge_en;
         if (bridge_in_acpi) {
-- 
2.31.1



^ permalink raw reply related	[flat|nested] 18+ messages in thread

* Re: [PATCH 01/11] acpi: pc: vga: use AcpiDevAmlIf interface to build VGA device descriptors
  2022-10-17 10:21 ` [PATCH 01/11] acpi: pc: vga: use AcpiDevAmlIf interface to build VGA device descriptors Igor Mammedov
@ 2022-10-17 11:02   ` Ani Sinha
  0 siblings, 0 replies; 18+ messages in thread
From: Ani Sinha @ 2022-10-17 11:02 UTC (permalink / raw)
  To: Igor Mammedov; +Cc: qemu-devel, mst

On Mon, Oct 17, 2022 at 3:52 PM Igor Mammedov <imammedo@redhat.com> wrote:
>

I would add a comment that we do not expect any functional change in
any ACPI tables with this change. It's only a refactoring.

> Signed-off-by: Igor Mammedov <imammedo@redhat.com>

Other than the comment above,
Reviewed-by: Ani Sinha <ani@anisinha.ca>

> ---
>  hw/display/vga_int.h       |  2 ++
>  hw/display/acpi-vga-stub.c |  7 +++++++
>  hw/display/acpi-vga.c      | 26 ++++++++++++++++++++++++++
>  hw/display/meson.build     | 17 +++++++++++++++++
>  hw/display/vga-pci.c       |  4 ++++
>  hw/i386/acpi-build.c       | 26 +-------------------------
>  6 files changed, 57 insertions(+), 25 deletions(-)
>  create mode 100644 hw/display/acpi-vga-stub.c
>  create mode 100644 hw/display/acpi-vga.c
>
> diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h
> index 305e700014..330406ad9c 100644
> --- a/hw/display/vga_int.h
> +++ b/hw/display/vga_int.h
> @@ -30,6 +30,7 @@
>  #include "ui/console.h"
>
>  #include "hw/display/bochs-vbe.h"
> +#include "hw/acpi/acpi_aml_interface.h"
>
>  #define ST01_V_RETRACE      0x08
>  #define ST01_DISP_ENABLE    0x01
> @@ -195,4 +196,5 @@ void pci_std_vga_mmio_region_init(VGACommonState *s,
>                                    MemoryRegion *subs,
>                                    bool qext, bool edid);
>
> +void build_vga_aml(AcpiDevAmlIf *adev, Aml *scope);
>  #endif
> diff --git a/hw/display/acpi-vga-stub.c b/hw/display/acpi-vga-stub.c
> new file mode 100644
> index 0000000000..a9b0ecf76d
> --- /dev/null
> +++ b/hw/display/acpi-vga-stub.c
> @@ -0,0 +1,7 @@
> +#include "qemu/osdep.h"
> +#include "hw/acpi/acpi_aml_interface.h"
> +#include "vga_int.h"
> +
> +void build_vga_aml(AcpiDevAmlIf *adev, Aml *scope)
> +{
> +}
> diff --git a/hw/display/acpi-vga.c b/hw/display/acpi-vga.c
> new file mode 100644
> index 0000000000..f0e9ef1fcf
> --- /dev/null
> +++ b/hw/display/acpi-vga.c
> @@ -0,0 +1,26 @@
> +#include "qemu/osdep.h"
> +#include "hw/acpi/acpi_aml_interface.h"
> +#include "hw/pci/pci.h"
> +#include "vga_int.h"
> +
> +void build_vga_aml(AcpiDevAmlIf *adev, Aml *scope)
> +{
> +    int s3d = 0;
> +    Aml *method;
> +
> +    if (object_dynamic_cast(OBJECT(adev), "qxl-vga")) {
> +        s3d = 3;
> +    }
> +
> +    method = aml_method("_S1D", 0, AML_NOTSERIALIZED);
> +    aml_append(method, aml_return(aml_int(0)));
> +    aml_append(scope, method);
> +
> +    method = aml_method("_S2D", 0, AML_NOTSERIALIZED);
> +    aml_append(method, aml_return(aml_int(0)));
> +    aml_append(scope, method);
> +
> +    method = aml_method("_S3D", 0, AML_NOTSERIALIZED);
> +    aml_append(method, aml_return(aml_int(s3d)));
> +    aml_append(scope, method);
> +}
> diff --git a/hw/display/meson.build b/hw/display/meson.build
> index adc53dd8b6..7a725ed80e 100644
> --- a/hw/display/meson.build
> +++ b/hw/display/meson.build
> @@ -38,10 +38,21 @@ softmmu_ss.add(when: 'CONFIG_NEXTCUBE', if_true: files('next-fb.c'))
>
>  specific_ss.add(when: 'CONFIG_VGA', if_true: files('vga.c'))
>
> +if (config_all_devices.has_key('CONFIG_VGA_CIRRUS') or
> +    config_all_devices.has_key('CONFIG_VGA_PCI') or
> +    config_all_devices.has_key('CONFIG_VMWARE_VGA') or
> +    config_all_devices.has_key('CONFIG_ATI_VGA')
> +   )
> +  softmmu_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-vga.c'),
> +                                      if_false: files('acpi-vga-stub.c'))
> +endif
> +
>  if config_all_devices.has_key('CONFIG_QXL')
>    qxl_ss = ss.source_set()
>    qxl_ss.add(when: 'CONFIG_QXL', if_true: [files('qxl.c', 'qxl-logger.c', 'qxl-render.c'),
>                                             pixman, spice])
> +  qxl_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-vga.c'),
> +                                  if_false: files('acpi-vga-stub.c'))
>    hw_display_modules += {'qxl': qxl_ss}
>  endif
>
> @@ -52,6 +63,7 @@ softmmu_ss.add(when: 'CONFIG_ARTIST', if_true: files('artist.c'))
>
>  softmmu_ss.add(when: [pixman, 'CONFIG_ATI_VGA'], if_true: files('ati.c', 'ati_2d.c', 'ati_dbg.c'))
>
> +
>  if config_all_devices.has_key('CONFIG_VIRTIO_GPU')
>    virtio_gpu_ss = ss.source_set()
>    virtio_gpu_ss.add(when: 'CONFIG_VIRTIO_GPU',
> @@ -87,14 +99,19 @@ if config_all_devices.has_key('CONFIG_VIRTIO_VGA')
>                      if_true: [files('virtio-vga.c'), pixman])
>    virtio_vga_ss.add(when: 'CONFIG_VHOST_USER_VGA',
>                      if_true: files('vhost-user-vga.c'))
> +  virtio_vga_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-vga.c'),
> +                                         if_false: files('acpi-vga-stub.c'))
>    hw_display_modules += {'virtio-vga': virtio_vga_ss}
>
>    virtio_vga_gl_ss = ss.source_set()
>    virtio_vga_gl_ss.add(when: ['CONFIG_VIRTIO_VGA', virgl, opengl],
>                         if_true: [files('virtio-vga-gl.c'), pixman])
> +  virtio_vga_gl_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-vga.c'),
> +                                            if_false: files('acpi-vga-stub.c'))
>    hw_display_modules += {'virtio-vga-gl': virtio_vga_gl_ss}
>  endif
>
>  specific_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_lcdc.c'))
>
> +softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('acpi-vga-stub.c'))
>  modules += { 'hw-display': hw_display_modules }
> diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c
> index 3e5bc259f7..9a91de7ed1 100644
> --- a/hw/display/vga-pci.c
> +++ b/hw/display/vga-pci.c
> @@ -35,6 +35,7 @@
>  #include "hw/loader.h"
>  #include "hw/display/edid.h"
>  #include "qom/object.h"
> +#include "hw/acpi/acpi_aml_interface.h"
>
>  enum vga_pci_flags {
>      PCI_VGA_FLAG_ENABLE_MMIO = 1,
> @@ -354,11 +355,13 @@ static void vga_pci_class_init(ObjectClass *klass, void *data)
>  {
>      DeviceClass *dc = DEVICE_CLASS(klass);
>      PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
> +    AcpiDevAmlIfClass *adevc = ACPI_DEV_AML_IF_CLASS(klass);
>
>      k->vendor_id = PCI_VENDOR_ID_QEMU;
>      k->device_id = PCI_DEVICE_ID_QEMU_VGA;
>      dc->vmsd = &vmstate_vga_pci;
>      set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);
> +    adevc->build_dev_aml = build_vga_aml;
>  }
>
>  static const TypeInfo vga_pci_type_info = {
> @@ -369,6 +372,7 @@ static const TypeInfo vga_pci_type_info = {
>      .class_init = vga_pci_class_init,
>      .interfaces = (InterfaceInfo[]) {
>          { INTERFACE_CONVENTIONAL_PCI_DEVICE },
> +        { TYPE_ACPI_DEV_AML_IF },
>          { },
>      },
>  };
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index 4f54b61904..26932b4e2c 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -430,7 +430,6 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
>          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);
> @@ -440,8 +439,6 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
>                  continue;
>              }
>
> -            is_vga = pc->class_id == PCI_CLASS_DISPLAY_VGA;
> -
>              /*
>               * Cold plugged bridges aren't themselves hot-pluggable.
>               * Hotplugged bridges *are* hot-pluggable.
> @@ -489,28 +486,7 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
>              aml_append(dev, aml_pci_device_dsm());
>          }
>
> -        if (is_vga) {
> -            /* add VGA specific AML methods */
> -            int s3d;
> -
> -            if (object_dynamic_cast(OBJECT(pdev), "qxl-vga")) {
> -                s3d = 3;
> -            } else {
> -                s3d = 0;
> -            }
> -
> -            method = aml_method("_S1D", 0, AML_NOTSERIALIZED);
> -            aml_append(method, aml_return(aml_int(0)));
> -            aml_append(dev, method);
> -
> -            method = aml_method("_S2D", 0, AML_NOTSERIALIZED);
> -            aml_append(method, aml_return(aml_int(0)));
> -            aml_append(dev, method);
> -
> -            method = aml_method("_S3D", 0, AML_NOTSERIALIZED);
> -            aml_append(method, aml_return(aml_int(s3d)));
> -            aml_append(dev, method);
> -        }
> +        call_dev_aml_func(DEVICE(pdev), dev);
>
>          bridge_in_acpi =  cold_plugged_bridge && pcihp_bridge_en;
>          if (bridge_in_acpi) {
> --
> 2.31.1
>


^ permalink raw reply	[flat|nested] 18+ messages in thread

* [PATCH 02/11] tests: acpi: whitelist DSDT before generating PCI-ISA bridge AML automatically
  2022-10-17 10:21 [PATCH 00/11] x86: clean up ACPI PCI code part 2 Igor Mammedov
  2022-10-17 10:21 ` [PATCH 01/11] acpi: pc: vga: use AcpiDevAmlIf interface to build VGA device descriptors Igor Mammedov
@ 2022-10-17 10:21 ` Igor Mammedov
  2022-10-17 10:21 ` [PATCH 03/11] acpi: pc/q35: drop ad-hoc PCI-ISA bridge AML routines and let bus ennumeration generate AML Igor Mammedov
                   ` (9 subsequent siblings)
  11 siblings, 0 replies; 18+ messages in thread
From: Igor Mammedov @ 2022-10-17 10:21 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..570b17478e 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.nohpet",
+"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.nohpet",
+"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] 18+ messages in thread

* [PATCH 03/11] acpi: pc/q35: drop ad-hoc PCI-ISA bridge AML routines and let bus ennumeration generate AML
  2022-10-17 10:21 [PATCH 00/11] x86: clean up ACPI PCI code part 2 Igor Mammedov
  2022-10-17 10:21 ` [PATCH 01/11] acpi: pc: vga: use AcpiDevAmlIf interface to build VGA device descriptors Igor Mammedov
  2022-10-17 10:21 ` [PATCH 02/11] tests: acpi: whitelist DSDT before generating PCI-ISA bridge AML automatically Igor Mammedov
@ 2022-10-17 10:21 ` Igor Mammedov
  2022-10-17 10:21 ` [PATCH 04/11] tests: acpi: update expected DSDT after ISA bridge is moved directly under PCI host bridge Igor Mammedov
                   ` (8 subsequent siblings)
  11 siblings, 0 replies; 18+ messages in thread
From: Igor Mammedov @ 2022-10-17 10:21 UTC (permalink / raw)
  To: qemu-devel; +Cc: mst, ani

PCI-ISA bridges that are built in PIIX/Q35 are building its own AML
using AcpiDevAmlIf interface. Now build_append_pci_bus_devices()
gained AcpiDevAmlIf interface support to get AML of devices atached
to PCI slots.
So drop ad-hoc build_q35_isa_bridge()/build_piix4_isa_bridge()
and let PCI bus enumeration to include PCI-ISA bridge AML
when it's enumerated by build_append_pci_bus_devices().

AML change is mostly contextual, which moves whole ISA hierarchy
directly under PCI host bridge instead of it being described
as separate \SB.PCI0.ISA block.

Note:
If bus/slot that hosts ISA bridge has BSEL set, it will gain new
ASUN and _DMS entries (i.e. acpi-index support, but it should not
cause any functional change and that is fine from PCI Firmware
spec point of view), potentially it's possible to suppress that
by adding a flag to PCIDevice but I don't see a reason to do that
yet, I'd rather treat bridge just as any other PCI device if it's
possible.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 hw/i386/acpi-build.c | 75 --------------------------------------------
 hw/isa/lpc_ich9.c    | 23 ++++++++++++++
 hw/isa/piix3.c       | 17 +++++++++-
 3 files changed, 39 insertions(+), 76 deletions(-)

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 26932b4e2c..e1483bb11a 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -435,10 +435,6 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
             pc = PCI_DEVICE_GET_CLASS(pdev);
             dc = DEVICE_GET_CLASS(pdev);
 
-            if (pc->class_id == PCI_CLASS_BRIDGE_ISA) {
-                continue;
-            }
-
             /*
              * Cold plugged bridges aren't themselves hot-pluggable.
              * Hotplugged bridges *are* hot-pluggable.
@@ -1006,7 +1002,6 @@ static void build_piix4_pci0_int(Aml *table)
 {
     Aml *dev;
     Aml *crs;
-    Aml *field;
     Aml *method;
     uint32_t irqs;
     Aml *sb_scope = aml_scope("_SB");
@@ -1015,13 +1010,6 @@ static void build_piix4_pci0_int(Aml *table)
     aml_append(pci0_scope, build_prt(true));
     aml_append(sb_scope, pci0_scope);
 
-    field = aml_field("PCI0.ISA.P40C", AML_BYTE_ACC, AML_NOLOCK, AML_PRESERVE);
-    aml_append(field, aml_named_field("PRQ0", 8));
-    aml_append(field, aml_named_field("PRQ1", 8));
-    aml_append(field, aml_named_field("PRQ2", 8));
-    aml_append(field, aml_named_field("PRQ3", 8));
-    aml_append(sb_scope, field);
-
     aml_append(sb_scope, build_irq_status_method());
     aml_append(sb_scope, build_iqcr_method(true));
 
@@ -1125,7 +1113,6 @@ static Aml *build_q35_routing_table(const char *str)
 
 static void build_q35_pci0_int(Aml *table)
 {
-    Aml *field;
     Aml *method;
     Aml *sb_scope = aml_scope("_SB");
     Aml *pci0_scope = aml_scope("PCI0");
@@ -1162,18 +1149,6 @@ static void build_q35_pci0_int(Aml *table)
     aml_append(pci0_scope, method);
     aml_append(sb_scope, pci0_scope);
 
-    field = aml_field("PCI0.ISA.PIRQ", AML_BYTE_ACC, AML_NOLOCK, AML_PRESERVE);
-    aml_append(field, aml_named_field("PRQA", 8));
-    aml_append(field, aml_named_field("PRQB", 8));
-    aml_append(field, aml_named_field("PRQC", 8));
-    aml_append(field, aml_named_field("PRQD", 8));
-    aml_append(field, aml_reserved_field(0x20));
-    aml_append(field, aml_named_field("PRQE", 8));
-    aml_append(field, aml_named_field("PRQF", 8));
-    aml_append(field, aml_named_field("PRQG", 8));
-    aml_append(field, aml_named_field("PRQH", 8));
-    aml_append(sb_scope, field);
-
     aml_append(sb_scope, build_irq_status_method());
     aml_append(sb_scope, build_iqcr_method(false));
 
@@ -1238,54 +1213,6 @@ static Aml *build_q35_dram_controller(const AcpiMcfgInfo *mcfg)
     return dev;
 }
 
-static void build_q35_isa_bridge(Aml *table)
-{
-    Aml *dev;
-    Aml *scope;
-    Object *obj;
-    bool ambiguous;
-
-    /*
-     * temporarily fish out isa bridge, build_q35_isa_bridge() will be dropped
-     * once PCI is converted to AcpiDevAmlIf and would be ble to generate
-     * AML for bridge itself
-     */
-    obj = object_resolve_path_type("", TYPE_ICH9_LPC_DEVICE, &ambiguous);
-    assert(obj && !ambiguous);
-
-    scope =  aml_scope("_SB.PCI0");
-    dev = aml_device("ISA");
-    aml_append(dev, aml_name_decl("_ADR", aml_int(0x001F0000)));
-
-    call_dev_aml_func(DEVICE(obj), dev);
-    aml_append(scope, dev);
-    aml_append(table, scope);
-}
-
-static void build_piix4_isa_bridge(Aml *table)
-{
-    Aml *dev;
-    Aml *scope;
-    Object *obj;
-    bool ambiguous;
-
-    /*
-     * temporarily fish out isa bridge, build_piix4_isa_bridge() will be dropped
-     * once PCI is converted to AcpiDevAmlIf and would be ble to generate
-     * AML for bridge itself
-     */
-    obj = object_resolve_path_type("", TYPE_PIIX3_PCI_DEVICE, &ambiguous);
-    assert(obj && !ambiguous);
-
-    scope =  aml_scope("_SB.PCI0");
-    dev = aml_device("ISA");
-    aml_append(dev, aml_name_decl("_ADR", aml_int(0x00010000)));
-
-    call_dev_aml_func(DEVICE(obj), dev);
-    aml_append(scope, dev);
-    aml_append(table, scope);
-}
-
 static void build_x86_acpi_pci_hotplug(Aml *table, uint64_t pcihp_addr)
 {
     Aml *scope;
@@ -1465,7 +1392,6 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
         aml_append(sb_scope, dev);
         aml_append(dsdt, sb_scope);
 
-        build_piix4_isa_bridge(dsdt);
         if (pm->pcihp_bridge_en || pm->pcihp_root_en) {
             build_x86_acpi_pci_hotplug(dsdt, pm->pcihp_io_base);
         }
@@ -1510,7 +1436,6 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
 
         aml_append(dsdt, sb_scope);
 
-        build_q35_isa_bridge(dsdt);
         if (pm->pcihp_bridge_en) {
             build_x86_acpi_pci_hotplug(dsdt, pm->pcihp_io_base);
         }
diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
index 4553b5925b..facc3745e4 100644
--- a/hw/isa/lpc_ich9.c
+++ b/hw/isa/lpc_ich9.c
@@ -806,6 +806,7 @@ static void ich9_send_gpe(AcpiDeviceIf *adev, AcpiEventStatusBits ev)
 
 static void build_ich9_isa_aml(AcpiDevAmlIf *adev, Aml *scope)
 {
+    Aml *field;
     BusChild *kid;
     ICH9LPCState *s = ICH9_LPC_DEVICE(adev);
     BusState *bus = BUS(s->isa_bus);
@@ -813,6 +814,28 @@ static void build_ich9_isa_aml(AcpiDevAmlIf *adev, Aml *scope)
     /* ICH9 PCI to ISA irq remapping */
     aml_append(scope, aml_operation_region("PIRQ", AML_PCI_CONFIG,
                                            aml_int(0x60), 0x0C));
+    /* Fields declarion has to happen *after* operation region */
+    field = aml_field("PIRQ", AML_BYTE_ACC, AML_NOLOCK, AML_PRESERVE);
+    aml_append(field, aml_named_field("PRQA", 8));
+    aml_append(field, aml_named_field("PRQB", 8));
+    aml_append(field, aml_named_field("PRQC", 8));
+    aml_append(field, aml_named_field("PRQD", 8));
+    aml_append(field, aml_reserved_field(0x20));
+    aml_append(field, aml_named_field("PRQE", 8));
+    aml_append(field, aml_named_field("PRQF", 8));
+    aml_append(field, aml_named_field("PRQG", 8));
+    aml_append(field, aml_named_field("PRQH", 8));
+    aml_append(scope, field);
+
+    /* hack: put fields into _SB scope for LNKx to find them */
+    aml_append(scope, aml_alias("PRQA", "\\_SB.PRQA"));
+    aml_append(scope, aml_alias("PRQB", "\\_SB.PRQB"));
+    aml_append(scope, aml_alias("PRQC", "\\_SB.PRQC"));
+    aml_append(scope, aml_alias("PRQD", "\\_SB.PRQD"));
+    aml_append(scope, aml_alias("PRQE", "\\_SB.PRQE"));
+    aml_append(scope, aml_alias("PRQF", "\\_SB.PRQF"));
+    aml_append(scope, aml_alias("PRQG", "\\_SB.PRQG"));
+    aml_append(scope, aml_alias("PRQH", "\\_SB.PRQH"));
 
     QTAILQ_FOREACH(kid, &bus->children, sibling) {
             call_dev_aml_func(DEVICE(kid->child), scope);
diff --git a/hw/isa/piix3.c b/hw/isa/piix3.c
index 48f9ab1096..d81b385e26 100644
--- a/hw/isa/piix3.c
+++ b/hw/isa/piix3.c
@@ -311,12 +311,27 @@ static void pci_piix3_realize(PCIDevice *dev, Error **errp)
 
 static void build_pci_isa_aml(AcpiDevAmlIf *adev, Aml *scope)
 {
+    Aml *field;
     BusChild *kid;
     BusState *bus = qdev_get_child_bus(DEVICE(adev), "isa.0");
 
     /* PIIX PCI to ISA irq remapping */
     aml_append(scope, aml_operation_region("P40C", AML_PCI_CONFIG,
-                                         aml_int(0x60), 0x04));
+                                           aml_int(0x60), 0x04));
+    /* Fields declarion has to happen *after* operation region */
+    field = aml_field("P40C", AML_BYTE_ACC, AML_NOLOCK, AML_PRESERVE);
+    aml_append(field, aml_named_field("PRQ0", 8));
+    aml_append(field, aml_named_field("PRQ1", 8));
+    aml_append(field, aml_named_field("PRQ2", 8));
+    aml_append(field, aml_named_field("PRQ3", 8));
+    aml_append(scope, field);
+
+    /* hack: put fields into _SB scope for LNKx to find them */
+    aml_append(scope, aml_alias("PRQ0", "\\_SB.PRQ0"));
+    aml_append(scope, aml_alias("PRQ1", "\\_SB.PRQ1"));
+    aml_append(scope, aml_alias("PRQ2", "\\_SB.PRQ2"));
+    aml_append(scope, aml_alias("PRQ3", "\\_SB.PRQ3"));
+
     QTAILQ_FOREACH(kid, &bus->children, sibling) {
         call_dev_aml_func(DEVICE(kid->child), scope);
     }
-- 
2.31.1



^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [PATCH 04/11] tests: acpi: update expected DSDT after ISA bridge is moved directly under PCI host bridge
  2022-10-17 10:21 [PATCH 00/11] x86: clean up ACPI PCI code part 2 Igor Mammedov
                   ` (2 preceding siblings ...)
  2022-10-17 10:21 ` [PATCH 03/11] acpi: pc/q35: drop ad-hoc PCI-ISA bridge AML routines and let bus ennumeration generate AML Igor Mammedov
@ 2022-10-17 10:21 ` Igor Mammedov
  2022-10-17 10:21 ` [PATCH 05/11] tests: acpi: whitelist DSDT before generating ICH9_SMB AML automatically Igor Mammedov
                   ` (7 subsequent siblings)
  11 siblings, 0 replies; 18+ messages in thread
From: Igor Mammedov @ 2022-10-17 10:21 UTC (permalink / raw)
  To: qemu-devel; +Cc: mst, ani

example of the change for PC machine with hotplug disabled on root buss (no BSEL case):

 -        Field (PCI0.ISA.P40C, ByteAcc, NoLock, Preserve)
 +        Field (S08.P40C, ByteAcc, NoLock, Preserve)

 ===
 -    Scope (_SB.PCI0)
 -    {
 -        Device (ISA)
 -        {
 -            Name (_ADR, 0x00010000)  // _ADR: Address
 -            OperationRegion (P40C, PCI_Config, 0x60, 0x04)
 ...
 -        }
 -    }
 -
      Scope (_SB)
 ===
 +            Device (S08)
 +            {
 +                Name (_ADR, 0x00010000)  // _ADR: Address
 +                OperationRegion (P40C, PCI_Config, 0x60, 0x04)
 ...
 +            }
 +
              Device (S10)
              {
                  Name (_ADR, 0x00020000)  // _ADR: Address

with hotplug enabled on root bus (i.e. bus has BSEL configured),
a following addtional entries will be seen:

 +                Name (ASUN, One)
 +                Method (_DSM, 4, Serialized)  // _DSM: Device-Specific Method
 +                {
 +                    Local0 = Package (0x02)
 +                        {
 +                            BSEL,
 +                            ASUN
 +                        }
 +                    Return (PDSM (Arg0, Arg1, Arg2, Arg3, Local0))
 +                }

similar changes are expected for Q35 modulo:

 -        Field (PCI0.ISA.PIRQ, ByteAcc, NoLock, Preserve)
 +        Field (SF8.PIRQ, ByteAcc, NoLock, Preserve)

and bridge address

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 tests/qtest/bios-tables-test-allowed-diff.h |  34 --------------------
 tests/data/acpi/pc/DSDT                     | Bin 6422 -> 6496 bytes
 tests/data/acpi/pc/DSDT.acpierst            | Bin 6382 -> 6456 bytes
 tests/data/acpi/pc/DSDT.acpihmat            | Bin 7747 -> 7821 bytes
 tests/data/acpi/pc/DSDT.bridge              | Bin 9496 -> 9570 bytes
 tests/data/acpi/pc/DSDT.cphp                | Bin 6886 -> 6960 bytes
 tests/data/acpi/pc/DSDT.dimmpxm             | Bin 8076 -> 8150 bytes
 tests/data/acpi/pc/DSDT.hpbridge            | Bin 6382 -> 6456 bytes
 tests/data/acpi/pc/DSDT.hpbrroot            | Bin 3069 -> 3107 bytes
 tests/data/acpi/pc/DSDT.ipmikcs             | Bin 6494 -> 6568 bytes
 tests/data/acpi/pc/DSDT.memhp               | Bin 7781 -> 7855 bytes
 tests/data/acpi/pc/DSDT.nohpet              | Bin 6280 -> 6354 bytes
 tests/data/acpi/pc/DSDT.numamem             | Bin 6428 -> 6502 bytes
 tests/data/acpi/pc/DSDT.roothp              | Bin 6656 -> 6694 bytes
 tests/data/acpi/q35/DSDT                    | Bin 8320 -> 8418 bytes
 tests/data/acpi/q35/DSDT.acpierst           | Bin 8337 -> 8435 bytes
 tests/data/acpi/q35/DSDT.acpihmat           | Bin 9645 -> 9743 bytes
 tests/data/acpi/q35/DSDT.applesmc           | Bin 8366 -> 8464 bytes
 tests/data/acpi/q35/DSDT.bridge             | Bin 11449 -> 11547 bytes
 tests/data/acpi/q35/DSDT.cphp               | Bin 8784 -> 8882 bytes
 tests/data/acpi/q35/DSDT.cxl                | Bin 9646 -> 9744 bytes
 tests/data/acpi/q35/DSDT.dimmpxm            | Bin 9974 -> 10072 bytes
 tests/data/acpi/q35/DSDT.ipmibt             | Bin 8395 -> 8493 bytes
 tests/data/acpi/q35/DSDT.ipmismbus          | Bin 8409 -> 8507 bytes
 tests/data/acpi/q35/DSDT.ivrs               | Bin 8337 -> 8435 bytes
 tests/data/acpi/q35/DSDT.memhp              | Bin 9679 -> 9777 bytes
 tests/data/acpi/q35/DSDT.mmio64             | Bin 9450 -> 9548 bytes
 tests/data/acpi/q35/DSDT.multi-bridge       | Bin 8640 -> 8738 bytes
 tests/data/acpi/q35/DSDT.nohpet             | Bin 8178 -> 8276 bytes
 tests/data/acpi/q35/DSDT.numamem            | Bin 8326 -> 8424 bytes
 tests/data/acpi/q35/DSDT.pvpanic-isa        | Bin 8421 -> 8519 bytes
 tests/data/acpi/q35/DSDT.tis.tpm12          | Bin 8926 -> 9024 bytes
 tests/data/acpi/q35/DSDT.tis.tpm2           | Bin 8952 -> 9050 bytes
 tests/data/acpi/q35/DSDT.viot               | Bin 9429 -> 9527 bytes
 tests/data/acpi/q35/DSDT.xapic              | Bin 35683 -> 35781 bytes
 35 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 570b17478e..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.nohpet",
-"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.nohpet",
-"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 da2a3e5c0551ac2d1d8a0a40b92d3235d5757475..5b4624cb68c78eab6e356987974b9bee6c9a1785 100644
GIT binary patch
delta 186
zcmbPc^uUPACD<h-L6U)i(O@E1$7W3?Uq&VmlgSm#8#eo~XmfJ8+=_`0c8VA9xjDI+
z*H+9`A=tnoo+IATC5Q*8hk?T}IMk1E@<su<<miR~69Z=^t^_WY=te0Jn=v3L(0~I-
v7=j2R5Mj*01`>?X0~rcpfw+cnt|5qP1m_xoxW;g<@y1<wjGOoIMsNcF?p`uF

delta 139
zcmaE0G|h<1CD<iIOp<|tam_@o4h=U+z4&0K_yA{5gXktt3D021c#e2SmmnUX0*2^@
z022deCawf7md&$x@)$Qx^kZc5Gn@R7af4cPql!K=NE=8CNEu^5P@n+^kT3)hMj*nN
dWAj8NZB8!VoiQLw1YCDcKE`dknTs!s8vqocC7J*L

diff --git a/tests/data/acpi/pc/DSDT.acpierst b/tests/data/acpi/pc/DSDT.acpierst
index abcd6d9d309a8f9a9080edc64df7a6c195b5885f..99461b771eec2043263b5bc3c109a08969a99af9 100644
GIT binary patch
delta 186
zcmaE7xWkCcCD<jzLXv@jv2Y?+$7W3?Uq&VmlgSm#8#eo~XmfJ;T#tzlc8V8pxjwm>
z*H+9`A=tnoo+IATC5Q*8hk?T}IMk1EG9$lSa&$w0iGec{R{|GHbfXlA%@`0AXuts^
u3_*kuh%n}00}00HfeZz)KwLvO*AT=tf^&^PTw^%bc;l`-#?AY94Y&c&fia{2

delta 139
zcmdmC^v;mWCD<k8odg2|<GYDm9U5+udhx+d@d3`B2GLEP5}v`1@f`7vE<rp%1q{&*
z0VW2{Ok4?EESqQX<S}lX=*P(9XEymE;|8_pMiqT#kT#GOkTS-Apg;o-AYlk1j6j4j
d$L5Jl+MHaj+hahM2>5QBe2m+6GZ&v8Hvqa2Cba+n

diff --git a/tests/data/acpi/pc/DSDT.acpihmat b/tests/data/acpi/pc/DSDT.acpihmat
index 884d4871a2a0b87db2c0dd7e6f32486ba9b7e424..b84f3b47c37e427b927c36036307db6e83a843e5 100644
GIT binary patch
delta 186
zcmX?X(`(D+66_MvE62dV_;w;!$7W3?Uq&VmlgSm#8#eo~MDTIB+=_`0c8VA9xjA`*
zkgb@jLa>2FJV(5vOArrG4+Do|aHt>S<cnf*$<Yk~CI-$-TnSt((T!3dHe*0gpaBPv
vFa!}sAi|h~4I~(&2Qn1I0&xxDTtg7o2+lPEagE_z<BhxW7&pHbir@wS&T=!<

delta 139
zcmeCRJ#53}66_M<EXTmWm^qQFL&Hr{FFx2QKET=2AiBv@!ZX-0o+IATC5Q*8fFZge
zz{J3ri7SDNW%F^tJjRU^{TP}2%qBl%+@KcSsG`pd(gxB3QpOk%6llN!Bn&}>5r{D6
d*gTObf{)90XAH;^0oR?AKMUAyHWv=#1^^j}CO`lH

diff --git a/tests/data/acpi/pc/DSDT.bridge b/tests/data/acpi/pc/DSDT.bridge
index 31a79aa47673c14f7e564475c39bd38c872f8165..6771620078086e42b445474b16797094e0d0a801 100644
GIT binary patch
delta 167
zcmbQ?^~j6MCD<h-NtJ<tQFbC%$7W3?Uq&VmlgSm#8#eo~XmfJ6&0>s+4|a+d=$$#a
zh1ZVBRblcxKBMI5h5!=-XC|%$E|%y<DG-}6ASlp)14tNx2qO?-%)tf{jL`!b0Ahi-
dhH$PSh-(Dr8iBaRaIW#jU3rX~5Aa5a0{|E1F2n!;

delta 140
zcmaFlHN%U`CD<iILY0Amappv>4h=U+z4&0K_yA{5gXktt3D021c#e2SmmnUX0*2^@
z022deCawf7md$f`@)$Qx^kZc5Gn@R7af4cPql!K=NE=8CNEu^5P@n+^kT3)hMj*nN
eWAj8NZBFj~O2!zFEdp(olaF)TZRX(%69)iL9VOrZ

diff --git a/tests/data/acpi/pc/DSDT.cphp b/tests/data/acpi/pc/DSDT.cphp
index 8b0cae4dbfbd083a43751a7c94dc5c76f89084a7..298fa1592676b3a2089b08eff5f764e04391b961 100644
GIT binary patch
delta 186
zcmaE6y1|UgCD<jzK$?Mpamqxlj?J1(zKl#BCX*|eH*EG}`OU@Uaw{f2*ePDX=jP;K
zep@kDg<u1Vc#e2SmmnUX9tIA_;7~ut$&EsC$<Yk~CI-$-TnSt((T!3dHe*0gpaBPv
vFa!}sAi|h~4I~(&2Qn1I0&xxDTtg7o2+lPEagE_z<BhxW7&rIvM{olGeS|XJ

delta 139
zcmdmB_RN&aCD<k8nG^#9qu@lY4h=U+z4&0K_yA{5gXktt3D021c#e2SmmnUX0*2^@
z022deCawf7md#mwd5jw;`Y|&3nN5DkxIrztQAM8_qz$A6q>M2jDA0fdNEm_$BM@QC
dv3VlXZ!Rw1oiQLw1YCDcp2lmt`4)c|Hvml~Cp`cF

diff --git a/tests/data/acpi/pc/DSDT.dimmpxm b/tests/data/acpi/pc/DSDT.dimmpxm
index 38865fb66747a6ee1cf2066b925be6eba064625a..9fcadb266b92fc4942621f0fd919703723de2fd9 100644
GIT binary patch
delta 186
zcmeCNzh=+n66_LkO`d^)v2G$)$7W3?Uq&VmlgSm#8#eo~Eac~MxfK&1>=ZBHb93@f
zVOud*g<u1Vc#e2SmmnUX9tIA_;7~ut$&R9O$<Yk~CI-$-TnSt((T!3dHe*0gpaBPv
vFa!}sAi|h~4I~(&2Qn1I0&xxDTtg7o2+lPEagE_z<BhxW7&n`UL~sKD*+VlF

delta 118
zcmca+-(%0^66_MvBhSFV_-i6phlZP^UVN}qe1Nm3L3ER+glDj0JV(5vOArrG0Yh{{
zfQf-K6ITKk%Vq)LJjRU^{TP}2%qBl%+`t>%sG`pd(gxBpdAE?{=7~%T`MG>|#(>Nd
QaNRlCM#y$^gGd-R0In+{5&!@I

diff --git a/tests/data/acpi/pc/DSDT.hpbridge b/tests/data/acpi/pc/DSDT.hpbridge
index abcd6d9d309a8f9a9080edc64df7a6c195b5885f..99461b771eec2043263b5bc3c109a08969a99af9 100644
GIT binary patch
delta 186
zcmaE7xWkCcCD<jzLXv@jv2Y?+$7W3?Uq&VmlgSm#8#eo~XmfJ;T#tzlc8V8pxjwm>
z*H+9`A=tnoo+IATC5Q*8hk?T}IMk1EG9$lSa&$w0iGec{R{|GHbfXlA%@`0AXuts^
u3_*kuh%n}00}00HfeZz)KwLvO*AT=tf^&^PTw^%bc;l`-#?AY94Y&c&fia{2

delta 139
zcmdmC^v;mWCD<k8odg2|<GYDm9U5+udhx+d@d3`B2GLEP5}v`1@f`7vE<rp%1q{&*
z0VW2{Ok4?EESqQX<S}lX=*P(9XEymE;|8_pMiqT#kT#GOkTS-Apg;o-AYlk1j6j4j
d$L5Jl+MHaj+hahM2>5QBe2m+6GZ&v8Hvqa2Cba+n

diff --git a/tests/data/acpi/pc/DSDT.hpbrroot b/tests/data/acpi/pc/DSDT.hpbrroot
index dd2c8c0c8c5bf9895eb524e094d5597515b4803e..b10b17cb1111f6b5d61da4aa1c754f2921a4ac1c 100644
GIT binary patch
delta 184
zcmew>zF30GCD<iInTLUaaq2{_4kizi$=XaCHZw9W;i&gkj)@O;iWhKJ4siA~h;HHz
zHZX|ih<9`eVu)^XlnXYnfbc+?8KN5kObncvxDvQnq8p_^Y{r0~Km!gSVF)6OK!h;|
p8%Qul4`eQg1>zdQxrQLF5sWJsXawRL!}x*58+YX~PCmeG3jp{LFk1is

delta 146
zcmZ21@mHM7CD<k8FE;}NBhy5#4h=U+z4&0K_yA{5gXktt3D021c#e2SmmnUX0*2^@
z022deCawf7mdzDhd5p{ger6M=Y*34CRMBS!X#pt*DPar<3N+vV5{4kc2t*ijY<6K>
b!Xf3s8UwOGz=0KF2Y0Z60mO>QPr2;?&p0K@

diff --git a/tests/data/acpi/pc/DSDT.ipmikcs b/tests/data/acpi/pc/DSDT.ipmikcs
index e819ce69461a36b6fab5e2ffeba90dfe558724a7..aff3e9bbe1fdbf783c49d07a49c2e16317a2871e 100644
GIT binary patch
delta 166
zcmca-w8EInCD<iog(L$5<C=+F9h(c8d>NTMOeP;--mrNZi#8{h&%K!VV5fKimwS^>
z^V*8}sstNY#B;<ux&-k6^)PTa28a4FPA=q=<BM(xFfnju;!5CRiEfmdT+1S9!xj(}
mXb__ZG62K^aSh>ILlD;p&NTvYjp1D5jk~rnZf4_);06GVOD_EY

delta 139
zcmZ2se9wr>CD<h-PLhFv(PSc5hlZc5UVN}qe1Nm3L3ER&tY@%eJV(5vOArrG0Yh{{
zfQf-K6ITKk%jQ`;+ZZ=a^kZc5Gn@R7af4cPql!K=NE=8CNEu^5P@n+^kT3)hMj*nN
dWAj8NZB8!VoiQLw1YCDcKE`dkIfyTe8vr6<CKLbw

diff --git a/tests/data/acpi/pc/DSDT.memhp b/tests/data/acpi/pc/DSDT.memhp
index 03a9decdc1563f5e759e34dffdab4bb34645d9b3..07b193b9939e2199bce5edc743de5494133c1e8c 100644
GIT binary patch
delta 186
zcmaEAv)-1=CD<ioy&MArqtZmKj?J1(zKl#BCX*|eH*EG}sp8{uxfK&1>=ZBHb93?~
zAzLw5g<u1Vc#e2SmmnUX9tIA_;7~ut$$?^W$<Yk~CI-$-TnSt((T!3dHe*0gpaBPv
vFa!}sAi|h~4I~(&2Qn1I0&xxDTtg7o2+lPEagE_z<BhxW7&r3@M{olGdIvIA

delta 139
zcmZ2)`_zWZCD<h-RgQsyao$9(4h=U+z4&0K_yA{5gXktt3D021c#e2SmmnUX0*2^@
z022deCawf7md!5(^B6Zy^kZc5Gn@R7af4cPql!K=NE=8CNEu^5P@n+^kT3)hMj*nN
dWAj9&Dn2gXoiQLw1YCDc78SJJ94Q>e4FGUoCS(8r

diff --git a/tests/data/acpi/pc/DSDT.nohpet b/tests/data/acpi/pc/DSDT.nohpet
index b413d9f31d483eca02f45ad09af2f556581ec381..ceee7722ceed8a7e8f61a37805a4c855f47244a8 100644
GIT binary patch
delta 186
zcmeA$ykyAb66_LkNrHia@z+GIj?J1(zKl#BCX*|eH*EG}najcDaw{f2*ePDX=jP<E
zJho!43c&^z@f`7vE<rp%Jq#R<!J&SPlN<TvlA{{}ObncvxDvQnq8p_^Y{r0~Km!gS
vVF)6OK!h;|8%Qul4`e8a1>zdQxrQLF5u9rT;u^!b#v6C#F>W^Cjo=0V7wI#4

delta 139
zcmca)*kQ=!66_MvA;G}FST>QXL&Hr{FFx2QKET=2AiBv@!ZX-0o+IATC5Q*8fFZge
zz{J3ri7SDNWit;?9^=M|evC|hW|JQ>ZcvMERMBS!X#;5iDPs%>3N+vV5{4kc2t*ij
dY@Wz8mxIf9XAH;^0oR?AEx2tr*YJjM0|5S~C4B$@

diff --git a/tests/data/acpi/pc/DSDT.numamem b/tests/data/acpi/pc/DSDT.numamem
index 9e701b2983f9ec45af9c26d801545c2b5d112a10..e03f4d07b86018d12def37b5397ba9673548e2b7 100644
GIT binary patch
delta 186
zcmbPZ^vsCMCD<h-O_G6u@zzAHj?J1(zKl#BCX*|eH*EG}G34ZOxfK&1>=ZBHb8~Vh
zudSG?La>2FJV(5vOArrG4+Do|aHt>S<coZA$<Yk~CI-$-TnSt((T!3dHe*0gpaBPv
vFa!}sAi|h~4I~(&2Qn1I0&xxDTtg7o2+lPEagE_z<BhxW7&jl`jo=0Vfr&FF

delta 118
zcmaE6G{=a`CD<iIMv{SnF>E4NhlZP^UVN}qe1Nm3L3ER+glDj0JV(5vOArrG0Yh{{
zfQf-K6ITKk%jN|<d5jw;`Y|&3nN5DkxPdpiQAM8_qz$BHvNw<9=7~&(oLs&;V?gE!
QxbB>MhTC?t0ACn407khWt^fc4

diff --git a/tests/data/acpi/pc/DSDT.roothp b/tests/data/acpi/pc/DSDT.roothp
index 8c3956c9ecc63133cc800f1d2d07a1392a35d548..418cc92e4c061ad21e1d281e0b5e6114e283b7d3 100644
GIT binary patch
delta 190
zcmZoLS!TlJ66_M9CdI(Oczz;R$7W3?Uq&VmlgSm#8#eo~Xmi$kJ&TDCc8V8pdKTd9
zX%OAS9c*9_&k^tF62uVQ<R}+xU;*Lr08L<sZU`_jaAx94;9`kxlmf9C1A+n#IDmv9
wh%f>X#vE)Q!5BS|xgZvZYY68Wg1AO7u3(@Mh;Izz2O4kOmB+Yw3U3Y%00)~hY5)KL

delta 133
zcmZ2x(qO{n66_MfAjQDIs56nPL&!~1FFx2QKET=2AiBv@!ZX-$@;z?x&AvRjj2kEV
zF*5m?O@7F@K`pvbMV}d@2&f=Fz{J3rF(4?=fCESvf(RoJVa&04B9k_!l>3PokdXrZ
X$04S22OAi~bHqEk1a02Qo67?Lm(C@O

diff --git a/tests/data/acpi/q35/DSDT b/tests/data/acpi/q35/DSDT
index 3870958969b1c0e29f9dd26a1256359e90897d3e..ea35dc5eba8433a8dcb54815f19ed6239f2534e7 100644
GIT binary patch
delta 229
zcmZp0eB{XG66_N4NP&TYal=L~Z^q4;ObLukO<|i)Gq2>^yg{gmm&-vRCO+6HUcf_s
zvW<eRLUfaZbg-L6JV(5vOArqOgFHiYLx5*cAQM*t7f*Df!Q@6E{d%^5pg_kMJ&-;S
z3&eGTbDcn3XE@gx#C3slT|it{IM)@#b%S%=KwNh?*B!+5fO9>fn@qf&T;eCUFg{@y
LVGD5f3t<2Npb9~@

delta 105
zcmaFl*x<<J66_MvpuoVu=(Lf`n^DMFP%l2%DL%m2(;&LZO~5nQak7ED_~eiBuQrD;
zCNeVhMQ+~Cw33fEy3tCX8KerRB7U-`y#D3{!6sfVKb9Dfb^$k*$#3Lr*+tj_oc%%=
E09ef)761SM

diff --git a/tests/data/acpi/q35/DSDT.acpierst b/tests/data/acpi/q35/DSDT.acpierst
index c9c18fa4e45288fb6c2182a793a8e6aff72b33d9..146269c68c68238a8be3aa67e049a85c0b8edc66 100644
GIT binary patch
delta 229
zcmbQ}_}P)mCD<k8vjPJHW57l(Z^q4;ObLukO<|i)Gq2>^yg{gmm&;KxCO+6HUcggf
zvW<eDLUfaZbg-L6JV(5vOArqOgFHiYLx5*cAQM*t7f*Df!Q@6E{d%^5pg_kMJ&-;S
z3&eGTbDcn3XE@gx#C3slT|it{IM)@#b%S%=KwNh?*B!+5fO9>fn@qf&T;eCUFg{@y
LVGD5f3t<2NiwZ%W

delta 105
zcmezDIMI>ICD<ioq5=a0<D-pS-i$)df_m}6PVoWGo(9oPZUUacj*}hb#V0c<yxJVX
zn8?V~7rA*m(@H+x=te7jW{@hNiulP<^7@+-1e<ud{8?i_+6CNMC%=*NV;5lyaP|vf
F0047{9x?y`

diff --git a/tests/data/acpi/q35/DSDT.acpihmat b/tests/data/acpi/q35/DSDT.acpihmat
index a32e90b5d913d07bc9ed9aca521420305559f357..4dd420b62fbcfdd21485fec2bafdea54f3fdb5a8 100644
GIT binary patch
delta 229
zcmZ4M-S5NY66_Mfug1W@n6r_~n{jg{QvxGXQ`qLy%q#geZxC89#O0t66CdmpFW@0R
zIaAeEA-c&yI@rx3o+IATC5VTCL7pMHA;2>zkclgSizm9#U~;37emz@2P@rRs9!MXE
z1>!ovxlSOiGo0%T;<~`OE+DQeoa+kWy1}__Ag(){>ki_2z_}jLO(xz>F7cCF7@x3<
Lumw2#g)jgB@by6W

delta 105
zcmeD8S?kT^66_MPR+WK)@&86HZ$=?!LB053r}zM8PlM<tHv!LJ$H}oO;*;f6Uu_Oy
zOk`y0i`=}OX(b<Tbfc9%Ge{LsMf~J475&W#g6oC2{8(Z@+6CNLCQGW=vWu_<IQxY#
F004x49q<4E

diff --git a/tests/data/acpi/q35/DSDT.applesmc b/tests/data/acpi/q35/DSDT.applesmc
index 5507b6b8f5e6ae4fd4275601eb85caf29bddc352..ff25d82ba24b5e792b9d87958aa1b162bc9e0de2 100644
GIT binary patch
delta 229
zcmZ4IIKhd_CD<iIK#_rgv2i1pH{<5%ObLukO<|jVGOy&@d{3yEms2SwKG-Q<z)fj#
zmV&K9bd#TKu$x6ZN4%p;5Dx=`JVSItfM-x36ITKkPjsWf<n==O^=tt_fsQeHAblVf
zi0cIBI)S*(aIQ0m>jLMxfVi%3t}BS^2IsngxbASSJBaH6=Xyjp=>+>a$8T<76k=o-
LVGD5f3t<2NSgJs!

delta 105
zcmbQ>w9b*sCD<ioodN>`qwz*AZ$=?U5xw|er}zM8PlM<t7h%s}$H@lr;+sFpOE7K@
zVN7IX>WkdGooOW>Z*-%TJ~K!eP)Yn`PkH^#34+bMoGdXQ?E-Erli$eMvWu_<IQxY#
F000}#9Tflo

diff --git a/tests/data/acpi/q35/DSDT.bridge b/tests/data/acpi/q35/DSDT.bridge
index a42eb674fa3469a815b1c91ba99b2d4cf85c9380..bde84efd1c5fcafee789781f4030d573002a886a 100644
GIT binary patch
delta 240
zcmdlPIXjBWCD<iIT9<)=F@7VLH{<3^rUXW&rm)SYnOE{{-XPS(%jNkvCO+6HUcmA3
zW*dbZ9);*82kBrpi+GNBN0%TT1_pVC=!O8#pg<<B1TLQFMuW+XLi+V=0YQO|F?t}4
zAQp)01m`+|xXy5{Gl=T~=emHnu5hj^i0cODx`DXvaIQOu>jCF_L^qjuJGsP9Zee^P
UC?XKx>=(iirx$E!5D#Jk0QJE|ng9R*

delta 116
zcmbOowKI~-CD<iorw#)H<EM>W-i$)df_m}6PVoWGo(9oPZUUacj+5iH#V0H1yxJVX
zn8?V~7rA*m(@H+x=te7jW{@hNiulPD+WMOl1e<ud+)u=Sv<vtj-~2`{heuFEAi&u#
Pgdt8Z*w6rIs9y*GI+7!-

diff --git a/tests/data/acpi/q35/DSDT.cphp b/tests/data/acpi/q35/DSDT.cphp
index 2d8cb603c9c937501247d32e6a5b2e79bb01eea3..537be7ca37c021e6a7f098e88c40ba178f3ec3e2 100644
GIT binary patch
delta 229
zcmccMvdNXpCD<iolM(|1qsT@sZ^q4;ObLukO<|i)Gq2>^yg?|4pUXiZCO+6HUcf_s
zGLMq2LUfaZbg-L6JV(5vOArqOgFHiYLx5*cAQM*t7f*Df!Q@6E{d%^5pg_kMJ&-;S
z3&eGTbDcn3XE@gx#C3slT|it{IM)@#b%S%=KwNh?*B!+5fO9>fn@qf&T;eCUFg{@y
LVGD5f3t<2N)oDPt

delta 104
zcmdnwdclRuCD<h-K#75YaoI*LZ$=?!LB053r}zM8PlM<tHv!LJ$4QFflMgDs+8n}|
z$jH<exp_O&N<QA`Mk{@0kRqUh_{oxr`kNC3gZR1pSYklB1>9IB?@_R27hwx<_6uPE
E08AJii~s-t

diff --git a/tests/data/acpi/q35/DSDT.cxl b/tests/data/acpi/q35/DSDT.cxl
index 20d0fb64ea52b2f4979105c934aadb6f416e2b71..aeea64d1cecad0ad011870ed5e04bfea1ae62510 100644
GIT binary patch
delta 229
zcmZ4IJ;8^|CD<iIK#hTcam7Y1Z^q4;ObLukO<|i)Gq2>^yg{f>h|5VSCO+6HUcgIn
zvWIHCLUfaZbg-L6JV(5vOArqOgFHiYLx5*cAQM*t7f*Df!Q@6E{d%^5pg_kMJ&-;S
z3&eGTbDcn3XE@gx#C3slT|it{IM)@#b%S%=KwNh?*B!+5fO9>fn@qf&T;eCUFg{@y
LVGD5f3t<2N6HY-N

delta 105
zcmbQ>v(B5#CD<ioohkzZqt`|*Z$=?!LB053r}zM8PlM<tHv!LJ$H{Rj;*;f7Uu_Oy
zOk`y0i`=}OX(b<Tbfc9%Ge{LsMf~J)75&W#f_*|<4(u@??E)TblYc13vx~3=IQxY#
F002z99vJ`t

diff --git a/tests/data/acpi/q35/DSDT.dimmpxm b/tests/data/acpi/q35/DSDT.dimmpxm
index b23339513af3be457c1974e0288fc4c6720690d8..ed11aefa4a56a8408bd4e0de83bf2373e6025449 100644
GIT binary patch
delta 229
zcmez7d&7^*CD<h-LY;wu@$W`1Z^q4;ObLukO<|i)Gq2>^yg}%PFqeZuOnk6Yynu)N
z<V|X}3eimt(!p*P@f`7vE<rpD4Dt-o4FR4(flOQpTs+Z@29q0w^y}FIf&v|5^g#MR
zED+ZT&UFHDo#9+(5Z49Hbpdf*;apb`*A32f199EqTz3%H1J3n`ZZh$9a*3bZ!uW(;
Lge}0?FN6UAoF78{

delta 123
zcmccN_sy5fCD<k8n;HWH<AjY|-i#W~f_m}6PVoWGo(9oPZUUacj`1AvjxIqw3=HxN
z(G3BfL4izM30ypr)6`yX4q;4WWa^9Dyq#$!A8&M{l|C~_A4t#S{i^z#69j(<bNR8v
WfD9CHW0{<!YRfLd7U1j`!T<oQ7$VgG

diff --git a/tests/data/acpi/q35/DSDT.ipmibt b/tests/data/acpi/q35/DSDT.ipmibt
index 8af2695edeeadbde2a1e8f04ab567f5c00b76945..d9d1e75c987acd42be4576688621be07b21f0e7b 100644
GIT binary patch
delta 230
zcmX@@xYmiwCD<iISCN5%@#sb_Z^q4Am=YM7n!+}Vv8?3V{9CArm&;ovCO+6HUcgyp
za=U`9LUfb2e6X8EJV(5vOArqOgFHiYLx5*cAQM*t7f*Df!Q?YS`t@u9L4l4jdLVru
z7KrNv=Q@G7&Ty_Xi0cC9x`4Q@aIPze>jvk#fw=B)t~-e90q1%|H+i!7dKzwSVbo`2
M7hwx<_6uPE0Ka}f-~a#s

delta 106
zcmZ4MblQ>2CD<k8v;qSIWBNueZ$=?MQN8$Jr}zM8PlM<tM^VpU$H@lr;+sFpn=)<=
zVN7IX>WkdGooOW>Z*-%TJ~K!eP)Yn`PkH^#34%?$Tz)JuApHVvER)~J*|LkU1vvYK
GFaQ91ARZV1

diff --git a/tests/data/acpi/q35/DSDT.ipmismbus b/tests/data/acpi/q35/DSDT.ipmismbus
index 479df48cd37af888317d63eac8f565f370201490..f6e124137721312722c820b5c084a143492945c9 100644
GIT binary patch
delta 229
zcmccVxZ8=#CD<jzT9JW)QEwxcH{<3^rUXW&rm)SYnOE{{-XL_Fm&-vRCO+6HUcf_s
z@>B&|h3F;+>0mdDc#e2SmmnSn26=|)h5*l?KqjsPE}rN{gUO9T`t@u9L4l4jdLVru
z7KrNv=Q@G7&Ty_Xi0cC9x`4Q@aIPze>jvk#fw=B)t~-e90q1%|H<@@lxx`OyVSK_a
L!WQ7{7s3DlR3kxi

delta 123
zcmdn(bkmW`CD<k8rUC;4<H3zw-i#W~f_m}6PVoWGo(9oPZUUacj`1AvjxIqw3=HxN
z(G3BfL4izM30yprJr!PW4q;4WWa^9Dyq#$!A8&M{l|C~_A4t#SMe_Qa69jMba`~~u
WfD9CHW0~wKZ_6&i7U1j`!T<nx-XaA6

diff --git a/tests/data/acpi/q35/DSDT.ivrs b/tests/data/acpi/q35/DSDT.ivrs
index c9c18fa4e45288fb6c2182a793a8e6aff72b33d9..146269c68c68238a8be3aa67e049a85c0b8edc66 100644
GIT binary patch
delta 229
zcmbQ}_}P)mCD<k8vjPJHW57l(Z^q4;ObLukO<|i)Gq2>^yg{gmm&;KxCO+6HUcggf
zvW<eDLUfaZbg-L6JV(5vOArqOgFHiYLx5*cAQM*t7f*Df!Q@6E{d%^5pg_kMJ&-;S
z3&eGTbDcn3XE@gx#C3slT|it{IM)@#b%S%=KwNh?*B!+5fO9>fn@qf&T;eCUFg{@y
LVGD5f3t<2NiwZ%W

delta 105
zcmezDIMI>ICD<ioq5=a0<D-pS-i$)df_m}6PVoWGo(9oPZUUacj*}hb#V0c<yxJVX
zn8?V~7rA*m(@H+x=te7jW{@hNiulP<^7@+-1e<ud{8?i_+6CNMC%=*NV;5lyaP|vf
F0047{9x?y`

diff --git a/tests/data/acpi/q35/DSDT.memhp b/tests/data/acpi/q35/DSDT.memhp
index a5730b8ab8abb2602334633cd6c760f79915e564..3e79ba7ac0b9a466fddd2213f32d20c522b8613b 100644
GIT binary patch
delta 229
zcmX@_z0rruCD<jzP>q3sap6WTZ^q4;ObLukO<|i)Gq2>^yg}%q5SN2OOnk6Yynu)N
z<Ze}4h3F;+>0mdDc#e2SmmnSn26=|)h5*l?KqjsPE}rN{gUO9T`t@u9L4l4jdLVru
z7KrNv=Q@G7&Ty_Xi0cC9x`4Q@aIPze>jvk#fw=B)t~-e90q1%|H<@@lxx`OyVSK_a
L!WQ7{7s3DlsQW?J

delta 105
zcmdn!bKaZFCD<k8yeb0&qsc}tZ$=?!LB053r}zM8PlM<tHv!LJ$I107;*%XzUu_Oy
zOk`y0i`=}OX(b<Tbfc9%Ge{LsMf~I$D*Brf1TPA4`LV=+v<tYgOtx0BWfx%!aP|vf
F004fR9yI^}

diff --git a/tests/data/acpi/q35/DSDT.mmio64 b/tests/data/acpi/q35/DSDT.mmio64
index a4293c20fed04d1ccfc4f4fc1ccf46ca81453854..afc260ebf4d91a2a9f7be5ff21968e99b1f9c5d1 100644
GIT binary patch
delta 229
zcmaFmdB%&&CD<jzN0otrF?J)DH{<3^rUXW&rm)SYnOE{{-XL^akjqgqCO+6HUcggf
z@>CT+h3F;+>0mdDc#e2SmmnSn26=|)h5*l?KqjsPE}rN{gUO9T`t@u9L4l4jdLVru
z7KrNv=Q@G7&Ty_Xi0cC9x`4Q@aIPze>jvk#fw=B)t~-e90q1%|H<@@lxx`OyVSK_a
L!WQ7{7s3Dl&Zt5L

delta 123
zcmX@(^~#gWCD<k8l?np`<A;r0-i#W~f_m}6PVoWGo(9oPZUUacj`1AvjxIqw3=HxN
z(G3BfL4izM30yprqf}mR4q;4WWa^9Dyq#$!A8&M{l|C~_A4t#S&C2?l69jJya{05y
WfD9CHXPxY-?8h#`7U1j`!T<oa`y#>s

diff --git a/tests/data/acpi/q35/DSDT.multi-bridge b/tests/data/acpi/q35/DSDT.multi-bridge
index 88bf47ab1805e4ef1dd8039933c5aa8144da37ac..7c14ce3a986fa06e88f3adc088faae54bdd2d8e4 100644
GIT binary patch
delta 250
zcmX@$yvT*iCD<iINr{1hQEDTXH{<3^rUXW&rm)SYnOE{{-XPS(%jIAa6CdmpFW_Ok
z*+wCgQ6aj?K|0vYBAz4O(Itq7fkB=jx*@<bD3FOOfr}@)(O`0;kbXT|Kv1A#j2=iM
zhy~(0!MRQ#t}~qL4C1=Lxh^2CE1c^J;<~}PZXm8Zoa+wadce6J(M=}aPA>72TNs~6
Yi%11H`-L#X=>;2F#)Ft3mI0Ur05;)9wEzGB

delta 144
zcmZ4Fa=@9(CD<k8fFc6}<Jyf}-i#W~f_m}6PVoWGo(9oPZUUacj`1AvjxIqw3=HxN
z(G3BfL4izM30yprWfWg;4q;4WWa^9Dyq#$!A8&M{l|C~_A4t#SQU(3Z34%?$Tz(QU
kAOi*5BsRa1%Vd-mkqU733t@=U3pTU_TH_Z2Vi|y008Qg3?f?J)

diff --git a/tests/data/acpi/q35/DSDT.nohpet b/tests/data/acpi/q35/DSDT.nohpet
index 6feed2ee106087d24d51f468df1b4d44e65143f0..60595f55fc72397e3ed9b1999dddd39cd98f89a8 100644
GIT binary patch
delta 229
zcmexlf5m~zCD<h-M1g^Uv2r7qH{<3^rUXW&rm)SYnOE{{-XQdahs!}BCO+6HUcf_s
z@;Z52h3F;+>0mdDc#e2SmmnSn26=|)h5*l?KqjsPE}rN{gUO9T`t@u9L4l4jdLVru
z7KrNv=Q@G7&Ty_Xi0cC9x`4Q@aIPze>jvk#fw=B)t~-e90q1%|H<@@lxx`OyVSK_a
L!WQ7{7s3Dl^Up#w

delta 123
zcmccO@X4ObCD<k8lRN_hBhN-IZ$=GgLB053r}zM8PlM<tHv!LJ$9Rr-N0%TT1_pVC
z=!O8#pg<<B1TLP*N%F5ZhcG5GGWA7n-p;g=k2ku}N}m~|52R=EZaMwU34&jExcpdR
WKn4o9u}qGWvt<`y3vl)eVE_PFiXrv@

diff --git a/tests/data/acpi/q35/DSDT.numamem b/tests/data/acpi/q35/DSDT.numamem
index 414b8af67bdf79238915de0d609ce45e150eb958..68e67eb91097c58365e3734c9b35d32796639d54 100644
GIT binary patch
delta 229
zcmZp3eBsFD66_N4LV<ySF=`{1H{<3^rUXW&rm)SYnOE{{-XPS$%jKXD6CdmpFW@0R
z*-61xA-c&yI@rx3o+IATC5VTCL7pMHA;2>zkclgSizm9#U~;37emz@2P@rRs9!MXE
z1>!ovxlSOiGo0%T;<~`OE+DQeoa+kWy1}__Ag(){>ki_2z_}jLO(xz>F7cCF7@x3<
Lumw2#g)jgBaBM+-

delta 123
zcmaFi*yhOP66_Mvroh0!_+}%QH=~BLpk92iQ+$B4r$Ka+n}BDqV?0N^qe~DE1A{z6
zbVGn=P#_am0vFHZZ}P7<hcG5GGWA7n-p;g=k2ku}N}m~|52R<Zzr6nD1i=noE<ctS
WkbwejER#RU*|LkU1vvYKFaQ8^2O?+y

diff --git a/tests/data/acpi/q35/DSDT.pvpanic-isa b/tests/data/acpi/q35/DSDT.pvpanic-isa
index 7277a0105035f984dc0a0f09747d441c21e62d1c..811cd27c7e7366e61683c7c5ef67f0996f395c25 100644
GIT binary patch
delta 230
zcmaFrc-)E0CD<jzU6Fx-F?b`FH{<4WObLukO<|i2SXT0F78P#d<#JVvi4S&)7w}b`
zyimbbA-c&`G1$!_o+IATC5VTCL7pMHA;2>zkclgSizm9#VDd8|{d%^5pg_kMJ&-;S
z3&eGTbDcn3XE@gx#C3slT|it{IM)@#b%S%=KwNh?*B!+5fO9>fn}DXdhHY+P^kifg
LVGD5f3t<2NL%%?L

delta 106
zcmX@^^wg2dCD<k8sR9E7<HwC$-i$&X;(GDHPVoWGo(9oP-eR7?j*|`K#W#PH_h;N3
z!kEa&)EBvVJJU)&-snaveP)m{ppy8>p7Q#e69k)hx%^mSK>7vTSSG)bvt<`y3vl)e
GVE_Qr;2#kH

diff --git a/tests/data/acpi/q35/DSDT.tis.tpm12 b/tests/data/acpi/q35/DSDT.tis.tpm12
index 253a66e65818d1df67b13d4b70f68add78adff98..7a213e3db230064cedf3a30b83b11128286eaeba 100644
GIT binary patch
delta 230
zcmccTdccj#CD<jzL79Pp@xeweZ^q5LSrQnTn!+~AvaRIX%p}^!%jM)66CdmpFW}`e
zd6tr`LUfapL$I4gJV(5vOArqOgFHiYLx5*cAQM*t7f*Df!Q{&#`t@u9L4l4jdLVru
z7KrNv=Q@G7&Ty_Xi0cC9x`4Q@aIPze>jvk#fw=B)t~-e90q1%|H#w+=1o&=lVKifA
M7hwx<_6uPE0Ky4DCIA2c

delta 124
zcmX@$cF&c|CD<k8o)QBC<E)Kb-i#WqW_t0#PVoWGo(9oP9;Tkbj`1AvjxIqw3=HxN
z(G3BfL4izM30ypz|H#`iZw_HhWMt}#+`OG>B_D5eqm@20NFzwo<WPD2%?W~iyj*@P
XF(4BK+*l_6kh5hMVGD5f3t<2Nq?jUv

diff --git a/tests/data/acpi/q35/DSDT.tis.tpm2 b/tests/data/acpi/q35/DSDT.tis.tpm2
index 76bd4661e6655d2a8f246f4bf38490df14da82ad..b55e828c6397f80c14de82f371fa34553008a875 100644
GIT binary patch
delta 230
zcmez2ddrQ=CD<h-N|}Lyv1TKeH{<53ED4NEO<|kO*;evxmJ#ja<??Zhi4S&)7jSW#
zyhX`YA-c)OG1$!_o+IATC5VTCL7pMHA;2>zkclgSizm9#VDeiL{d%^5pg_kMJ&-;S
z3&eGTbDcn3XE@gx#C3slT|it{IM)@#b%S%=KwNh?*B!+5fO9>fo4nLQ0(>{OFa|KQ
Mi?9Va`-Lz703b9$$p8QV

delta 124
zcmccR_QRFSCD<k8hY|w=qvJ*{Z$=G&bG`Urr}zM8PlM<tCv(qW$9Rr-N0%TT1_pVC
z=!O8#pg<<B1TLP<f8@iNH-|7LGBWi=Zr;wcl8-mK(Mq2gq!FZPa;Uui<^;h$UM@eD
X7?6nqZY-03$l0=sumw2#g)jgBtUn@}

diff --git a/tests/data/acpi/q35/DSDT.viot b/tests/data/acpi/q35/DSDT.viot
index 3f14b57f0797ab13fc4c90dd2949cf4bd6c30896..a8a93fe70d8e98ec0e66278b45d36393b75740ec 100644
GIT binary patch
delta 229
zcmccWx!sG)CD<jzT$O==(RU-4H{<3^rUXW&rm)SYnOE{{-XJttkjq6SCO+6HUcg6r
zvad>`LUfaZbg-L6JV(5vOArqOgFHiYLx5*cAQM*t7f*Df!Q@6E{d%^5pg_kMJ&-;S
z3&eGTbDcn3XE@gx#C3slT|it{IM)@#b%S%=KwNh?*B!+5fO9>fn@qf&T;eCUFg{@y
LVGD5f3t<2NOvpiI

delta 123
zcmdn)b=8y0CD<k8stN-G<NJ+V-i#W~f_m}6PVoWGo(9oPZUUacj`1AvjxIqw3=HxN
z(G3BfL4izM30yprT~%Ih4q;4WWa^9Dyq#$!A8&M{l|C~_A4t#SdCK~m69gv<ayfCv
WfD9Dy;+XtbsgYfTEx_3?gaH7Pw<7ld

diff --git a/tests/data/acpi/q35/DSDT.xapic b/tests/data/acpi/q35/DSDT.xapic
index baa88f6f219a2a47fe20ee0c08b92371cc7e2aa7..8211f5af8f9433b66b64768acb1de61a5716152a 100644
GIT binary patch
delta 231
zcmaDnjp^ugCN7s?myn~~3=E8E8@aq0H)k>>FfuiTZ9dJsl5g_{q0|a42ZfmUV5fKi
z5BbUR-L?wRO%Bq*ZWi$z@s2J*JPZu-4ABh%o<V_3TnSt}(TxU^8-?`i*#d$B9b@!B
z`amoY*9p#b0&$(;TxSs11<rK=ab4kDR}j|?&UFKE-Qiq!5Z43F^@wgV@pf{FpWMRu
Ngk6L!z}YW^0RZ#_LrVYv

delta 125
zcmX>)o$2v3CN7s?myqOc1_s6-8@aq0HJk<Y;)9*y1Drh#qMO_VJcAwMIpQ5%f_NAh
z<QbwH0z88PnYa?TcqU)&dc8S>F_Dp}FLLvCrj>lW(T!I6%piRrJ(G31^fxC6rdDwI
YvBZE36mVmie7@6`U4$*b*)N0v04#(g#Q*>R

-- 
2.31.1



^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [PATCH 05/11] tests: acpi: whitelist DSDT before generating ICH9_SMB AML automatically
  2022-10-17 10:21 [PATCH 00/11] x86: clean up ACPI PCI code part 2 Igor Mammedov
                   ` (3 preceding siblings ...)
  2022-10-17 10:21 ` [PATCH 04/11] tests: acpi: update expected DSDT after ISA bridge is moved directly under PCI host bridge Igor Mammedov
@ 2022-10-17 10:21 ` Igor Mammedov
  2022-10-17 10:21 ` [PATCH 06/11] acpi: add get_dev_aml_func() helper Igor Mammedov
                   ` (6 subsequent siblings)
  11 siblings, 0 replies; 18+ messages in thread
From: Igor Mammedov @ 2022-10-17 10:21 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 | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index dfb8523c8b..fd5852776c 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1 +1,22 @@
 /* List of comma-separated changed AML files to ignore */
+"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.nohpet",
+"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] 18+ messages in thread

* [PATCH 06/11] acpi: add get_dev_aml_func() helper
  2022-10-17 10:21 [PATCH 00/11] x86: clean up ACPI PCI code part 2 Igor Mammedov
                   ` (4 preceding siblings ...)
  2022-10-17 10:21 ` [PATCH 05/11] tests: acpi: whitelist DSDT before generating ICH9_SMB AML automatically Igor Mammedov
@ 2022-10-17 10:21 ` Igor Mammedov
  2022-10-17 11:12   ` Ani Sinha
  2022-10-17 10:21 ` [PATCH 07/11] acpi: enumerate SMB bridge automatically along with other PCI devices Igor Mammedov
                   ` (5 subsequent siblings)
  11 siblings, 1 reply; 18+ messages in thread
From: Igor Mammedov @ 2022-10-17 10:21 UTC (permalink / raw)
  To: qemu-devel; +Cc: mst, ani

It will be used in followup commits to figure out if
device has it's own, device specific AML block.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 include/hw/acpi/acpi_aml_interface.h | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/include/hw/acpi/acpi_aml_interface.h b/include/hw/acpi/acpi_aml_interface.h
index ab76f0e55d..436da069d6 100644
--- a/include/hw/acpi/acpi_aml_interface.h
+++ b/include/hw/acpi/acpi_aml_interface.h
@@ -29,11 +29,20 @@ struct AcpiDevAmlIfClass {
     dev_aml_fn build_dev_aml;
 };
 
-static inline void call_dev_aml_func(DeviceState *dev, Aml *scope)
+static inline dev_aml_fn get_dev_aml_func(DeviceState *dev)
 {
     if (object_dynamic_cast(OBJECT(dev), TYPE_ACPI_DEV_AML_IF)) {
         AcpiDevAmlIfClass *klass = ACPI_DEV_AML_IF_GET_CLASS(dev);
-        klass->build_dev_aml(ACPI_DEV_AML_IF(dev), scope);
+        return klass->build_dev_aml;
+    }
+    return NULL;
+}
+
+static inline void call_dev_aml_func(DeviceState *dev, Aml *scope)
+{
+    dev_aml_fn fn = get_dev_aml_func(dev);
+    if (fn) {
+        fn(ACPI_DEV_AML_IF(dev), scope);
     }
 }
 
-- 
2.31.1



^ permalink raw reply related	[flat|nested] 18+ messages in thread

* Re: [PATCH 06/11] acpi: add get_dev_aml_func() helper
  2022-10-17 10:21 ` [PATCH 06/11] acpi: add get_dev_aml_func() helper Igor Mammedov
@ 2022-10-17 11:12   ` Ani Sinha
  0 siblings, 0 replies; 18+ messages in thread
From: Ani Sinha @ 2022-10-17 11:12 UTC (permalink / raw)
  To: Igor Mammedov; +Cc: qemu-devel, mst

On Mon, Oct 17, 2022 at 3:52 PM Igor Mammedov <imammedo@redhat.com> wrote:
>
> It will be used in followup commits to figure out if
> device has it's own, device specific AML block.
>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>

Reviewed-by: Ani Sinha <ani@anisinha.ca>

> ---
>  include/hw/acpi/acpi_aml_interface.h | 13 +++++++++++--
>  1 file changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/include/hw/acpi/acpi_aml_interface.h b/include/hw/acpi/acpi_aml_interface.h
> index ab76f0e55d..436da069d6 100644
> --- a/include/hw/acpi/acpi_aml_interface.h
> +++ b/include/hw/acpi/acpi_aml_interface.h
> @@ -29,11 +29,20 @@ struct AcpiDevAmlIfClass {
>      dev_aml_fn build_dev_aml;
>  };
>
> -static inline void call_dev_aml_func(DeviceState *dev, Aml *scope)
> +static inline dev_aml_fn get_dev_aml_func(DeviceState *dev)
>  {
>      if (object_dynamic_cast(OBJECT(dev), TYPE_ACPI_DEV_AML_IF)) {
>          AcpiDevAmlIfClass *klass = ACPI_DEV_AML_IF_GET_CLASS(dev);
> -        klass->build_dev_aml(ACPI_DEV_AML_IF(dev), scope);
> +        return klass->build_dev_aml;
> +    }
> +    return NULL;
> +}
> +
> +static inline void call_dev_aml_func(DeviceState *dev, Aml *scope)
> +{
> +    dev_aml_fn fn = get_dev_aml_func(dev);
> +    if (fn) {
> +        fn(ACPI_DEV_AML_IF(dev), scope);
>      }
>  }
>
> --
> 2.31.1
>


^ permalink raw reply	[flat|nested] 18+ messages in thread

* [PATCH 07/11] acpi: enumerate SMB bridge automatically along with other PCI devices
  2022-10-17 10:21 [PATCH 00/11] x86: clean up ACPI PCI code part 2 Igor Mammedov
                   ` (5 preceding siblings ...)
  2022-10-17 10:21 ` [PATCH 06/11] acpi: add get_dev_aml_func() helper Igor Mammedov
@ 2022-10-17 10:21 ` Igor Mammedov
  2022-10-17 10:21 ` [PATCH 08/11] tests: acpi: update expected blobs Igor Mammedov
                   ` (4 subsequent siblings)
  11 siblings, 0 replies; 18+ messages in thread
From: Igor Mammedov @ 2022-10-17 10:21 UTC (permalink / raw)
  To: qemu-devel; +Cc: mst, ani

to make that happen (bridge sits at _ADR: 0x001F0003),
relax PCI enumeration logic to include devices with *function* > 0
if device has something to say about itself (i.e. has build_dev_aml
callback set).

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 hw/i386/acpi-build.c | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index e1483bb11a..916343d8d6 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -448,9 +448,10 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
             /*
              * 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
+             * generate description only for function 0 per slot, and for other
+             * functions if device on function provides its own AML
              */
-            if (func && !bridge_in_acpi) {
+            if (func && !bridge_in_acpi && !get_dev_aml_func(DEVICE(pdev))) {
                 continue;
             }
         } else {
@@ -1319,25 +1320,6 @@ static Aml *build_q35_osc_method(bool enable_native_pcie_hotplug)
     return method;
 }
 
-static void build_smb0(Aml *table, int devnr, int func)
-{
-    Aml *scope = aml_scope("_SB.PCI0");
-    Aml *dev = aml_device("SMB0");
-    bool ambiguous;
-    Object *obj;
-    /*
-     * temporarily fish out device hosting SMBUS, build_smb0 will be gone once
-     * PCI enumeration will be switched to call_dev_aml_func()
-     */
-    obj = object_resolve_path_type("", TYPE_ICH9_SMB_DEVICE, &ambiguous);
-    assert(obj && !ambiguous);
-
-    aml_append(dev, aml_name_decl("_ADR", aml_int(devnr << 16 | func)));
-    call_dev_aml_func(DEVICE(obj), dev);
-    aml_append(scope, dev);
-    aml_append(table, scope);
-}
-
 static void build_acpi0017(Aml *table)
 {
     Aml *dev, *scope, *method;
@@ -1440,9 +1422,6 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
             build_x86_acpi_pci_hotplug(dsdt, pm->pcihp_io_base);
         }
         build_q35_pci0_int(dsdt);
-        if (pcms->smbus) {
-            build_smb0(dsdt, ICH9_SMB_DEV, ICH9_SMB_FUNC);
-        }
     }
 
     if (misc->has_hpet) {
-- 
2.31.1



^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [PATCH 08/11] tests: acpi: update expected blobs
  2022-10-17 10:21 [PATCH 00/11] x86: clean up ACPI PCI code part 2 Igor Mammedov
                   ` (6 preceding siblings ...)
  2022-10-17 10:21 ` [PATCH 07/11] acpi: enumerate SMB bridge automatically along with other PCI devices Igor Mammedov
@ 2022-10-17 10:21 ` Igor Mammedov
  2022-10-17 12:43   ` Ani Sinha
  2022-10-17 10:21 ` [PATCH 09/11] tests: acpi: pc/q35 whitelist DSDT before \_GPE cleanup Igor Mammedov
                   ` (3 subsequent siblings)
  11 siblings, 1 reply; 18+ messages in thread
From: Igor Mammedov @ 2022-10-17 10:21 UTC (permalink / raw)
  To: qemu-devel; +Cc: mst, ani

Expected change in q35 tests:
	@@ -2797,14 +2797,6 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC    ", 0x00000001)
		 }
	     }

	-    Scope (_SB.PCI0)
	-    {
	-        Device (SMB0)
	-        {
	-            Name (_ADR, 0x001F0003)  // _ADR: Address
	-        }
	-    }
	-
	     Scope (_SB)
	     {
		 Device (HPET)
	@@ -3282,6 +3274,11 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC    ", 0x00000001)
			 }
		     }

	+            Device (SFB)
	+            {
	+                Name (_ADR, 0x001F0003)  // _ADR: Address
	+            }
	+
		     Method (PCNT, 0, NotSerialized)
		     {
		     }

Also for ipmismbus test, child 'Device (MI1)' of SMB0 will be moved along with it

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 tests/qtest/bios-tables-test-allowed-diff.h |  21 --------------------
 tests/data/acpi/q35/DSDT                    | Bin 8418 -> 8407 bytes
 tests/data/acpi/q35/DSDT.acpierst           | Bin 8435 -> 8424 bytes
 tests/data/acpi/q35/DSDT.acpihmat           | Bin 9743 -> 9732 bytes
 tests/data/acpi/q35/DSDT.applesmc           | Bin 8464 -> 8453 bytes
 tests/data/acpi/q35/DSDT.bridge             | Bin 11547 -> 11536 bytes
 tests/data/acpi/q35/DSDT.cphp               | Bin 8882 -> 8871 bytes
 tests/data/acpi/q35/DSDT.cxl                | Bin 9744 -> 9733 bytes
 tests/data/acpi/q35/DSDT.dimmpxm            | Bin 10072 -> 10061 bytes
 tests/data/acpi/q35/DSDT.ipmibt             | Bin 8493 -> 8482 bytes
 tests/data/acpi/q35/DSDT.ipmismbus          | Bin 8507 -> 8495 bytes
 tests/data/acpi/q35/DSDT.ivrs               | Bin 8435 -> 8424 bytes
 tests/data/acpi/q35/DSDT.memhp              | Bin 9777 -> 9766 bytes
 tests/data/acpi/q35/DSDT.mmio64             | Bin 9548 -> 9537 bytes
 tests/data/acpi/q35/DSDT.multi-bridge       | Bin 8738 -> 8727 bytes
 tests/data/acpi/q35/DSDT.nohpet             | Bin 8276 -> 8265 bytes
 tests/data/acpi/q35/DSDT.numamem            | Bin 8424 -> 8413 bytes
 tests/data/acpi/q35/DSDT.pvpanic-isa        | Bin 8519 -> 8508 bytes
 tests/data/acpi/q35/DSDT.tis.tpm12          | Bin 9024 -> 9013 bytes
 tests/data/acpi/q35/DSDT.tis.tpm2           | Bin 9050 -> 9039 bytes
 tests/data/acpi/q35/DSDT.viot               | Bin 9527 -> 9516 bytes
 tests/data/acpi/q35/DSDT.xapic              | Bin 35781 -> 35770 bytes
 22 files changed, 21 deletions(-)

diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index fd5852776c..dfb8523c8b 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,22 +1 @@
 /* List of comma-separated changed AML files to ignore */
-"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.nohpet",
-"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/q35/DSDT b/tests/data/acpi/q35/DSDT
index ea35dc5eba8433a8dcb54815f19ed6239f2534e7..c8a2b5df26608f10c75ab8f2f9e404fda987891b 100644
GIT binary patch
delta 65
zcmaFlc-@i9CD<k8x&i|Oqx(iKK8ejH66@Hw92H~YgPr09JQX&-k$cZ55#7We?B*2D
V5%1^{#KX)W&mh7U;OrN|004sf5rO~!

delta 76
zcmcca_{fpVCD<k8kpcq)<A#k~d=k>qdhx+d@d3`B2GLFY!M;ug9Py4WK|IV1@(i2B
eCDyZXIVi+{R0w#;Z@wV+o{?RIEx_3?gaH6HQWQi0

diff --git a/tests/data/acpi/q35/DSDT.acpierst b/tests/data/acpi/q35/DSDT.acpierst
index 146269c68c68238a8be3aa67e049a85c0b8edc66..eb63e439b92424e4c50b7e5f1df92da54ecfc6ea 100644
GIT binary patch
delta 64
zcmezD_`;FPCD<k8g#rTu<MWMNd=i^YB-XKUIVr`&2Rp?JcquM^BgZ5W-NYa4<`mBn
U@8}Z5!^|MhAi@^l>=(iS0Ek8rTL1t6

delta 75
zcmaFi_}P)mCD<k8vjPJHW57l(J_%`Qz4&0K_yA{5gXkvyU|%N#j(A6xARcB0d4|p6
d66@Kx92H|gDg-<g7GIEKVi#cxaP|vf000r=6CD5m

diff --git a/tests/data/acpi/q35/DSDT.acpihmat b/tests/data/acpi/q35/DSDT.acpihmat
index 4dd420b62fbcfdd21485fec2bafdea54f3fdb5a8..f9199a0dd614b30c9e73eb7de7e051ce84c1d73f 100644
GIT binary patch
delta 65
zcmeD8Y4PE533dr#QDb0WWZuZdC$ZT?;x;#zqhd^auv5H%r^04QmG_Ji(M|lpZcgzW
U@s2J*Jj@L83?gg+&VC^b02Q4NMgRZ+

delta 76
zcmZqi>G$Ds33dtLS7Tsc%-P7rCm}7Z7a!~tAK>h15Z%Nd?CWH}5%1^{#KX)W&#+ls
d;tn^LgF*~Qg@A|r=D*7C8QDeH0-XIq7y!*W69)hQ

diff --git a/tests/data/acpi/q35/DSDT.applesmc b/tests/data/acpi/q35/DSDT.applesmc
index ff25d82ba24b5e792b9d87958aa1b162bc9e0de2..286a4ecec273ca0e2fe2d65f80e8566a68a2f794 100644
GIT binary patch
delta 65
zcmbQ>)au0L66_Mfs>r~=D6x@?Phzu)#5y)Ef906?V5fKicje7*<Ybv7qMP`G-JIe%
U;vHRrc$gXF8AR9uoc%%=01xsHAOHXW

delta 76
zcmZp5n&8Cc66_Kppvb_$*tn64PeNK+FFx2QKET=2Ai9Y^*w@K`Bi_*^h=-X$o?)}N
d#CkR^KcyIu3IR8z%@^cknb<|x0-XIq7y!Nm5#j&<

diff --git a/tests/data/acpi/q35/DSDT.bridge b/tests/data/acpi/q35/DSDT.bridge
index bde84efd1c5fcafee789781f4030d573002a886a..9a733a54e428d3506aaf73f8d4c1f28324a71a42 100644
GIT binary patch
delta 75
zcmbOoH6e=2CD<iIK$n4m@!Li&K8ejH66@Hwyq?6w2Rp?JI6c|?Mox}TDY}V2*v%=P
dBi_*^h=-X$o<T$)z}YW^Ax<yY&>$Yf1OQ7T6vzMo

delta 86
zcmbObH9LySCD<iIT9<)=F@7T#pM<ouUVN}qe1Nm3L39&;u&<K=N4%p;5DznhJi}&j
niS=w;o{wWdDg+!KZ@wTW$0sNv5a8?=!VsqyY-j+~=NAG1zta|q

diff --git a/tests/data/acpi/q35/DSDT.cphp b/tests/data/acpi/q35/DSDT.cphp
index 537be7ca37c021e6a7f098e88c40ba178f3ec3e2..8579626c7f1f035c8d400544c2af6ce6372a5625 100644
GIT binary patch
delta 65
zcmdnwy4;n^CD<ioxe@~d<LZrEd=i^YB<eW092H~YgPr09JQX(YQFzZN5#7We?B*2D
V5%1^{#KX)W&mh7U;OrN|003#(5d;7L

delta 76
zcmZ4Py2+KxCD<iolM(|1qsT@sJ_%`Qz4&0K_yA{5gXkvyU|%N#j(A6xARcB0d4|p6
e67?Kh4hk_K6#^den-?g&XJi*)3vl)eVE_Q*#}dW>

diff --git a/tests/data/acpi/q35/DSDT.cxl b/tests/data/acpi/q35/DSDT.cxl
index aeea64d1cecad0ad011870ed5e04bfea1ae62510..96594c00b3b0e0a4933d6d851d927487ad4d18eb 100644
GIT binary patch
delta 65
zcmbQ>)9S<J66_Mfs>Z;;Xupw*Phzu)#4c_wXXTjqV5fKiZ>7yYlm(e2qMP`G-JIe%
U;vHRrc$gXF8AR9uoc%%=03WdrZ2$lO

delta 76
zcmZqmnc&0a66_KppvJ(!xMCw0pM<ouUVN}qe1Nm3L39&;u&<K=N4%p;5DznhJi}&j
eiQU{>PD(K#6#`z0o9`$KGO>%W1vvYKFaQA0rV=jz

diff --git a/tests/data/acpi/q35/DSDT.dimmpxm b/tests/data/acpi/q35/DSDT.dimmpxm
index ed11aefa4a56a8408bd4e0de83bf2373e6025449..e2a3ecf7d90c8c411550505c3b70bf8d19ba4bc9 100644
GIT binary patch
delta 65
zcmccNch--~CD<jzSDk@@amq$6K8ejH5-Pl0j*2ny!A|i4o(h|jRNpg7L^tsVyE(;k
V#5=kK@h~&UGl;MSIQxY#002@W5KI67

delta 76
zcmX@>cf*g%CD<h-LY;wu@$W`1J_%`Qz4&0K_yA{5gXkvyU|%N#j(A6xARcB0d4|p6
e5~{ph4hk_K6#^deo8463GqQ`Y1vvYKFaQ7)&=U>-

diff --git a/tests/data/acpi/q35/DSDT.ipmibt b/tests/data/acpi/q35/DSDT.ipmibt
index d9d1e75c987acd42be4576688621be07b21f0e7b..427272b95692099edc47f569e41fbb3ba69f6b60 100644
GIT binary patch
delta 65
zcmZ4Mw8)9eCD<iINs)npF=itdpTuSpiFIsTKB_VC!A|i4E~=Z~$XPK-L^tsVyE(;k
V#5=kK@h~&UGl;MSIQxY#001=^57qzx

delta 76
zcmZ4FwAP8sCD<iISCN5%@#sb_J_%`Qz4&0K_yA{5gXkvyU|%N#j(A6xARcB0d4|p6
e66@Kxyj5aADg>NWHeZmlVqzCz3vl)eVE_Q=2@;q9

diff --git a/tests/data/acpi/q35/DSDT.ipmismbus b/tests/data/acpi/q35/DSDT.ipmismbus
index f6e124137721312722c820b5c084a143492945c9..794779e75aaf33902de834caaa6b0763c4513615 100644
GIT binary patch
delta 61
zcmdn(wBCu!CD<iIUy*@<@%2V7K8ek}66@HwJk?_2gPr099Mv|v%D-pih;DLc3wCpg
RpR6sB$S%Sb;OrN|001n-5byv1

delta 72
zcmZ4QwA+cxCD<jzT9JW)QEwv`pM<aryIy>-Q+$B4r$Ka+J6o`?lfmTU3W=M=CDyZX
aIVi+{Bn3R=H(!u@&&V#q7U1j`!T<onCKIFp

diff --git a/tests/data/acpi/q35/DSDT.ivrs b/tests/data/acpi/q35/DSDT.ivrs
index 146269c68c68238a8be3aa67e049a85c0b8edc66..eb63e439b92424e4c50b7e5f1df92da54ecfc6ea 100644
GIT binary patch
delta 64
zcmezD_`;FPCD<k8g#rTu<MWMNd=i^YB-XKUIVr`&2Rp?JcquM^BgZ5W-NYa4<`mBn
U@8}Z5!^|MhAi@^l>=(iS0Ek8rTL1t6

delta 75
zcmaFi_}P)mCD<k8vjPJHW57l(J_%`Qz4&0K_yA{5gXkvyU|%N#j(A6xARcB0d4|p6
d66@Kx92H|gDg-<g7GIEKVi#cxaP|vf000r=6CD5m

diff --git a/tests/data/acpi/q35/DSDT.memhp b/tests/data/acpi/q35/DSDT.memhp
index 3e79ba7ac0b9a466fddd2213f32d20c522b8613b..923e213ab6a3c82faa6f659c29de9c8afb6878dd 100644
GIT binary patch
delta 65
zcmdn!v&@IfCD<iIO^tzp(PASPpTuSpiND-jj*2ny!A|i4o(h|-Ro*j7L^tsVyE(;k
V#5=kK@h~&UGl;MSIQxY#002TP5G4Qr

delta 76
zcmZ4Hv(bmkCD<jzP>q3sap6WTJ_%`Qz4&0K_yA{5gXkvyU|%N#j(A6xARcB0d4|p6
e692fl928<eDg->_H_NNMXJi*)3vl)eVE_Q{`4Z;<

diff --git a/tests/data/acpi/q35/DSDT.mmio64 b/tests/data/acpi/q35/DSDT.mmio64
index afc260ebf4d91a2a9f7be5ff21968e99b1f9c5d1..a77aa37ca0bb407abbef134e8dce4461070856a2 100644
GIT binary patch
delta 64
zcmX@(b<m5;CD<jzQI&y#@ykXoK8ejH671YuPD(NH!A|i4UW$udm6;@>oA`s>oZ>m+
T9bJNWm>J|5MA!nH{X!T3EYS}}

delta 75
zcmX@;b;gU!CD<jzN0otrF?J&tpM<ouUVN}qe1Nm3L39&;u&<K=N4%p;5DznhJi}&j
c2@Y;9N5vSB3IR`r#hS`Y>>_Ld&VC^b0K(`I2mk;8

diff --git a/tests/data/acpi/q35/DSDT.multi-bridge b/tests/data/acpi/q35/DSDT.multi-bridge
index 7c14ce3a986fa06e88f3adc088faae54bdd2d8e4..43469e6c89813025b902534ed61d39ad940ff7bb 100644
GIT binary patch
delta 85
zcmZ4FGTnvCCD<iIT#12!apOiVK8ejH66@Hw98F{5gPr09JWV#gk&|ZDiEiQ#c5{m7
hh<9`e;$dcxXAqGJaP|vfh|>!;w2TKaK`a9>3jo0872^N^

delta 72
zcmbR4vdD$YCD<iINr{1hQEDR>pM<ouUVN}qe1Nm3L39&;u&<K=N4%p;5DznhJi}&j
aiS=w;4kj@m6#^c{n=i;oGf)1bC=CF0xDr7C

diff --git a/tests/data/acpi/q35/DSDT.nohpet b/tests/data/acpi/q35/DSDT.nohpet
index 60595f55fc72397e3ed9b1999dddd39cd98f89a8..e17b252b03b290ba39601afffbee66159a57bfb1 100644
GIT binary patch
delta 65
zcmccOaMFRxCD<jzQ-OhjQD7q%pTuSp2?aJTN5z=<V5fKiPle5Ka_<=>qMP`G-JIe%
U;vHRrc$gXF8AR9uoc%%=04azMg8%>k

delta 76
zcmX@<aK(YkCD<h-M1g^Uv2r69pM<ouUVN}qe1Nm3L39&;u&<K=N4%p;5DznhJi}&j
d2}L$82Zb1r3IPxK%}#Rf8QDeH0-XIq7y#w#5=8(2

diff --git a/tests/data/acpi/q35/DSDT.numamem b/tests/data/acpi/q35/DSDT.numamem
index 68e67eb91097c58365e3734c9b35d32796639d54..ade716519de8bd626b3cddee686f55757bb4eb35 100644
GIT binary patch
delta 65
zcmaFic-N83CD<k8t^xxC<HwC$d=i^YB(|_|IV#4)2Rp?Jcq(lEB=??CBD#q`*v%=P
VBi_*^h=-X$o<W2yz}YW^0RXDm5=sC7

delta 76
zcmccX_`;FPCD<k8g#rTuW7I}2J_%`Qz4&0K_yA{5gXkvyU|%N#j(A6xARcB0d4|p6
e5?k50928<eDg->_H(!%`&&V#q7U1j`!T<m#coYl(

diff --git a/tests/data/acpi/q35/DSDT.pvpanic-isa b/tests/data/acpi/q35/DSDT.pvpanic-isa
index 811cd27c7e7366e61683c7c5ef67f0996f395c25..b6740b1ec2f4e01bdbdc34bc8bf0a2c36f134671 100644
GIT binary patch
delta 65
zcmX@^w8x3dCD<jzMv;Mm@zq8yK8ejH66@Hw+|*;@gPr09{M0tTkqcpxh;HH!c5{m7
Vh<9`e;$dcxXAofvaP|vf003u>5Yqqv

delta 76
zcmdnvbli!{CD<jzU6Fx-F?b^vpM<ouUVN}qe1Nm3L39&;u&<K=N4%p;5DznhJi}&j
eiS=w;u4*wL6#~Ahn=i<PFtLlU1vvYKFaQAK!4j1K

diff --git a/tests/data/acpi/q35/DSDT.tis.tpm12 b/tests/data/acpi/q35/DSDT.tis.tpm12
index 7a213e3db230064cedf3a30b83b11128286eaeba..5bc095351fd009fb2171daaa4f824c5cc9f36819 100644
GIT binary patch
delta 65
zcmX@$w$+WxCD<jzRGEQ+v3w&JpTuSpiCt`5&TcXB!A|i4-maT}$T_k|L^tsVyE(;k
V#5=kK@h~&UGl;MSIQxY#0037w5R?D_

delta 76
zcmdn$cEF9xCD<jzL79Pp@xeweJ_%`Qz4&0K_yA{5gXkvyU|%N#j(A6xARcB0d4|p6
e61&;BoLpl-Dg?Y-Hs6tRWMLO!3vl)eVE_OJ;S*K>

diff --git a/tests/data/acpi/q35/DSDT.tis.tpm2 b/tests/data/acpi/q35/DSDT.tis.tpm2
index b55e828c6397f80c14de82f371fa34553008a875..47417f47f7e25576f31207cb0b752b8c086a4480 100644
GIT binary patch
delta 65
zcmccRcHWK4CD<jzUzve{QFtR4pTuSpiCt`5zV0#c!A|i4uI`(E$VIbAL^tsVyE(;k
V#5=kK@h~&UGl;MSIQxY#003F<5T5`5

delta 76
zcmX@_cFT>+CD<h-N|}Lyv1TI|pM<ouUVN}qe1Nm3L39&;u&<K=N4%p;5DznhJi}&j
eiQQ~mK5j7}6#_19oA1a)v#^V>1vvYKFaQ7tbrWF#

diff --git a/tests/data/acpi/q35/DSDT.viot b/tests/data/acpi/q35/DSDT.viot
index a8a93fe70d8e98ec0e66278b45d36393b75740ec..574b8a0094c556cd8555b7a4e1b92b2d5f64750a 100644
GIT binary patch
delta 65
zcmdn)wZ@CfCD<iIN0otr@ySLmK8ejH68pKhTvcP@gPr09d{s98RWfFhh;HH!c5{m7
Vh<9`e;$dcxXAofvaP|vf003b*5VQaQ

delta 76
zcmZ4EwcU%$CD<jzT$O==(RU*kpM<ouUVN}qe1Nm3L39&;u&<K=N4%p;5DznhJi}&j
ei340*E-En~6#_oWn;$9}GqH=X1vvYKFaQAC!xDA?

diff --git a/tests/data/acpi/q35/DSDT.xapic b/tests/data/acpi/q35/DSDT.xapic
index 8211f5af8f9433b66b64768acb1de61a5716152a..74381116ad7f01a860fee9201df38d1ea24a0be6 100644
GIT binary patch
delta 67
zcmX>)ooUx}CN7s?myliE3=E8aH*)bwY&MaYSjgq57!x1t6ffYZu=#xFdq#=qCjMYI
Xr+AKdN0%TTW(Ii%5w-wlzYqoh?b#EU

delta 78
zcmdlro$2UwCN7s?myn~~3=E8E8@c!-q^0%ZgPr07oIMSqoA`r$oeVhQ9bJNWm>J|5
gHj7J4D&%rdhyke(@Q~lUx$`|Ey9ir=vtI}U0BHvmS^xk5

-- 
2.31.1



^ permalink raw reply related	[flat|nested] 18+ messages in thread

* Re: [PATCH 08/11] tests: acpi: update expected blobs
  2022-10-17 10:21 ` [PATCH 08/11] tests: acpi: update expected blobs Igor Mammedov
@ 2022-10-17 12:43   ` Ani Sinha
  2022-10-20 12:39     ` Igor Mammedov
  0 siblings, 1 reply; 18+ messages in thread
From: Ani Sinha @ 2022-10-17 12:43 UTC (permalink / raw)
  To: Igor Mammedov; +Cc: qemu-devel, mst

On Mon, Oct 17, 2022 at 3:52 PM Igor Mammedov <imammedo@redhat.com> wrote:
>
> Expected change in q35 tests:
>         @@ -2797,14 +2797,6 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC    ", 0x00000001)
>                  }
>              }
>
>         -    Scope (_SB.PCI0)
>         -    {
>         -        Device (SMB0)
>         -        {
>         -            Name (_ADR, 0x001F0003)  // _ADR: Address
>         -        }
>         -    }
>         -
>              Scope (_SB)
>              {
>                  Device (HPET)
>         @@ -3282,6 +3274,11 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC    ", 0x00000001)
>                          }
>                      }
>
>         +            Device (SFB)
>         +            {
>         +                Name (_ADR, 0x001F0003)  // _ADR: Address
>         +            }
>         +

Which code generates this hunk? Shouldn't this be "SMB0" for Device?

>                      Method (PCNT, 0, NotSerialized)
>                      {
>                      }
>
> Also for ipmismbus test, child 'Device (MI1)' of SMB0 will be moved along with it
>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
>  tests/qtest/bios-tables-test-allowed-diff.h |  21 --------------------
>  tests/data/acpi/q35/DSDT                    | Bin 8418 -> 8407 bytes
>  tests/data/acpi/q35/DSDT.acpierst           | Bin 8435 -> 8424 bytes
>  tests/data/acpi/q35/DSDT.acpihmat           | Bin 9743 -> 9732 bytes
>  tests/data/acpi/q35/DSDT.applesmc           | Bin 8464 -> 8453 bytes
>  tests/data/acpi/q35/DSDT.bridge             | Bin 11547 -> 11536 bytes
>  tests/data/acpi/q35/DSDT.cphp               | Bin 8882 -> 8871 bytes
>  tests/data/acpi/q35/DSDT.cxl                | Bin 9744 -> 9733 bytes
>  tests/data/acpi/q35/DSDT.dimmpxm            | Bin 10072 -> 10061 bytes
>  tests/data/acpi/q35/DSDT.ipmibt             | Bin 8493 -> 8482 bytes
>  tests/data/acpi/q35/DSDT.ipmismbus          | Bin 8507 -> 8495 bytes
>  tests/data/acpi/q35/DSDT.ivrs               | Bin 8435 -> 8424 bytes
>  tests/data/acpi/q35/DSDT.memhp              | Bin 9777 -> 9766 bytes
>  tests/data/acpi/q35/DSDT.mmio64             | Bin 9548 -> 9537 bytes
>  tests/data/acpi/q35/DSDT.multi-bridge       | Bin 8738 -> 8727 bytes
>  tests/data/acpi/q35/DSDT.nohpet             | Bin 8276 -> 8265 bytes
>  tests/data/acpi/q35/DSDT.numamem            | Bin 8424 -> 8413 bytes
>  tests/data/acpi/q35/DSDT.pvpanic-isa        | Bin 8519 -> 8508 bytes
>  tests/data/acpi/q35/DSDT.tis.tpm12          | Bin 9024 -> 9013 bytes
>  tests/data/acpi/q35/DSDT.tis.tpm2           | Bin 9050 -> 9039 bytes
>  tests/data/acpi/q35/DSDT.viot               | Bin 9527 -> 9516 bytes
>  tests/data/acpi/q35/DSDT.xapic              | Bin 35781 -> 35770 bytes
>  22 files changed, 21 deletions(-)
>
> diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
> index fd5852776c..dfb8523c8b 100644
> --- a/tests/qtest/bios-tables-test-allowed-diff.h
> +++ b/tests/qtest/bios-tables-test-allowed-diff.h
> @@ -1,22 +1 @@
>  /* List of comma-separated changed AML files to ignore */
> -"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.nohpet",
> -"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/q35/DSDT b/tests/data/acpi/q35/DSDT
> index ea35dc5eba8433a8dcb54815f19ed6239f2534e7..c8a2b5df26608f10c75ab8f2f9e404fda987891b 100644
> GIT binary patch
> delta 65
> zcmaFlc-@i9CD<k8x&i|Oqx(iKK8ejH66@Hw92H~YgPr09JQX&-k$cZ55#7We?B*2D
> V5%1^{#KX)W&mh7U;OrN|004sf5rO~!
>
> delta 76
> zcmcca_{fpVCD<k8kpcq)<A#k~d=k>qdhx+d@d3`B2GLFY!M;ug9Py4WK|IV1@(i2B
> eCDyZXIVi+{R0w#;Z@wV+o{?RIEx_3?gaH6HQWQi0
>
> diff --git a/tests/data/acpi/q35/DSDT.acpierst b/tests/data/acpi/q35/DSDT.acpierst
> index 146269c68c68238a8be3aa67e049a85c0b8edc66..eb63e439b92424e4c50b7e5f1df92da54ecfc6ea 100644
> GIT binary patch
> delta 64
> zcmezD_`;FPCD<k8g#rTu<MWMNd=i^YB-XKUIVr`&2Rp?JcquM^BgZ5W-NYa4<`mBn
> U@8}Z5!^|MhAi@^l>=(iS0Ek8rTL1t6
>
> delta 75
> zcmaFi_}P)mCD<k8vjPJHW57l(J_%`Qz4&0K_yA{5gXkvyU|%N#j(A6xARcB0d4|p6
> d66@Kx92H|gDg-<g7GIEKVi#cxaP|vf000r=6CD5m
>
> diff --git a/tests/data/acpi/q35/DSDT.acpihmat b/tests/data/acpi/q35/DSDT.acpihmat
> index 4dd420b62fbcfdd21485fec2bafdea54f3fdb5a8..f9199a0dd614b30c9e73eb7de7e051ce84c1d73f 100644
> GIT binary patch
> delta 65
> zcmeD8Y4PE533dr#QDb0WWZuZdC$ZT?;x;#zqhd^auv5H%r^04QmG_Ji(M|lpZcgzW
> U@s2J*Jj@L83?gg+&VC^b02Q4NMgRZ+
>
> delta 76
> zcmZqi>G$Ds33dtLS7Tsc%-P7rCm}7Z7a!~tAK>h15Z%Nd?CWH}5%1^{#KX)W&#+ls
> d;tn^LgF*~Qg@A|r=D*7C8QDeH0-XIq7y!*W69)hQ
>
> diff --git a/tests/data/acpi/q35/DSDT.applesmc b/tests/data/acpi/q35/DSDT.applesmc
> index ff25d82ba24b5e792b9d87958aa1b162bc9e0de2..286a4ecec273ca0e2fe2d65f80e8566a68a2f794 100644
> GIT binary patch
> delta 65
> zcmbQ>)au0L66_Mfs>r~=D6x@?Phzu)#5y)Ef906?V5fKicje7*<Ybv7qMP`G-JIe%
> U;vHRrc$gXF8AR9uoc%%=01xsHAOHXW
>
> delta 76
> zcmZp5n&8Cc66_Kppvb_$*tn64PeNK+FFx2QKET=2Ai9Y^*w@K`Bi_*^h=-X$o?)}N
> d#CkR^KcyIu3IR8z%@^cknb<|x0-XIq7y!Nm5#j&<
>
> diff --git a/tests/data/acpi/q35/DSDT.bridge b/tests/data/acpi/q35/DSDT.bridge
> index bde84efd1c5fcafee789781f4030d573002a886a..9a733a54e428d3506aaf73f8d4c1f28324a71a42 100644
> GIT binary patch
> delta 75
> zcmbOoH6e=2CD<iIK$n4m@!Li&K8ejH66@Hwyq?6w2Rp?JI6c|?Mox}TDY}V2*v%=P
> dBi_*^h=-X$o<T$)z}YW^Ax<yY&>$Yf1OQ7T6vzMo
>
> delta 86
> zcmbObH9LySCD<iIT9<)=F@7T#pM<ouUVN}qe1Nm3L39&;u&<K=N4%p;5DznhJi}&j
> niS=w;o{wWdDg+!KZ@wTW$0sNv5a8?=!VsqyY-j+~=NAG1zta|q
>
> diff --git a/tests/data/acpi/q35/DSDT.cphp b/tests/data/acpi/q35/DSDT.cphp
> index 537be7ca37c021e6a7f098e88c40ba178f3ec3e2..8579626c7f1f035c8d400544c2af6ce6372a5625 100644
> GIT binary patch
> delta 65
> zcmdnwy4;n^CD<ioxe@~d<LZrEd=i^YB<eW092H~YgPr09JQX(YQFzZN5#7We?B*2D
> V5%1^{#KX)W&mh7U;OrN|003#(5d;7L
>
> delta 76
> zcmZ4Py2+KxCD<iolM(|1qsT@sJ_%`Qz4&0K_yA{5gXkvyU|%N#j(A6xARcB0d4|p6
> e67?Kh4hk_K6#^den-?g&XJi*)3vl)eVE_Q*#}dW>
>
> diff --git a/tests/data/acpi/q35/DSDT.cxl b/tests/data/acpi/q35/DSDT.cxl
> index aeea64d1cecad0ad011870ed5e04bfea1ae62510..96594c00b3b0e0a4933d6d851d927487ad4d18eb 100644
> GIT binary patch
> delta 65
> zcmbQ>)9S<J66_Mfs>Z;;Xupw*Phzu)#4c_wXXTjqV5fKiZ>7yYlm(e2qMP`G-JIe%
> U;vHRrc$gXF8AR9uoc%%=03WdrZ2$lO
>
> delta 76
> zcmZqmnc&0a66_KppvJ(!xMCw0pM<ouUVN}qe1Nm3L39&;u&<K=N4%p;5DznhJi}&j
> eiQU{>PD(K#6#`z0o9`$KGO>%W1vvYKFaQA0rV=jz
>
> diff --git a/tests/data/acpi/q35/DSDT.dimmpxm b/tests/data/acpi/q35/DSDT.dimmpxm
> index ed11aefa4a56a8408bd4e0de83bf2373e6025449..e2a3ecf7d90c8c411550505c3b70bf8d19ba4bc9 100644
> GIT binary patch
> delta 65
> zcmccNch--~CD<jzSDk@@amq$6K8ejH5-Pl0j*2ny!A|i4o(h|jRNpg7L^tsVyE(;k
> V#5=kK@h~&UGl;MSIQxY#002@W5KI67
>
> delta 76
> zcmX@>cf*g%CD<h-LY;wu@$W`1J_%`Qz4&0K_yA{5gXkvyU|%N#j(A6xARcB0d4|p6
> e5~{ph4hk_K6#^deo8463GqQ`Y1vvYKFaQ7)&=U>-
>
> diff --git a/tests/data/acpi/q35/DSDT.ipmibt b/tests/data/acpi/q35/DSDT.ipmibt
> index d9d1e75c987acd42be4576688621be07b21f0e7b..427272b95692099edc47f569e41fbb3ba69f6b60 100644
> GIT binary patch
> delta 65
> zcmZ4Mw8)9eCD<iINs)npF=itdpTuSpiFIsTKB_VC!A|i4E~=Z~$XPK-L^tsVyE(;k
> V#5=kK@h~&UGl;MSIQxY#001=^57qzx
>
> delta 76
> zcmZ4FwAP8sCD<iISCN5%@#sb_J_%`Qz4&0K_yA{5gXkvyU|%N#j(A6xARcB0d4|p6
> e66@Kxyj5aADg>NWHeZmlVqzCz3vl)eVE_Q=2@;q9
>
> diff --git a/tests/data/acpi/q35/DSDT.ipmismbus b/tests/data/acpi/q35/DSDT.ipmismbus
> index f6e124137721312722c820b5c084a143492945c9..794779e75aaf33902de834caaa6b0763c4513615 100644
> GIT binary patch
> delta 61
> zcmdn(wBCu!CD<iIUy*@<@%2V7K8ek}66@HwJk?_2gPr099Mv|v%D-pih;DLc3wCpg
> RpR6sB$S%Sb;OrN|001n-5byv1
>
> delta 72
> zcmZ4QwA+cxCD<jzT9JW)QEwv`pM<aryIy>-Q+$B4r$Ka+J6o`?lfmTU3W=M=CDyZX
> aIVi+{Bn3R=H(!u@&&V#q7U1j`!T<onCKIFp
>
> diff --git a/tests/data/acpi/q35/DSDT.ivrs b/tests/data/acpi/q35/DSDT.ivrs
> index 146269c68c68238a8be3aa67e049a85c0b8edc66..eb63e439b92424e4c50b7e5f1df92da54ecfc6ea 100644
> GIT binary patch
> delta 64
> zcmezD_`;FPCD<k8g#rTu<MWMNd=i^YB-XKUIVr`&2Rp?JcquM^BgZ5W-NYa4<`mBn
> U@8}Z5!^|MhAi@^l>=(iS0Ek8rTL1t6
>
> delta 75
> zcmaFi_}P)mCD<k8vjPJHW57l(J_%`Qz4&0K_yA{5gXkvyU|%N#j(A6xARcB0d4|p6
> d66@Kx92H|gDg-<g7GIEKVi#cxaP|vf000r=6CD5m
>
> diff --git a/tests/data/acpi/q35/DSDT.memhp b/tests/data/acpi/q35/DSDT.memhp
> index 3e79ba7ac0b9a466fddd2213f32d20c522b8613b..923e213ab6a3c82faa6f659c29de9c8afb6878dd 100644
> GIT binary patch
> delta 65
> zcmdn!v&@IfCD<iIO^tzp(PASPpTuSpiND-jj*2ny!A|i4o(h|-Ro*j7L^tsVyE(;k
> V#5=kK@h~&UGl;MSIQxY#002TP5G4Qr
>
> delta 76
> zcmZ4Hv(bmkCD<jzP>q3sap6WTJ_%`Qz4&0K_yA{5gXkvyU|%N#j(A6xARcB0d4|p6
> e692fl928<eDg->_H_NNMXJi*)3vl)eVE_Q{`4Z;<
>
> diff --git a/tests/data/acpi/q35/DSDT.mmio64 b/tests/data/acpi/q35/DSDT.mmio64
> index afc260ebf4d91a2a9f7be5ff21968e99b1f9c5d1..a77aa37ca0bb407abbef134e8dce4461070856a2 100644
> GIT binary patch
> delta 64
> zcmX@(b<m5;CD<jzQI&y#@ykXoK8ejH671YuPD(NH!A|i4UW$udm6;@>oA`s>oZ>m+
> T9bJNWm>J|5MA!nH{X!T3EYS}}
>
> delta 75
> zcmX@;b;gU!CD<jzN0otrF?J&tpM<ouUVN}qe1Nm3L39&;u&<K=N4%p;5DznhJi}&j
> c2@Y;9N5vSB3IR`r#hS`Y>>_Ld&VC^b0K(`I2mk;8
>
> diff --git a/tests/data/acpi/q35/DSDT.multi-bridge b/tests/data/acpi/q35/DSDT.multi-bridge
> index 7c14ce3a986fa06e88f3adc088faae54bdd2d8e4..43469e6c89813025b902534ed61d39ad940ff7bb 100644
> GIT binary patch
> delta 85
> zcmZ4FGTnvCCD<iIT#12!apOiVK8ejH66@Hw98F{5gPr09JWV#gk&|ZDiEiQ#c5{m7
> hh<9`e;$dcxXAqGJaP|vfh|>!;w2TKaK`a9>3jo0872^N^
>
> delta 72
> zcmbR4vdD$YCD<iINr{1hQEDR>pM<ouUVN}qe1Nm3L39&;u&<K=N4%p;5DznhJi}&j
> aiS=w;4kj@m6#^c{n=i;oGf)1bC=CF0xDr7C
>
> diff --git a/tests/data/acpi/q35/DSDT.nohpet b/tests/data/acpi/q35/DSDT.nohpet
> index 60595f55fc72397e3ed9b1999dddd39cd98f89a8..e17b252b03b290ba39601afffbee66159a57bfb1 100644
> GIT binary patch
> delta 65
> zcmccOaMFRxCD<jzQ-OhjQD7q%pTuSp2?aJTN5z=<V5fKiPle5Ka_<=>qMP`G-JIe%
> U;vHRrc$gXF8AR9uoc%%=04azMg8%>k
>
> delta 76
> zcmX@<aK(YkCD<h-M1g^Uv2r69pM<ouUVN}qe1Nm3L39&;u&<K=N4%p;5DznhJi}&j
> d2}L$82Zb1r3IPxK%}#Rf8QDeH0-XIq7y#w#5=8(2
>
> diff --git a/tests/data/acpi/q35/DSDT.numamem b/tests/data/acpi/q35/DSDT.numamem
> index 68e67eb91097c58365e3734c9b35d32796639d54..ade716519de8bd626b3cddee686f55757bb4eb35 100644
> GIT binary patch
> delta 65
> zcmaFic-N83CD<k8t^xxC<HwC$d=i^YB(|_|IV#4)2Rp?Jcq(lEB=??CBD#q`*v%=P
> VBi_*^h=-X$o<W2yz}YW^0RXDm5=sC7
>
> delta 76
> zcmccX_`;FPCD<k8g#rTuW7I}2J_%`Qz4&0K_yA{5gXkvyU|%N#j(A6xARcB0d4|p6
> e5?k50928<eDg->_H(!%`&&V#q7U1j`!T<m#coYl(
>
> diff --git a/tests/data/acpi/q35/DSDT.pvpanic-isa b/tests/data/acpi/q35/DSDT.pvpanic-isa
> index 811cd27c7e7366e61683c7c5ef67f0996f395c25..b6740b1ec2f4e01bdbdc34bc8bf0a2c36f134671 100644
> GIT binary patch
> delta 65
> zcmX@^w8x3dCD<jzMv;Mm@zq8yK8ejH66@Hw+|*;@gPr09{M0tTkqcpxh;HH!c5{m7
> Vh<9`e;$dcxXAofvaP|vf003u>5Yqqv
>
> delta 76
> zcmdnvbli!{CD<jzU6Fx-F?b^vpM<ouUVN}qe1Nm3L39&;u&<K=N4%p;5DznhJi}&j
> eiS=w;u4*wL6#~Ahn=i<PFtLlU1vvYKFaQAK!4j1K
>
> diff --git a/tests/data/acpi/q35/DSDT.tis.tpm12 b/tests/data/acpi/q35/DSDT.tis.tpm12
> index 7a213e3db230064cedf3a30b83b11128286eaeba..5bc095351fd009fb2171daaa4f824c5cc9f36819 100644
> GIT binary patch
> delta 65
> zcmX@$w$+WxCD<jzRGEQ+v3w&JpTuSpiCt`5&TcXB!A|i4-maT}$T_k|L^tsVyE(;k
> V#5=kK@h~&UGl;MSIQxY#0037w5R?D_
>
> delta 76
> zcmdn$cEF9xCD<jzL79Pp@xeweJ_%`Qz4&0K_yA{5gXkvyU|%N#j(A6xARcB0d4|p6
> e61&;BoLpl-Dg?Y-Hs6tRWMLO!3vl)eVE_OJ;S*K>
>
> diff --git a/tests/data/acpi/q35/DSDT.tis.tpm2 b/tests/data/acpi/q35/DSDT.tis.tpm2
> index b55e828c6397f80c14de82f371fa34553008a875..47417f47f7e25576f31207cb0b752b8c086a4480 100644
> GIT binary patch
> delta 65
> zcmccRcHWK4CD<jzUzve{QFtR4pTuSpiCt`5zV0#c!A|i4uI`(E$VIbAL^tsVyE(;k
> V#5=kK@h~&UGl;MSIQxY#003F<5T5`5
>
> delta 76
> zcmX@_cFT>+CD<h-N|}Lyv1TI|pM<ouUVN}qe1Nm3L39&;u&<K=N4%p;5DznhJi}&j
> eiQQ~mK5j7}6#_19oA1a)v#^V>1vvYKFaQ7tbrWF#
>
> diff --git a/tests/data/acpi/q35/DSDT.viot b/tests/data/acpi/q35/DSDT.viot
> index a8a93fe70d8e98ec0e66278b45d36393b75740ec..574b8a0094c556cd8555b7a4e1b92b2d5f64750a 100644
> GIT binary patch
> delta 65
> zcmdn)wZ@CfCD<iIN0otr@ySLmK8ejH68pKhTvcP@gPr09d{s98RWfFhh;HH!c5{m7
> Vh<9`e;$dcxXAofvaP|vf003b*5VQaQ
>
> delta 76
> zcmZ4EwcU%$CD<jzT$O==(RU*kpM<ouUVN}qe1Nm3L39&;u&<K=N4%p;5DznhJi}&j
> ei340*E-En~6#_oWn;$9}GqH=X1vvYKFaQAC!xDA?
>
> diff --git a/tests/data/acpi/q35/DSDT.xapic b/tests/data/acpi/q35/DSDT.xapic
> index 8211f5af8f9433b66b64768acb1de61a5716152a..74381116ad7f01a860fee9201df38d1ea24a0be6 100644
> GIT binary patch
> delta 67
> zcmX>)ooUx}CN7s?myliE3=E8aH*)bwY&MaYSjgq57!x1t6ffYZu=#xFdq#=qCjMYI
> Xr+AKdN0%TTW(Ii%5w-wlzYqoh?b#EU
>
> delta 78
> zcmdlro$2UwCN7s?myn~~3=E8E8@c!-q^0%ZgPr07oIMSqoA`r$oeVhQ9bJNWm>J|5
> gHj7J4D&%rdhyke(@Q~lUx$`|Ey9ir=vtI}U0BHvmS^xk5
>
> --
> 2.31.1
>


^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PATCH 08/11] tests: acpi: update expected blobs
  2022-10-17 12:43   ` Ani Sinha
@ 2022-10-20 12:39     ` Igor Mammedov
  0 siblings, 0 replies; 18+ messages in thread
From: Igor Mammedov @ 2022-10-20 12:39 UTC (permalink / raw)
  To: Ani Sinha; +Cc: qemu-devel, mst

On Mon, 17 Oct 2022 18:13:14 +0530
Ani Sinha <ani@anisinha.ca> wrote:

> On Mon, Oct 17, 2022 at 3:52 PM Igor Mammedov <imammedo@redhat.com> wrote:
> >
> > Expected change in q35 tests:
> >         @@ -2797,14 +2797,6 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC    ", 0x00000001)
> >                  }
> >              }
> >
> >         -    Scope (_SB.PCI0)
> >         -    {
> >         -        Device (SMB0)
> >         -        {
> >         -            Name (_ADR, 0x001F0003)  // _ADR: Address
> >         -        }
> >         -    }
> >         -
> >              Scope (_SB)
> >              {
> >                  Device (HPET)
> >         @@ -3282,6 +3274,11 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC    ", 0x00000001)
> >                          }
> >                      }
> >
> >         +            Device (SFB)
> >         +            {
> >         +                Name (_ADR, 0x001F0003)  // _ADR: Address
> >         +            }
> >         +  
> 
> Which code generates this hunk? Shouldn't this be "SMB0" for Device?
There is no point in trying to keep SMB0 name

it's done by build_append_pci_bus_devices() like for any other PCI device.
  
        /* start to compose PCI device descriptor */                             
        dev = aml_device("S%.02X", devfn);                                       
        aml_append(dev, aml_name_decl("_ADR", aml_int(adr)));   



> 
> >                      Method (PCNT, 0, NotSerialized)
> >                      {
> >                      }
> >
> > Also for ipmismbus test, child 'Device (MI1)' of SMB0 will be moved along with it
> >
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > ---
> >  tests/qtest/bios-tables-test-allowed-diff.h |  21 --------------------
> >  tests/data/acpi/q35/DSDT                    | Bin 8418 -> 8407 bytes
> >  tests/data/acpi/q35/DSDT.acpierst           | Bin 8435 -> 8424 bytes
> >  tests/data/acpi/q35/DSDT.acpihmat           | Bin 9743 -> 9732 bytes
> >  tests/data/acpi/q35/DSDT.applesmc           | Bin 8464 -> 8453 bytes
> >  tests/data/acpi/q35/DSDT.bridge             | Bin 11547 -> 11536 bytes
> >  tests/data/acpi/q35/DSDT.cphp               | Bin 8882 -> 8871 bytes
> >  tests/data/acpi/q35/DSDT.cxl                | Bin 9744 -> 9733 bytes
> >  tests/data/acpi/q35/DSDT.dimmpxm            | Bin 10072 -> 10061 bytes
> >  tests/data/acpi/q35/DSDT.ipmibt             | Bin 8493 -> 8482 bytes
> >  tests/data/acpi/q35/DSDT.ipmismbus          | Bin 8507 -> 8495 bytes
> >  tests/data/acpi/q35/DSDT.ivrs               | Bin 8435 -> 8424 bytes
> >  tests/data/acpi/q35/DSDT.memhp              | Bin 9777 -> 9766 bytes
> >  tests/data/acpi/q35/DSDT.mmio64             | Bin 9548 -> 9537 bytes
> >  tests/data/acpi/q35/DSDT.multi-bridge       | Bin 8738 -> 8727 bytes
> >  tests/data/acpi/q35/DSDT.nohpet             | Bin 8276 -> 8265 bytes
> >  tests/data/acpi/q35/DSDT.numamem            | Bin 8424 -> 8413 bytes
> >  tests/data/acpi/q35/DSDT.pvpanic-isa        | Bin 8519 -> 8508 bytes
> >  tests/data/acpi/q35/DSDT.tis.tpm12          | Bin 9024 -> 9013 bytes
> >  tests/data/acpi/q35/DSDT.tis.tpm2           | Bin 9050 -> 9039 bytes
> >  tests/data/acpi/q35/DSDT.viot               | Bin 9527 -> 9516 bytes
> >  tests/data/acpi/q35/DSDT.xapic              | Bin 35781 -> 35770 bytes
> >  22 files changed, 21 deletions(-)
> >
> > diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
> > index fd5852776c..dfb8523c8b 100644
> > --- a/tests/qtest/bios-tables-test-allowed-diff.h
> > +++ b/tests/qtest/bios-tables-test-allowed-diff.h
> > @@ -1,22 +1 @@
> >  /* List of comma-separated changed AML files to ignore */
> > -"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.nohpet",
> > -"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/q35/DSDT b/tests/data/acpi/q35/DSDT
> > index ea35dc5eba8433a8dcb54815f19ed6239f2534e7..c8a2b5df26608f10c75ab8f2f9e404fda987891b 100644
> > GIT binary patch
> > delta 65
> > zcmaFlc-@i9CD<k8x&i|Oqx(iKK8ejH66@Hw92H~YgPr09JQX&-k$cZ55#7We?B*2D
> > V5%1^{#KX)W&mh7U;OrN|004sf5rO~!
> >
> > delta 76
> > zcmcca_{fpVCD<k8kpcq)<A#k~d=k>qdhx+d@d3`B2GLFY!M;ug9Py4WK|IV1@(i2B
> > eCDyZXIVi+{R0w#;Z@wV+o{?RIEx_3?gaH6HQWQi0
> >
> > diff --git a/tests/data/acpi/q35/DSDT.acpierst b/tests/data/acpi/q35/DSDT.acpierst
> > index 146269c68c68238a8be3aa67e049a85c0b8edc66..eb63e439b92424e4c50b7e5f1df92da54ecfc6ea 100644
> > GIT binary patch
> > delta 64
> > zcmezD_`;FPCD<k8g#rTu<MWMNd=i^YB-XKUIVr`&2Rp?JcquM^BgZ5W-NYa4<`mBn  
> > U@8}Z5!^|MhAi@^l>=(iS0Ek8rTL1t6  
> >
> > delta 75
> > zcmaFi_}P)mCD<k8vjPJHW57l(J_%`Qz4&0K_yA{5gXkvyU|%N#j(A6xARcB0d4|p6
> > d66@Kx92H|gDg-<g7GIEKVi#cxaP|vf000r=6CD5m
> >
> > diff --git a/tests/data/acpi/q35/DSDT.acpihmat b/tests/data/acpi/q35/DSDT.acpihmat
> > index 4dd420b62fbcfdd21485fec2bafdea54f3fdb5a8..f9199a0dd614b30c9e73eb7de7e051ce84c1d73f 100644
> > GIT binary patch
> > delta 65
> > zcmeD8Y4PE533dr#QDb0WWZuZdC$ZT?;x;#zqhd^auv5H%r^04QmG_Ji(M|lpZcgzW
> > U@s2J*Jj@L83?gg+&VC^b02Q4NMgRZ+
> >
> > delta 76  
> > zcmZqi>G$Ds33dtLS7Tsc%-P7rCm}7Z7a!~tAK>h15Z%Nd?CWH}5%1^{#KX)W&#+ls  
> > d;tn^LgF*~Qg@A|r=D*7C8QDeH0-XIq7y!*W69)hQ
> >
> > diff --git a/tests/data/acpi/q35/DSDT.applesmc b/tests/data/acpi/q35/DSDT.applesmc
> > index ff25d82ba24b5e792b9d87958aa1b162bc9e0de2..286a4ecec273ca0e2fe2d65f80e8566a68a2f794 100644
> > GIT binary patch
> > delta 65  
> > zcmbQ>)au0L66_Mfs>r~=D6x@?Phzu)#5y)Ef906?V5fKicje7*<Ybv7qMP`G-JIe%  
> > U;vHRrc$gXF8AR9uoc%%=01xsHAOHXW
> >
> > delta 76
> > zcmZp5n&8Cc66_Kppvb_$*tn64PeNK+FFx2QKET=2Ai9Y^*w@K`Bi_*^h=-X$o?)}N
> > d#CkR^KcyIu3IR8z%@^cknb<|x0-XIq7y!Nm5#j&<
> >
> > diff --git a/tests/data/acpi/q35/DSDT.bridge b/tests/data/acpi/q35/DSDT.bridge
> > index bde84efd1c5fcafee789781f4030d573002a886a..9a733a54e428d3506aaf73f8d4c1f28324a71a42 100644
> > GIT binary patch
> > delta 75
> > zcmbOoH6e=2CD<iIK$n4m@!Li&K8ejH66@Hwyq?6w2Rp?JI6c|?Mox}TDY}V2*v%=P
> > dBi_*^h=-X$o<T$)z}YW^Ax<yY&>$Yf1OQ7T6vzMo
> >
> > delta 86
> > zcmbObH9LySCD<iIT9<)=F@7T#pM<ouUVN}qe1Nm3L39&;u&<K=N4%p;5DznhJi}&j
> > niS=w;o{wWdDg+!KZ@wTW$0sNv5a8?=!VsqyY-j+~=NAG1zta|q
> >
> > diff --git a/tests/data/acpi/q35/DSDT.cphp b/tests/data/acpi/q35/DSDT.cphp
> > index 537be7ca37c021e6a7f098e88c40ba178f3ec3e2..8579626c7f1f035c8d400544c2af6ce6372a5625 100644
> > GIT binary patch
> > delta 65
> > zcmdnwy4;n^CD<ioxe@~d<LZrEd=i^YB<eW092H~YgPr09JQX(YQFzZN5#7We?B*2D
> > V5%1^{#KX)W&mh7U;OrN|003#(5d;7L
> >
> > delta 76
> > zcmZ4Py2+KxCD<iolM(|1qsT@sJ_%`Qz4&0K_yA{5gXkvyU|%N#j(A6xARcB0d4|p6
> > e67?Kh4hk_K6#^den-?g&XJi*)3vl)eVE_Q*#}dW>
> >
> > diff --git a/tests/data/acpi/q35/DSDT.cxl b/tests/data/acpi/q35/DSDT.cxl
> > index aeea64d1cecad0ad011870ed5e04bfea1ae62510..96594c00b3b0e0a4933d6d851d927487ad4d18eb 100644
> > GIT binary patch
> > delta 65  
> > zcmbQ>)9S<J66_Mfs>Z;;Xupw*Phzu)#4c_wXXTjqV5fKiZ>7yYlm(e2qMP`G-JIe%  
> > U;vHRrc$gXF8AR9uoc%%=03WdrZ2$lO
> >
> > delta 76
> > zcmZqmnc&0a66_KppvJ(!xMCw0pM<ouUVN}qe1Nm3L39&;u&<K=N4%p;5DznhJi}&j  
> > eiQU{>PD(K#6#`z0o9`$KGO>%W1vvYKFaQA0rV=jz  
> >
> > diff --git a/tests/data/acpi/q35/DSDT.dimmpxm b/tests/data/acpi/q35/DSDT.dimmpxm
> > index ed11aefa4a56a8408bd4e0de83bf2373e6025449..e2a3ecf7d90c8c411550505c3b70bf8d19ba4bc9 100644
> > GIT binary patch
> > delta 65
> > zcmccNch--~CD<jzSDk@@amq$6K8ejH5-Pl0j*2ny!A|i4o(h|jRNpg7L^tsVyE(;k
> > V#5=kK@h~&UGl;MSIQxY#002@W5KI67
> >
> > delta 76  
> > zcmX@>cf*g%CD<h-LY;wu@$W`1J_%`Qz4&0K_yA{5gXkvyU|%N#j(A6xARcB0d4|p6
> > e5~{ph4hk_K6#^deo8463GqQ`Y1vvYKFaQ7)&=U>-  
> >
> > diff --git a/tests/data/acpi/q35/DSDT.ipmibt b/tests/data/acpi/q35/DSDT.ipmibt
> > index d9d1e75c987acd42be4576688621be07b21f0e7b..427272b95692099edc47f569e41fbb3ba69f6b60 100644
> > GIT binary patch
> > delta 65
> > zcmZ4Mw8)9eCD<iINs)npF=itdpTuSpiFIsTKB_VC!A|i4E~=Z~$XPK-L^tsVyE(;k
> > V#5=kK@h~&UGl;MSIQxY#001=^57qzx
> >
> > delta 76
> > zcmZ4FwAP8sCD<iISCN5%@#sb_J_%`Qz4&0K_yA{5gXkvyU|%N#j(A6xARcB0d4|p6  
> > e66@Kxyj5aADg>NWHeZmlVqzCz3vl)eVE_Q=2@;q9  
> >
> > diff --git a/tests/data/acpi/q35/DSDT.ipmismbus b/tests/data/acpi/q35/DSDT.ipmismbus
> > index f6e124137721312722c820b5c084a143492945c9..794779e75aaf33902de834caaa6b0763c4513615 100644
> > GIT binary patch
> > delta 61
> > zcmdn(wBCu!CD<iIUy*@<@%2V7K8ek}66@HwJk?_2gPr099Mv|v%D-pih;DLc3wCpg
> > RpR6sB$S%Sb;OrN|001n-5byv1
> >
> > delta 72
> > zcmZ4QwA+cxCD<jzT9JW)QEwv`pM<aryIy>-Q+$B4r$Ka+J6o`?lfmTU3W=M=CDyZX
> > aIVi+{Bn3R=H(!u@&&V#q7U1j`!T<onCKIFp
> >
> > diff --git a/tests/data/acpi/q35/DSDT.ivrs b/tests/data/acpi/q35/DSDT.ivrs
> > index 146269c68c68238a8be3aa67e049a85c0b8edc66..eb63e439b92424e4c50b7e5f1df92da54ecfc6ea 100644
> > GIT binary patch
> > delta 64
> > zcmezD_`;FPCD<k8g#rTu<MWMNd=i^YB-XKUIVr`&2Rp?JcquM^BgZ5W-NYa4<`mBn  
> > U@8}Z5!^|MhAi@^l>=(iS0Ek8rTL1t6  
> >
> > delta 75
> > zcmaFi_}P)mCD<k8vjPJHW57l(J_%`Qz4&0K_yA{5gXkvyU|%N#j(A6xARcB0d4|p6
> > d66@Kx92H|gDg-<g7GIEKVi#cxaP|vf000r=6CD5m
> >
> > diff --git a/tests/data/acpi/q35/DSDT.memhp b/tests/data/acpi/q35/DSDT.memhp
> > index 3e79ba7ac0b9a466fddd2213f32d20c522b8613b..923e213ab6a3c82faa6f659c29de9c8afb6878dd 100644
> > GIT binary patch
> > delta 65
> > zcmdn!v&@IfCD<iIO^tzp(PASPpTuSpiND-jj*2ny!A|i4o(h|-Ro*j7L^tsVyE(;k
> > V#5=kK@h~&UGl;MSIQxY#002TP5G4Qr
> >
> > delta 76
> > zcmZ4Hv(bmkCD<jzP>q3sap6WTJ_%`Qz4&0K_yA{5gXkvyU|%N#j(A6xARcB0d4|p6
> > e692fl928<eDg->_H_NNMXJi*)3vl)eVE_Q{`4Z;<
> >
> > diff --git a/tests/data/acpi/q35/DSDT.mmio64 b/tests/data/acpi/q35/DSDT.mmio64
> > index afc260ebf4d91a2a9f7be5ff21968e99b1f9c5d1..a77aa37ca0bb407abbef134e8dce4461070856a2 100644
> > GIT binary patch
> > delta 64
> > zcmX@(b<m5;CD<jzQI&y#@ykXoK8ejH671YuPD(NH!A|i4UW$udm6;@>oA`s>oZ>m+  
> > T9bJNWm>J|5MA!nH{X!T3EYS}}  
> >
> > delta 75
> > zcmX@;b;gU!CD<jzN0otrF?J&tpM<ouUVN}qe1Nm3L39&;u&<K=N4%p;5DznhJi}&j  
> > c2@Y;9N5vSB3IR`r#hS`Y>>_Ld&VC^b0K(`I2mk;8  
> >
> > diff --git a/tests/data/acpi/q35/DSDT.multi-bridge b/tests/data/acpi/q35/DSDT.multi-bridge
> > index 7c14ce3a986fa06e88f3adc088faae54bdd2d8e4..43469e6c89813025b902534ed61d39ad940ff7bb 100644
> > GIT binary patch
> > delta 85
> > zcmZ4FGTnvCCD<iIT#12!apOiVK8ejH66@Hw98F{5gPr09JWV#gk&|ZDiEiQ#c5{m7
> > hh<9`e;$dcxXAqGJaP|vfh|>!;w2TKaK`a9>3jo0872^N^
> >
> > delta 72
> > zcmbR4vdD$YCD<iINr{1hQEDR>pM<ouUVN}qe1Nm3L39&;u&<K=N4%p;5DznhJi}&j
> > aiS=w;4kj@m6#^c{n=i;oGf)1bC=CF0xDr7C
> >
> > diff --git a/tests/data/acpi/q35/DSDT.nohpet b/tests/data/acpi/q35/DSDT.nohpet
> > index 60595f55fc72397e3ed9b1999dddd39cd98f89a8..e17b252b03b290ba39601afffbee66159a57bfb1 100644
> > GIT binary patch
> > delta 65
> > zcmccOaMFRxCD<jzQ-OhjQD7q%pTuSp2?aJTN5z=<V5fKiPle5Ka_<=>qMP`G-JIe%  
> > U;vHRrc$gXF8AR9uoc%%=04azMg8%>k  
> >
> > delta 76
> > zcmX@<aK(YkCD<h-M1g^Uv2r69pM<ouUVN}qe1Nm3L39&;u&<K=N4%p;5DznhJi}&j
> > d2}L$82Zb1r3IPxK%}#Rf8QDeH0-XIq7y#w#5=8(2
> >
> > diff --git a/tests/data/acpi/q35/DSDT.numamem b/tests/data/acpi/q35/DSDT.numamem
> > index 68e67eb91097c58365e3734c9b35d32796639d54..ade716519de8bd626b3cddee686f55757bb4eb35 100644
> > GIT binary patch
> > delta 65
> > zcmaFic-N83CD<k8t^xxC<HwC$d=i^YB(|_|IV#4)2Rp?Jcq(lEB=??CBD#q`*v%=P
> > VBi_*^h=-X$o<W2yz}YW^0RXDm5=sC7
> >
> > delta 76
> > zcmccX_`;FPCD<k8g#rTuW7I}2J_%`Qz4&0K_yA{5gXkvyU|%N#j(A6xARcB0d4|p6
> > e5?k50928<eDg->_H(!%`&&V#q7U1j`!T<m#coYl(
> >
> > diff --git a/tests/data/acpi/q35/DSDT.pvpanic-isa b/tests/data/acpi/q35/DSDT.pvpanic-isa
> > index 811cd27c7e7366e61683c7c5ef67f0996f395c25..b6740b1ec2f4e01bdbdc34bc8bf0a2c36f134671 100644
> > GIT binary patch
> > delta 65
> > zcmX@^w8x3dCD<jzMv;Mm@zq8yK8ejH66@Hw+|*;@gPr09{M0tTkqcpxh;HH!c5{m7
> > Vh<9`e;$dcxXAofvaP|vf003u>5Yqqv
> >
> > delta 76
> > zcmdnvbli!{CD<jzU6Fx-F?b^vpM<ouUVN}qe1Nm3L39&;u&<K=N4%p;5DznhJi}&j
> > eiS=w;u4*wL6#~Ahn=i<PFtLlU1vvYKFaQAK!4j1K
> >
> > diff --git a/tests/data/acpi/q35/DSDT.tis.tpm12 b/tests/data/acpi/q35/DSDT.tis.tpm12
> > index 7a213e3db230064cedf3a30b83b11128286eaeba..5bc095351fd009fb2171daaa4f824c5cc9f36819 100644
> > GIT binary patch
> > delta 65
> > zcmX@$w$+WxCD<jzRGEQ+v3w&JpTuSpiCt`5&TcXB!A|i4-maT}$T_k|L^tsVyE(;k
> > V#5=kK@h~&UGl;MSIQxY#0037w5R?D_
> >
> > delta 76
> > zcmdn$cEF9xCD<jzL79Pp@xeweJ_%`Qz4&0K_yA{5gXkvyU|%N#j(A6xARcB0d4|p6
> > e61&;BoLpl-Dg?Y-Hs6tRWMLO!3vl)eVE_OJ;S*K>
> >
> > diff --git a/tests/data/acpi/q35/DSDT.tis.tpm2 b/tests/data/acpi/q35/DSDT.tis.tpm2
> > index b55e828c6397f80c14de82f371fa34553008a875..47417f47f7e25576f31207cb0b752b8c086a4480 100644
> > GIT binary patch
> > delta 65
> > zcmccRcHWK4CD<jzUzve{QFtR4pTuSpiCt`5zV0#c!A|i4uI`(E$VIbAL^tsVyE(;k
> > V#5=kK@h~&UGl;MSIQxY#003F<5T5`5
> >
> > delta 76  
> > zcmX@_cFT>+CD<h-N|}Lyv1TI|pM<ouUVN}qe1Nm3L39&;u&<K=N4%p;5DznhJi}&j
> > eiQQ~mK5j7}6#_19oA1a)v#^V>1vvYKFaQ7tbrWF#  
> >
> > diff --git a/tests/data/acpi/q35/DSDT.viot b/tests/data/acpi/q35/DSDT.viot
> > index a8a93fe70d8e98ec0e66278b45d36393b75740ec..574b8a0094c556cd8555b7a4e1b92b2d5f64750a 100644
> > GIT binary patch
> > delta 65
> > zcmdn)wZ@CfCD<iIN0otr@ySLmK8ejH68pKhTvcP@gPr09d{s98RWfFhh;HH!c5{m7
> > Vh<9`e;$dcxXAofvaP|vf003b*5VQaQ
> >
> > delta 76
> > zcmZ4EwcU%$CD<jzT$O==(RU*kpM<ouUVN}qe1Nm3L39&;u&<K=N4%p;5DznhJi}&j
> > ei340*E-En~6#_oWn;$9}GqH=X1vvYKFaQAC!xDA?
> >
> > diff --git a/tests/data/acpi/q35/DSDT.xapic b/tests/data/acpi/q35/DSDT.xapic
> > index 8211f5af8f9433b66b64768acb1de61a5716152a..74381116ad7f01a860fee9201df38d1ea24a0be6 100644
> > GIT binary patch
> > delta 67  
> > zcmX>)ooUx}CN7s?myliE3=E8aH*)bwY&MaYSjgq57!x1t6ffYZu=#xFdq#=qCjMYI  
> > Xr+AKdN0%TTW(Ii%5w-wlzYqoh?b#EU
> >
> > delta 78
> > zcmdlro$2UwCN7s?myn~~3=E8E8@c!-q^0%ZgPr07oIMSqoA`r$oeVhQ9bJNWm>J|5
> > gHj7J4D&%rdhyke(@Q~lUx$`|Ey9ir=vtI}U0BHvmS^xk5
> >
> > --
> > 2.31.1
> >  
> 



^ permalink raw reply	[flat|nested] 18+ messages in thread

* [PATCH 09/11] tests: acpi: pc/q35 whitelist DSDT before \_GPE cleanup
  2022-10-17 10:21 [PATCH 00/11] x86: clean up ACPI PCI code part 2 Igor Mammedov
                   ` (7 preceding siblings ...)
  2022-10-17 10:21 ` [PATCH 08/11] tests: acpi: update expected blobs Igor Mammedov
@ 2022-10-17 10:21 ` Igor Mammedov
  2022-10-17 10:21 ` [PATCH 10/11] acpi: pc/35: sanitize _GPE declaration order Igor Mammedov
                   ` (2 subsequent siblings)
  11 siblings, 0 replies; 18+ messages in thread
From: Igor Mammedov @ 2022-10-17 10:21 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..725a1dc798 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.bridge",
+"tests/data/acpi/pc/DSDT.ipmikcs",
+"tests/data/acpi/pc/DSDT.cphp",
+"tests/data/acpi/pc/DSDT.memhp",
+"tests/data/acpi/pc/DSDT.numamem",
+"tests/data/acpi/pc/DSDT.nohpet",
+"tests/data/acpi/pc/DSDT.dimmpxm",
+"tests/data/acpi/pc/DSDT.acpihmat",
+"tests/data/acpi/pc/DSDT.acpierst",
+"tests/data/acpi/pc/DSDT.roothp",
+"tests/data/acpi/pc/DSDT.hpbridge",
+"tests/data/acpi/pc/DSDT.hpbrroot",
+"tests/data/acpi/q35/DSDT",
+"tests/data/acpi/q35/DSDT.tis.tpm2",
+"tests/data/acpi/q35/DSDT.tis.tpm12",
+"tests/data/acpi/q35/DSDT.bridge",
+"tests/data/acpi/q35/DSDT.multi-bridge",
+"tests/data/acpi/q35/DSDT.mmio64",
+"tests/data/acpi/q35/DSDT.ipmibt",
+"tests/data/acpi/q35/DSDT.cphp",
+"tests/data/acpi/q35/DSDT.memhp",
+"tests/data/acpi/q35/DSDT.numamem",
+"tests/data/acpi/q35/DSDT.nohpet",
+"tests/data/acpi/q35/DSDT.dimmpxm",
+"tests/data/acpi/q35/DSDT.acpihmat",
+"tests/data/acpi/q35/DSDT.acpierst",
+"tests/data/acpi/q35/DSDT.applesmc",
+"tests/data/acpi/q35/DSDT.pvpanic-isa",
+"tests/data/acpi/q35/DSDT.ivrs",
+"tests/data/acpi/q35/DSDT.viot",
+"tests/data/acpi/q35/DSDT.cxl",
+"tests/data/acpi/q35/DSDT.ipmismbus",
+"tests/data/acpi/q35/DSDT.xapic",
-- 
2.31.1



^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [PATCH 10/11] acpi: pc/35: sanitize _GPE declaration order
  2022-10-17 10:21 [PATCH 00/11] x86: clean up ACPI PCI code part 2 Igor Mammedov
                   ` (8 preceding siblings ...)
  2022-10-17 10:21 ` [PATCH 09/11] tests: acpi: pc/q35 whitelist DSDT before \_GPE cleanup Igor Mammedov
@ 2022-10-17 10:21 ` Igor Mammedov
  2022-10-17 10:21 ` [PATCH 11/11] tests: acpi: update expected blobs Igor Mammedov
  2022-10-27 12:06 ` [PATCH 00/11] x86: clean up ACPI PCI code part 2 Igor Mammedov
  11 siblings, 0 replies; 18+ messages in thread
From: Igor Mammedov @ 2022-10-17 10:21 UTC (permalink / raw)
  To: qemu-devel; +Cc: mst, ani

Move _GPE block declaration before it gets referenced by other
hotplug handlers. While at it move PCI hotplug (_E01) handler
after PCI tree description to avoid forward reference to
to not yet declared methods/devices.

PS:
Forward 'usage' usualy is fine as long as it's hidden within
method, however 'iasl' may print warnings. So be nice
to iasl/guest OS and do things in proper order.

PS2: Also follow up patches will move some of hotplug code
from PCI tree to _E01 and that also requires PCI Device
nodes build first, before Scope can reuse that from
global context.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 hw/i386/acpi-build.c | 47 +++++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 916343d8d6..960305462c 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1434,6 +1434,18 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
         aml_append(dsdt, sb_scope);
     }
 
+    scope =  aml_scope("_GPE");
+    {
+        aml_append(scope, aml_name_decl("_HID", aml_string("ACPI0006")));
+        if (machine->nvdimms_state->is_enabled) {
+            method = aml_method("_E04", 0, AML_NOTSERIALIZED);
+            aml_append(method, aml_notify(aml_name("\\_SB.NVDR"),
+                                          aml_int(0x80)));
+            aml_append(scope, method);
+        }
+    }
+    aml_append(dsdt, scope);
+
     if (pcmc->legacy_cpu_hotplug) {
         build_legacy_cpu_hotplug_aml(dsdt, machine, pm->cpu_hp_io_base);
     } else {
@@ -1452,28 +1464,6 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
                                  pcms->memhp_io_base);
     }
 
-    scope =  aml_scope("_GPE");
-    {
-        aml_append(scope, aml_name_decl("_HID", aml_string("ACPI0006")));
-
-        if (pm->pcihp_bridge_en || pm->pcihp_root_en) {
-            method = aml_method("_E01", 0, AML_NOTSERIALIZED);
-            aml_append(method,
-                aml_acquire(aml_name("\\_SB.PCI0.BLCK"), 0xFFFF));
-            aml_append(method, aml_call0("\\_SB.PCI0.PCNT"));
-            aml_append(method, aml_release(aml_name("\\_SB.PCI0.BLCK")));
-            aml_append(scope, method);
-        }
-
-        if (machine->nvdimms_state->is_enabled) {
-            method = aml_method("_E04", 0, AML_NOTSERIALIZED);
-            aml_append(method, aml_notify(aml_name("\\_SB.NVDR"),
-                                          aml_int(0x80)));
-            aml_append(scope, method);
-        }
-    }
-    aml_append(dsdt, scope);
-
     crs_range_set_init(&crs_range_set);
     bus = PC_MACHINE(machine)->bus;
     if (bus) {
@@ -1752,6 +1742,19 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
     }
     aml_append(dsdt, sb_scope);
 
+    if (pm->pcihp_bridge_en || pm->pcihp_root_en) {
+        scope =  aml_scope("_GPE");
+        {
+            method = aml_method("_E01", 0, AML_NOTSERIALIZED);
+            aml_append(method,
+                aml_acquire(aml_name("\\_SB.PCI0.BLCK"), 0xFFFF));
+            aml_append(method, aml_call0("\\_SB.PCI0.PCNT"));
+            aml_append(method, aml_release(aml_name("\\_SB.PCI0.BLCK")));
+            aml_append(scope, method);
+        }
+        aml_append(dsdt, scope);
+    }
+
     /* copy AML table into ACPI tables blob and patch header there */
     g_array_append_vals(table_data, dsdt->buf->data, dsdt->buf->len);
     acpi_table_end(linker, &table);
-- 
2.31.1



^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [PATCH 11/11] tests: acpi: update expected blobs
  2022-10-17 10:21 [PATCH 00/11] x86: clean up ACPI PCI code part 2 Igor Mammedov
                   ` (9 preceding siblings ...)
  2022-10-17 10:21 ` [PATCH 10/11] acpi: pc/35: sanitize _GPE declaration order Igor Mammedov
@ 2022-10-17 10:21 ` Igor Mammedov
  2022-10-27 12:06 ` [PATCH 00/11] x86: clean up ACPI PCI code part 2 Igor Mammedov
  11 siblings, 0 replies; 18+ messages in thread
From: Igor Mammedov @ 2022-10-17 10:21 UTC (permalink / raw)
  To: qemu-devel; +Cc: mst, ani

Expected changes are:
 1) Moving _GPE scope declaration achec of all _E0x methods
   +    Scope (_GPE)
   +    {
   +        Name (_HID, "ACPI0006" /* GPE Block Device */)  // _HID: Hardware ID
   +    }
   +
        Scope (_SB)
        {
            Device (\_SB.PCI0.PRES)
    ============
            \_SB.CPUS.CSCN ()
        }

   -    Scope (_GPE)
   -    {
   -        Name (_HID, "ACPI0006" /* GPE Block Device */)  // _HID: Hardware ID
   -    }

 2) Moving _E01 handler after PCI0 scope is defined
    -    Scope (_GPE)
    -    {
    -        Name (_HID, "ACPI0006" /* GPE Block Device */)  // _HID: Hardware ID
    -        Method (_E01, 0, NotSerialized)  // _Exx: Edge-Triggered GPE
    -        {
    -            Acquire (\_SB.PCI0.BLCK, 0xFFFF)
    -            \_SB.PCI0.PCNT ()
    -            Release (\_SB.PCI0.BLCK)
    -        }
    -    }
    -
         Scope (\_SB.PCI0)
         {
             Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings
    =============
                 }
             }
         }
    +
    +    Scope (_GPE)
    +    {
    +        Method (_E01, 0, NotSerialized)  // _Exx: Edge-Triggered GPE
    +        {
    +            Acquire (\_SB.PCI0.BLCK, 0xFFFF)
    +            \_SB.PCI0.PCNT ()
    +            Release (\_SB.PCI0.BLCK)
    +        }
    +    }
     }

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 tests/qtest/bios-tables-test-allowed-diff.h |  34 --------------------
 tests/data/acpi/pc/DSDT                     | Bin 6496 -> 6501 bytes
 tests/data/acpi/pc/DSDT.acpierst            | Bin 6456 -> 6461 bytes
 tests/data/acpi/pc/DSDT.acpihmat            | Bin 7821 -> 7826 bytes
 tests/data/acpi/pc/DSDT.bridge              | Bin 9570 -> 9575 bytes
 tests/data/acpi/pc/DSDT.cphp                | Bin 6960 -> 6965 bytes
 tests/data/acpi/pc/DSDT.dimmpxm             | Bin 8150 -> 8155 bytes
 tests/data/acpi/pc/DSDT.hpbridge            | Bin 6456 -> 6461 bytes
 tests/data/acpi/pc/DSDT.hpbrroot            | Bin 3107 -> 3107 bytes
 tests/data/acpi/pc/DSDT.ipmikcs             | Bin 6568 -> 6573 bytes
 tests/data/acpi/pc/DSDT.memhp               | Bin 7855 -> 7860 bytes
 tests/data/acpi/pc/DSDT.nohpet              | Bin 6354 -> 6359 bytes
 tests/data/acpi/pc/DSDT.numamem             | Bin 6502 -> 6507 bytes
 tests/data/acpi/pc/DSDT.roothp              | Bin 6694 -> 6699 bytes
 tests/data/acpi/q35/DSDT                    | Bin 8407 -> 8412 bytes
 tests/data/acpi/q35/DSDT.acpierst           | Bin 8424 -> 8429 bytes
 tests/data/acpi/q35/DSDT.acpihmat           | Bin 9732 -> 9737 bytes
 tests/data/acpi/q35/DSDT.applesmc           | Bin 8453 -> 8458 bytes
 tests/data/acpi/q35/DSDT.bridge             | Bin 11536 -> 11541 bytes
 tests/data/acpi/q35/DSDT.cphp               | Bin 8871 -> 8876 bytes
 tests/data/acpi/q35/DSDT.cxl                | Bin 9733 -> 9738 bytes
 tests/data/acpi/q35/DSDT.dimmpxm            | Bin 10061 -> 10066 bytes
 tests/data/acpi/q35/DSDT.ipmibt             | Bin 8482 -> 8487 bytes
 tests/data/acpi/q35/DSDT.ipmismbus          | Bin 8495 -> 8500 bytes
 tests/data/acpi/q35/DSDT.ivrs               | Bin 8424 -> 8429 bytes
 tests/data/acpi/q35/DSDT.memhp              | Bin 9766 -> 9771 bytes
 tests/data/acpi/q35/DSDT.mmio64             | Bin 9537 -> 9542 bytes
 tests/data/acpi/q35/DSDT.multi-bridge       | Bin 8727 -> 8732 bytes
 tests/data/acpi/q35/DSDT.nohpet             | Bin 8265 -> 8270 bytes
 tests/data/acpi/q35/DSDT.numamem            | Bin 8413 -> 8418 bytes
 tests/data/acpi/q35/DSDT.pvpanic-isa        | Bin 8508 -> 8513 bytes
 tests/data/acpi/q35/DSDT.tis.tpm12          | Bin 9013 -> 9018 bytes
 tests/data/acpi/q35/DSDT.tis.tpm2           | Bin 9039 -> 9044 bytes
 tests/data/acpi/q35/DSDT.viot               | Bin 9516 -> 9521 bytes
 tests/data/acpi/q35/DSDT.xapic              | Bin 35770 -> 35775 bytes
 35 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 725a1dc798..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.bridge",
-"tests/data/acpi/pc/DSDT.ipmikcs",
-"tests/data/acpi/pc/DSDT.cphp",
-"tests/data/acpi/pc/DSDT.memhp",
-"tests/data/acpi/pc/DSDT.numamem",
-"tests/data/acpi/pc/DSDT.nohpet",
-"tests/data/acpi/pc/DSDT.dimmpxm",
-"tests/data/acpi/pc/DSDT.acpihmat",
-"tests/data/acpi/pc/DSDT.acpierst",
-"tests/data/acpi/pc/DSDT.roothp",
-"tests/data/acpi/pc/DSDT.hpbridge",
-"tests/data/acpi/pc/DSDT.hpbrroot",
-"tests/data/acpi/q35/DSDT",
-"tests/data/acpi/q35/DSDT.tis.tpm2",
-"tests/data/acpi/q35/DSDT.tis.tpm12",
-"tests/data/acpi/q35/DSDT.bridge",
-"tests/data/acpi/q35/DSDT.multi-bridge",
-"tests/data/acpi/q35/DSDT.mmio64",
-"tests/data/acpi/q35/DSDT.ipmibt",
-"tests/data/acpi/q35/DSDT.cphp",
-"tests/data/acpi/q35/DSDT.memhp",
-"tests/data/acpi/q35/DSDT.numamem",
-"tests/data/acpi/q35/DSDT.nohpet",
-"tests/data/acpi/q35/DSDT.dimmpxm",
-"tests/data/acpi/q35/DSDT.acpihmat",
-"tests/data/acpi/q35/DSDT.acpierst",
-"tests/data/acpi/q35/DSDT.applesmc",
-"tests/data/acpi/q35/DSDT.pvpanic-isa",
-"tests/data/acpi/q35/DSDT.ivrs",
-"tests/data/acpi/q35/DSDT.viot",
-"tests/data/acpi/q35/DSDT.cxl",
-"tests/data/acpi/q35/DSDT.ipmismbus",
-"tests/data/acpi/q35/DSDT.xapic",
diff --git a/tests/data/acpi/pc/DSDT b/tests/data/acpi/pc/DSDT
index 5b4624cb68c78eab6e356987974b9bee6c9a1785..f1cf7fab349bd26e0f0fa461c715534c1426fbf5 100644
GIT binary patch
delta 60
zcmaE0^wfyUCD<h-Rg!^$@xex}HLSuS@$Lbx9Pu8WF1(J;0iFg124<VLu=25N7UJ^b
OXA`goNl(7cX$1fe{1Br6

delta 55
zcmaEA^uUPACD<h-L6U)i(O@Ij8rIFHS$SAQ{aNDO16(=cJv?1_9i0O_4Gav-7$$2=
LT5Z0@>CX=Uu}Tiy

diff --git a/tests/data/acpi/pc/DSDT.acpierst b/tests/data/acpi/pc/DSDT.acpierst
index 99461b771eec2043263b5bc3c109a08969a99af9..5cb477625e96f5526f0c7703ba3b443a0b35eefd 100644
GIT binary patch
delta 60
zcmdmCwAYBsCD<jzR+52%QE?;J8dhPEc=rHTj(87G7hXr_08ax01GCLrSov5s3vsFO
OvkBOPq$gkJv;qLpD-T2f

delta 55
zcmdmMw8MzYCD<jzLXv@jv2Y{T8rIFHS$SAQ{aNDO16(=cJv?1_9i0O_4Gav-7$!4I
LT5Z0@sm>1oq7x2P

diff --git a/tests/data/acpi/pc/DSDT.acpihmat b/tests/data/acpi/pc/DSDT.acpihmat
index b84f3b47c37e427b927c36036307db6e83a843e5..76e8bef36fdb667447ad0320d35604031aae2c93 100644
GIT binary patch
delta 46
zcmeCRon*`966_K(NsfVmaqdR0HLQ#xlRxqaZ{Esk#ktv@-;bY7z&_qRz;!YUzZC#I
C&J4u>

delta 55
zcmbPa+iT0^66_MvE62dV_;w@L8rIFHSuHt5{aNDO16(=cJv?1_9i0O_4Gav-7$!%^
LS#4(K_vZ%yzRnKP

diff --git a/tests/data/acpi/pc/DSDT.bridge b/tests/data/acpi/pc/DSDT.bridge
index 6771620078086e42b445474b16797094e0d0a801..c94c1b54b3ac3085c02307d9564b258e791fcf1e 100644
GIT binary patch
delta 60
zcmaFl_1ufgCD<h-U6p}>@$5#fHLSuS@$Lbx9Pu8WF1(J;0iFg124<VLu=25N7UBw!
OW)rXnNl(7cX$1fq#t`5D

delta 55
zcmaFv^~j6MCD<h-NtJ<tQFbHO8rIFHS$SAQ{aNDO16(=cJv?1_9i0O_4Gav-7$)ng
LT5Z0@87K_^yYmkx

diff --git a/tests/data/acpi/pc/DSDT.cphp b/tests/data/acpi/pc/DSDT.cphp
index 298fa1592676b3a2089b08eff5f764e04391b961..eb3da0e232e4362bd5850e4eebf5916cbc1d565a 100644
GIT binary patch
delta 60
zcmdmBw$+TwCD<jzRGNW-(Pbmo8dhPEc=rHTj(87G7hXr_08ax01GCLrSnsiJe#Gs^
O&n93GlAgSr+X?{i%n<be

delta 55
zcmdmLw!w_cCD<jzK$?Mpamq%nHLROYv)*A9^=FB94{+s(_waP#b#xB!G%zqQW0?F~
L%4+j6Zhw9N$1M;p

diff --git a/tests/data/acpi/pc/DSDT.dimmpxm b/tests/data/acpi/pc/DSDT.dimmpxm
index 9fcadb266b92fc4942621f0fd919703723de2fd9..6553e4c6053aff76ac42dad87d714e4e9ab28f72 100644
GIT binary patch
delta 81
zcmca+f7_nRCD<k8wmbs^qrgV4HLMyM@$Lbx9Pu8WF1(J;0iFg124)N*!tt&KCJb#c
jdhx+d@qS@0L0k=+x3U&+ZSEBC<!2MH2kDt?DPRQvnI{$^

delta 75
zcmca@f6boDCD<k8nmhvoW8FrsHLRQOv*vS&u*JIvxN^jMc)IX9ItO?f7#Nr_OkOB&
fB_bjm?`mMe&=#W?AM6zG7v>Vg)v(z|z@HxgQ?nI5

diff --git a/tests/data/acpi/pc/DSDT.hpbridge b/tests/data/acpi/pc/DSDT.hpbridge
index 99461b771eec2043263b5bc3c109a08969a99af9..5cb477625e96f5526f0c7703ba3b443a0b35eefd 100644
GIT binary patch
delta 60
zcmdmCwAYBsCD<jzR+52%QE?;J8dhPEc=rHTj(87G7hXr_08ax01GCLrSov5s3vsFO
OvkBOPq$gkJv;qLpD-T2f

delta 55
zcmdmMw8MzYCD<jzLXv@jv2Y{T8rIFHS$SAQ{aNDO16(=cJv?1_9i0O_4Gav-7$!4I
LT5Z0@sm>1oq7x2P

diff --git a/tests/data/acpi/pc/DSDT.hpbrroot b/tests/data/acpi/pc/DSDT.hpbrroot
index b10b17cb1111f6b5d61da4aa1c754f2921a4ac1c..ff04ad360beb60571d48bd1e477a4e58e5ee9337 100644
GIT binary patch
delta 37
scmZ21u~=e5CX290ynBEvN4$rp3$LSdfTw|hf!XGC7Cx5ET^uu+0mthKGXMYp

delta 38
tcmZ21u~=e5Cd=kJ79JK6k$Cq2SB`iOPZwTC=KxOw0|PUL&7B;xm;uwt3P}I}

diff --git a/tests/data/acpi/pc/DSDT.ipmikcs b/tests/data/acpi/pc/DSDT.ipmikcs
index aff3e9bbe1fdbf783c49d07a49c2e16317a2871e..83eec58a52b5844a02003665494f63a4ea0b26a7 100644
GIT binary patch
delta 60
zcmZ2syw;e@CD<iott0~jW6VabHLSuS@$Lbx9Pu8WF1(J;0iFg124<VLu=25N7UG)5
O&n93GlAe5>(+U9a*$_bh

delta 55
zcmZ2$yuz5vCD<iog(L$5<C=|JYgjj*X60cK^=FB94{+s(_waP#b#xB!G%zqQW0+hl
LX|?$p=X8Dmy|53$

diff --git a/tests/data/acpi/pc/DSDT.memhp b/tests/data/acpi/pc/DSDT.memhp
index 07b193b9939e2199bce5edc743de5494133c1e8c..9e2201d170a86652951a2a4b234bb58204010642 100644
GIT binary patch
delta 60
zcmZ2)yTz8vCD<ioiyQ+3<E4#UYgmOv;@tyWIpRG$U3eXx13V2349qrfVU6Y7oXGFT
O&n93GlAf%_Zv_AqSP+^3

delta 55
zcmdmDyWW<|CD<ioy&MArqtZsMHLROYvqp1@`m@Bl2e@*?dw9C=Iywh<8W<RuF-)$K
Lv)Zi6@6QhaxVa9~

diff --git a/tests/data/acpi/pc/DSDT.nohpet b/tests/data/acpi/pc/DSDT.nohpet
index ceee7722ceed8a7e8f61a37805a4c855f47244a8..c969e0dae410763a5f749c4c4fc842ccbf901fc5 100644
GIT binary patch
delta 61
zcmca)c-@f8CD<k8x&#9Q<Eo8Za;zdE@$Lbx9Pu8WF1(J;0iFg124)PK)meF2Hn(v4
P@v{logXAZBa#{fZ0$&e^

delta 55
zcmca^c*&5<CD<k8k^}<-<FAcea;%$eS$SAQ{aNDO16(=cJv?1_9i0O_4Gav-7$(n^
Lu-fdw>CX=UxO5J{

diff --git a/tests/data/acpi/pc/DSDT.numamem b/tests/data/acpi/pc/DSDT.numamem
index e03f4d07b86018d12def37b5397ba9673548e2b7..1cecaa64e9ef29b5096ae1ba4882e2c8e080f0ea 100644
GIT binary patch
delta 60
zcmaE6^xBBaCD<h-Tatl+v1=pO8dhPEc=rHTj(87G7hXr_08ax01GCLrSVdSiOK|z|
OvkBOPq$l6yv;qJHRuFLj

delta 55
zcmaED^vsCMCD<h-O_G6u@zzGJHLROYvkI|@`m@Bl2e@*?dw9C=Iywh<8W<RuF-$g;
LwAy@!)1Myz(Jl|F

diff --git a/tests/data/acpi/pc/DSDT.roothp b/tests/data/acpi/pc/DSDT.roothp
index 418cc92e4c061ad21e1d281e0b5e6114e283b7d3..f57a14cd5c48ddded4c5d0b7da037b9d021a9ecb 100644
GIT binary patch
delta 60
zcmZ2xvf6~pCD<iITZ(~!v3?`h8dhPEc=rHTj(87G7hXr_08ax01GCLrSov5s3vr1E
OunE|Mq$gkJv;qLuX%Aok

delta 55
zcmZ2&vdo0bCD<iIO^Shm@%%=vHLROYv+}Tr`m@Bl2e@*?dw9C=Iywh<8W<RuF--m_
LX|?$pr>Fn`uA2{E

diff --git a/tests/data/acpi/q35/DSDT b/tests/data/acpi/q35/DSDT
index c8a2b5df26608f10c75ab8f2f9e404fda987891b..8e989819a5f8c470a8933bf9b7af7b988048cce6 100644
GIT binary patch
delta 60
zcmccac*l{;CD<k8jsgP%<M)kRb0maC;@tyWIpRG$U3eXx13V2349qq!k>F$5%p`l2
OnN7eRBt7}Kj1>Sj$q~x{

delta 55
zcmccPc-@i9CD<k8x&i|Oqx(j#ITD+9OYpFW`m@Bl2e@*?dw9C=Iywh<8W<RuF-%^h
LV72*}%r#~J)0q%|

diff --git a/tests/data/acpi/q35/DSDT.acpierst b/tests/data/acpi/q35/DSDT.acpierst
index eb63e439b92424e4c50b7e5f1df92da54ecfc6ea..03745d78de4c7e9639a4a37553361e0e18258633 100644
GIT binary patch
delta 60
zcmaFi_|}ojCD<k8tpWoB<MfSOb0maC;@tyWIpRG$U3eXx13V2349qq!k>F$5%q07a
OnN7eRBt7}Kj1>SepAoMB

delta 55
zcmaFs_`;FPCD<k8g#rTu<MWMNb0jwJmf&F#^=FB94{+s(_waP#b#xB!G%zqQW0<^I
L!D{m{ndi&^_#F{+

diff --git a/tests/data/acpi/q35/DSDT.acpihmat b/tests/data/acpi/q35/DSDT.acpihmat
index f9199a0dd614b30c9e73eb7de7e051ce84c1d73f..3ad9ba3c987ca1cfbafc3778db889602ab53530e 100644
GIT binary patch
delta 46
zcmZqi>Ga`p33dtLRAXRZ+`N%%js&B~<cEsFo0m#hac<UEy2{KZU?1-u;5zw>q7?u+
C+70gj

delta 55
zcmeD5Y4PE533dr#QDb0WWZuX%M`H7C2}@2<f0lUn09TH94^J0fN9O=f0|NsyhRNqu
Ltu}vFyv7Uwjvfzm

diff --git a/tests/data/acpi/q35/DSDT.applesmc b/tests/data/acpi/q35/DSDT.applesmc
index 286a4ecec273ca0e2fe2d65f80e8566a68a2f794..5f01572dc2cf44aa0e730401e0709b95cd8db604 100644
GIT binary patch
delta 60
zcmZp5>T=?833dtLQe<FYJh72$j)bsCynBEvN4$rp3$LSdfTw|hf!XFI5_~M1nPiz+
O*aYlB(vy$NSOEakt`ArM

delta 55
zcmeBjYIWjr33dr#Rb*gbl-S5MM`H7C2_6<vf0lUn09TH94^J0fN9O=f0|NsyhRGKc
LtTrE$VPOFPgdz?)

diff --git a/tests/data/acpi/q35/DSDT.bridge b/tests/data/acpi/q35/DSDT.bridge
index 9a733a54e428d3506aaf73f8d4c1f28324a71a42..97141f9db208e1948bc2bdb3f3452ac8f78f98b0 100644
GIT binary patch
delta 60
zcmbObH8qOMCD<iIRF{E)aoI+$ITFGm@$Lbx9Pu8WF1(J;0iFg124<U=Nbs?2W|HL-
OU=y$hNl!j5V+8=@EDx#x

delta 55
zcmbOlH6e=2CD<iIK$n4m@!LkOITD+9OYpFW`m@Bl2e@*?dw9C=Iywh<8W<RuF-*R#
LW3~C148H&XyC@H%

diff --git a/tests/data/acpi/q35/DSDT.cphp b/tests/data/acpi/q35/DSDT.cphp
index 8579626c7f1f035c8d400544c2af6ce6372a5625..622e8e5f3700abffc58683689b9470573c117cd0 100644
GIT binary patch
delta 60
zcmZ4Py2h2uCD<iojS>R`WAsL@ITFGm@$Lbx9Pu8WF1(J;0iFg124<U=NZe!Hd`a#q
OGn;@tNP6;gIV%7cs1h9j

delta 55
zcmZ4Ey4;n^CD<ioxe@~d<LZrEb0jwJmbk+z>dzAI9^lFm@8Rjf>*yTdX<%Sr#xS`^
L$!ha7xogY-;e!y;

diff --git a/tests/data/acpi/q35/DSDT.cxl b/tests/data/acpi/q35/DSDT.cxl
index 96594c00b3b0e0a4933d6d851d927487ad4d18eb..cecc1caaab81db8559781d23e45d8c615dc73740 100644
GIT binary patch
delta 60
zcmZqm>GI)n33dtLQe$9Xe7})vj)bsCynBEvN4$rp3$LSdfTw|hf!XFI5_~M1nPizc
O*#zuC(vy$NSOEaxZV#OR

delta 55
zcmeD3Y4zc933dr#RbyaawBN`zM`H7C2_6<vf0lUn09TH94^J0fN9O=f0|NsyhRGLH
Ltu`N%Vc`S-kB$z6

diff --git a/tests/data/acpi/q35/DSDT.dimmpxm b/tests/data/acpi/q35/DSDT.dimmpxm
index e2a3ecf7d90c8c411550505c3b70bf8d19ba4bc9..e5be00b4fa658477a9ae7016ed72ae04430a3b2f 100644
GIT binary patch
delta 81
zcmX@>cgc^-CD<h-NS%R!QEemF90?7Lc=rHTj(87G7hXr_08ax012YB@;doaA6Na`J
jz4&0Kc)u{0Ag+eZOC|ETHdiQLWo8qw2kDutscZ!Rg;*9z

delta 76
zcmccQch--~CD<jzSDk@@amq%nITD-COXP8hI<v*Q2e@*?dw9C=Iywh<8W<RuF-(?F
gw-ON%j(0UMVQ7odiw|~+_X~3g;%eAzqkN4S07LH;B>(^b

diff --git a/tests/data/acpi/q35/DSDT.ipmibt b/tests/data/acpi/q35/DSDT.ipmibt
index 427272b95692099edc47f569e41fbb3ba69f6b60..c4f8212c63be2a1d579d6ebc9ac41d4bd5be414b 100644
GIT binary patch
delta 60
zcmZ4FwA_iyCD<iIU6Fx-k!K^<90_5Oc=rHTj(87G7hXr_08ax01GCLbB=}f1Gs!Bj
OunE|Mq$eMju>t_cgbxq^

delta 55
zcmZ4Pw8)9eCD<iINs)npF=ivz9Er`lC3sjw{aNDO16(=cJv?1_9i0O_4Gav-7$(0}
Lu-be~Mv(;op_&g5

diff --git a/tests/data/acpi/q35/DSDT.ipmismbus b/tests/data/acpi/q35/DSDT.ipmismbus
index 794779e75aaf33902de834caaa6b0763c4513615..05fb38820fa9213a20ace5943486ed18ad6a765c 100644
GIT binary patch
delta 60
zcmZ4Qw8e?bCD<jzM3I4karQ>8ITFGm@$Lbx9Pu8WF1(J;0iFg124<U=Nbs?2W|Gxq
OVH2<iNl!j5V+8=}bPv-2

delta 55
zcmdnuwBCu!CD<iIUy*@<@%2WoITD+9OYpFW`m@Bl2e@*?dw9C=Iywh<8W<RuF--oY
LV72*}j2;UBz|{}m

diff --git a/tests/data/acpi/q35/DSDT.ivrs b/tests/data/acpi/q35/DSDT.ivrs
index eb63e439b92424e4c50b7e5f1df92da54ecfc6ea..03745d78de4c7e9639a4a37553361e0e18258633 100644
GIT binary patch
delta 60
zcmaFi_|}ojCD<k8tpWoB<MfSOb0maC;@tyWIpRG$U3eXx13V2349qq!k>F$5%q07a
OnN7eRBt7}Kj1>SepAoMB

delta 55
zcmaFs_`;FPCD<k8g#rTu<MWMNb0jwJmf&F#^=FB94{+s(_waP#b#xB!G%zqQW0<^I
L!D{m{ndi&^_#F{+

diff --git a/tests/data/acpi/q35/DSDT.memhp b/tests/data/acpi/q35/DSDT.memhp
index 923e213ab6a3c82faa6f659c29de9c8afb6878dd..2a4635d48c017970ee38d14148b20d38b699b030 100644
GIT binary patch
delta 60
zcmZ4Hv)YHtCD<iITaAH%@x?~2ITFGm@$Lbx9Pu8WF1(J;0iFg124<U=NW^k(4ph3z
O%qCzDlAbK4WCZ{TDG<T{

delta 55
zcmZ4Ov&@IfCD<iIO^tzp(PAUl9Er`lC89Y+{aNDO16(=cJv?1_9i0O_4Gav-7$$#I
Lwc0GIbd4DRtqc!#

diff --git a/tests/data/acpi/q35/DSDT.mmio64 b/tests/data/acpi/q35/DSDT.mmio64
index a77aa37ca0bb407abbef134e8dce4461070856a2..0491761dc7132460b08b443579f0d4cad3fa3163 100644
GIT binary patch
delta 60
zcmX@;b<B&)CD<jzO_hOxamhxmITFGm@$Lbx9Pu8WF1(J;0iFg124<U=NThRYj#hle
O%qCzDlAf%fXaxWd&Jgwh

delta 55
zcmX@+b<m5;CD<jzQI&y#@ykZ8ITD+9OQdp$`m@Bl2e@*?dw9C=Iywh<8W<RuF-+!B
Lwc0GN_?#I4)UFS_

diff --git a/tests/data/acpi/q35/DSDT.multi-bridge b/tests/data/acpi/q35/DSDT.multi-bridge
index 43469e6c89813025b902534ed61d39ad940ff7bb..485f571afd35cbd2044baeb7027ef077ba9a133d 100644
GIT binary patch
delta 60
zcmbR4GRK9>CD<iIMu~xeF>xc;90_5Oc=rHTj(87G7hXr_08ax01GCLbB=}f1Gs%jw
OvI*FOq$eMju>t_l9uGeN

delta 55
zcmbQ^GTnvCCD<iIT#12!apOj=ITD+9OYpFW`m@Bl2e@*?dw9C=Iywh<8W<RuF-(4>
LXtnv6j2J5bsWcBX

diff --git a/tests/data/acpi/q35/DSDT.nohpet b/tests/data/acpi/q35/DSDT.nohpet
index e17b252b03b290ba39601afffbee66159a57bfb1..9c2ec9f2c96f6bdf536c28559fd804523134cf2c 100644
GIT binary patch
delta 61
zcmX@<aL$3tCD<jzPl17f@xVqdJ_!+#c=rHTj(87G7hXr_08ax012cxr;u5?pn@eP_
PGP4QTgXAY$%2)va^~Ddc

delta 55
zcmX@-aMFRxCD<jzQ-OhjQD7q%pTuTe2_6<vf0lUn09TH94^J0fN9O=f0|NsyhRGrd
LR+}wkt}z1ud(I7H

diff --git a/tests/data/acpi/q35/DSDT.numamem b/tests/data/acpi/q35/DSDT.numamem
index ade716519de8bd626b3cddee686f55757bb4eb35..2302de88e93a22118889cd33a8c63811925cff02 100644
GIT binary patch
delta 60
zcmccX_{fpVCD<k8kpcq)<HC(xb0maC;@tyWIpRG$U3eXx13V2349qq!kq}|o%prS~
OnN7eRBt7}8j1>SZBN3SZ

delta 55
zcmaFlc-N83CD<k8t^xxC<HwC$b0jwJmJnhQ^=FB94{+s(_waP#b#xB!G%zqQW0<@`
L!D{mvnQP1d^L-Ib

diff --git a/tests/data/acpi/q35/DSDT.pvpanic-isa b/tests/data/acpi/q35/DSDT.pvpanic-isa
index b6740b1ec2f4e01bdbdc34bc8bf0a2c36f134671..5e4b51d33b8bb88ca2610254e6306c16e5b5b0db 100644
GIT binary patch
delta 60
zcmdnvbkK>*CD<jzQIUaxan?qzITFGm@$Lbx9Pu8WF1(J;0iFg124<U=Nbs?2W|FmH
OVH2<iNl!j5V+8>7gb)S*

delta 55
zcmX@;w8x3dCD<jzMv;Mm@zqAIITD+9OYpFW`m@Bl2e@*?dw9C=Iywh<8W<RuF-&Gx
LwAy@3#+n5H!3Pf@

diff --git a/tests/data/acpi/q35/DSDT.tis.tpm12 b/tests/data/acpi/q35/DSDT.tis.tpm12
index 5bc095351fd009fb2171daaa4f824c5cc9f36819..1723fca4464383694f806f93331d008e84b93fef 100644
GIT binary patch
delta 60
zcmdn$w#$vnCD<jzN|}LyQGFxV90_5Oc=rHTj(87G7hXr_08ax01GCLbB=}f1GszmW
Ou?g6Nq$eMju>t_xEDwVK

delta 54
zcmdnxw$+WxCD<jzRGEQ+v3w)f9Er`lC3sjw{aNDO16(=cJv?1_9i0O_4Gav-7$zxO
KZ9XPr!Uh1Jz7CfF

diff --git a/tests/data/acpi/q35/DSDT.tis.tpm2 b/tests/data/acpi/q35/DSDT.tis.tpm2
index 47417f47f7e25576f31207cb0b752b8c086a4480..1a0d6284da01addd0393b8aad96873398411895e 100644
GIT binary patch
delta 60
zcmX@_cEyd$CD<h-M45qs@$g2jITFGm@$Lbx9Pu8WF1(J;0iFg124<U=Nbs?2W|H+~
OV-v6kNl!j5V+8;TzYvE2

delta 55
zcmccOcHWK4CD<jzUzve{QFtTQ9Er`lC3sjw{aNDO16(=cJv?1_9i0O_4Gav-7$!?8
LTWvlj<HrU7tkw>;

diff --git a/tests/data/acpi/q35/DSDT.viot b/tests/data/acpi/q35/DSDT.viot
index 574b8a0094c556cd8555b7a4e1b92b2d5f64750a..6927d1cc96565f0e1e4c7f19fd709635873db912 100644
GIT binary patch
delta 60
zcmZ4Ewb6^qCD<jzP?dp!amq%nITFGm@$Lbx9Pu8WF1(J;0iFg124<U=Nbs?2W|Gz7
OU=y$hNl!j5V+8=~s1Mix

delta 55
zcmdn!wZ@CfCD<iIN0otr@ySN6ITD+9OYpFW`m@Bl2e@*?dw9C=Iywh<8W<RuF--oh
LVzv30j5Y@V!R`;`

diff --git a/tests/data/acpi/q35/DSDT.xapic b/tests/data/acpi/q35/DSDT.xapic
index 74381116ad7f01a860fee9201df38d1ea24a0be6..4a8a4af625edb1fd01a1404e33f34e85c1a252f3 100644
GIT binary patch
delta 62
zcmdlrooWAcCN7s?myrG43=E8GH*(F95EhAd4{+s(_waP#b#xB!G%zqQ+q^{LW8UVc
R?N^!E1nfc5lUKD{0RVxr6)gY&

delta 57
zcmV-90LK5nmjb$%0t!S^L{z$q0005~u?n0Rv%47YZWT`iUq?_y2wzA^L=8bhP)RT_
PFg5^_g^N0~sfX4BNAVNl

-- 
2.31.1



^ permalink raw reply related	[flat|nested] 18+ messages in thread

* Re: [PATCH 00/11] x86: clean up ACPI PCI code part 2
  2022-10-17 10:21 [PATCH 00/11] x86: clean up ACPI PCI code part 2 Igor Mammedov
                   ` (10 preceding siblings ...)
  2022-10-17 10:21 ` [PATCH 11/11] tests: acpi: update expected blobs Igor Mammedov
@ 2022-10-27 12:06 ` Igor Mammedov
  2022-10-27 14:18   ` Michael S. Tsirkin
  11 siblings, 1 reply; 18+ messages in thread
From: Igor Mammedov @ 2022-10-27 12:06 UTC (permalink / raw)
  To: qemu-devel; +Cc: mst

On Mon, 17 Oct 2022 12:21:35 +0200
Igor Mammedov <imammedo@redhat.com> wrote:

> Series continues refactoring started at recently merged [1].
> It replaces special cases/quirks for ISA/SMB bridges and PCI
> attached VGA devices with generic AcpiDevAmlIf interface,
> which allows device to provide its own AML description
> without need for adhoc plumbing in generic DSDT or PCI
> enumeration code.
> 
> PS:
> at the end, \_GPE clean up patches which are not part of
> AcpiDevAmlIf refactoring but iti's still related to PCI,
> so I've included them there as well.


ping

> 
>  1)
>   https://patchwork.ozlabs.org/project/qemu-devel/list/?series=303856
> 
> Igor Mammedov (11):
>   acpi: pc: vga: use AcpiDevAmlIf interface to build VGA device
>     descriptors
>   tests: acpi: whitelist DSDT before generating PCI-ISA bridge AML
>     automatically
>   acpi: pc/q35: drop ad-hoc PCI-ISA bridge AML routines and let bus
>     ennumeration generate AML
>   tests: acpi: update expected DSDT after ISA bridge is moved directly
>     under PCI host bridge
>   tests: acpi: whitelist DSDT before generating ICH9_SMB AML
>     automatically
>   acpi: add get_dev_aml_func() helper
>   acpi: enumerate SMB bridge automatically along with other PCI devices
>   tests: acpi: update expected blobs
>   tests: acpi: pc/q35 whitelist DSDT before \_GPE cleanup
>   acpi: pc/35: sanitize _GPE declaration order
>   tests: acpi: update expected blobs
> 
>  hw/display/vga_int.h                  |   2 +
>  include/hw/acpi/acpi_aml_interface.h  |  13 +-
>  hw/display/acpi-vga-stub.c            |   7 ++
>  hw/display/acpi-vga.c                 |  26 ++++
>  hw/display/meson.build                |  17 +++
>  hw/display/vga-pci.c                  |   4 +
>  hw/i386/acpi-build.c                  | 175 +++++---------------------
>  hw/isa/lpc_ich9.c                     |  23 ++++
>  hw/isa/piix3.c                        |  17 ++-
>  tests/data/acpi/pc/DSDT               | Bin 6422 -> 6501 bytes
>  tests/data/acpi/pc/DSDT.acpierst      | Bin 6382 -> 6461 bytes
>  tests/data/acpi/pc/DSDT.acpihmat      | Bin 7747 -> 7826 bytes
>  tests/data/acpi/pc/DSDT.bridge        | Bin 9496 -> 9575 bytes
>  tests/data/acpi/pc/DSDT.cphp          | Bin 6886 -> 6965 bytes
>  tests/data/acpi/pc/DSDT.dimmpxm       | Bin 8076 -> 8155 bytes
>  tests/data/acpi/pc/DSDT.hpbridge      | Bin 6382 -> 6461 bytes
>  tests/data/acpi/pc/DSDT.hpbrroot      | Bin 3069 -> 3107 bytes
>  tests/data/acpi/pc/DSDT.ipmikcs       | Bin 6494 -> 6573 bytes
>  tests/data/acpi/pc/DSDT.memhp         | Bin 7781 -> 7860 bytes
>  tests/data/acpi/pc/DSDT.nohpet        | Bin 6280 -> 6359 bytes
>  tests/data/acpi/pc/DSDT.numamem       | Bin 6428 -> 6507 bytes
>  tests/data/acpi/pc/DSDT.roothp        | Bin 6656 -> 6699 bytes
>  tests/data/acpi/q35/DSDT              | Bin 8320 -> 8412 bytes
>  tests/data/acpi/q35/DSDT.acpierst     | Bin 8337 -> 8429 bytes
>  tests/data/acpi/q35/DSDT.acpihmat     | Bin 9645 -> 9737 bytes
>  tests/data/acpi/q35/DSDT.applesmc     | Bin 8366 -> 8458 bytes
>  tests/data/acpi/q35/DSDT.bridge       | Bin 11449 -> 11541 bytes
>  tests/data/acpi/q35/DSDT.cphp         | Bin 8784 -> 8876 bytes
>  tests/data/acpi/q35/DSDT.cxl          | Bin 9646 -> 9738 bytes
>  tests/data/acpi/q35/DSDT.dimmpxm      | Bin 9974 -> 10066 bytes
>  tests/data/acpi/q35/DSDT.ipmibt       | Bin 8395 -> 8487 bytes
>  tests/data/acpi/q35/DSDT.ipmismbus    | Bin 8409 -> 8500 bytes
>  tests/data/acpi/q35/DSDT.ivrs         | Bin 8337 -> 8429 bytes
>  tests/data/acpi/q35/DSDT.memhp        | Bin 9679 -> 9771 bytes
>  tests/data/acpi/q35/DSDT.mmio64       | Bin 9450 -> 9542 bytes
>  tests/data/acpi/q35/DSDT.multi-bridge | Bin 8640 -> 8732 bytes
>  tests/data/acpi/q35/DSDT.nohpet       | Bin 8178 -> 8270 bytes
>  tests/data/acpi/q35/DSDT.numamem      | Bin 8326 -> 8418 bytes
>  tests/data/acpi/q35/DSDT.pvpanic-isa  | Bin 8421 -> 8513 bytes
>  tests/data/acpi/q35/DSDT.tis.tpm12    | Bin 8926 -> 9018 bytes
>  tests/data/acpi/q35/DSDT.tis.tpm2     | Bin 8952 -> 9044 bytes
>  tests/data/acpi/q35/DSDT.viot         | Bin 9429 -> 9521 bytes
>  tests/data/acpi/q35/DSDT.xapic        | Bin 35683 -> 35775 bytes
>  43 files changed, 135 insertions(+), 149 deletions(-)
>  create mode 100644 hw/display/acpi-vga-stub.c
>  create mode 100644 hw/display/acpi-vga.c
> 



^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PATCH 00/11] x86: clean up ACPI PCI code part 2
  2022-10-27 12:06 ` [PATCH 00/11] x86: clean up ACPI PCI code part 2 Igor Mammedov
@ 2022-10-27 14:18   ` Michael S. Tsirkin
  0 siblings, 0 replies; 18+ messages in thread
From: Michael S. Tsirkin @ 2022-10-27 14:18 UTC (permalink / raw)
  To: Igor Mammedov; +Cc: qemu-devel

On Thu, Oct 27, 2022 at 02:06:40PM +0200, Igor Mammedov wrote:
> On Mon, 17 Oct 2022 12:21:35 +0200
> Igor Mammedov <imammedo@redhat.com> wrote:
> 
> > Series continues refactoring started at recently merged [1].
> > It replaces special cases/quirks for ISA/SMB bridges and PCI
> > attached VGA devices with generic AcpiDevAmlIf interface,
> > which allows device to provide its own AML description
> > without need for adhoc plumbing in generic DSDT or PCI
> > enumeration code.
> > 
> > PS:
> > at the end, \_GPE clean up patches which are not part of
> > AcpiDevAmlIf refactoring but iti's still related to PCI,
> > so I've included them there as well.
> 
> 
> ping

it's in my tree, testing found some issues (looks like they are
unrelated to this patchset), debugging.

> > 
> >  1)
> >   https://patchwork.ozlabs.org/project/qemu-devel/list/?series=303856
> > 
> > Igor Mammedov (11):
> >   acpi: pc: vga: use AcpiDevAmlIf interface to build VGA device
> >     descriptors
> >   tests: acpi: whitelist DSDT before generating PCI-ISA bridge AML
> >     automatically
> >   acpi: pc/q35: drop ad-hoc PCI-ISA bridge AML routines and let bus
> >     ennumeration generate AML
> >   tests: acpi: update expected DSDT after ISA bridge is moved directly
> >     under PCI host bridge
> >   tests: acpi: whitelist DSDT before generating ICH9_SMB AML
> >     automatically
> >   acpi: add get_dev_aml_func() helper
> >   acpi: enumerate SMB bridge automatically along with other PCI devices
> >   tests: acpi: update expected blobs
> >   tests: acpi: pc/q35 whitelist DSDT before \_GPE cleanup
> >   acpi: pc/35: sanitize _GPE declaration order
> >   tests: acpi: update expected blobs
> > 
> >  hw/display/vga_int.h                  |   2 +
> >  include/hw/acpi/acpi_aml_interface.h  |  13 +-
> >  hw/display/acpi-vga-stub.c            |   7 ++
> >  hw/display/acpi-vga.c                 |  26 ++++
> >  hw/display/meson.build                |  17 +++
> >  hw/display/vga-pci.c                  |   4 +
> >  hw/i386/acpi-build.c                  | 175 +++++---------------------
> >  hw/isa/lpc_ich9.c                     |  23 ++++
> >  hw/isa/piix3.c                        |  17 ++-
> >  tests/data/acpi/pc/DSDT               | Bin 6422 -> 6501 bytes
> >  tests/data/acpi/pc/DSDT.acpierst      | Bin 6382 -> 6461 bytes
> >  tests/data/acpi/pc/DSDT.acpihmat      | Bin 7747 -> 7826 bytes
> >  tests/data/acpi/pc/DSDT.bridge        | Bin 9496 -> 9575 bytes
> >  tests/data/acpi/pc/DSDT.cphp          | Bin 6886 -> 6965 bytes
> >  tests/data/acpi/pc/DSDT.dimmpxm       | Bin 8076 -> 8155 bytes
> >  tests/data/acpi/pc/DSDT.hpbridge      | Bin 6382 -> 6461 bytes
> >  tests/data/acpi/pc/DSDT.hpbrroot      | Bin 3069 -> 3107 bytes
> >  tests/data/acpi/pc/DSDT.ipmikcs       | Bin 6494 -> 6573 bytes
> >  tests/data/acpi/pc/DSDT.memhp         | Bin 7781 -> 7860 bytes
> >  tests/data/acpi/pc/DSDT.nohpet        | Bin 6280 -> 6359 bytes
> >  tests/data/acpi/pc/DSDT.numamem       | Bin 6428 -> 6507 bytes
> >  tests/data/acpi/pc/DSDT.roothp        | Bin 6656 -> 6699 bytes
> >  tests/data/acpi/q35/DSDT              | Bin 8320 -> 8412 bytes
> >  tests/data/acpi/q35/DSDT.acpierst     | Bin 8337 -> 8429 bytes
> >  tests/data/acpi/q35/DSDT.acpihmat     | Bin 9645 -> 9737 bytes
> >  tests/data/acpi/q35/DSDT.applesmc     | Bin 8366 -> 8458 bytes
> >  tests/data/acpi/q35/DSDT.bridge       | Bin 11449 -> 11541 bytes
> >  tests/data/acpi/q35/DSDT.cphp         | Bin 8784 -> 8876 bytes
> >  tests/data/acpi/q35/DSDT.cxl          | Bin 9646 -> 9738 bytes
> >  tests/data/acpi/q35/DSDT.dimmpxm      | Bin 9974 -> 10066 bytes
> >  tests/data/acpi/q35/DSDT.ipmibt       | Bin 8395 -> 8487 bytes
> >  tests/data/acpi/q35/DSDT.ipmismbus    | Bin 8409 -> 8500 bytes
> >  tests/data/acpi/q35/DSDT.ivrs         | Bin 8337 -> 8429 bytes
> >  tests/data/acpi/q35/DSDT.memhp        | Bin 9679 -> 9771 bytes
> >  tests/data/acpi/q35/DSDT.mmio64       | Bin 9450 -> 9542 bytes
> >  tests/data/acpi/q35/DSDT.multi-bridge | Bin 8640 -> 8732 bytes
> >  tests/data/acpi/q35/DSDT.nohpet       | Bin 8178 -> 8270 bytes
> >  tests/data/acpi/q35/DSDT.numamem      | Bin 8326 -> 8418 bytes
> >  tests/data/acpi/q35/DSDT.pvpanic-isa  | Bin 8421 -> 8513 bytes
> >  tests/data/acpi/q35/DSDT.tis.tpm12    | Bin 8926 -> 9018 bytes
> >  tests/data/acpi/q35/DSDT.tis.tpm2     | Bin 8952 -> 9044 bytes
> >  tests/data/acpi/q35/DSDT.viot         | Bin 9429 -> 9521 bytes
> >  tests/data/acpi/q35/DSDT.xapic        | Bin 35683 -> 35775 bytes
> >  43 files changed, 135 insertions(+), 149 deletions(-)
> >  create mode 100644 hw/display/acpi-vga-stub.c
> >  create mode 100644 hw/display/acpi-vga.c
> > 



^ permalink raw reply	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2022-10-27 14:23 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-17 10:21 [PATCH 00/11] x86: clean up ACPI PCI code part 2 Igor Mammedov
2022-10-17 10:21 ` [PATCH 01/11] acpi: pc: vga: use AcpiDevAmlIf interface to build VGA device descriptors Igor Mammedov
2022-10-17 11:02   ` Ani Sinha
2022-10-17 10:21 ` [PATCH 02/11] tests: acpi: whitelist DSDT before generating PCI-ISA bridge AML automatically Igor Mammedov
2022-10-17 10:21 ` [PATCH 03/11] acpi: pc/q35: drop ad-hoc PCI-ISA bridge AML routines and let bus ennumeration generate AML Igor Mammedov
2022-10-17 10:21 ` [PATCH 04/11] tests: acpi: update expected DSDT after ISA bridge is moved directly under PCI host bridge Igor Mammedov
2022-10-17 10:21 ` [PATCH 05/11] tests: acpi: whitelist DSDT before generating ICH9_SMB AML automatically Igor Mammedov
2022-10-17 10:21 ` [PATCH 06/11] acpi: add get_dev_aml_func() helper Igor Mammedov
2022-10-17 11:12   ` Ani Sinha
2022-10-17 10:21 ` [PATCH 07/11] acpi: enumerate SMB bridge automatically along with other PCI devices Igor Mammedov
2022-10-17 10:21 ` [PATCH 08/11] tests: acpi: update expected blobs Igor Mammedov
2022-10-17 12:43   ` Ani Sinha
2022-10-20 12:39     ` Igor Mammedov
2022-10-17 10:21 ` [PATCH 09/11] tests: acpi: pc/q35 whitelist DSDT before \_GPE cleanup Igor Mammedov
2022-10-17 10:21 ` [PATCH 10/11] acpi: pc/35: sanitize _GPE declaration order Igor Mammedov
2022-10-17 10:21 ` [PATCH 11/11] tests: acpi: update expected blobs Igor Mammedov
2022-10-27 12:06 ` [PATCH 00/11] x86: clean up ACPI PCI code part 2 Igor Mammedov
2022-10-27 14:18   ` Michael S. Tsirkin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).