x86: clean up ACPI PCI code part 2
cover x86: clean up ACPI PCI code part 2
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
Signature · 1 line
2.31.1
PATCH 1/11 acpi: pc: vga: use AcpiDevAmlIf interface to build VGA device descriptors
--- 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
hw/display/vga_int.h +2 -0
@@ -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
hw/display/acpi-vga-stub.c new file +7 -0
@@ -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) +{ +}
hw/display/acpi-vga.c new file +26 -0
@@ -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); +}
hw/display/meson.build +17 -0
@@ -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 }
hw/display/vga-pci.c +4 -0
@@ -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 }, { }, }, };
hw/i386/acpi-build.c +1 -25
@@ -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) {
Signature · 1 line
2.31.1
Re: [PATCH 01/11] acpi: pc: vga: use AcpiDevAmlIf interface to build VGA device descriptors
Quoted 1 line · Igor Mammedov
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.
Quoted 1 line
Signed-off-by Igor Mammedov <[email protected]>
Other than the comment above,
Quoted 216 lines
--- 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.chw/display/vga_int.h +2
-0@@ -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 hw/display/acpi-vga-stub.c new file +7
-0@@ -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) +{ +}hw/display/acpi-vga.c new file +26
-0@@ -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); +}hw/display/meson.build +17
-0@@ -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 }hw/display/vga-pci.c +4
-0@@ -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 }, { }, }, };hw/i386/acpi-build.c +1
-26@@ -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
PATCH 2/11 tests: acpi: whitelist DSDT before generating PCI-ISA bridge AML automatically
In reply to Igor Mammedov--- tests/qtest/bios-tables-test-allowed-diff.h | 34 +++++++++++++++++++++ 1 file changed, 34 insertions(+)
tests/qtest/bios-tables-test-allowed-diff.h +34 -0
@@ -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",
Signature · 1 line
2.31.1
PATCH 3/11 acpi: pc/q35: drop ad-hoc PCI-ISA bridge AML routines and let bus ennumeration generate AML
In reply to Igor MammedovPCI-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.
--- hw/i386/acpi-build.c | 75 -------------------------------------------- hw/isa/lpc_ich9.c | 23 ++++++++++++++ hw/isa/piix3.c | 17 +++++++++- 3 files changed, 39 insertions(+), 76 deletions(-)
hw/i386/acpi-build.c +0 -75
@@ -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); }
hw/isa/lpc_ich9.c +23 -0
@@ -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);
hw/isa/piix3.c +16 -1
@@ -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); }
Signature · 1 line
2.31.1
PATCH 4/11 tests: acpi: update expected DSDT after ISA bridge is moved directly under PCI host bridge
In reply to Igor Mammedovexample 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: Addresswith 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
--- 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(-)
tests/qtest/bios-tables-test-allowed-diff.h +0 -34
@@ -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",
tests/data/acpi/pc/DSDT binary +0 -0
tests/data/acpi/pc/DSDT.acpierst binary +0 -0
tests/data/acpi/pc/DSDT.acpihmat binary +0 -0
tests/data/acpi/pc/DSDT.bridge binary +0 -0
tests/data/acpi/pc/DSDT.cphp binary +0 -0
tests/data/acpi/pc/DSDT.dimmpxm binary +0 -0
tests/data/acpi/pc/DSDT.hpbridge binary +0 -0
tests/data/acpi/pc/DSDT.hpbrroot binary +0 -0
tests/data/acpi/pc/DSDT.ipmikcs binary +0 -0
tests/data/acpi/pc/DSDT.memhp binary +0 -0
tests/data/acpi/pc/DSDT.nohpet binary +0 -0
tests/data/acpi/pc/DSDT.numamem binary +0 -0
tests/data/acpi/pc/DSDT.roothp binary +0 -0
tests/data/acpi/q35/DSDT binary +0 -0
tests/data/acpi/q35/DSDT.acpierst binary +0 -0
tests/data/acpi/q35/DSDT.acpihmat binary +0 -0
tests/data/acpi/q35/DSDT.applesmc binary +0 -0
tests/data/acpi/q35/DSDT.bridge binary +0 -0
tests/data/acpi/q35/DSDT.cphp binary +0 -0
tests/data/acpi/q35/DSDT.cxl binary +0 -0
tests/data/acpi/q35/DSDT.dimmpxm binary +0 -0
tests/data/acpi/q35/DSDT.ipmibt binary +0 -0
tests/data/acpi/q35/DSDT.ipmismbus binary +0 -0
tests/data/acpi/q35/DSDT.ivrs binary +0 -0
tests/data/acpi/q35/DSDT.memhp binary +0 -0
tests/data/acpi/q35/DSDT.mmio64 binary +0 -0
tests/data/acpi/q35/DSDT.multi-bridge binary +0 -0
tests/data/acpi/q35/DSDT.nohpet binary +0 -0
tests/data/acpi/q35/DSDT.numamem binary +0 -0
tests/data/acpi/q35/DSDT.pvpanic-isa binary +0 -0
tests/data/acpi/q35/DSDT.tis.tpm12 binary +0 -0
tests/data/acpi/q35/DSDT.tis.tpm2 binary +0 -0
tests/data/acpi/q35/DSDT.viot binary +0 -0
tests/data/acpi/q35/DSDT.xapic binary +0 -0
Signature · 1 line
2.31.1
PATCH 5/11 tests: acpi: whitelist DSDT before generating ICH9_SMB AML automatically
In reply to Igor Mammedov--- tests/qtest/bios-tables-test-allowed-diff.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
tests/qtest/bios-tables-test-allowed-diff.h +21 -0
@@ -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",
Signature · 1 line
2.31.1
PATCH 6/11 acpi: add get_dev_aml_func() helper
In reply to Igor MammedovIt will be used in followup commits to figure out if device has it's own, device specific AML block.
--- include/hw/acpi/acpi_aml_interface.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
include/hw/acpi/acpi_aml_interface.h +11 -2
@@ -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); } }
Signature · 1 line
2.31.1
Re: [PATCH 06/11] acpi: add get_dev_aml_func() helper
Quoted 5 lines · Igor Mammedov
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 <[email protected]>
Quoted 34 lines
--- include/hw/acpi/acpi_aml_interface.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)include/hw/acpi/acpi_aml_interface.h +11
-3@@ -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
PATCH 7/11 acpi: enumerate SMB bridge automatically along with other PCI devices
In reply to Igor Mammedovto 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).
--- hw/i386/acpi-build.c | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-)
hw/i386/acpi-build.c +3 -24
@@ -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) {
Signature · 1 line
2.31.1
PATCH 8/11 tests: acpi: update expected blobs
In reply to Igor MammedovExpected 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
--- 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(-)
tests/qtest/bios-tables-test-allowed-diff.h +0 -21
@@ -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",
tests/data/acpi/q35/DSDT binary +0 -0
tests/data/acpi/q35/DSDT.acpierst binary +0 -0
tests/data/acpi/q35/DSDT.acpihmat binary +0 -0
tests/data/acpi/q35/DSDT.applesmc binary +0 -0
tests/data/acpi/q35/DSDT.bridge binary +0 -0
tests/data/acpi/q35/DSDT.cphp binary +0 -0
tests/data/acpi/q35/DSDT.cxl binary +0 -0
tests/data/acpi/q35/DSDT.dimmpxm binary +0 -0
tests/data/acpi/q35/DSDT.ipmibt binary +0 -0
tests/data/acpi/q35/DSDT.ipmismbus binary +0 -0
tests/data/acpi/q35/DSDT.ivrs binary +0 -0
tests/data/acpi/q35/DSDT.memhp binary +0 -0
tests/data/acpi/q35/DSDT.mmio64 binary +0 -0
tests/data/acpi/q35/DSDT.multi-bridge binary +0 -0
tests/data/acpi/q35/DSDT.nohpet binary +0 -0
tests/data/acpi/q35/DSDT.numamem binary +0 -0
tests/data/acpi/q35/DSDT.pvpanic-isa binary +0 -0
tests/data/acpi/q35/DSDT.tis.tpm12 binary +0 -0
tests/data/acpi/q35/DSDT.tis.tpm2 binary +0 -0
tests/data/acpi/q35/DSDT.viot binary +0 -0
tests/data/acpi/q35/DSDT.xapic binary +0 -0
Signature · 1 line
2.31.1
Re: [PATCH 08/11] tests: acpi: update expected blobs
Quoted 21 lines · Igor Mammedov
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)
}
}
Quoted 5 lines
+ Device (SFB)
+ {
+ Name (_ADR,0x001F0003) //_ADR: Address
+ }
+
Which code generates this hunk? Shouldn't this be "SMB0" for Device?
Quoted 293 lines
Method (PCNT, 0, NotSerialized) { }Also for ipmismbus test, child 'Device (MI1)' of SMB0 will be moved along with it
Signed-off-by Igor Mammedov <[email protected]>--- 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(-)tests/qtest/bios-tables-test-allowed-diff.h +0
-21@@ -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",tests/data/acpi/q35/DSDT binary +0
-0tests/data/acpi/q35/DSDT.acpierst binary +0
-0tests/data/acpi/q35/DSDT.acpihmat binary +0
-0tests/data/acpi/q35/DSDT.applesmc binary +0
-0tests/data/acpi/q35/DSDT.bridge binary +0
-0tests/data/acpi/q35/DSDT.cphp binary +0
-0tests/data/acpi/q35/DSDT.cxl binary +0
-0tests/data/acpi/q35/DSDT.dimmpxm binary +0
-0tests/data/acpi/q35/DSDT.ipmibt binary +0
-0tests/data/acpi/q35/DSDT.ipmismbus binary +0
-0tests/data/acpi/q35/DSDT.ivrs binary +0
-0tests/data/acpi/q35/DSDT.memhp binary +0
-0tests/data/acpi/q35/DSDT.mmio64 binary +0
-0tests/data/acpi/q35/DSDT.multi-bridge binary +0
-0tests/data/acpi/q35/DSDT.nohpet binary +0
-0tests/data/acpi/q35/DSDT.numamem binary +0
-0tests/data/acpi/q35/DSDT.pvpanic-isa binary +0
-0tests/data/acpi/q35/DSDT.tis.tpm12 binary +0
-0tests/data/acpi/q35/DSDT.tis.tpm2 binary +0
-0tests/data/acpi/q35/DSDT.viot binary +0
-0tests/data/acpi/q35/DSDT.xapic binary +0
-1--2.31.1
Re: [PATCH 08/11] tests: acpi: update expected blobs
Quoted 22 lines · On Mon, 17 Oct 2022 18:13:14 +0530 Ani Sinha <[email protected]> wrote:
Quoted 21 lines · Igor Mammedov
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) } }
Quoted 7 lines
Quoted 5 lines
+ 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))); Quoted 295 lines
Quoted 294 lines
Method (PCNT, 0, NotSerialized) { }Also for ipmismbus test, child 'Device (MI1)' of SMB0 will be moved along with it
Signed-off-by Igor Mammedov <[email protected]>--- 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(-)tests/qtest/bios-tables-test-allowed-diff.h +0
-21@@ -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",tests/data/acpi/q35/DSDT binary +0
-0tests/data/acpi/q35/DSDT.acpierst binary +0
-0
zcmezD_;FPCD<k8g#rTu<MWMNd=i^YB-XKUIVr&2Rp?JcquM^BgZ5W-NYa4<`mBn U@8}Z5!^|MhAi@^l>=(iS0Ek8rTL1t6delta 75 zcmaFi_}P)mCD<k8vjPJHW57l(J_%`Qz4&0K_yA{5gXkvyU|%N#j(A6xARcB0d4|p6 d66@Kx92H|gDg-<g7GIEKVi#cxaP|vf000r=6CD5m
tests/data/acpi/q35/DSDT.acpihmat binary +0
-0zcmZqi>G$Ds33dtLS7Tsc%-P7rCm}7Z7a!~tAK>h15Z%Nd?CWH}5%1^{#KX)W&#+ls d;tn^LgF*~Qg@A|r=D*7C8QDeH0-XIq7y!*W69)hQ
tests/data/acpi/q35/DSDT.applesmc binary +0
-0zcmbQ>)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&<
tests/data/acpi/q35/DSDT.bridge binary +0
-0tests/data/acpi/q35/DSDT.cphp binary +0
-0tests/data/acpi/q35/DSDT.cxl binary +0
-0zcmbQ>)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=jztests/data/acpi/q35/DSDT.dimmpxm binary +0
-0e5~{ph4hk_K6#^deo8463GqQ`Y1vvYKFaQ7)&=U>-
tests/data/acpi/q35/DSDT.ipmibt binary +0
-0zcmZ4FwAP8sCD<iISCN5%@#sb_J_%`Qz4&0K_yA{5gXkvyU|%N#j(A6xARcB0d4|p6 e66@Kxyj5aADg>NWHeZmlVqzCz3vl)eVE_Q=2@;q9
tests/data/acpi/q35/DSDT.ipmismbus binary +0
-0tests/data/acpi/q35/DSDT.ivrs binary +0
-0
zcmezD_;FPCD<k8g#rTu<MWMNd=i^YB-XKUIVr&2Rp?JcquM^BgZ5W-NYa4<`mBn U@8}Z5!^|MhAi@^l>=(iS0Ek8rTL1t6delta 75 zcmaFi_}P)mCD<k8vjPJHW57l(J_%`Qz4&0K_yA{5gXkvyU|%N#j(A6xARcB0d4|p6 d66@Kx92H|gDg-<g7GIEKVi#cxaP|vf000r=6CD5m
tests/data/acpi/q35/DSDT.memhp binary +0
-0tests/data/acpi/q35/DSDT.mmio64 binary +0
-0zcmX@(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#hSY>>_Ld&VC^b0K(`I2mk;8tests/data/acpi/q35/DSDT.multi-bridge binary +0
-0tests/data/acpi/q35/DSDT.nohpet binary +0
-0zcmccOaMFRxCD<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
tests/data/acpi/q35/DSDT.numamem binary +0
-0tests/data/acpi/q35/DSDT.pvpanic-isa binary +0
-0tests/data/acpi/q35/DSDT.tis.tpm12 binary +0
-0tests/data/acpi/q35/DSDT.tis.tpm2 binary +0
-0eiQQ~mK5j7}6#_19oA1a)v#^V>1vvYKFaQ7tbrWF#
tests/data/acpi/q35/DSDT.viot binary +0
-0tests/data/acpi/q35/DSDT.xapic binary +0
-0zcmX>)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
PATCH 9/11 tests: acpi: pc/q35 whitelist DSDT before \_GPE cleanup
In reply to Igor Mammedov--- tests/qtest/bios-tables-test-allowed-diff.h | 34 +++++++++++++++++++++ 1 file changed, 34 insertions(+)
tests/qtest/bios-tables-test-allowed-diff.h +34 -0
@@ -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",
Signature · 1 line
2.31.1
PATCH 10/11 acpi: pc/35: sanitize _GPE declaration order
In reply to Igor MammedovMove _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.
--- hw/i386/acpi-build.c | 47 +++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 22 deletions(-)
hw/i386/acpi-build.c +25 -22
@@ -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);
Signature · 1 line
2.31.1
PATCH 11/11 tests: acpi: update expected blobs
In reply to Igor MammedovExpected 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)
+ }
+ }
}
--- 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(-)
tests/qtest/bios-tables-test-allowed-diff.h +0 -34
@@ -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",
tests/data/acpi/pc/DSDT binary +0 -0
tests/data/acpi/pc/DSDT.acpierst binary +0 -0
tests/data/acpi/pc/DSDT.acpihmat binary +0 -0
tests/data/acpi/pc/DSDT.bridge binary +0 -0
tests/data/acpi/pc/DSDT.cphp binary +0 -0
tests/data/acpi/pc/DSDT.dimmpxm binary +0 -0
tests/data/acpi/pc/DSDT.hpbridge binary +0 -0
tests/data/acpi/pc/DSDT.hpbrroot binary +0 -0
tests/data/acpi/pc/DSDT.ipmikcs binary +0 -0
tests/data/acpi/pc/DSDT.memhp binary +0 -0
tests/data/acpi/pc/DSDT.nohpet binary +0 -0
tests/data/acpi/pc/DSDT.numamem binary +0 -0
tests/data/acpi/pc/DSDT.roothp binary +0 -0
tests/data/acpi/q35/DSDT binary +0 -0
tests/data/acpi/q35/DSDT.acpierst binary +0 -0
tests/data/acpi/q35/DSDT.acpihmat binary +0 -0
tests/data/acpi/q35/DSDT.applesmc binary +0 -0
tests/data/acpi/q35/DSDT.bridge binary +0 -0
tests/data/acpi/q35/DSDT.cphp binary +0 -0
tests/data/acpi/q35/DSDT.cxl binary +0 -0
tests/data/acpi/q35/DSDT.dimmpxm binary +0 -0
tests/data/acpi/q35/DSDT.ipmibt binary +0 -0
tests/data/acpi/q35/DSDT.ipmismbus binary +0 -0
tests/data/acpi/q35/DSDT.ivrs binary +0 -0
tests/data/acpi/q35/DSDT.memhp binary +0 -0
tests/data/acpi/q35/DSDT.mmio64 binary +0 -0
tests/data/acpi/q35/DSDT.multi-bridge binary +0 -0
tests/data/acpi/q35/DSDT.nohpet binary +0 -0
tests/data/acpi/q35/DSDT.numamem binary +0 -0
tests/data/acpi/q35/DSDT.pvpanic-isa binary +0 -0
tests/data/acpi/q35/DSDT.tis.tpm12 binary +0 -0
tests/data/acpi/q35/DSDT.tis.tpm2 binary +0 -0
tests/data/acpi/q35/DSDT.viot binary +0 -0
tests/data/acpi/q35/DSDT.xapic binary +0 -0
Signature · 1 line
2.31.1
Quoted 11 lines · On Mon, 17 Oct 2022 12:21:35 +0200 Igor Mammedov <[email protected]> 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
Quoted 69 lines
1)
https://patchwork.ozlabs.org/project/qemu-devel/list/?series=303856Igor 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 generatingICH9_SMBAML
automatically
acpi: addget_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_GPEdeclaration order
tests: acpi: update expected blobshw/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
Quoted 10 lines · Igor Mammedov
Quoted 7 lines · On Mon, 17 Oct 2022 12:21:35 +0200 Igor Mammedov <[email protected]> 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.
Quoted 7 lines
Quoted 4 lines
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.
Quoted 69 lines
Quoted 69 lines
1)
https://patchwork.ozlabs.org/project/qemu-devel/list/?series=303856Igor 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 generatingICH9_SMBAML
automatically
acpi: addget_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_GPEdeclaration order
tests: acpi: update expected blobshw/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