ACPI PCI Hotplug support on ARM
v4 cover ACPI PCI Hotplug support on ARM
This series enables ACPI PCI hotplug/hotunplug on ARM. It is not enabled by default and ACPI PCI hotplug can be selected by setting:
-global acpi-ged.acpi-pci-hotplug-with-bridge-support=on
Expected benefits should be similar to those listed in [1], ie. removal of some racy behaviors, improved latencies.
The infrastructure used in x86 is heavily reused and a huge part of the series consists in moving code from hw/i386/acpi-build.c to a generic place and slightly adapting it to make it usable on ARM. The DSDT table is augmented to support ACPI PCI hotplug elements.
On ARM we use use a GED event to notify the OS about hotplug events.
Best Regards
Eric
This series can be found at:
https://github.com/eauger/qemu/tree/arm-acpi-pcihp-v4
previous series:
https://github.com/eauger/qemu/tree/arm-acpi-pcihp-v3
https://github.com/eauger/qemu/tree/arm-acpi-pcihp-v2
History:
v3 -> v4:
- toook into account all comments on v3
- static acpi-index is now supported unconditionally
from acpi pcihp option. See indiviual patches.
- I hit a problem with ref block generation at
[19/32] tests/qtest/bios-tables-test: Update ARM DSDT reference
blobs: despite I regenerate the blobs, I get some errors.
v2 -> v3:
- lot of changes taking into account various feedbacks (many thanks to all reviewers). Please refer to individual patches for details. Main changes:
- no more machine option, acpi pci hp is not set by default.
- removal of 2 unused variables in the osc method
- introduction of GED property to set the bus
- rework of the init/reset sequence
- fix virtio-mem-pci hotplug regression
v1 -> v2:
- collected a bunch of R-bs from Gustavo (many thanks!)
- Fixed the breakage of bios-tables-test in TCG mode by incorporating Gustavo's patches (part of
[PATCH 0/5] ACPI tests for PCI Hotplug on ARM
https://lore.kernel.org/all/[email protected]/)
- Tweeked the dsdt aml changes to avoid any dsdt blob difference when acpi-pcihp is off.
RFC -> v1:
- First 3 trivial patches were pulled separately
- Fix of the register region size (0x18), ie. ACPI_PCIHP_SIZE
- addition of aml_pci_edsm which was not called in RFC
- acpi-index feature is now fixed. vms->bus was not set on acpi_pcihp_init. The init sequence is still hacky though. Suggestions are welcome.
[1] [PATCH v6 0/6] Use ACPI PCI hot-plug for Q35
https://lore.kernel.org/all/[email protected]/
Eric Auger (28):
hw/i386/acpi-build: Make aml_pci_device_dsm() static hw/acpi: Rename and move build_x86_acpi_pci_hotplug to pcihp hw/pci-host/gpex-acpi: Add native_pci_hotplug arg to
acpi_dsdt_add_pci_osc
hw/pci-host/gpex-acpi: Split host bridge OSC and DSM generation hw/acpi/ged: Add a acpi-pci-hotplug-with-bridge-support property hw/pci-host/gpex-acpi: Use GED acpi pcihp property hw/i386/acpi-build: Turn build_q35_osc_method into a generic method hw/pci-host/gpex-acpi: Use build_pci_host_bridge_osc_method tests/qtest/bios-tables-test: Update DSDT blobs after GPEX _OSC change hw/i386/acpi-build: Introduce build_append_pcihp_resources() helper hw/acpi/pcihp: Add an AmlRegionSpace arg to build_acpi_pci_hotplug hw/i386/acpi-build: Move build_append_notification_callback to pcihp hw/i386/acpi-build: Move build_append_pci_bus_devices/pcihp_slots to
pcihp
hw/i386/acpi-build: Use AcpiPciHpState::root in acpi_set_pci_info hw/i386/acpi-build: Move aml_pci_edsm to a generic place hw/arm/virt-acpi-build: Let non hotplug ports support static
acpi-index
tests/qtest/bios-tables-test: Update ARM DSDT reference blobs hw/arm/virt-acpi-build: Modify the DSDT ACPI table to enable ACPI PCI
hotplug
hw/acpi/ged: Add a bus link property
hw/arm/virt: Pass the bus on the ged creation
hw/acpi/ged: Call pcihp plug callbacks in hotplug handler
implementation
hw/acpi/pcihp: Remove root arg in acpi_pcihp_init hw/acpi/ged: Prepare the device to react to PCI hotplug events hw/acpi/ged: Support migration of AcpiPciHpState hw/core/sysbus: Introduce sysbus_mmio_map_name() helper hw/arm/virt: Minor code reshuffling in create_acpi_ged hw/arm/virt: Let virt support pci hotplug/unplug GED event qtest/bios-tables-test: Create DSDT acpipcihp and hpoffacpiindex
variant blobs
Gustavo Romero (4):
tests/qtest/bios-tables-test: Prepare for changes in the DSDT table tests/qtest/bios-tables-test: Prepare for changes in the arm virt DSDT
table
tests/qtest/bios-tables-test: Prepare for addition of acpi pci hp
tests
tests/qtest/bios-tables-test: Add aarch64 ACPI PCI hotplug test
hw/i386/acpi-build.h | 4 - include/hw/acpi/generic_event_device.h | 7 + include/hw/acpi/pci.h | 5 +- include/hw/acpi/pcihp.h | 19 +- include/hw/arm/virt.h | 1 + include/hw/pci-host/gpex.h | 1 + include/hw/sysbus.h | 1 + hw/acpi/acpi-pci-hotplug-stub.c | 2 +- hw/acpi/generic_event_device.c | 73 +++ hw/acpi/ich9.c | 7 +- hw/acpi/pci-bridge.c | 54 ++ hw/acpi/pci.c | 50 ++ hw/acpi/pcihp.c | 439 ++++++++++++++- hw/acpi/piix4.c | 5 +- hw/arm/virt-acpi-build.c | 30 + hw/arm/virt.c | 27 +- hw/core/sysbus.c | 11 + hw/i386/acpi-build.c | 532 +----------------- hw/pci-host/gpex-acpi.c | 74 +-- tests/qtest/bios-tables-test.c | 52 ++ hw/arm/Kconfig | 2 + hw/pci-host/Kconfig | 1 + tests/data/acpi/aarch64/virt/DSDT | Bin 5196 -> 5310 bytes .../data/acpi/aarch64/virt/DSDT.acpihmatvirt | Bin 5282 -> 5379 bytes tests/data/acpi/aarch64/virt/DSDT.acpipcihp | Bin 0 -> 6294 bytes .../acpi/aarch64/virt/DSDT.hpoffacpiindex | Bin 0 -> 5347 bytes tests/data/acpi/aarch64/virt/DSDT.memhp | Bin 6557 -> 6654 bytes tests/data/acpi/aarch64/virt/DSDT.pxb | Bin 7679 -> 7768 bytes tests/data/acpi/aarch64/virt/DSDT.topology | Bin 5398 -> 5495 bytes tests/data/acpi/riscv64/virt/DSDT | Bin 3576 -> 3538 bytes tests/data/acpi/x86/microvm/DSDT.pcie | Bin 3023 -> 2985 bytes 31 files changed, 790 insertions(+), 607 deletions(-) create mode 100644 tests/data/acpi/aarch64/virt/DSDT.acpipcihp create mode 100644 tests/data/acpi/aarch64/virt/DSDT.hpoffacpiindex
Signature · 1 line
2.49.0
PATCH v4 1/32 hw/i386/acpi-build: Make aml_pci_device_dsm() static
No need to export aml_pci_device_dsm() as it is only used in hw/i386/acpi-build.c.
--- include/hw/acpi/pci.h | 1 - hw/i386/acpi-build.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
include/hw/acpi/pci.h +0 -1
@@ -36,7 +36,6 @@ typedef struct AcpiMcfgInfo {void build_mcfg (GArray *table_data,BIOSLinker *linker,AcpiMcfgInfo *info,const char *oem_id,const char *oem_table_id); -Aml *aml_pci_device_dsm (void );void build_append_pci_bus_devices (Aml *parent_scope,PCIBus *bus);void build_pci_bridge_aml (AcpiDevAmlIf *adev,Aml *scope);
hw/i386/acpi-build.c +1 -1
@@ -338,7 +338,7 @@ build_facs(GArray *table_data)g_array_append_vals (table_data, reserved,40 );/* Reserved */ } -Aml *aml_pci_device_dsm (void ) +static Aml *aml_pci_device_dsm (void ) {Aml *method;
Signature · 1 line
2.49.0
PATCH v4 2/32 hw/acpi: Rename and move build_x86_acpi_pci_hotplug to pcihp
In reply to Eric AugerWe plan to reuse build_x86_acpi_pci_hotplug() implementation for ARM so let's move the code to generic pcihp.
Associated static aml_pci_pdsm() helper is also moved along. build_x86_acpi_pci_hotplug is renamed into build_acpi_pci_hotplug().
No code change intended.
Also fix the reference to acpi_pci_hotplug.rst documentation
---
v1 -> v2:
- s/spec/specs in reference to rst (Gustavo)
- fixed double space in commit msg (Gustavo)
rfc -> v1:
- make build_append_pci_dsm_func0_common non static and move it to pcihp
--- hw/i386/acpi-build.h | 4 - include/hw/acpi/pcihp.h | 9 +- hw/acpi/pcihp.c | 174 ++++++++++++++++++++++++++++++++++++++- hw/i386/acpi-build.c | 176 +--------------------------------------- 4 files changed, 183 insertions(+), 180 deletions(-)
hw/i386/acpi-build.h +0 -4
@@ -5,10 +5,6 @@extern const struct AcpiGenericAddress x86_nvdimm_acpi_dsmio; -/* PCI Hot-plug registers' base. See docs/specs/acpi_pci_hotplug.rst */ -#define ACPI_PCIHP_SEJ_BASE 0x8 -#define ACPI_PCIHP_BNMR_BASE 0x10 -void acpi_setup (void );Object *acpi_get_i386_pci_host (void );
include/hw/acpi/pcihp.h +8 -1
@@ -3,7 +3,7 @@* * QEMU supports PCI hotplug via ACPI. This module * implements the interface between QEMU and the ACPI BIOS. -* Interface specification - see docs/specs/acpi_pci_hotplug.txt +* Interface specification - see docs/specs/acpi_pci_hotplug.rst * * Copyright (c) 2013, Red Hat Inc, Michael S. Tsirkin ([email protected]) * Copyright (c) 2006 Fabrice Bellard
@@ -33,6 +33,10 @@#define ACPI_PCIHP_IO_BASE_PROP "acpi-pcihp-io-base"#define ACPI_PCIHP_IO_LEN_PROP "acpi-pcihp-io-len" +/* PCI Hot-plug registers bases. See docs/specs/acpi_pci_hotplug.rst */ +#define ACPI_PCIHP_SEJ_BASE 0x8 +#define ACPI_PCIHP_BNMR_BASE 0x10 + typedef struct AcpiPciHpPciStatus { uint32_t up; uint32_t down;
@@ -69,6 +73,9 @@ void acpi_pcihp_device_unplug_request_cb(HotplugHandler *hotplug_dev, AcpiPciHpState *s, DeviceState *dev, Error **errp); +void build_acpi_pci_hotplug (Aml *table,uint64_t pcihp_addr); +void build_append_pci_dsm_func0_common (Aml *ctx,Aml *retvar); +/* Called on reset */ void acpi_pcihp_reset (AcpiPciHpState *s);
hw/acpi/pcihp.c +173 -1
186 lines not on this page · raw message
hw/i386/acpi-build.c +2 -174
206 lines not on this page · raw message
Signature · 1 line
2.49.0
PATCH v4 3/32 hw/pci-host/gpex-acpi: Add native_pci_hotplug arg to acpi_dsdt_add_pci_osc
In reply to Eric AugerAdd a new argument to acpi_dsdt_add_pci_osc to be able to disable native pci hotplug.
---
rfc -> v1:
- updated the "Allow OS control for all 5 features" comment
--- hw/pci-host/gpex-acpi.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
hw/pci-host/gpex-acpi.c +8 -7
@@ -50,7 +50,7 @@ static void acpi_dsdt_add_pci_route_table(Aml *dev, uint32_t irq, } } -static void acpi_dsdt_add_pci_osc (Aml *dev) +static void acpi_dsdt_add_pci_osc (Aml *dev,bool enable_native_pcie_hotplug) {Aml *method, *UUID , *ifctx, *ifctx1, *elsectx, *buf;
@@ -77,11 +77,12 @@ static void acpi_dsdt_add_pci_osc(Aml *dev)aml_append (ifctx,aml_store (aml_name ("CDW3" ),aml_name ("CTRL" )));/* -* Allow OS control for all 5 features: -* PCIeHotplug SHPCHotplug PME AER PCIeCapability. +* Allow OS control for SHPCHotplug, PME, AER, PCIeCapability, +* and PCIeHotplug depending on enable_native_pcie_hotplug */ -aml_append (ifctx,aml_and (aml_name ("CTRL" ),aml_int (0x1F ), -aml_name ("CTRL" ))); +aml_append (ifctx,aml_and (aml_name ("CTRL" ), +aml_int (0x1E | (enable_native_pcie_hotplug ?0x1 :0x0 )), +aml_name ("CTRL" ))); ifctx1 =aml_if (aml_lnot (aml_equal (aml_arg (1 ),aml_int (0x1 )))); aml_append(ifctx1, aml_or(aml_name("CDW1"), aml_int(0x08),
@@ -192,7 +193,7 @@ void acpi_dsdt_add_gpex(Aml *scope, struct GPEXConfig *cfg)if (is_cxl) {build_cxl_osc_method (dev); }else { -acpi_dsdt_add_pci_osc (dev); +acpi_dsdt_add_pci_osc (dev, true); }aml_append (scope, dev);
@@ -267,7 +268,7 @@ void acpi_dsdt_add_gpex(Aml *scope, struct GPEXConfig *cfg) }aml_append (dev,aml_name_decl ("_CRS" , rbuf)); -acpi_dsdt_add_pci_osc (dev); +acpi_dsdt_add_pci_osc (dev, true);Aml *dev_res0 =aml_device ("%s" ,"RES0" );aml_append (dev_res0,aml_name_decl ("_HID" ,aml_string ("PNP0C02" )));
Signature · 1 line
2.49.0
PATCH v4 4/32 tests/qtest/bios-tables-test: Prepare for changes in the DSDT table
In reply to Eric AugerFrom: Gustavo Romero <[email protected]>
This commit adds DSDT blobs to the whilelist in the prospect to allow changes in the GPEX _OSC method.
---
v3 -> v4:
- add missed tests/data/acpi/riscv64/virt/DSDT
v2 -> v3:
- fix for microvm
--- tests/qtest/bios-tables-test-allowed-diff.h | 7 +++++++ 1 file changed, 7 insertions(+)
tests/qtest/bios-tables-test-allowed-diff.h +7 -0
@@ -1 +1,8 @@/* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/aarch64/virt/DSDT" , +"tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt" , +"tests/data/acpi/aarch64/virt/DSDT.memhp" , +"tests/data/acpi/aarch64/virt/DSDT.pxb" , +"tests/data/acpi/aarch64/virt/DSDT.topology" , +"tests/data/acpi/x86/microvm/DSDT.pcie" , +"tests/data/acpi/riscv64/virt/DSDT",
Signature · 1 line
2.49.0
PATCH v4 5/32 hw/pci-host/gpex-acpi: Split host bridge OSC and DSM generation
In reply to Eric Augeracpi_dsdt_add_pci_osc() name is confusing as it gives the impression it appends the _OSC method but in fact it also appends the _DSM method for the host bridge. Let's split the function into two separate ones and let them return the method Aml pointer instead. This matches the way it is done on x86 (build_q35_osc_method). In a subsequent patch we will replace the gpex method by the q35 implementation that will become shared between ARM and x86.
acpi_dsdt_add_host_bridge_methods is a new top helper that generates both the _OSC and _DSM methods.
We take the opportunity to move SUPP and CTRL in the _osc method that use them.
---
v2 -> v3:
- moved
aml_append(dev, aml_name_decl("SUPP", aml_int(0)));
aml_append(dev, aml_name_decl("CTRL", aml_int(0)));
into the _osc function. (Jonathan)
hence discarded Gustavo's and Igor's R-bs
---
hw/pci-host/gpex-acpi.c | 32 +++++++++++++++++++++-----------
1 file changed, 21 insertions(+), 11 deletions(-)hw/pci-host/gpex-acpi.c +21 -11
@@ -50,14 +50,12 @@ static void acpi_dsdt_add_pci_route_table(Aml *dev, uint32_t irq, } } -static void acpi_dsdt_add_pci_osc (Aml *dev,bool enable_native_pcie_hotplug) +static Aml *build_host_bridge_osc (bool enable_native_pcie_hotplug) { -Aml *method, *UUID , *ifctx, *ifctx1, *elsectx, *buf; - -/* Declare an _OSC (OS Control Handoff) method */ -aml_append (dev,aml_name_decl ("SUPP" ,aml_int (0 ))); -aml_append (dev,aml_name_decl ("CTRL" ,aml_int (0 ))); +Aml *method, *UUID , *ifctx, *ifctx1, *elsectx; method =aml_method ("_OSC" ,4 ,AML_NOTSERIALIZED ); +aml_append (method,aml_name_decl ("SUPP" ,aml_int (0 ))); +aml_append (method,aml_name_decl ("CTRL" ,aml_int (0 )));aml_append (method,aml_create_dword_field (aml_arg (3 ),aml_int (0 ),"CDW1" ));
@@ -103,9 +101,13 @@ static void acpi_dsdt_add_pci_osc(Aml *dev, bool enable_native_pcie_hotplug) aml_name("CDW1")));aml_append (elsectx,aml_return (aml_arg (3 )));aml_append (method, elsectx); -aml_append (dev, method); +return method; +} - method =aml_method ("_DSM" ,4 ,AML_NOTSERIALIZED ); +static Aml *build_host_bridge_dsm (void ) +{ +Aml *method =aml_method ("_DSM" ,4 ,AML_NOTSERIALIZED ); +Aml *UUID , *ifctx, *ifctx1, *buf;/* PCI Firmware Specification 3.0 * 4.6.1. _DSM for PCI Express Slot Information
@@ -124,7 +126,15 @@ static void acpi_dsdt_add_pci_osc(Aml *dev, bool enable_native_pcie_hotplug) byte_list[0 ] =0 ; buf =aml_buffer (1 , byte_list);aml_append (method,aml_return (buf)); -aml_append (dev, method); +return method; +} + +static void acpi_dsdt_add_host_bridge_methods (Aml *dev, +bool enable_native_pcie_hotplug) +{ +/* Declare an _OSC (OS Control Handoff) method */ +aml_append (dev,build_host_bridge_osc (enable_native_pcie_hotplug)); +aml_append (dev,build_host_bridge_dsm ()); }void acpi_dsdt_add_gpex (Aml *scope,struct GPEXConfig *cfg)
@@ -193,7 +203,7 @@ void acpi_dsdt_add_gpex(Aml *scope, struct GPEXConfig *cfg)if (is_cxl) {build_cxl_osc_method (dev); }else { -acpi_dsdt_add_pci_osc (dev, true); +acpi_dsdt_add_host_bridge_methods (dev, true); }aml_append (scope, dev);
@@ -268,7 +278,7 @@ void acpi_dsdt_add_gpex(Aml *scope, struct GPEXConfig *cfg) }aml_append (dev,aml_name_decl ("_CRS" , rbuf)); -acpi_dsdt_add_pci_osc (dev, true); +acpi_dsdt_add_host_bridge_methods (dev, true);Aml *dev_res0 =aml_device ("%s" ,"RES0" );aml_append (dev_res0,aml_name_decl ("_HID" ,aml_string ("PNP0C02" )));
Signature · 1 line
2.49.0
PATCH v4 6/32 hw/acpi/ged: Add a acpi-pci-hotplug-with-bridge-support property
In reply to Eric AugerA new boolean property is introduced. This will be used to turn ACPI PCI hotplug support. By default it is unset.
--- include/hw/acpi/generic_event_device.h | 2 ++ hw/acpi/generic_event_device.c | 2 ++ 2 files changed, 4 insertions(+)
include/hw/acpi/generic_event_device.h +2 -0
@@ -63,6 +63,7 @@#include "hw/acpi/memory_hotplug.h" #include "hw/acpi/ghes.h" #include "hw/acpi/cpu.h" +#include "hw/acpi/pcihp.h" #include "qom/object.h" #define ACPI_POWER_BUTTON_DEVICE "PWRB"
@@ -114,6 +115,7 @@ struct AcpiGedState {MemoryRegion container_memhp;CPUHotplugState cpuhp_state;MemoryRegion container_cpuhp; +AcpiPciHpState pcihp_state;GEDState ged_state;uint32_t ged_event_bitmap;qemu_irq irq;
hw/acpi/generic_event_device.c +2 -0
@@ -318,6 +318,8 @@ static void acpi_ged_send_event(AcpiDeviceIf *adev, AcpiEventStatusBits ev)static const Property acpi_ged_properties[] = {DEFINE_PROP_UINT32 ("ged-event" , AcpiGedState, ged_event_bitmap,0 ), +DEFINE_PROP_BOOL (ACPI_PM_PROP_ACPI_PCIHP_BRIDGE , AcpiGedState, + pcihp_state.use_acpi_hotplug_bridge,0 ), };static const VMStateDescription vmstate_memhp_state = {
Signature · 1 line
2.49.0
PATCH v4 7/32 hw/pci-host/gpex-acpi: Use GED acpi pcihp property
In reply to Eric AugerRetrieve the acpi pcihp property value from the ged. In case this latter is not set, PCI native hotplug is used on pci0. For expander bridges we keep pci native hotplug, as done on x86 q35.
---
v3 -> v4:
- Use object_property_get_bool (Igor)
- rework the commit description (Igor)
v2 -> v3:
- don'use the virt arm machine option anymore.
--- include/hw/pci-host/gpex.h | 1 + hw/arm/virt-acpi-build.c | 5 +++++ hw/pci-host/gpex-acpi.c | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-)
include/hw/pci-host/gpex.h +1 -0
@@ -45,6 +45,7 @@ struct GPEXConfig {MemMapEntry pio;int irq;PCIBus *bus; +bool pci_native_hotplug; };typedef struct GPEXIrq GPEXIrq ;
hw/arm/virt-acpi-build.c +5 -0
@@ -123,12 +123,17 @@ static void acpi_dsdt_add_pci(Aml *scope, const MemMapEntry *memmap, uint32_t irq, VirtMachineState *vms) { int ecam_id = VIRT_ECAM_ID(vms->highmem_ecam); +bool acpi_pcihp =object_property_get_bool (OBJECT (vms->acpi_dev), +ACPI_PM_PROP_ACPI_PCIHP_BRIDGE , +NULL ); +struct GPEXConfig cfg = { .mmio32 = memmap[VIRT_PCIE_MMIO ], .pio = memmap[VIRT_PCIE_PIO ], .ecam = memmap[ecam_id], .irq = irq, .bus = vms->bus, + .pci_native_hotplug = !acpi_pcihp, };if (vms->highmem_mmio) {
hw/pci-host/gpex-acpi.c +2 -1
@@ -203,6 +203,7 @@ void acpi_dsdt_add_gpex(Aml *scope, struct GPEXConfig *cfg)if (is_cxl) {build_cxl_osc_method (dev); }else { +/* pxb bridges do not have ACPI PCI Hot-plug enabled */ acpi_dsdt_add_host_bridge_methods (dev, true); }
@@ -278,7 +279,7 @@ void acpi_dsdt_add_gpex(Aml *scope, struct GPEXConfig *cfg) }aml_append (dev,aml_name_decl ("_CRS" , rbuf)); -acpi_dsdt_add_host_bridge_methods (dev, true); +acpi_dsdt_add_host_bridge_methods (dev, cfg->pci_native_hotplug);Aml *dev_res0 =aml_device ("%s" ,"RES0" );aml_append (dev_res0,aml_name_decl ("_HID" ,aml_string ("PNP0C02" )));
Signature · 1 line
2.49.0
Re: [PATCH v4 07/32] hw/pci-host/gpex-acpi: Use GED acpi pcihp property
Quoted 5 lines · On Fri, 27 Jun 2025 11:54:56 +0200 Eric Auger <[email protected]> wrote:
Retrieve the acpi pcihp property value from the ged. In case this latter is not set, PCI native hotplug is used on pci0. For expander bridges we keep pci native hotplug, as done on x86 q35.
Signed-off-by Eric Auger <[email protected]>
PATCH v4 8/32 hw/i386/acpi-build: Turn build_q35_osc_method into a generic method
In reply to Eric AugerGPEX acpi_dsdt_add_pci_osc() does basically the same as build_q35_osc_method().
Rename build_q35_osc_method() into build_pci_host_bridge_osc_method() and move it into hw/acpi/pci.c. In a subsequent patch we will use this later in place of acpi_dsdt_add_pci_osc().
---
v2 -> v3:
- move to hw/acpi/pci.c instead of aml-build.c (Igor)
--- include/hw/acpi/pci.h | 2 ++ hw/acpi/pci.c | 50 +++++++++++++++++++++++++++++++++++++++ hw/i386/acpi-build.c | 54 ++----------------------------------------- 3 files changed, 54 insertions(+), 52 deletions(-)
include/hw/acpi/pci.h +2 -0
@@ -42,4 +42,6 @@ void build_pci_bridge_aml(AcpiDevAmlIf *adev, Aml *scope);void build_srat_generic_affinity_structures (GArray *table_data); +Aml *build_pci_host_bridge_osc_method (bool enable_native_pcie_hotplug); +#endif
hw/acpi/pci.c +50 -0
53 lines not on this page · raw message
hw/i386/acpi-build.c +2 -52
72 lines not on this page · raw message
Signature · 1 line
2.49.0
PATCH v4 9/32 hw/pci-host/gpex-acpi: Use build_pci_host_bridge_osc_method
In reply to Eric Augergpex build_host_bridge_osc() and x86 originated build_pci_host_bridge_osc_method() are mostly identical.
In GPEX, SUPP is set to CDW2 but is not further used. CTRL is same as Local0.
So let gpex code reuse build_pci_host_bridge_osc_method() and remove build_host_bridge_osc().
Also add an imply ACPI_PCI clause along with PCI_EXPRESS_GENERIC_BRIDGE to compile hw/acpi/pci.c when its dependency is resolved (ie. CONFIG_ACPI_PCI). This is requested to link qemu-system-mips64el.
The disassembled DSDT difference is given below:
* Original Table Header:
* Signature "DSDT"
- * Length 0x00001A4F (6735)
+ * Length 0x00001A35 (6709)
* Revision 0x02
- * Checksum 0xBF
+ * Checksum 0xDD
* OEM ID "BOCHS "
* OEM Table ID "BXPC "
* OEM Revision 0x00000001 (1)
@@ -1849,27 +1849,26 @@ DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPC ", 0x00000001)
{
CreateDWordField (Arg3, 0x04, CDW2)
CreateDWordField (Arg3, 0x08, CDW3)
- SUPP = CDW2 /* \_SB_.PCI0._OSC.CDW2 */
- CTRL = CDW3 /* \_SB_.PCI0._OSC.CDW3 */
- CTRL &= 0x1F
+ Local0 = CDW3 /* \_SB_.PCI0._OSC.CDW3 */
+ Local0 &= 0x1F
If ((Arg1 != One))
{
CDW1 |= 0x08
}- If ((CDW3 != CTRL))
+ If ((CDW3 != Local0))
{
CDW1 |= 0x10
}- CDW3 = CTRL /* \_SB_.PCI0.CTRL */
- Return (Arg3)
+ CDW3 = Local0
}
Else
{
CDW1 |= 0x04
- Return (Arg3)
}+
+ Return (Arg3)
}
Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific Method
---
v3 -> v3:
- Fix link issue:/usr/bin/ld: libsystem.a.p/hw_pci-host_gpex-acpi.c.o: in function `acpi_dsdt_add_host_bridge_methods':./hw/pci-host/gpex-acpi.c:83: undefined reference to `build_pci_host_bridge_osc_method'
v1 -> v2:
- move in the dsdt.dsl diff in the commit message and remove useless info (Gustavo, Michael)
--- hw/pci-host/gpex-acpi.c | 62 ++++------------------------------------- hw/pci-host/Kconfig | 1 + 2 files changed, 6 insertions(+), 57 deletions(-)
hw/pci-host/gpex-acpi.c +5 -57
@@ -1,5 +1,6 @@#include "qemu/osdep.h" #include "hw/acpi/aml-build.h" +#include "hw/acpi/pci.h" #include "hw/pci-host/gpex.h" #include "hw/arm/virt.h" #include "hw/pci/pci_bus.h"
@@ -50,61 +51,7 @@ static void acpi_dsdt_add_pci_route_table(Aml *dev, uint32_t irq, } } -static Aml *build_host_bridge_osc (bool enable_native_pcie_hotplug) -{ -Aml *method, *UUID , *ifctx, *ifctx1, *elsectx; - method =aml_method ("_OSC" ,4 ,AML_NOTSERIALIZED ); -aml_append (method,aml_name_decl ("SUPP" ,aml_int (0 ))); -aml_append (method,aml_name_decl ("CTRL" ,aml_int (0 ))); -aml_append (method, -aml_create_dword_field (aml_arg (3 ),aml_int (0 ),"CDW1" )); - -/* PCI Firmware Specification 3.0 -* 4.5.1. _OSC Interface for PCI Host Bridge Devices -* The _OSC interface for a PCI/PCI-X/PCI Express hierarchy is -* identified by the Universal Unique IDentifier (UUID) -* 33DB4D5B-1FF7-401C-9657-7441C03DD766 -*/ -UUID =aml_touuid ("33DB4D5B-1FF7-401C-9657-7441C03DD766" ); - ifctx =aml_if (aml_equal (aml_arg (0 ),UUID )); -aml_append (ifctx, -aml_create_dword_field (aml_arg (3 ),aml_int (4 ),"CDW2" )); -aml_append (ifctx, -aml_create_dword_field (aml_arg (3 ),aml_int (8 ),"CDW3" )); -aml_append (ifctx,aml_store (aml_name ("CDW2" ),aml_name ("SUPP" ))); -aml_append (ifctx,aml_store (aml_name ("CDW3" ),aml_name ("CTRL" ))); - -/* -* Allow OS control for SHPCHotplug, PME, AER, PCIeCapability, -* and PCIeHotplug depending on enable_native_pcie_hotplug -*/ -aml_append (ifctx,aml_and (aml_name ("CTRL" ), -aml_int (0x1E | (enable_native_pcie_hotplug ?0x1 :0x0 )), -aml_name ("CTRL" ))); - - ifctx1 =aml_if (aml_lnot (aml_equal (aml_arg (1 ),aml_int (0x1 )))); -aml_append (ifctx1,aml_or (aml_name ("CDW1" ),aml_int (0x08 ), -aml_name ("CDW1" ))); -aml_append (ifctx, ifctx1); - - ifctx1 =aml_if (aml_lnot (aml_equal (aml_name ("CDW3" ),aml_name ("CTRL" )))); -aml_append (ifctx1,aml_or (aml_name ("CDW1" ),aml_int (0x10 ), -aml_name ("CDW1" ))); -aml_append (ifctx, ifctx1); - -aml_append (ifctx,aml_store (aml_name ("CTRL" ),aml_name ("CDW3" ))); -aml_append (ifctx,aml_return (aml_arg (3 ))); -aml_append (method, ifctx); - - elsectx =aml_else (); -aml_append (elsectx,aml_or (aml_name ("CDW1" ),aml_int (4 ), -aml_name ("CDW1" ))); -aml_append (elsectx,aml_return (aml_arg (3 ))); -aml_append (method, elsectx); -return method; -} - -static Aml *build_host_bridge_dsm (void ) +static Aml *build_pci_host_bridge_dsm_method (void ) {Aml *method =aml_method ("_DSM" ,4 ,AML_NOTSERIALIZED );Aml *UUID , *ifctx, *ifctx1, *buf;
@@ -133,8 +80,9 @@ static void acpi_dsdt_add_host_bridge_methods(Aml *dev, bool enable_native_pcie_hotplug) {/* Declare an _OSC (OS Control Handoff) method */ -aml_append (dev,build_host_bridge_osc (enable_native_pcie_hotplug)); -aml_append (dev,build_host_bridge_dsm ()); +aml_append (dev, +build_pci_host_bridge_osc_method (enable_native_pcie_hotplug)); +aml_append (dev,build_pci_host_bridge_dsm_method ()); }void acpi_dsdt_add_gpex (Aml *scope,struct GPEXConfig *cfg)
hw/pci-host/Kconfig +1 -0
@@ -54,6 +54,7 @@ config PCI_EXPRESS_Q35 config PCI_EXPRESS_GENERIC_BRIDGE bool select PCI_EXPRESS + imply ACPI_PCI config PCI_EXPRESS_XILINX bool
Signature · 1 line
2.49.0
Re: [PATCH v4 09/32] hw/pci-host/gpex-acpi: Use build_pci_host_bridge_osc_method
Quoted 61 lines · On Fri, 27 Jun 2025 11:54:58 +0200 Eric Auger <[email protected]> wrote:
gpex
build_host_bridge_osc()and x86 originatedbuild_pci_host_bridge_osc_method()are mostly identical.In GPEX, SUPP is set to CDW2 but is not further used. CTRL is same as Local0.
So let gpex code reuse
build_pci_host_bridge_osc_method()and removebuild_host_bridge_osc().Also add an imply
ACPI_PCIclause along withPCI_EXPRESS_GENERIC_BRIDGEto compilehw/acpi/pci.cwhen its dependency is resolved (ie.CONFIG_ACPI_PCI). This is requested to link qemu-system-mips64el.The disassembled DSDT difference is given below:
* Original Table Header:
* Signature "DSDT" - * Length 0x00001A4F (6735) + * Length 0x00001A35 (6709) * Revision 0x02 - * Checksum 0xBF + * Checksum 0xDD * OEM ID "BOCHS " * OEM Table ID "BXPC " * OEM Revision 0x00000001 (1)(quoted diff) +6
-7@@ -1849,27 +1849,26 @@ DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPC ", 0x00000001) { CreateDWordField (Arg3, 0x04, CDW2) CreateDWordField (Arg3, 0x08, CDW3) - SUPP = CDW2 /* \_SB_.PCI0._OSC.CDW2 */ - CTRL = CDW3 /* \_SB_.PCI0._OSC.CDW3 */ - CTRL &= 0x1F + Local0 = CDW3 /* \_SB_.PCI0._OSC.CDW3 */ + Local0 &= 0x1F If ((Arg1 != One)) { CDW1 |= 0x08 } - If ((CDW3 != CTRL)) + If ((CDW3 != Local0)) { CDW1 |= 0x10 } - CDW3 = CTRL /* \_SB_.PCI0.CTRL */ - Return (Arg3) + CDW3 = Local0 } Else { CDW1 |= 0x04 - Return (Arg3) } + + Return (Arg3) } Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific Method
Quoted 6 lines
Signed-off-by Eric Auger <[email protected]>Reviewed-by Igor Mammedov <[email protected]>---
v3 -> v3:
v3->v4?
PATCH v4 10/32 tests/qtest/bios-tables-test: Update DSDT blobs after GPEX _OSC change
In reply to Eric AugerUpdate the reference DSDT blobs after GPEX _OSC change. The _OSC change affects the aarch64 'virt' and the x86 'microvm' machines.
DSDT diff is the same for all the machines/tests:
* Original Table Header:
* Signature "DSDT"
- * Length 0x00001A4F (6735)
+ * Length 0x00001A35 (6709)
* Revision 0x02
- * Checksum 0xBF
+ * Checksum 0xDD
* OEM ID "BOCHS "
* OEM Table ID "BXPC "
* OEM Revision 0x00000001 (1)
@@ -1849,27 +1849,26 @@ DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPC ", 0x00000001)
{
CreateDWordField (Arg3, 0x04, CDW2)
CreateDWordField (Arg3, 0x08, CDW3)
- SUPP = CDW2 /* \_SB_.PCI0._OSC.CDW2 */
- CTRL = CDW3 /* \_SB_.PCI0._OSC.CDW3 */
- CTRL &= 0x1F
+ Local0 = CDW3 /* \_SB_.PCI0._OSC.CDW3 */
+ Local0 &= 0x1F
If ((Arg1 != One))
{
CDW1 |= 0x08
}- If ((CDW3 != CTRL))
+ If ((CDW3 != Local0))
{
CDW1 |= 0x10
}- CDW3 = CTRL /* \_SB_.PCI0.CTRL */
- Return (Arg3)
+ CDW3 = Local0
}
Else
{
CDW1 |= 0x04
- Return (Arg3)
}+
+ Return (Arg3)
}
Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific Method
---
v3 -> v4
- fix the commit msg: dsl reverse diff (Jonathan)
--- tests/qtest/bios-tables-test-allowed-diff.h | 7 ------- tests/data/acpi/aarch64/virt/DSDT | Bin 5196 -> 5158 bytes .../data/acpi/aarch64/virt/DSDT.acpihmatvirt | Bin 5282 -> 5244 bytes tests/data/acpi/aarch64/virt/DSDT.memhp | Bin 6557 -> 6519 bytes tests/data/acpi/aarch64/virt/DSDT.pxb | Bin 7679 -> 7603 bytes tests/data/acpi/aarch64/virt/DSDT.topology | Bin 5398 -> 5360 bytes tests/data/acpi/riscv64/virt/DSDT | Bin 3576 -> 3538 bytes tests/data/acpi/x86/microvm/DSDT.pcie | Bin 3023 -> 2985 bytes 8 files changed, 7 deletions(-)
tests/qtest/bios-tables-test-allowed-diff.h +0 -7
@@ -1,8 +1 @@/* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/aarch64/virt/DSDT" , -"tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt" , -"tests/data/acpi/aarch64/virt/DSDT.memhp" , -"tests/data/acpi/aarch64/virt/DSDT.pxb" , -"tests/data/acpi/aarch64/virt/DSDT.topology" , -"tests/data/acpi/x86/microvm/DSDT.pcie" , -"tests/data/acpi/riscv64/virt/DSDT",
tests/data/acpi/aarch64/virt/DSDT binary +0 -0
tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt binary +0 -0
tests/data/acpi/aarch64/virt/DSDT.memhp binary +0 -0
tests/data/acpi/aarch64/virt/DSDT.pxb binary +0 -0
tests/data/acpi/aarch64/virt/DSDT.topology binary +0 -0
tests/data/acpi/riscv64/virt/DSDT binary +0 -0
tests/data/acpi/x86/microvm/DSDT.pcie binary +0 -0
Signature · 1 line
2.49.0
Re: [PATCH v4 10/32] tests/qtest/bios-tables-test: Update DSDT blobs after GPEX _OSC change
Quoted 50 lines · On Fri, 27 Jun 2025 11:54:59 +0200 Eric Auger <[email protected]> wrote:
Update the reference DSDT blobs after GPEX
_OSCchange. The_OSCchange affects the aarch64 'virt' and the x86 'microvm' machines.DSDT diff is the same for all the machines/tests:
* Original Table Header:
* Signature "DSDT" - * Length 0x00001A4F (6735) + * Length 0x00001A35 (6709) * Revision 0x02 - * Checksum 0xBF + * Checksum 0xDD * OEM ID "BOCHS " * OEM Table ID "BXPC " * OEM Revision 0x00000001 (1)(quoted diff) +6
-7@@ -1849,27 +1849,26 @@ DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPC ", 0x00000001) { CreateDWordField (Arg3, 0x04, CDW2) CreateDWordField (Arg3, 0x08, CDW3) - SUPP = CDW2 /* \_SB_.PCI0._OSC.CDW2 */ - CTRL = CDW3 /* \_SB_.PCI0._OSC.CDW3 */ - CTRL &= 0x1F + Local0 = CDW3 /* \_SB_.PCI0._OSC.CDW3 */ + Local0 &= 0x1F If ((Arg1 != One)) { CDW1 |= 0x08 } - If ((CDW3 != CTRL)) + If ((CDW3 != Local0)) { CDW1 |= 0x10 } - CDW3 = CTRL /* \_SB_.PCI0.CTRL */ - Return (Arg3) + CDW3 = Local0 } Else { CDW1 |= 0x04 - Return (Arg3) } + + Return (Arg3) } Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific Method
Quoted 2 lines
Signed-off-by Eric Auger <[email protected]>Signed-off-by Gustavo Romero <[email protected]>
PATCH v4 11/32 hw/i386/acpi-build: Introduce build_append_pcihp_resources() helper
In reply to Eric AugerExtract the code that reserves resources for ACPI PCI hotplug into a new helper named build_append_pcihp_resources() and move it to pcihp.c. We will reuse it on ARM.
---
v2 -> v3:
- fixed indent (Jonathan)
--- include/hw/acpi/pcihp.h | 2 ++ hw/acpi/pcihp.c | 18 ++++++++++++++++++ hw/i386/acpi-build.c | 15 ++------------- 3 files changed, 22 insertions(+), 13 deletions(-)
include/hw/acpi/pcihp.h +2 -0
@@ -75,6 +75,8 @@ void acpi_pcihp_device_unplug_request_cb(HotplugHandler *hotplug_dev,void build_acpi_pci_hotplug (Aml *table,uint64_t pcihp_addr);void build_append_pci_dsm_func0_common (Aml *ctx,Aml *retvar); +void build_append_pcihp_resources (Aml *table, +uint64_t io_addr,uint64_t io_len);/* Called on reset */ void acpi_pcihp_reset (AcpiPciHpState *s);
hw/acpi/pcihp.c +18 -0
@@ -685,6 +685,24 @@ void build_acpi_pci_hotplug(Aml *table, uint64_t pcihp_addr)aml_append (table, scope); } +/* Reserve PCIHP resources */ +void build_append_pcihp_resources (Aml *scope/* \\_SB.PCI0 */ , +uint64_t io_addr,uint64_t io_len) +{ +Aml *dev, *crs; + + dev =aml_device ("PHPR" ); +aml_append (dev,aml_name_decl ("_HID" ,aml_string ("PNP0A06" ))); +aml_append (dev, +aml_name_decl ("_UID" ,aml_string ("PCI Hotplug resources" ))); +/* device present, functioning, decoding, not shown in UI */ +aml_append (dev,aml_name_decl ("_STA" ,aml_int (0xB ))); + crs =aml_resource_template (); +aml_append (crs,aml_io (AML_DECODE16 , io_addr, io_addr,1 , io_len)); +aml_append (dev,aml_name_decl ("_CRS" , crs)); +aml_append (scope, dev); +} +const VMStateDescription vmstate_acpi_pcihp_pci_status = { .name ="acpi_pcihp_pci_status" , .version_id =1 ,
hw/i386/acpi-build.c +2 -13
@@ -1432,19 +1432,8 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,/* reserve PCIHP resources */ if (pm->pcihp_io_len && (pm->pcihp_bridge_en || pm->pcihp_root_en)) { - dev =aml_device ("PHPR" ); -aml_append (dev,aml_name_decl ("_HID" ,aml_string ("PNP0A06" ))); -aml_append (dev, -aml_name_decl ("_UID" ,aml_string ("PCI Hotplug resources" ))); -/* device present, functioning, decoding, not shown in UI */ -aml_append (dev,aml_name_decl ("_STA" ,aml_int (0xB ))); - crs =aml_resource_template (); -aml_append (crs, -aml_io (AML_DECODE16 , pm->pcihp_io_base, pm->pcihp_io_base,1 , - pm->pcihp_io_len) - ); -aml_append (dev,aml_name_decl ("_CRS" , crs)); -aml_append (scope, dev); +build_append_pcihp_resources (scope, + pm->pcihp_io_base, pm->pcihp_io_len); }aml_append (dsdt, scope);
Signature · 1 line
2.49.0
PATCH v4 12/32 hw/acpi/pcihp: Add an AmlRegionSpace arg to build_acpi_pci_hotplug
In reply to Eric AugerOn ARM we will put the operation regions in AML_SYSTEM_MEMORY. So let's allow this configuration.
--- include/hw/acpi/pcihp.h | 3 ++- hw/acpi/pcihp.c | 8 ++++---- hw/i386/acpi-build.c | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-)
include/hw/acpi/pcihp.h +2 -1
@@ -28,6 +28,7 @@#define HW_ACPI_PCIHP_H #include "hw/acpi/acpi.h" +#include "hw/acpi/aml-build.h" #include "hw/hotplug.h" #define ACPI_PCIHP_IO_BASE_PROP "acpi-pcihp-io-base"
@@ -73,7 +74,7 @@ void acpi_pcihp_device_unplug_request_cb(HotplugHandler *hotplug_dev, AcpiPciHpState *s, DeviceState *dev, Error **errp); -void build_acpi_pci_hotplug (Aml *table,uint64_t pcihp_addr); +void build_acpi_pci_hotplug (Aml *table,AmlRegionSpace rs,uint64_t pcihp_addr);void build_append_pci_dsm_func0_common (Aml *ctx,Aml *retvar);void build_append_pcihp_resources (Aml *table,uint64_t io_addr,uint64_t io_len);
hw/acpi/pcihp.c +4 -4
@@ -629,7 +629,7 @@ static Aml *aml_pci_pdsm(void)return method; } -void build_acpi_pci_hotplug (Aml *table,uint64_t pcihp_addr) +void build_acpi_pci_hotplug (Aml *table,AmlRegionSpace rs,uint64_t pcihp_addr) {Aml *scope;Aml *field;
@@ -638,21 +638,21 @@ void build_acpi_pci_hotplug(Aml *table, uint64_t pcihp_addr) scope =aml_scope ("_SB.PCI0" );aml_append (scope, -aml_operation_region ("PCST" ,AML_SYSTEM_IO ,aml_int (pcihp_addr),0x08 )); +aml_operation_region ("PCST" , rs,aml_int (pcihp_addr),0x08 )); field =aml_field ("PCST" ,AML_DWORD_ACC ,AML_NOLOCK ,AML_WRITE_AS_ZEROS );aml_append (field,aml_named_field ("PCIU" ,32 ));aml_append (field,aml_named_field ("PCID" ,32 ));aml_append (scope, field);aml_append (scope, -aml_operation_region ("SEJ" ,AML_SYSTEM_IO , +aml_operation_region ("SEJ" , rs,aml_int (pcihp_addr +ACPI_PCIHP_SEJ_BASE ),0x04 )); field =aml_field ("SEJ" ,AML_DWORD_ACC ,AML_NOLOCK ,AML_WRITE_AS_ZEROS );aml_append (field,aml_named_field ("B0EJ" ,32 ));aml_append (scope, field);aml_append (scope, -aml_operation_region ("BNMR" ,AML_SYSTEM_IO , +aml_operation_region ("BNMR" , rs,aml_int (pcihp_addr +ACPI_PCIHP_BNMR_BASE ),0x08 )); field =aml_field ("BNMR" ,AML_DWORD_ACC ,AML_NOLOCK ,AML_WRITE_AS_ZEROS );aml_append (field,aml_named_field ("BNUM" ,32 ));
hw/i386/acpi-build.c +2 -2
@@ -1172,7 +1172,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,aml_append (dsdt, sb_scope);if (pm->pcihp_bridge_en || pm->pcihp_root_en) { -build_acpi_pci_hotplug (dsdt, pm->pcihp_io_base); +build_acpi_pci_hotplug (dsdt,AML_SYSTEM_IO , pm->pcihp_io_base); }build_piix4_pci0_int (dsdt); }else if (q35) {
@@ -1216,7 +1216,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,aml_append (dsdt, sb_scope);if (pm->pcihp_bridge_en) { -build_acpi_pci_hotplug (dsdt, pm->pcihp_io_base); +build_acpi_pci_hotplug (dsdt,AML_SYSTEM_IO , pm->pcihp_io_base); }build_q35_pci0_int (dsdt); }
Signature · 1 line
2.49.0
PATCH v4 13/32 hw/i386/acpi-build: Move build_append_notification_callback to pcihp
In reply to Eric AugerWe plan to reuse build_append_notification_callback() on ARM so let's move it to pcihp.c.
No functional change intended.
--- include/hw/acpi/pcihp.h | 1 + hw/acpi/pcihp.c | 58 +++++++++++++++++++++++++++++++++++++++++ hw/i386/acpi-build.c | 58 ----------------------------------------- 3 files changed, 59 insertions(+), 58 deletions(-)
include/hw/acpi/pcihp.h +1 -0
@@ -78,6 +78,7 @@ void build_acpi_pci_hotplug(Aml *table, AmlRegionSpace rs, uint64_t pcihp_addr);void build_append_pci_dsm_func0_common (Aml *ctx,Aml *retvar);void build_append_pcihp_resources (Aml *table,uint64_t io_addr,uint64_t io_len); +bool build_append_notification_callback (Aml *parent_scope,const PCIBus *bus);/* Called on reset */ void acpi_pcihp_reset (AcpiPciHpState *s);
hw/acpi/pcihp.c +58 -0
70 lines not on this page · raw message
hw/i386/acpi-build.c +0 -58
64 lines not on this page · raw message
Signature · 1 line
2.49.0
PATCH v4 14/32 hw/i386/acpi-build: Move build_append_pci_bus_devices/pcihp_slots to pcihp
In reply to Eric AugerWe intend to reuse build_append_pci_bus_devices and build_append_pcihp_slots on ARM. So let's move them to hw/acpi/pcihp.c as well as all static helpers they use.
No functional change intended.
---
v2 -> v3:
- changed the layout of the commit message
- reordered the moved functions to match the original ordering (Jonathan)
--- include/hw/acpi/pci.h | 1 - include/hw/acpi/pcihp.h | 2 + hw/acpi/pcihp.c | 173 ++++++++++++++++++++++++++++++++++++++++ hw/i386/acpi-build.c | 172 --------------------------------------- 4 files changed, 175 insertions(+), 173 deletions(-)
include/hw/acpi/pci.h +0 -1
@@ -37,7 +37,6 @@ typedef struct AcpiMcfgInfo {void build_mcfg (GArray *table_data,BIOSLinker *linker,AcpiMcfgInfo *info,const char *oem_id,const char *oem_table_id); -void build_append_pci_bus_devices (Aml *parent_scope,PCIBus *bus);void build_pci_bridge_aml (AcpiDevAmlIf *adev,Aml *scope);void build_srat_generic_affinity_structures (GArray *table_data);
include/hw/acpi/pcihp.h +2 -0
@@ -80,6 +80,8 @@ void build_append_pcihp_resources(Aml *table, uint64_t io_addr, uint64_t io_len);bool build_append_notification_callback (Aml *parent_scope,const PCIBus *bus); +void build_append_pci_bus_devices (Aml *parent_scope,PCIBus *bus); +/* Called on reset */ void acpi_pcihp_reset (AcpiPciHpState *s);
hw/acpi/pcihp.c +173 -0
185 lines not on this page · raw message
hw/i386/acpi-build.c +0 -172
184 lines not on this page · raw message
Signature · 1 line
2.49.0
PATCH v4 15/32 hw/i386/acpi-build: Use AcpiPciHpState::root in acpi_set_pci_info
In reply to Eric Augerpcihp acpi_set_pci_info() generic code currently uses acpi_get_i386_pci_host() to retrieve the pci host bridge.
To make it work also on ARM we get rid of that call and directly use AcpiPciHpState::root.
---
v2 -> v3:
- Use AcpiPciHpState::root
v1 -> v2
- described the fact we changed the implementation of acpi_get_pci_host() in the commit msg.
--- hw/acpi/pcihp.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
hw/acpi/pcihp.c +4 -7
@@ -99,10 +99,10 @@ static void *acpi_set_bsel(PCIBus *bus, void *opaque)return info; } -static void acpi_set_pci_info (bool has_bridge_hotplug) +static void acpi_set_pci_info (AcpiPciHpState *s) {static bool bsel_is_set; -Object *host =acpi_get_i386_pci_host (); +bool has_bridge_hotplug = s->use_acpi_hotplug_bridge;PCIBus *bus;BSELInfo info = { .bsel_alloc =ACPI_PCIHP_BSEL_DEFAULT , .has_bridge_hotplug = has_bridge_hotplug };
@@ -112,11 +112,8 @@ static void acpi_set_pci_info(bool has_bridge_hotplug) } bsel_is_set = true; -if (!host) { -return ; - } - bus =PCI_HOST_BRIDGE (host)->bus; + bus = s->root;if (bus) {/* Scan all PCI buses. Set property to enable acpi based hotplug. */ pci_for_each_bus_depth_first (bus, acpi_set_bsel,NULL , &info);
@@ -266,7 +263,7 @@ static void acpi_pcihp_update(AcpiPciHpState *s)void acpi_pcihp_reset (AcpiPciHpState *s) { -acpi_set_pci_info (s->use_acpi_hotplug_bridge); +acpi_set_pci_info (s);acpi_pcihp_update (s); }
Signature · 1 line
2.49.0
PATCH v4 16/32 hw/i386/acpi-build: Move aml_pci_edsm to a generic place
In reply to Eric AugerMove aml_pci_edsm to pci-bridge.c since we want to reuse that for ARM and acpi-index support. Also rename it into build_pci_bridge_edsm.
---
v3->v4:
- renamed into build_pci_bridge_edsm() (Jonathan, Igor)
v2 -> v3:
- move to pci-bridge.c instead of pcihp.c (Igor)
--- include/hw/acpi/pci.h | 1 + hw/acpi/pci-bridge.c | 54 ++++++++++++++++++++++++++++++++++++++++ hw/i386/acpi-build.c | 57 ++----------------------------------------- 3 files changed, 57 insertions(+), 55 deletions(-)
include/hw/acpi/pci.h +1 -0
@@ -42,5 +42,6 @@ void build_pci_bridge_aml(AcpiDevAmlIf *adev, Aml *scope);void build_srat_generic_affinity_structures (GArray *table_data);Aml *build_pci_host_bridge_osc_method (bool enable_native_pcie_hotplug); +Aml *build_pci_bridge_edsm (void );#endif
hw/acpi/pci-bridge.c +54 -0
57 lines not on this page · raw message
hw/i386/acpi-build.c +2 -55
75 lines not on this page · raw message
Signature · 1 line
2.49.0
Re: [PATCH v4 16/32] hw/i386/acpi-build: Move aml_pci_edsm to a generic place
Quoted 4 lines · On Fri, 27 Jun 2025 11:55:05 +0200 Eric Auger <[email protected]> wrote:
Move
aml_pci_edsmtopci-bridge.csince we want to reuse that for ARM and acpi-index support. Also rename it intobuild_pci_bridge_edsm.Signed-off-by Eric Auger <[email protected]>
PATCH v4 17/32 tests/qtest/bios-tables-test: Prepare for changes in the arm virt DSDT table
In reply to Eric AugerFrom: Gustavo Romero <[email protected]>
This commit adds DSDT blobs to the whilelist in the prospect to allow changes in the arm virt DSDT method.
---
--- tests/qtest/bios-tables-test-allowed-diff.h | 5 +++++ 1 file changed, 5 insertions(+)
tests/qtest/bios-tables-test-allowed-diff.h +5 -0
@@ -1 +1,6 @@/* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/aarch64/virt/DSDT" , +"tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt" , +"tests/data/acpi/aarch64/virt/DSDT.memhp" , +"tests/data/acpi/aarch64/virt/DSDT.pxb" , +"tests/data/acpi/aarch64/virt/DSDT.topology",
Signature · 1 line
2.49.0
Re: [PATCH v4 17/32] tests/qtest/bios-tables-test: Prepare for changes in the arm virt DSDT table
Quoted 8 lines · On Fri, 27 Jun 2025 11:55:06 +0200 Eric Auger <[email protected]> wrote:
From: Gustavo Romero <[email protected]>
This commit adds DSDT blobs to the whilelist in the prospect to allow changes in the arm virt DSDT method.
Signed-off-by Gustavo Romero <[email protected]>Signed-off-by Eric Auger <[email protected]>
Always feels slightly silly to give tags to these, but for FWIW
Quoted 16 lines
---
--- tests/qtest/bios-tables-test-allowed-diff.h | 5 +++++ 1 file changed, 5 insertions(+)tests/qtest/bios-tables-test-allowed-diff.h +5
-0@@ -1 +1,6 @@/* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/aarch64/virt/DSDT" , +"tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt" , +"tests/data/acpi/aarch64/virt/DSDT.memhp" , +"tests/data/acpi/aarch64/virt/DSDT.pxb" , +"tests/data/acpi/aarch64/virt/DSDT.topology",
PATCH v4 18/32 hw/arm/virt-acpi-build: Let non hotplug ports support static acpi-index
In reply to Eric Augerhw/arm/virt-acpi-build: Let non hotplug ports support static acpi-index
Add the requested ACPI bits requested to support static acpi-index for non hotplug ports.
--- hw/arm/virt-acpi-build.c | 12 ++++++++++++ hw/arm/Kconfig | 2 ++ 2 files changed, 14 insertions(+)
hw/arm/virt-acpi-build.c +12 -0
@@ -34,6 +34,7 @@#include "hw/core/cpu.h" #include "hw/acpi/acpi-defs.h" #include "hw/acpi/acpi.h" +#include "hw/acpi/pcihp.h" #include "hw/nvram/fw_cfg_acpi.h" #include "hw/acpi/bios-linker-loader.h" #include "hw/acpi/aml-build.h"
@@ -815,6 +816,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)const int *irqmap = vms->irqmap;AcpiTable table = { .sig ="DSDT" , .rev =2 , .oem_id = vms->oem_id, .oem_table_id = vms->oem_table_id }; +Aml *pci0_scope;acpi_table_begin (&table, table_data); dsdt =init_aml_allocator ();
@@ -868,6 +870,16 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)aml_append (dsdt, scope); + pci0_scope =aml_scope ("\\_SB.PCI0" ); + +aml_append (pci0_scope,build_pci_bridge_edsm ()); +build_append_pci_bus_devices (pci0_scope, vms->bus); +if (object_property_find (OBJECT (vms->bus),ACPI_PCIHP_PROP_BSEL )) { +build_append_pcihp_slots (pci0_scope, vms->bus); + } + +aml_append (dsdt, pci0_scope); +/* copy AML table into ACPI tables blob */ g_array_append_vals (table_data, dsdt->buf->data, dsdt->buf->len);
hw/arm/Kconfig +2 -0
@@ -34,6 +34,8 @@ config ARM_VIRT select ACPI_HW_REDUCED select ACPI_APEI select ACPI_VIOT + select ACPI_PCIHP + select ACPI_PCI_BRIDGE select VIRTIO_MEM_SUPPORTED select ACPI_CXL select ACPI_HMAT
Signature · 1 line
2.49.0
Re: [PATCH v4 18/32] hw/arm/virt-acpi-build: Let non hotplug ports support static acpi-index
Quoted 6 lines · On Fri, 27 Jun 2025 11:55:07 +0200 Eric Auger <[email protected]> wrote:
hw/arm/virt-acpi-build: Let non hotplug ports support static acpi-index
Add the requested ACPI bits requested to support static acpi-index for non hotplug ports.
Signed-off-by Eric Auger <[email protected]>
Matches up with the i386 code so LGTM
PATCH v4 19/32 tests/qtest/bios-tables-test: Update ARM DSDT reference blobs
In reply to Eric AugerChanges relate to the introduction of pieces related to acpi-index static support along with root ports with no hotplug.
+
+ Scope (\_SB.PCI0)
+ {
+ Method (EDSM, 5, Serialized)
+ {
+ If ((Arg2 == Zero))
+ {
+ Local0 = Buffer (One)
+ {
+ 0x00 // .
+ }
+ If ((Arg0 != ToUUID ("e5c937d0-3553-4d7a-9117-ea4d19c3434d") /* Device Labeling Interface */))
+ {
+ Return (Local0)
+ }
+
+ If ((Arg1 < 0x02))
+ {
+ Return (Local0)
+ }
+
+ Local0 [Zero] = 0x81
+ Return (Local0)
+ }
+
+ If ((Arg2 == 0x07))
+ {
+ Local0 = Package (0x02)
+ {
+ Zero,
+ ""
+ }
+ Local1 = DerefOf (Arg4 [Zero]) + Local0 [Zero] = Local1 + Return (Local0)
+ }
+ }
+
+ Device (S00)
+ {
+ Name (_ADR, Zero) // _ADR: Address
+ }
+
+ Device (S08)
+ {
+ Name (_ADR, 0x00010000) // _ADR: Address
+ }
+
+ Device (S10)
+ {
+ Name (_ADR, 0x00020000) // _ADR: Address
+ }
+ }
}
---
above changes are reported after running make check V=2 then I launched ../tests/data/acpi/rebuild-expected-aml.sh from the build directory and it putput those reference blobs.
But I run make check V=2 after committing those changes I get and error which looks totally unexpected to me:
acpi-test: Warning! DSDT binary file mismatch. Actual [aml:/tmp/aml-LZSL82], Expected [aml:tests/data/acpi/aarch64/virt/DSDT].
See source file tests/qtest/bios-tables-test.c for instructions on how to update expected files.
acpi-test: Warning! DSDT mismatch. Actual [asl:/tmp/asl-FTSL82.dsl, aml:/tmp/aml-LZSL82], Expected [asl:/tmp/asl-ZAWL82.dsl, aml:tests/data/acpi/aarch64/virt/DSDT].
tmp/asl-FTSL82.dsl renamed from tmp/asl-ZAWL82.dsl +3 -9
@@ -1,30 +1,30 @@ /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20210604 (64-bit version) * Copyright (c) 2000 - 2021 Intel Corporation * * Disassembling to symbolic ASL+ operators * - * Disassembly of tests/data/acpi/aarch64/virt/DSDT, Fri Jun 27 03:34:45 2025 + * Disassembly of /tmp/aml-LZSL82, Fri Jun 27 03:34:45 2025 * * Original Table Header: * Signature "DSDT" - * Length 0x000014BE (5310) + * Length 0x000014AD (5293) * Revision 0x02 - * Checksum 0x8C + * Checksum 0xEA * OEM ID "BOCHS " * OEM Table ID "BXPC " * OEM Revision 0x00000001 (1) * Compiler ID "BXPC" * Compiler Version 0x00000001 (1) */ DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPC ", 0x00000001) { Scope (\_SB) { Device (C000) { Name (_HID, "ACPI0007" /* Processor Device */) // _HID: Hardware ID Name (_UID, Zero) // _UID: Unique ID }
@@ -1929,24 +1929,19 @@ } Local1 = DerefOf (Arg4 [Zero]) Local0 [Zero] = Local1 Return (Local0) } } Device (S00) { Name (_ADR, Zero) // _ADR: Address } Device (S08) { Name (_ADR, 0x00010000) // _ADR: Address } - - Device (S10) - { - Name (_ADR, 0x00020000) // _ADR: Address - } } } ---
tests/qtest/bios-tables-test-allowed-diff.h | 5 ----- tests/data/acpi/aarch64/virt/DSDT | Bin 5158 -> 5310 bytes .../data/acpi/aarch64/virt/DSDT.acpihmatvirt | Bin 5244 -> 5379 bytes tests/data/acpi/aarch64/virt/DSDT.memhp | Bin 6519 -> 6654 bytes tests/data/acpi/aarch64/virt/DSDT.pxb | Bin 7603 -> 7768 bytes tests/data/acpi/aarch64/virt/DSDT.topology | Bin 5360 -> 5495 bytes 6 files changed, 5 deletions(-)
tests/qtest/bios-tables-test-allowed-diff.h +0 -5
@@ -1,6 +1 @@/* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/aarch64/virt/DSDT" , -"tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt" , -"tests/data/acpi/aarch64/virt/DSDT.memhp" , -"tests/data/acpi/aarch64/virt/DSDT.pxb" , -"tests/data/acpi/aarch64/virt/DSDT.topology",
tests/data/acpi/aarch64/virt/DSDT binary +0 -0
tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt binary +0 -0
tests/data/acpi/aarch64/virt/DSDT.memhp binary +0 -0
tests/data/acpi/aarch64/virt/DSDT.pxb binary +0 -0
tests/data/acpi/aarch64/virt/DSDT.topology binary +0 -0
Signature · 1 line
2.49.0
Re: [PATCH v4 19/32] tests/qtest/bios-tables-test: Update ARM DSDT reference blobs
Hi,
Quoted 46 lines · Eric Auger
Changes relate to the introduction of pieces related to acpi-index static support along with root ports with no hotplug.
(quoted diff) +43
-0+ + Scope (\_SB.PCI0) + { + Method (EDSM, 5, Serialized) + { + If ((Arg2 == Zero)) + { + Local0 = Buffer (One) + { + 0x00 // . + } + If ((Arg0 != ToUUID ("e5c937d0-3553-4d7a-9117-ea4d19c3434d") /* Device Labeling Interface */)) + { + Return (Local0) + } + + If ((Arg1 < 0x02)) + { + Return (Local0) + } + + Local0 [Zero] = 0x81 + Return (Local0) + } + + If ((Arg2 == 0x07)) + { + Local0 = Package (0x02) + { + Zero, + "" + } + Local1 = DerefOf (Arg4 [Zero]) + Local0 [Zero] = Local1 + Return (Local0) + } + } + + Device (S00) + { + Name (_ADR, Zero) // _ADR: Address + } +
Review
Quoted 10 lines
(quoted diff) +10
-0+ Device (S08) + { + Name (_ADR, 0x00010000) // _ADR: Address + } + + Device (S10) + { + Name (_ADR, 0x00020000) // _ADR: Address + } + }
after regenerating the blobs using
../tests/data/acpi/rebuild-expected-aml.sh
I still get an error :
Using expected file 'tests/data/acpi/aarch64/virt/DSDT'
acpi-test: Warning! DSDT binary file mismatch. Actual [aml:/tmp/aml-2YB972], Expected [aml:tests/data/acpi/aarch64/virt/DSDT]. See source file tests/qtest/bios-tables-test.c for instructions on how to update expected files.
acpi-test: Warning! DSDT mismatch. Actual [asl:/tmp/asl-O0B972.dsl, aml:/tmp/aml-2YB972], Expected [asl:/tmp/asl-NO6872.dsl, aml:tests/data/acpi/aarch64/virt/DSDT].
../..
-
- Device (S10)
- {
- Name (_ADR, 0x00020000) // _ADR: Address
- }
}
}
** ERROR:../tests/qtest/bios-tables-test.c:554:test_acpi_asl: assertion
failed: (all_tables_match)
(test program exited with status code -6)
I don't get what is wrong.
Thoughts?
Eric
Quoted 155 lines
}
Signed-off-by Eric Auger <[email protected]>---
above changes are reported after running make check V=2 then I launched
../tests/data/acpi/rebuild-expected-aml.shfrom the build directory and it putput those reference blobs.But I run make check V=2 after committing those changes I get and error which looks totally unexpected to me:
acpi-test: Warning! DSDT binary file mismatch. Actual [aml:/tmp/aml-LZSL82], Expected [aml:tests/data/acpi/aarch64/virt/DSDT].
See source filetests/qtest/bios-tables-test.cfor instructions on how to update expected files.
acpi-test: Warning! DSDT mismatch. Actual [asl:/tmp/asl-FTSL82.dsl, aml:/tmp/aml-LZSL82], Expected [asl:/tmp/asl-ZAWL82.dsl, aml:tests/data/acpi/aarch64/virt/DSDT].tmp/asl-FTSL82.dsl renamed from tmp/asl-ZAWL82.dsl +3
-9@@ -1,30 +1,30 @@ /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20210604 (64-bit version) * Copyright (c) 2000 - 2021 Intel Corporation * * Disassembling to symbolic ASL+ operators * - * Disassembly of tests/data/acpi/aarch64/virt/DSDT, Fri Jun 27 03:34:45 2025 + * Disassembly of /tmp/aml-LZSL82, Fri Jun 27 03:34:45 2025 * * Original Table Header: * Signature "DSDT" - * Length 0x000014BE (5310) + * Length 0x000014AD (5293) * Revision 0x02 - * Checksum 0x8C + * Checksum 0xEA * OEM ID "BOCHS " * OEM Table ID "BXPC " * OEM Revision 0x00000001 (1) * Compiler ID "BXPC" * Compiler Version 0x00000001 (1) */ DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPC ", 0x00000001) { Scope (\_SB) { Device (C000) { Name (_HID, "ACPI0007" /* Processor Device */) // _HID: Hardware ID Name (_UID, Zero) // _UID: Unique ID }@@ -1929,24 +1929,19 @@ } Local1 = DerefOf (Arg4 [Zero]) Local0 [Zero] = Local1 Return (Local0) } } Device (S00) { Name (_ADR, Zero) // _ADR: Address } Device (S08) { Name (_ADR, 0x00010000) // _ADR: Address } - - Device (S10) - { - Name (_ADR, 0x00020000) // _ADR: Address - } } } --- tests/qtest/bios-tables-test-allowed-diff.h | 5 ----- tests/data/acpi/aarch64/virt/DSDT | Bin 5158 -> 5310 bytes .../data/acpi/aarch64/virt/DSDT.acpihmatvirt | Bin 5244 -> 5379 bytes tests/data/acpi/aarch64/virt/DSDT.memhp | Bin 6519 -> 6654 bytes tests/data/acpi/aarch64/virt/DSDT.pxb | Bin 7603 -> 7768 bytes tests/data/acpi/aarch64/virt/DSDT.topology | Bin 5360 -> 5495 bytes 6 files changed, 5 deletions(-)tests/qtest/bios-tables-test-allowed-diff.h +0
-5@@ -1,6 +1 @@/* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/aarch64/virt/DSDT" , -"tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt" , -"tests/data/acpi/aarch64/virt/DSDT.memhp" , -"tests/data/acpi/aarch64/virt/DSDT.pxb" , -"tests/data/acpi/aarch64/virt/DSDT.topology",tests/data/acpi/aarch64/virt/DSDT binary +0
-0tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt binary +0
-0tests/data/acpi/aarch64/virt/DSDT.memhp binary +0
-0tests/data/acpi/aarch64/virt/DSDT.pxb binary +0
-0tests/data/acpi/aarch64/virt/DSDT.topology binary +0
-0
Re: [PATCH v4 19/32] tests/qtest/bios-tables-test: Update ARM DSDT reference blobs
Quoted 87 lines · On Fri, 27 Jun 2025 12:00:51 +0200 Eric Auger <[email protected]> wrote:
Hi,
Quoted 46 lines · Eric Auger
Changes relate to the introduction of pieces related to acpi-index static support along with root ports with no hotplug.
(quoted diff) +43
-0+ + Scope (\_SB.PCI0) + { + Method (EDSM, 5, Serialized) + { + If ((Arg2 == Zero)) + { + Local0 = Buffer (One) + { + 0x00 // . + } + If ((Arg0 != ToUUID ("e5c937d0-3553-4d7a-9117-ea4d19c3434d") /* Device Labeling Interface */)) + { + Return (Local0) + } + + If ((Arg1 < 0x02)) + { + Return (Local0) + } + + Local0 [Zero] = 0x81 + Return (Local0) + } + + If ((Arg2 == 0x07)) + { + Local0 = Package (0x02) + { + Zero, + "" + } + Local1 = DerefOf (Arg4 [Zero]) + Local0 [Zero] = Local1 + Return (Local0) + } + } + + Device (S00) + { + Name (_ADR, Zero) // _ADR: Address + } +Review
Quoted 10 lines
(quoted diff) +10
-0+ Device (S08) + { + Name (_ADR, 0x00010000) // _ADR: Address + } + + Device (S10) + { + Name (_ADR, 0x00020000) // _ADR: Address + } + }after regenerating the blobs using
../tests/data/acpi/rebuild-expected-aml.shI still get an error :
Using expected file 'tests/data/acpi/aarch64/virt/DSDT'
acpi-test: Warning! DSDT binary file mismatch. Actual [aml:/tmp/aml-2YB972], Expected [aml:tests/data/acpi/aarch64/virt/DSDT]. See source filetests/qtest/bios-tables-test.cfor instructions on how to update expected files.
acpi-test: Warning! DSDT mismatch. Actual [asl:/tmp/asl-O0B972.dsl, aml:/tmp/aml-2YB972], Expected [asl:/tmp/asl-NO6872.dsl, aml:tests/data/acpi/aarch64/virt/DSDT].../..
-
- Device (S10)
- {
- Name (_ADR, 0x00020000) //_ADR: Address
- }
}
}
** ERROR:../tests/qtest/bios-tables-test.c:554:test_acpi_asl: assertion
failed: (all_tables_match)
Quoted 6 lines
(test program exited with status code -6)
I don't get what is wrong.
Thoughts?
I've hit so many problems over time with regenerating these I tend to just blow away the build directory whenever this sort of issue happens to make sure it's building a clean set.
Otherwise, no idea!
Jonathan
Quoted 159 lines
Eric
Quoted 155 lines
}
Signed-off-by Eric Auger <[email protected]>---
above changes are reported after running make check V=2 then I launched
../tests/data/acpi/rebuild-expected-aml.shfrom the build directory and it putput those reference blobs.But I run make check V=2 after committing those changes I get and error which looks totally unexpected to me:
acpi-test: Warning! DSDT binary file mismatch. Actual [aml:/tmp/aml-LZSL82], Expected [aml:tests/data/acpi/aarch64/virt/DSDT].
See source filetests/qtest/bios-tables-test.cfor instructions on how to update expected files.
acpi-test: Warning! DSDT mismatch. Actual [asl:/tmp/asl-FTSL82.dsl, aml:/tmp/aml-LZSL82], Expected [asl:/tmp/asl-ZAWL82.dsl, aml:tests/data/acpi/aarch64/virt/DSDT].tmp/asl-FTSL82.dsl renamed from tmp/asl-ZAWL82.dsl +3
-9@@ -1,30 +1,30 @@ /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20210604 (64-bit version) * Copyright (c) 2000 - 2021 Intel Corporation * * Disassembling to symbolic ASL+ operators * - * Disassembly of tests/data/acpi/aarch64/virt/DSDT, Fri Jun 27 03:34:45 2025 + * Disassembly of /tmp/aml-LZSL82, Fri Jun 27 03:34:45 2025 * * Original Table Header: * Signature "DSDT" - * Length 0x000014BE (5310) + * Length 0x000014AD (5293) * Revision 0x02 - * Checksum 0x8C + * Checksum 0xEA * OEM ID "BOCHS " * OEM Table ID "BXPC " * OEM Revision 0x00000001 (1) * Compiler ID "BXPC" * Compiler Version 0x00000001 (1) */ DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPC ", 0x00000001) { Scope (\_SB) { Device (C000) { Name (_HID, "ACPI0007" /* Processor Device */) // _HID: Hardware ID Name (_UID, Zero) // _UID: Unique ID }@@ -1929,24 +1929,19 @@ } Local1 = DerefOf (Arg4 [Zero]) Local0 [Zero] = Local1 Return (Local0) } } Device (S00) { Name (_ADR, Zero) // _ADR: Address } Device (S08) { Name (_ADR, 0x00010000) // _ADR: Address } - - Device (S10) - { - Name (_ADR, 0x00020000) // _ADR: Address - } } } --- tests/qtest/bios-tables-test-allowed-diff.h | 5 ----- tests/data/acpi/aarch64/virt/DSDT | Bin 5158 -> 5310 bytes .../data/acpi/aarch64/virt/DSDT.acpihmatvirt | Bin 5244 -> 5379 bytes tests/data/acpi/aarch64/virt/DSDT.memhp | Bin 6519 -> 6654 bytes tests/data/acpi/aarch64/virt/DSDT.pxb | Bin 7603 -> 7768 bytes tests/data/acpi/aarch64/virt/DSDT.topology | Bin 5360 -> 5495 bytes 6 files changed, 5 deletions(-)tests/qtest/bios-tables-test-allowed-diff.h +0
-5@@ -1,6 +1 @@/* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/aarch64/virt/DSDT" , -"tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt" , -"tests/data/acpi/aarch64/virt/DSDT.memhp" , -"tests/data/acpi/aarch64/virt/DSDT.pxb" , -"tests/data/acpi/aarch64/virt/DSDT.topology",tests/data/acpi/aarch64/virt/DSDT binary +0
-0tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt binary +0
-0tests/data/acpi/aarch64/virt/DSDT.memhp binary +0
-0zv$)s
gjksvcoB3nmckB7!nH-A(GKe+$G0@f7vE<p^@P5i+I7V#YM9F8tQJPZts F3;>E4EZYD8delta 19
acmexo{N0GlCD<jTT#|u->Fq|YTuA^&WCm0Ktests/data/acpi/aarch64/virt/DSDT.pxb binary +0
-0tests/data/acpi/aarch64/virt/DSDT.topology binary +0
-0zGcqJBkeW0(Lr|DY;DY(dr@^LGz7xe?
AQyk_Fa;&fPHEv7t@l20<Ol61O|pB2@7N< zXK}F?2(dCT@G>M6G<W1MFeDZvLL{SxPuK0;yL0SU4j^*oA`qbEaExhIUHSrco-NM F8359@EocA$delta 19
acmeya^+A)%CD<k8g9rly)25AF&qM%8i3Z^S
Re: [PATCH v4 19/32] tests/qtest/bios-tables-test: Update ARM DSDT reference blobs
Hi Jonathan,
Quoted 93 lines · Jonathan Cameron
Quoted 90 lines · On Fri, 27 Jun 2025 12:00:51 +0200 Eric Auger <[email protected]> wrote:
Hi,
Quoted 46 lines · Eric Auger
Changes relate to the introduction of pieces related to acpi-index static support along with root ports with no hotplug.
(quoted diff) +43
-0+ + Scope (\_SB.PCI0) + { + Method (EDSM, 5, Serialized) + { + If ((Arg2 == Zero)) + { + Local0 = Buffer (One) + { + 0x00 // . + } + If ((Arg0 != ToUUID ("e5c937d0-3553-4d7a-9117-ea4d19c3434d") /* Device Labeling Interface */)) + { + Return (Local0) + } + + If ((Arg1 < 0x02)) + { + Return (Local0) + } + + Local0 [Zero] = 0x81 + Return (Local0) + } + + If ((Arg2 == 0x07)) + { + Local0 = Package (0x02) + { + Zero, + "" + } + Local1 = DerefOf (Arg4 [Zero]) + Local0 [Zero] = Local1 + Return (Local0) + } + } + + Device (S00) + { + Name (_ADR, Zero) // _ADR: Address + } +Review
Quoted 10 lines
(quoted diff) +10
-0+ Device (S08) + { + Name (_ADR, 0x00010000) // _ADR: Address + } + + Device (S10) + { + Name (_ADR, 0x00020000) // _ADR: Address + } + }after regenerating the blobs using
../tests/data/acpi/rebuild-expected-aml.shI still get an error :
Using expected file 'tests/data/acpi/aarch64/virt/DSDT'
acpi-test: Warning! DSDT binary file mismatch. Actual [aml:/tmp/aml-2YB972], Expected [aml:tests/data/acpi/aarch64/virt/DSDT]. See source filetests/qtest/bios-tables-test.cfor instructions on how to update expected files.
acpi-test: Warning! DSDT mismatch. Actual [asl:/tmp/asl-O0B972.dsl, aml:/tmp/aml-2YB972], Expected [asl:/tmp/asl-NO6872.dsl, aml:tests/data/acpi/aarch64/virt/DSDT].../..
-
- Device (S10)
- {
- Name (_ADR, 0x00020000) //_ADR: Address
- }
}
}
** ERROR:../tests/qtest/bios-tables-test.c:554:test_acpi_asl: assertion
failed: (all_tables_match)(test program exited with status code -6)
Quoted 6 lines
Quoted 3 lines
I don't get what is wrong.
Thoughts?
I've hit so many problems over time with regenerating these I tend to just blow away the build directory whenever this sort of issue happens to make sure it's building a clean set.
thank you for the review again and thanks for trying to help here.
Unfortunately I have make clean distclean and retried ../tests/data/acpi/rebuild-expected-aml.sh and then
make check V=2
it still reports the above mismatch.
I need to have a look at the scripts
Eric
Quoted 162 lines
Otherwise, no idea!
Jonathan
Quoted 157 lines
Eric
Quoted 155 lines
}
Signed-off-by Eric Auger <[email protected]>---
above changes are reported after running make check V=2 then I launched
../tests/data/acpi/rebuild-expected-aml.shfrom the build directory and it putput those reference blobs.But I run make check V=2 after committing those changes I get and error which looks totally unexpected to me:
acpi-test: Warning! DSDT binary file mismatch. Actual [aml:/tmp/aml-LZSL82], Expected [aml:tests/data/acpi/aarch64/virt/DSDT].
See source filetests/qtest/bios-tables-test.cfor instructions on how to update expected files.
acpi-test: Warning! DSDT mismatch. Actual [asl:/tmp/asl-FTSL82.dsl, aml:/tmp/aml-LZSL82], Expected [asl:/tmp/asl-ZAWL82.dsl, aml:tests/data/acpi/aarch64/virt/DSDT].tmp/asl-FTSL82.dsl renamed from tmp/asl-ZAWL82.dsl +3
-9@@ -1,30 +1,30 @@ /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20210604 (64-bit version) * Copyright (c) 2000 - 2021 Intel Corporation * * Disassembling to symbolic ASL+ operators * - * Disassembly of tests/data/acpi/aarch64/virt/DSDT, Fri Jun 27 03:34:45 2025 + * Disassembly of /tmp/aml-LZSL82, Fri Jun 27 03:34:45 2025 * * Original Table Header: * Signature "DSDT" - * Length 0x000014BE (5310) + * Length 0x000014AD (5293) * Revision 0x02 - * Checksum 0x8C + * Checksum 0xEA * OEM ID "BOCHS " * OEM Table ID "BXPC " * OEM Revision 0x00000001 (1) * Compiler ID "BXPC" * Compiler Version 0x00000001 (1) */ DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPC ", 0x00000001) { Scope (\_SB) { Device (C000) { Name (_HID, "ACPI0007" /* Processor Device */) // _HID: Hardware ID Name (_UID, Zero) // _UID: Unique ID }@@ -1929,24 +1929,19 @@ } Local1 = DerefOf (Arg4 [Zero]) Local0 [Zero] = Local1 Return (Local0) } } Device (S00) { Name (_ADR, Zero) // _ADR: Address } Device (S08) { Name (_ADR, 0x00010000) // _ADR: Address } - - Device (S10) - { - Name (_ADR, 0x00020000) // _ADR: Address - } } } --- tests/qtest/bios-tables-test-allowed-diff.h | 5 ----- tests/data/acpi/aarch64/virt/DSDT | Bin 5158 -> 5310 bytes .../data/acpi/aarch64/virt/DSDT.acpihmatvirt | Bin 5244 -> 5379 bytes tests/data/acpi/aarch64/virt/DSDT.memhp | Bin 6519 -> 6654 bytes tests/data/acpi/aarch64/virt/DSDT.pxb | Bin 7603 -> 7768 bytes tests/data/acpi/aarch64/virt/DSDT.topology | Bin 5360 -> 5495 bytes 6 files changed, 5 deletions(-)tests/qtest/bios-tables-test-allowed-diff.h +0
-5@@ -1,6 +1 @@/* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/aarch64/virt/DSDT" , -"tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt" , -"tests/data/acpi/aarch64/virt/DSDT.memhp" , -"tests/data/acpi/aarch64/virt/DSDT.pxb" , -"tests/data/acpi/aarch64/virt/DSDT.topology",tests/data/acpi/aarch64/virt/DSDT binary +0
-0tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt binary +0
-0tests/data/acpi/aarch64/virt/DSDT.memhp binary +0
-0zv$)s
gjksvcoB3nmckB7!nH-A(GKe+$G0@f7vE<p^@P5i+I7V#YM9F8tQJPZts F3;>E4EZYD8delta 19
acmexo{N0GlCD<jTT#|u->Fq|YTuA^&WCm0Ktests/data/acpi/aarch64/virt/DSDT.pxb binary +0
-0tests/data/acpi/aarch64/virt/DSDT.topology binary +0
-0zGcqJBkeW0(Lr|DY;DY(dr@^LGz7xe?
AQyk_Fa;&fPHEv7t@l20<Ol61O|pB2@7N< zXK}F?2(dCT@G>M6G<W1MFeDZvLL{SxPuK0;yL0SU4j^*oA`qbEaExhIUHSrco-NM F8359@EocA$delta 19
acmeya^+A)%CD<k8g9rly)25AF&qM%8i3Z^S
Re: [PATCH v4 19/32] tests/qtest/bios-tables-test: Update ARM DSDT reference blobs
In reply to Jonathan CameronHi,
Quoted 93 lines · Jonathan Cameron
Quoted 90 lines · On Fri, 27 Jun 2025 12:00:51 +0200 Eric Auger <[email protected]> wrote:
Hi,
Quoted 46 lines · Eric Auger
Changes relate to the introduction of pieces related to acpi-index static support along with root ports with no hotplug.
(quoted diff) +43
-0+ + Scope (\_SB.PCI0) + { + Method (EDSM, 5, Serialized) + { + If ((Arg2 == Zero)) + { + Local0 = Buffer (One) + { + 0x00 // . + } + If ((Arg0 != ToUUID ("e5c937d0-3553-4d7a-9117-ea4d19c3434d") /* Device Labeling Interface */)) + { + Return (Local0) + } + + If ((Arg1 < 0x02)) + { + Return (Local0) + } + + Local0 [Zero] = 0x81 + Return (Local0) + } + + If ((Arg2 == 0x07)) + { + Local0 = Package (0x02) + { + Zero, + "" + } + Local1 = DerefOf (Arg4 [Zero]) + Local0 [Zero] = Local1 + Return (Local0) + } + } + + Device (S00) + { + Name (_ADR, Zero) // _ADR: Address + } +Review
Quoted 10 lines
(quoted diff) +10
-0+ Device (S08) + { + Name (_ADR, 0x00010000) // _ADR: Address + } + + Device (S10) + { + Name (_ADR, 0x00020000) // _ADR: Address + } + }after regenerating the blobs using
../tests/data/acpi/rebuild-expected-aml.shI still get an error :
Using expected file 'tests/data/acpi/aarch64/virt/DSDT'
acpi-test: Warning! DSDT binary file mismatch. Actual [aml:/tmp/aml-2YB972], Expected [aml:tests/data/acpi/aarch64/virt/DSDT]. See source filetests/qtest/bios-tables-test.cfor instructions on how to update expected files.
acpi-test: Warning! DSDT mismatch. Actual [asl:/tmp/asl-O0B972.dsl, aml:/tmp/aml-2YB972], Expected [asl:/tmp/asl-NO6872.dsl, aml:tests/data/acpi/aarch64/virt/DSDT].../..
-
- Device (S10)
- {
- Name (_ADR, 0x00020000) //_ADR: Address
- }
}
}
** ERROR:../tests/qtest/bios-tables-test.c:554:test_acpi_asl: assertion
failed: (all_tables_match)(test program exited with status code -6)
Quoted 8 lines
Quoted 3 lines
I don't get what is wrong.
Thoughts?
I've hit so many problems over time with regenerating these I tend to just blow away the build directory whenever this sort of issue happens to make sure it's building a clean set.
Otherwise, no idea!
I actually found the reason of this failure. The viot test for aarch64 is missing a "variant" and this causes the DSDT ref blob to be overriden.
Fixing that asap
Cheers
Eric
Quoted 160 lines
Jonathan
Quoted 157 lines
Eric
Quoted 155 lines
}
Signed-off-by Eric Auger <[email protected]>---
above changes are reported after running make check V=2 then I launched
../tests/data/acpi/rebuild-expected-aml.shfrom the build directory and it putput those reference blobs.But I run make check V=2 after committing those changes I get and error which looks totally unexpected to me:
acpi-test: Warning! DSDT binary file mismatch. Actual [aml:/tmp/aml-LZSL82], Expected [aml:tests/data/acpi/aarch64/virt/DSDT].
See source filetests/qtest/bios-tables-test.cfor instructions on how to update expected files.
acpi-test: Warning! DSDT mismatch. Actual [asl:/tmp/asl-FTSL82.dsl, aml:/tmp/aml-LZSL82], Expected [asl:/tmp/asl-ZAWL82.dsl, aml:tests/data/acpi/aarch64/virt/DSDT].tmp/asl-FTSL82.dsl renamed from tmp/asl-ZAWL82.dsl +3
-9@@ -1,30 +1,30 @@ /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20210604 (64-bit version) * Copyright (c) 2000 - 2021 Intel Corporation * * Disassembling to symbolic ASL+ operators * - * Disassembly of tests/data/acpi/aarch64/virt/DSDT, Fri Jun 27 03:34:45 2025 + * Disassembly of /tmp/aml-LZSL82, Fri Jun 27 03:34:45 2025 * * Original Table Header: * Signature "DSDT" - * Length 0x000014BE (5310) + * Length 0x000014AD (5293) * Revision 0x02 - * Checksum 0x8C + * Checksum 0xEA * OEM ID "BOCHS " * OEM Table ID "BXPC " * OEM Revision 0x00000001 (1) * Compiler ID "BXPC" * Compiler Version 0x00000001 (1) */ DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPC ", 0x00000001) { Scope (\_SB) { Device (C000) { Name (_HID, "ACPI0007" /* Processor Device */) // _HID: Hardware ID Name (_UID, Zero) // _UID: Unique ID }@@ -1929,24 +1929,19 @@ } Local1 = DerefOf (Arg4 [Zero]) Local0 [Zero] = Local1 Return (Local0) } } Device (S00) { Name (_ADR, Zero) // _ADR: Address } Device (S08) { Name (_ADR, 0x00010000) // _ADR: Address } - - Device (S10) - { - Name (_ADR, 0x00020000) // _ADR: Address - } } } --- tests/qtest/bios-tables-test-allowed-diff.h | 5 ----- tests/data/acpi/aarch64/virt/DSDT | Bin 5158 -> 5310 bytes .../data/acpi/aarch64/virt/DSDT.acpihmatvirt | Bin 5244 -> 5379 bytes tests/data/acpi/aarch64/virt/DSDT.memhp | Bin 6519 -> 6654 bytes tests/data/acpi/aarch64/virt/DSDT.pxb | Bin 7603 -> 7768 bytes tests/data/acpi/aarch64/virt/DSDT.topology | Bin 5360 -> 5495 bytes 6 files changed, 5 deletions(-)tests/qtest/bios-tables-test-allowed-diff.h +0
-5@@ -1,6 +1 @@/* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/aarch64/virt/DSDT" , -"tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt" , -"tests/data/acpi/aarch64/virt/DSDT.memhp" , -"tests/data/acpi/aarch64/virt/DSDT.pxb" , -"tests/data/acpi/aarch64/virt/DSDT.topology",tests/data/acpi/aarch64/virt/DSDT binary +0
-0tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt binary +0
-0tests/data/acpi/aarch64/virt/DSDT.memhp binary +0
-0zv$)s
gjksvcoB3nmckB7!nH-A(GKe+$G0@f7vE<p^@P5i+I7V#YM9F8tQJPZts F3;>E4EZYD8delta 19
acmexo{N0GlCD<jTT#|u->Fq|YTuA^&WCm0Ktests/data/acpi/aarch64/virt/DSDT.pxb binary +0
-0tests/data/acpi/aarch64/virt/DSDT.topology binary +0
-0zGcqJBkeW0(Lr|DY;DY(dr@^LGz7xe?
AQyk_Fa;&fPHEv7t@l20<Ol61O|pB2@7N< zXK}F?2(dCT@G>M6G<W1MFeDZvLL{SxPuK0;yL0SU4j^*oA`qbEaExhIUHSrco-NM F8359@EocA$delta 19
acmeya^+A)%CD<k8g9rly)25AF&qM%8i3Z^S
PATCH v4 20/32 hw/arm/virt-acpi-build: Modify the DSDT ACPI table to enable ACPI PCI hotplug
In reply to Eric AugerModify the DSDT ACPI table to enable ACPI PCI hotplug.
---
v3 -> v4:
- use property accessor
- removed ACPI_PCIHP_SIZE which is already in the header
- make addition of EDSM unconditional
v2 -> v3:
- use ACPI_PCIHP_SIZE instead of 0x1000 (Igor)
- use cihp_state->use_acpi_hotplug_bridge
--- include/hw/acpi/pcihp.h | 2 ++ include/hw/arm/virt.h | 1 + hw/acpi/pcihp.c | 1 - hw/arm/virt-acpi-build.c | 13 +++++++++++++ hw/arm/virt.c | 2 ++ 5 files changed, 18 insertions(+), 1 deletion(-)
include/hw/acpi/pcihp.h +2 -0
@@ -38,6 +38,8 @@#define ACPI_PCIHP_SEJ_BASE 0x8#define ACPI_PCIHP_BNMR_BASE 0x10 +#define ACPI_PCIHP_SIZE 0x0018 + typedef struct AcpiPciHpPciStatus { uint32_t up; uint32_t down;
include/hw/arm/virt.h +1 -0
@@ -79,6 +79,7 @@ enum {VIRT_ACPI_GED ,VIRT_NVDIMM_ACPI ,VIRT_PVTIME , +VIRT_ACPI_PCIHP , VIRT_LOWMEMMAP_LAST, };
hw/acpi/pcihp.c +0 -1
@@ -43,7 +43,6 @@#include "qobject/qnum.h" #include "trace.h" -#define ACPI_PCIHP_SIZE 0x0018#define PCI_UP_BASE 0x0000#define PCI_DOWN_BASE 0x0004#define PCI_EJ_BASE 0x0008
hw/arm/virt-acpi-build.c +13 -0
@@ -817,6 +817,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)AcpiTable table = { .sig ="DSDT" , .rev =2 , .oem_id = vms->oem_id, .oem_table_id = vms->oem_table_id };Aml *pci0_scope; +bool acpi_pcihp;acpi_table_begin (&table, table_data); dsdt =init_aml_allocator ();
@@ -878,6 +879,18 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)build_append_pcihp_slots (pci0_scope, vms->bus); } + acpi_pcihp =object_property_get_bool (OBJECT (vms->acpi_dev), +ACPI_PM_PROP_ACPI_PCIHP_BRIDGE ,NULL ); +if (acpi_pcihp) { +aml_append (pci0_scope,build_pci_bridge_edsm ()); +build_acpi_pci_hotplug (dsdt,AML_SYSTEM_MEMORY , + memmap[VIRT_ACPI_PCIHP ].base); +build_append_pcihp_resources (pci0_scope, + memmap[VIRT_ACPI_PCIHP ].base, + memmap[VIRT_ACPI_PCIHP ].size); + +build_append_notification_callback (pci0_scope, vms->bus); + }aml_append (dsdt, pci0_scope);/* copy AML table into ACPI tables blob */
hw/arm/virt.c +2 -0
@@ -75,6 +75,7 @@#include "standard-headers/linux/input.h" #include "hw/arm/smmuv3.h" #include "hw/acpi/acpi.h" +#include "hw/acpi/pcihp.h" #include "target/arm/cpu-qom.h" #include "target/arm/internals.h" #include "target/arm/multiprocessing.h"
@@ -183,6 +184,7 @@ static const MemMapEntry base_memmap[] = { [VIRT_NVDIMM_ACPI] = { 0x09090000, NVDIMM_ACPI_IO_LEN}, [VIRT_PVTIME] = { 0x090a0000, 0x00010000 }, [VIRT_SECURE_GPIO] = { 0x090b0000, 0x00001000 }, + [VIRT_ACPI_PCIHP] = { 0x090c0000, ACPI_PCIHP_SIZE }, [VIRT_MMIO] = { 0x0a000000, 0x00000200 }, /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */ [VIRT_PLATFORM_BUS] = { 0x0c000000, 0x02000000 },
Signature · 1 line
2.49.0
Re: [PATCH v4 20/32] hw/arm/virt-acpi-build: Modify the DSDT ACPI table to enable ACPI PCI hotplug
Quoted 3 lines · On Fri, 27 Jun 2025 11:55:09 +0200 Eric Auger <[email protected]> wrote:
Modify the DSDT ACPI table to enable ACPI PCI hotplug.
Signed-off-by Eric Auger <[email protected]>
PATCH v4 21/32 hw/acpi/ged: Add a bus link property
In reply to Eric AugerThis property will be set by the machine code on the object creation. It will be used by acpi pcihp hotplug code.
--- hw/acpi/generic_event_device.c | 3 +++ 1 file changed, 3 insertions(+)
hw/acpi/generic_event_device.c +3 -0
@@ -13,6 +13,7 @@#include "qapi/error.h" #include "hw/acpi/acpi.h" #include "hw/acpi/generic_event_device.h" +#include "hw/pci/pci.h" #include "hw/irq.h" #include "hw/mem/pc-dimm.h" #include "hw/mem/nvdimm.h"
@@ -320,6 +321,8 @@ static const Property acpi_ged_properties[] = {DEFINE_PROP_UINT32 ("ged-event" , AcpiGedState, ged_event_bitmap,0 ),DEFINE_PROP_BOOL (ACPI_PM_PROP_ACPI_PCIHP_BRIDGE , AcpiGedState, pcihp_state.use_acpi_hotplug_bridge,0 ), +DEFINE_PROP_LINK ("bus" , AcpiGedState, pcihp_state.root, + TYPE_PCI_BUS, PCIBus *), }; static const VMStateDescription vmstate_memhp_state = {
Signature · 1 line
2.49.0
PATCH v4 22/32 hw/arm/virt: Pass the bus on the ged creation
In reply to Eric AugerThe bus will be needed on ged realize for acpi pci hp setup.
--- hw/arm/virt.c | 1 + 1 file changed, 1 insertion(+)
hw/arm/virt.c +1 -0
@@ -696,6 +696,7 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms) dev =qdev_new (TYPE_ACPI_GED );qdev_prop_set_uint32 (dev,"ged-event" , event); +object_property_set_link (OBJECT (dev),"bus" ,OBJECT (vms->bus), &error_abort);sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , vms->memmap[VIRT_ACPI_GED ].base);
Signature · 1 line
2.49.0
PATCH v4 23/32 hw/acpi/ged: Call pcihp plug callbacks in hotplug handler implementation
In reply to Eric AugerAdd PCI device related code in the TYPE_HOTPLUG_HANDLER implementation.
For a PCI device hotplug/hotunplug event, the code routes to acpi_pcihp_device callbacks (pre_plug_cb, plug_cb, unplug_request_cb, unplug_cb).
---
v2 -> v4:
moved before "hw/acpi/ged: Prepare the device to react to PCI hotplug events" (Igor)
v2 -> v3:
- remove else block in acpi_ged_device_pre_plug_cb
--- hw/acpi/generic_event_device.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
hw/acpi/generic_event_device.c +17 -0
@@ -17,6 +17,7 @@#include "hw/irq.h" #include "hw/mem/pc-dimm.h" #include "hw/mem/nvdimm.h" +#include "hw/pci/pci_device.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/error-report.h"
@@ -228,6 +229,14 @@ static const MemoryRegionOps ged_regs_ops = { }, }; +static void acpi_ged_device_pre_plug_cb (HotplugHandler *hotplug_dev, +DeviceState *dev,Error **errp) +{ +if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +acpi_pcihp_device_pre_plug_cb (hotplug_dev, dev, errp); + } +} +static void acpi_ged_device_plug_cb (HotplugHandler *hotplug_dev,DeviceState *dev,Error **errp) {
@@ -241,6 +250,8 @@ static void acpi_ged_device_plug_cb(HotplugHandler *hotplug_dev, } }else if (object_dynamic_cast (OBJECT (dev),TYPE_CPU )) {acpi_cpu_plug_cb (hotplug_dev, &s->cpuhp_state, dev, errp); + }else if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +acpi_pcihp_device_plug_cb (hotplug_dev, &s->pcihp_state, dev, errp); }else {error_setg (errp,"virt: device plug request for unsupported device" " type: %s" ,object_get_typename (OBJECT (dev)));
@@ -257,6 +268,9 @@ static void acpi_ged_unplug_request_cb(HotplugHandler *hotplug_dev,acpi_memory_unplug_request_cb (hotplug_dev, &s->memhp_state, dev, errp); }else if (object_dynamic_cast (OBJECT (dev),TYPE_CPU )) {acpi_cpu_unplug_request_cb (hotplug_dev, &s->cpuhp_state, dev, errp); + }else if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +acpi_pcihp_device_unplug_request_cb (hotplug_dev, &s->pcihp_state, + dev, errp); }else {error_setg (errp,"acpi: device unplug request for unsupported device" " type: %s" ,object_get_typename (OBJECT (dev)));
@@ -272,6 +286,8 @@ static void acpi_ged_unplug_cb(HotplugHandler *hotplug_dev,acpi_memory_unplug_cb (&s->memhp_state, dev, errp); }else if (object_dynamic_cast (OBJECT (dev),TYPE_CPU )) {acpi_cpu_unplug_cb (&s->cpuhp_state, dev, errp); + }else if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +acpi_pcihp_device_unplug_cb (hotplug_dev, &s->pcihp_state, dev, errp); }else {error_setg (errp,"acpi: device unplug for unsupported device" " type: %s" ,object_get_typename (OBJECT (dev)));
@@ -485,6 +501,7 @@ static void acpi_ged_class_init(ObjectClass *class, const void *data) dc->vmsd = &vmstate_acpi_ged; dc->realize = acpi_ged_realize; + hc->pre_plug = acpi_ged_device_pre_plug_cb; hc->plug = acpi_ged_device_plug_cb; hc->unplug_request = acpi_ged_unplug_request_cb; hc->unplug = acpi_ged_unplug_cb;
Signature · 1 line
2.49.0
PATCH v4 24/32 hw/acpi/pcihp: Remove root arg in acpi_pcihp_init
In reply to Eric AugerLet pass the root bus to ich9 and piix4 through a property link instead of through an argument passed to acpi_pcihp_init().
Also make sure the root bus is set at the entry of acpi_pcihp_init().
The rationale of that change is to be consistent with the forecoming ARM implementation where the machine passes the root bus (steming from GPEX) to the GED device through a link property.
--- include/hw/acpi/pcihp.h | 2 +- hw/acpi/acpi-pci-hotplug-stub.c | 2 +- hw/acpi/ich9.c | 7 ++++++- hw/acpi/pcihp.c | 4 ++-- hw/acpi/piix4.c | 5 ++++- 5 files changed, 14 insertions(+), 6 deletions(-)
include/hw/acpi/pcihp.h +1 -1
@@ -62,7 +62,7 @@ typedef struct AcpiPciHpState {bool use_acpi_root_pci_hotplug; } AcpiPciHpState; -void acpi_pcihp_init (Object *owner,AcpiPciHpState *,PCIBus *root, +void acpi_pcihp_init (Object *owner,AcpiPciHpState *,MemoryRegion *io,uint16_t io_base);bool acpi_pcihp_is_hotpluggable_bus (AcpiPciHpState *s,BusState *bus);
hw/acpi/acpi-pci-hotplug-stub.c +1 -1
@@ -4,7 +4,7 @@const VMStateDescription vmstate_acpi_pcihp_pci_status; -void acpi_pcihp_init (Object *owner,AcpiPciHpState *s,PCIBus *root_bus, +void acpi_pcihp_init (Object *owner,AcpiPciHpState *s,MemoryRegion *address_space_io,uint16_t io_base) { }
hw/acpi/ich9.c +6 -1
@@ -322,9 +322,10 @@ void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm, qemu_irq sci_irq) }if (pm->acpi_pci_hotplug.use_acpi_hotplug_bridge) { +object_property_set_link (OBJECT (lpc_pci),"bus" , +OBJECT (pci_get_bus (lpc_pci)), &error_abort);acpi_pcihp_init (OBJECT (lpc_pci), &pm->acpi_pci_hotplug, -pci_get_bus (lpc_pci),pci_address_space_io (lpc_pci),ACPI_PCIHP_ADDR_ICH9 );
@@ -428,6 +429,10 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm)object_property_add_uint32_ptr (obj,ACPI_PM_PROP_PM_IO_BASE , &pm->pm_io_base,OBJ_PROP_FLAG_READ ); +object_property_add_link (obj,"bus" ,TYPE_PCI_BUS , + (Object **)&pm->acpi_pci_hotplug.root, + object_property_allow_set_link, +OBJ_PROP_LINK_STRONG );object_property_add (obj,ACPI_PM_PROP_GPE0_BLK ,"uint32" , ich9_pm_get_gpe0_blk,NULL ,NULL , pm);
hw/acpi/pcihp.c +2 -2
@@ -493,13 +493,13 @@ static const MemoryRegionOps acpi_pcihp_io_ops = { }, }; -void acpi_pcihp_init (Object *owner,AcpiPciHpState *s,PCIBus *root_bus, +void acpi_pcihp_init (Object *owner,AcpiPciHpState *s,MemoryRegion *io,uint16_t io_base) { s->io_len =ACPI_PCIHP_SIZE ; s->io_base = io_base; - s->root = root_bus; +assert (s->root);memory_region_init_io (&s->io, owner, &acpi_pcihp_io_ops, s,"acpi-pci-hotplug" , s->io_len);
hw/acpi/piix4.c +4 -1
@@ -567,7 +567,8 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion *parent,if (s->acpi_pci_hotplug.use_acpi_hotplug_bridge || s->acpi_pci_hotplug.use_acpi_root_pci_hotplug) { -acpi_pcihp_init (OBJECT (s), &s->acpi_pci_hotplug, bus, parent, +object_property_set_link (OBJECT (s),"bus" ,OBJECT (bus), &error_abort); +acpi_pcihp_init (OBJECT (s), &s->acpi_pci_hotplug, parent,ACPI_PCIHP_ADDR_PIIX4 );qbus_set_hotplug_handler (BUS (pci_get_bus (PCI_DEVICE (s))),OBJECT (s)); }
@@ -611,6 +612,8 @@ static const Property piix4_pm_properties[] = { acpi_pci_hotplug.use_acpi_hotplug_bridge, true),DEFINE_PROP_BOOL (ACPI_PM_PROP_ACPI_PCI_ROOTHP , PIIX4PMState, acpi_pci_hotplug.use_acpi_root_pci_hotplug, true), +DEFINE_PROP_LINK ("bus" , PIIX4PMState, acpi_pci_hotplug.root, + TYPE_PCI_BUS, PCIBus *),DEFINE_PROP_BOOL ("memory-hotplug-support" , PIIX4PMState, acpi_memory_hotplug.is_enabled, true), DEFINE_PROP_BOOL("smm-compat", PIIX4PMState, smm_compat, false),
Signature · 1 line
2.49.0
Re: [PATCH v4 24/32] hw/acpi/pcihp: Remove root arg in acpi_pcihp_init
Quoted 11 lines · On Fri, 27 Jun 2025 11:55:13 +0200 Eric Auger <[email protected]> wrote:
Let pass the root bus to ich9 and piix4 through a property link instead of through an argument passed to
acpi_pcihp_init().Also make sure the root bus is set at the entry of
acpi_pcihp_init().The rationale of that change is to be consistent with the forecoming ARM implementation where the machine passes the root bus (steming from GPEX) to the GED device through a link property.
Signed-off-by Eric Auger <[email protected]>Suggested-by Igor Mammedov <[email protected]>
Seems reasonable to me.
PATCH v4 25/32 hw/acpi/ged: Prepare the device to react to PCI hotplug events
In reply to Eric AugerQEMU will notify the OS about PCI hotplug/hotunplug events through GED interrupts. Let the GED device handle a new PCI hotplug event. On its occurrence it calls the \\_SB.PCI0.PCNT method with the BLCK mutex held.
The GED device uses a dedicated MMIO region that will be mapped by the machine code.
At this point the GED still does not support PCI device hotplug in its TYPE_HOTPLUG_HANDLER implementation. This will come in a subsequent patch.
---
v3 -> v4:
- add qbus_set_hotplug_handler
- root bus is not passed in acpi_pcihp_init arg
v2 -> v3:
- pcihp_init and reset are put in ged code instead of machine code (Igor)
- Add ACPI_GED_PCI_HOTPLUG_EVT event depending on use_acpi_hotplug_bridge (Igor)
v1 -> v2:
- Introduce ACPI_PCIHP_REGION_NAME
--- include/hw/acpi/generic_event_device.h | 4 ++++ hw/acpi/generic_event_device.c | 31 ++++++++++++++++++++++++++ 2 files changed, 35 insertions(+)
include/hw/acpi/generic_event_device.h +4 -0
@@ -102,6 +102,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(AcpiGedState, ACPI_GED)#define ACPI_GED_PWR_DOWN_EVT 0x2#define ACPI_GED_NVDIMM_HOTPLUG_EVT 0x4#define ACPI_GED_CPU_HOTPLUG_EVT 0x8 +#define ACPI_GED_PCI_HOTPLUG_EVT 0x10 typedef struct GEDState { MemoryRegion evt;
@@ -109,6 +110,8 @@ typedef struct GEDState {uint32_t sel; } GEDState; +#define ACPI_PCIHP_REGION_NAME "pcihp container" +struct AcpiGedState {SysBusDevice parent_obj;MemHotplugState memhp_state;
@@ -116,6 +119,7 @@ struct AcpiGedState {CPUHotplugState cpuhp_state;MemoryRegion container_cpuhp;AcpiPciHpState pcihp_state; +MemoryRegion container_pcihp;GEDState ged_state;uint32_t ged_event_bitmap;qemu_irq irq;
hw/acpi/generic_event_device.c +31 -0
@@ -12,6 +12,7 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "hw/acpi/acpi.h" +#include "hw/acpi/pcihp.h" #include "hw/acpi/generic_event_device.h" #include "hw/pci/pci.h" #include "hw/irq.h"
@@ -28,6 +29,7 @@ static const uint32_t ged_supported_events[] = {ACPI_GED_PWR_DOWN_EVT ,ACPI_GED_NVDIMM_HOTPLUG_EVT ,ACPI_GED_CPU_HOTPLUG_EVT , + ACPI_GED_PCI_HOTPLUG_EVT, };/*
@@ -123,6 +125,12 @@ void build_ged_aml(Aml *table, const char *name, HotplugHandler *hotplug_dev,aml_notify (aml_name ("\\_SB.NVDR" ), aml_int(0x80)));break ; +case ACPI_GED_PCI_HOTPLUG_EVT : +aml_append (if_ctx, +aml_acquire (aml_name ("\\_SB.PCI0.BLCK" ),0xFFFF )); +aml_append (if_ctx,aml_call0 ("\\_SB.PCI0.PCNT" )); +aml_append (if_ctx,aml_release (aml_name ("\\_SB.PCI0.BLCK" ))); +break ;default :/* * Please make sure all the events in ged_supported_events[]
@@ -316,6 +324,8 @@ static void acpi_ged_send_event(AcpiDeviceIf *adev, AcpiEventStatusBits ev) sel =ACPI_GED_NVDIMM_HOTPLUG_EVT ; }else if (ev &ACPI_CPU_HOTPLUG_STATUS ) { sel =ACPI_GED_CPU_HOTPLUG_EVT ; + }else if (ev &ACPI_PCI_HOTPLUG_STATUS ) { + sel =ACPI_GED_PCI_HOTPLUG_EVT ; }else {/* Unknown event. Return without generating interrupt. */ warn_report ("GED: Unsupported event %d. No irq injected" , ev);
@@ -427,9 +437,13 @@ static void acpi_ged_realize(DeviceState *dev, Error **errp) {SysBusDevice *sbd =SYS_BUS_DEVICE (dev);AcpiGedState *s =ACPI_GED (dev); +AcpiPciHpState *pcihp_state = &s->pcihp_state;uint32_t ged_events;int i; +if (pcihp_state->use_acpi_hotplug_bridge) { + s->ged_event_bitmap |=ACPI_GED_PCI_HOTPLUG_EVT ; + } ged_events =ctpop32 (s->ged_event_bitmap);for (i =0 ; i <ARRAY_SIZE (ged_supported_events) && ged_events; i++) {
@@ -449,6 +463,13 @@ static void acpi_ged_realize(DeviceState *dev, Error **errp)cpu_hotplug_hw_init (&s->container_cpuhp,OBJECT (dev), &s->cpuhp_state,0 );break ; +case ACPI_GED_PCI_HOTPLUG_EVT : +memory_region_init (&s->container_pcihp,OBJECT (dev), +ACPI_PCIHP_REGION_NAME ,ACPI_PCIHP_SIZE ); +sysbus_init_mmio (sbd, &s->container_pcihp); +acpi_pcihp_init (OBJECT (s), &s->pcihp_state, + &s->container_pcihp,0 ); +qbus_set_hotplug_handler (BUS (s->pcihp_state.root),OBJECT (dev)); } ged_events--; }
@@ -490,6 +511,15 @@ static void acpi_ged_initfn(Object *obj)sysbus_init_mmio (sbd, &ged_st->regs); } +static void ged_reset (DeviceState *dev) +{ +AcpiGedState *s =ACPI_GED (dev); + +if (s->pcihp_state.use_acpi_hotplug_bridge) { +acpi_pcihp_reset (&s->pcihp_state); + } +} +static void acpi_ged_class_init (ObjectClass *class,const void *data) {DeviceClass *dc =DEVICE_CLASS (class);
@@ -505,6 +535,7 @@ static void acpi_ged_class_init(ObjectClass *class, const void *data) hc->plug = acpi_ged_device_plug_cb; hc->unplug_request = acpi_ged_unplug_request_cb; hc->unplug = acpi_ged_unplug_cb; +device_class_set_legacy_reset (dc, ged_reset); adevc->ospm_status = acpi_ged_ospm_status; adevc->send_event = acpi_ged_send_event;
Signature · 1 line
2.49.0
Re: [PATCH v4 25/32] hw/acpi/ged: Prepare the device to react to PCI hotplug events
Quoted 5 lines · On Fri, 27 Jun 2025 11:55:14 +0200 Eric Auger <[email protected]> wrote:
QEMU will notify the OS about PCI hotplug/hotunplug events through GED interrupts. Let the GED device handle a new PCI hotplug event. On its occurrence it calls the \\_SB.PCI0.PCNT method with the BLCK mutex held.
Quoted 8 lines
The GED device uses a dedicated MMIO region that will be mapped by the machine code.
At this point the GED still does not support PCI device hotplug in its
TYPE_HOTPLUG_HANDLERimplementation. This will come in a subsequent patch.Signed-off-by Eric Auger <[email protected]>
Maybe call out why you aren't following the advice in the docs for device_class_set_legacy_reset() to use the resettable API.
One other question inline about setting of the event bitmap in ged_realize rather than create_acpi_ged() in virt.c
There is not obviously right answer to where that should be but what you have here seems inconsistent with existing code s a comment may makes sense if you leave it as it stands.
Quoted 21 lines
---
v3 -> v4:
- addqbus_set_hotplug_handler
- root bus is not passed inacpi_pcihp_initargv2 -> v3:
-pcihp_initand reset are put in ged code instead of machine code (Igor)
- AddACPI_GED_PCI_HOTPLUG_EVTevent depending onuse_acpi_hotplug_bridge(Igor)v1 -> v2:
- IntroduceACPI_PCIHP_REGION_NAMEhw/acpi/generic_event_device.c +0
-0
hw/acpi/generic_event_device.c static void acpi_ged_realize(DeviceState *dev, Error **errp) · line 446
Quoted 10 lines
hw/acpi/generic_event_device.c +4
-0@@ -427,9 +437,13 @@ static void acpi_ged_realize(DeviceState *dev, Error **errp) {SysBusDevice *sbd =SYS_BUS_DEVICE (dev);AcpiGedState *s =ACPI_GED (dev); +AcpiPciHpState *pcihp_state = &s->pcihp_state;uint32_t ged_events;int i; +if (pcihp_state->use_acpi_hotplug_bridge) { + s->ged_event_bitmap |=ACPI_GED_PCI_HOTPLUG_EVT ; + }
Maybe a comment on why this belongs insider the GED code rather than being provided in the event_bitmap from virt.c or similar as is done for all the over elements of ged_event_bitmap.
Particularly as you get the acpi_pcihp property in create_acpi_ged() in patch 29.
Quoted 2 lines
hw/acpi/generic_event_device.c +0
-0ged_events =ctpop32 (s->ged_event_bitmap);
Re: [PATCH v4 25/32] hw/acpi/ged: Prepare the device to react to PCI hotplug events
Hi Jonathan,
Quoted 11 lines · Jonathan Cameron
Quoted 8 lines · On Fri, 27 Jun 2025 11:55:14 +0200 Eric Auger <[email protected]> wrote:
QEMU will notify the OS about PCI hotplug/hotunplug events through GED interrupts. Let the GED device handle a new PCI hotplug event. On its occurrence it calls the \\_SB.PCI0.PCNT method with the BLCK mutex held.
The GED device uses a dedicated MMIO region that will be mapped by the machine code.
Quoted 7 lines
Quoted 5 lines
At this point the GED still does not support PCI device hotplug in its
TYPE_HOTPLUG_HANDLERimplementation. This will come in a subsequent patch.Signed-off-by Eric Auger <[email protected]>Maybe call out why you aren't following the advice in the docs for
device_class_set_legacy_reset()to use the resettable API.
Good point. I think I shall migrate to the new API.
Quoted 40 lines
One other question inline about setting of the event bitmap in
ged_realizerather thancreate_acpi_ged()invirt.cThere is not obviously right answer to where that should be but what you have here seems inconsistent with existing code s a comment may makes sense if you leave it as it stands.
Quoted 18 lines
---
v3 -> v4:
- addqbus_set_hotplug_handler
- root bus is not passed inacpi_pcihp_initargv2 -> v3:
-pcihp_initand reset are put in ged code instead of machine code (Igor)
- AddACPI_GED_PCI_HOTPLUG_EVTevent depending onuse_acpi_hotplug_bridge(Igor)v1 -> v2:
- IntroduceACPI_PCIHP_REGION_NAMEhw/acpi/generic_event_device.c +0
-0hw/acpi/generic_event_device.c static void acpi_ged_realize(DeviceState *dev, Error **errp) · line 446
Quoted 10 lines
hw/acpi/generic_event_device.c +4
-0@@ -427,9 +437,13 @@ static void acpi_ged_realize(DeviceState *dev, Error **errp) {SysBusDevice *sbd =SYS_BUS_DEVICE (dev);AcpiGedState *s =ACPI_GED (dev); +AcpiPciHpState *pcihp_state = &s->pcihp_state;uint32_t ged_events;int i; +if (pcihp_state->use_acpi_hotplug_bridge) { + s->ged_event_bitmap |=ACPI_GED_PCI_HOTPLUG_EVT ; + }Maybe a comment on why this belongs insider the GED code rather than being provided in the
event_bitmapfromvirt.cor similar as is done for all the over elements ofged_event_bitmap.
Quoted 2 lines
Particularly as you get the
acpi_pcihpproperty increate_acpi_ged()in patch 29.
Actually Igor suggested to put this setting in the realize()
https://lore.kernel.org/all/20250620150648.09dab163@fedora/
instead of in create_acpi_ged(), as it was done in v3 So I followed his guidance Eric
Quoted 5 lines
Quoted 4 lines
hw/acpi/generic_event_device.c +0
-0ged_events =ctpop32 (s->ged_event_bitmap);
PATCH v4 26/32 hw/acpi/ged: Support migration of AcpiPciHpState
In reply to Eric AugerAdd a subsection to migrate the AcpiPciHpState state.
--- hw/acpi/generic_event_device.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
hw/acpi/generic_event_device.c +20 -0
@@ -417,6 +417,25 @@ static const VMStateDescription vmstate_ghes_state = { } }; +static bool pcihp_needed (void *opaque) +{ +AcpiGedState *s = opaque; +return s->pcihp_state.use_acpi_hotplug_bridge; +} + +static const VMStateDescription vmstate_pcihp_state = { + .name ="acpi-ged/pcihp" , + .version_id =1 , + .minimum_version_id =1 , + .needed = pcihp_needed, + .fields = (const VMStateField []) { +VMSTATE_PCI_HOTPLUG (pcihp_state, + AcpiGedState, +NULL ,NULL ), +VMSTATE_END_OF_LIST () + } +}; +static const VMStateDescription vmstate_acpi_ged = { .name ="acpi-ged" , .version_id =1 ,
@@ -429,6 +448,7 @@ static const VMStateDescription vmstate_acpi_ged = { &vmstate_memhp_state, &vmstate_cpuhp_state, &vmstate_ghes_state, + &vmstate_pcihp_state, NULL } };
Signature · 1 line
2.49.0
Re: [PATCH v4 26/32] hw/acpi/ged: Support migration of AcpiPciHpState
Quoted 4 lines · On Fri, 27 Jun 2025 11:55:15 +0200 Eric Auger <[email protected]> wrote:
Add a subsection to migrate the AcpiPciHpState state.
Signed-off-by Eric Auger <[email protected]>Reviewed-by Igor Mammedov <[email protected]>
PATCH v4 27/32 hw/core/sysbus: Introduce sysbus_mmio_map_name() helper
In reply to Eric AugerSome sysbus devices have conditional mmio regions. This happens for instance with the hw/acpi/ged device. In that case it becomes difficult to predict which index a specific MMIO region corresponds to when one needs to mmio map the region. Introduce a new helper that takes the name of the region instead of its index. If the region is not found this returns -1. Otherwise it maps the corresponding index and returns this latter.
--- include/hw/sysbus.h | 1 + hw/core/sysbus.c | 11 +++++++++++ 2 files changed, 12 insertions(+)
include/hw/sysbus.h +1 -0
@@ -82,6 +82,7 @@ void sysbus_connect_irq(SysBusDevice *dev, int n, qemu_irq irq);bool sysbus_is_irq_connected (SysBusDevice *dev,int n);qemu_irq sysbus_get_connected_irq (SysBusDevice *dev,int n);void sysbus_mmio_map (SysBusDevice *dev,int n,hwaddr addr); +int sysbus_mmio_map_name (SysBusDevice *dev,const char *name,hwaddr addr);void sysbus_mmio_map_overlap (SysBusDevice *dev,int n,hwaddr addr,int priority);
hw/core/sysbus.c +11 -0
@@ -151,6 +151,17 @@ void sysbus_mmio_map(SysBusDevice *dev, int n, hwaddr addr)sysbus_mmio_map_common (dev, n, addr, false,0 ); } +int sysbus_mmio_map_name (SysBusDevice *dev,const char *name,hwaddr addr) +{ +for (int i =0 ; i < dev->num_mmio; i++) { +if (!strcmp (dev->mmio[i].memory->name, name)) { +sysbus_mmio_map (dev, i, addr); +return i; + } + } +return -1 ; +} +void sysbus_mmio_map_overlap (SysBusDevice *dev,int n,hwaddr addr,int priority) {
Signature · 1 line
2.49.0
PATCH v4 28/32 hw/arm/virt: Minor code reshuffling in create_acpi_ged
In reply to Eric AugerUse a local SysBusDevice handle. Also use the newly introduced sysbus_mmio_map_name which brings better readability about the region being mapped. GED device has regions which exist depending on some external properties and it becomes difficult to guess the index of a region. Better refer to a region by its name.
--- include/hw/acpi/generic_event_device.h | 1 + hw/arm/virt.c | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-)
include/hw/acpi/generic_event_device.h +1 -0
@@ -111,6 +111,7 @@ typedef struct GEDState { } GEDState;#define ACPI_PCIHP_REGION_NAME "pcihp container" +#define ACPI_MEMHP_REGION_NAME "memhp container"struct AcpiGedState {SysBusDevice parent_obj;
hw/arm/virt.c +7 -4
@@ -683,6 +683,7 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms) {DeviceState *dev;MachineState *ms =MACHINE (vms); +SysBusDevice *sbdev;int irq = vms->irqmap[VIRT_ACPI_GED ];uint32_t event =ACPI_GED_PWR_DOWN_EVT ;
@@ -697,11 +698,13 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms) dev =qdev_new (TYPE_ACPI_GED );qdev_prop_set_uint32 (dev,"ged-event" , event);object_property_set_link (OBJECT (dev),"bus" ,OBJECT (vms->bus), &error_abort); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); + sbdev =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (sbdev, &error_fatal); -sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , vms->memmap[VIRT_ACPI_GED ].base); -sysbus_mmio_map (SYS_BUS_DEVICE (dev),1 , vms->memmap[VIRT_PCDIMM_ACPI ].base); -sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 ,qdev_get_gpio_in (vms->gic, irq)); +sysbus_mmio_map_name (sbdev,TYPE_ACPI_GED , vms->memmap[VIRT_ACPI_GED ].base); +sysbus_mmio_map_name (sbdev,ACPI_MEMHP_REGION_NAME , + vms->memmap[VIRT_PCDIMM_ACPI ].base); +sysbus_connect_irq (sbdev,0 ,qdev_get_gpio_in (vms->gic, irq));return dev; }
Signature · 1 line
2.49.0
Re: [PATCH v4 28/32] hw/arm/virt: Minor code reshuffling in create_acpi_ged
Quoted 7 lines · On Fri, 27 Jun 2025 11:55:17 +0200 Eric Auger <[email protected]> wrote:
Use a local SysBusDevice handle. Also use the newly introduced
sysbus_mmio_map_namewhich brings better readability about the region being mapped. GED device has regions which exist depending on some external properties and it becomes difficult to guess the index of a region. Better refer to a region by its name.Signed-off-by Eric Auger <[email protected]>
PATCH v4 29/32 hw/arm/virt: Let virt support pci hotplug/unplug GED event
In reply to Eric AugerSet up the IO registers used to communicate between QEMU and ACPI.
---
v2 -> v3:
- remove acpi_ged_state->pcihp_state.use_acpi_hotplug_bridge = true;
- use sysbus_mmio_map_name for all regs (Igor)
- create_pcie left at its original place
v1 -> v2:
- use ACPI_PCIHP_REGION_NAME
--- hw/arm/virt.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
hw/arm/virt.c +13 -0
@@ -686,6 +686,7 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms)SysBusDevice *sbdev;int irq = vms->irqmap[VIRT_ACPI_GED ];uint32_t event =ACPI_GED_PWR_DOWN_EVT ; +bool acpi_pcihp;if (ms->ram_slots) { event |=ACPI_GED_MEM_HOTPLUG_EVT ;
@@ -704,6 +705,18 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms)sysbus_mmio_map_name (sbdev,TYPE_ACPI_GED , vms->memmap[VIRT_ACPI_GED ].base);sysbus_mmio_map_name (sbdev,ACPI_MEMHP_REGION_NAME , vms->memmap[VIRT_PCDIMM_ACPI ].base); + + acpi_pcihp =object_property_get_bool (OBJECT (dev), +ACPI_PM_PROP_ACPI_PCIHP_BRIDGE ,NULL ); + +if (acpi_pcihp) { +int pcihp_region_index; + + pcihp_region_index =sysbus_mmio_map_name (sbdev,ACPI_PCIHP_REGION_NAME , + vms->memmap[VIRT_ACPI_PCIHP ].base); +assert (pcihp_region_index >=0 ); + } +sysbus_connect_irq (sbdev,0 ,qdev_get_gpio_in (vms->gic, irq));return dev;
Signature · 1 line
2.49.0
Re: [PATCH v4 29/32] hw/arm/virt: Let virt support pci hotplug/unplug GED event
Quoted 4 lines · On Fri, 27 Jun 2025 11:55:18 +0200 Eric Auger <[email protected]> wrote:
Set up the IO registers used to communicate between QEMU and ACPI.
Signed-off-by Eric Auger <[email protected]>
Follow on comment inline. Otherwise LGTM
Quoted 26 lines
---
v2 -> v3:
- removeacpi_ged_state->pcihp_state.use_acpi_hotplug_bridge= true;
- usesysbus_mmio_map_namefor all regs (Igor)
-create_pcieleft at its original placev1 -> v2:
- useACPI_PCIHP_REGION_NAME--- hw/arm/virt.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)hw/arm/virt.c +1
-0@@ -686,6 +686,7 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms)SysBusDevice *sbdev;int irq = vms->irqmap[VIRT_ACPI_GED ];uint32_t event =ACPI_GED_PWR_DOWN_EVT ; +bool acpi_pcihp;if (ms->ram_slots) { event |=ACPI_GED_MEM_HOTPLUG_EVT ;
hw/arm/virt.c static inline DeviceState *create_acpi_ged(VirtMachineState *vms) · line 712
Quoted 8 lines
hw/arm/virt.c +5
-0@@ -704,6 +705,18 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms)sysbus_mmio_map_name (sbdev,TYPE_ACPI_GED , vms->memmap[VIRT_ACPI_GED ].base);sysbus_mmio_map_name (sbdev,ACPI_MEMHP_REGION_NAME , vms->memmap[VIRT_PCDIMM_ACPI ].base); + + acpi_pcihp =object_property_get_bool (OBJECT (dev), +ACPI_PM_PROP_ACPI_PCIHP_BRIDGE ,NULL ); + +if (acpi_pcihp) {
As mentioned in earlier patch review, with this code you now have means to set the event bitmap as done in other cases. Maybe just do that here as well?
Quoted 10 lines
hw/arm/virt.c +7
-0+int pcihp_region_index; + + pcihp_region_index =sysbus_mmio_map_name (sbdev,ACPI_PCIHP_REGION_NAME , + vms->memmap[VIRT_ACPI_PCIHP ].base); +assert (pcihp_region_index >=0 ); + } +sysbus_connect_irq (sbdev,0 ,qdev_get_gpio_in (vms->gic, irq));return dev;
Re: [PATCH v4 29/32] hw/arm/virt: Let virt support pci hotplug/unplug GED event
Hi Jonathan
Quoted 10 lines · Jonathan Cameron
Quoted 4 lines · On Fri, 27 Jun 2025 11:55:18 +0200 Eric Auger <[email protected]> wrote:
Set up the IO registers used to communicate between QEMU and ACPI.
Signed-off-by Eric Auger <[email protected]>Follow on comment inline. Otherwise LGTM
Reviewed-by Jonathan Cameron <[email protected]>
thanks!
Quoted 23 lines
Quoted 23 lines
---
v2 -> v3:
- removeacpi_ged_state->pcihp_state.use_acpi_hotplug_bridge= true;
- usesysbus_mmio_map_namefor all regs (Igor)
-create_pcieleft at its original placev1 -> v2:
- useACPI_PCIHP_REGION_NAME--- hw/arm/virt.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)hw/arm/virt.c +1
-0@@ -686,6 +686,7 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms)SysBusDevice *sbdev;int irq = vms->irqmap[VIRT_ACPI_GED ];uint32_t event =ACPI_GED_PWR_DOWN_EVT ; +bool acpi_pcihp;
Quoted 13 lines
hw/arm/virt.c static inline DeviceState *create_acpi_ged(VirtMachineState *vms) · line 712
Quoted 11 lines
hw/arm/virt.c +5
-0if (ms->ram_slots) { event |=ACPI_GED_MEM_HOTPLUG_EVT ;@@ -704,6 +705,18 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms)sysbus_mmio_map_name (sbdev,TYPE_ACPI_GED , vms->memmap[VIRT_ACPI_GED ].base);sysbus_mmio_map_name (sbdev,ACPI_MEMHP_REGION_NAME , vms->memmap[VIRT_PCDIMM_ACPI ].base); + + acpi_pcihp =object_property_get_bool (OBJECT (dev), +ACPI_PM_PROP_ACPI_PCIHP_BRIDGE ,NULL ); + +if (acpi_pcihp) {As mentioned in earlier patch review, with this code you now have means to set the event bitmap as done in other cases. Maybe just do that here as well?
see my previous reply
Hope this clarifies
Eric
Quoted 11 lines
Quoted 11 lines
hw/arm/virt.c +7
-0+int pcihp_region_index; + + pcihp_region_index =sysbus_mmio_map_name (sbdev,ACPI_PCIHP_REGION_NAME , + vms->memmap[VIRT_ACPI_PCIHP ].base); +assert (pcihp_region_index >=0 ); + } +sysbus_connect_irq (sbdev,0 ,qdev_get_gpio_in (vms->gic, irq));return dev;
PATCH v4 30/32 tests/qtest/bios-tables-test: Prepare for addition of acpi pci hp tests
In reply to Eric AugerFrom: Gustavo Romero <[email protected]>
Soon we will introduce new tests related to ACPI PCI hotplug and acpi-index that will use a new reference blob:
tests/data/acpi/aarch64/virt/DSDT.acpipcihp
tests/data/acpi/aarch64/virt/DSDT.hpoffacpiindex
---
v3 -> v4:
- switch Sign-off's (Jonathan)
--- tests/qtest/bios-tables-test-allowed-diff.h | 2 ++ tests/data/acpi/aarch64/virt/DSDT.acpipcihp | 0 tests/data/acpi/aarch64/virt/DSDT.hpoffacpiindex | 0 3 files changed, 2 insertions(+) create mode 100644 tests/data/acpi/aarch64/virt/DSDT.acpipcihp create mode 100644 tests/data/acpi/aarch64/virt/DSDT.hpoffacpiindex
tests/qtest/bios-tables-test-allowed-diff.h +2 -0
@@ -1 +1,3 @@/* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/aarch64/virt/DSDT.acpipcihp" , +"tests/data/acpi/aarch64/virt/DSDT.hpoffacpiindex",
tests/data/acpi/aarch64/virt/DSDT.acpipcihp new file +0 -0
tests/data/acpi/aarch64/virt/DSDT.hpoffacpiindex new file +0 -0
Signature · 1 line
2.49.0
Re: [PATCH v4 30/32] tests/qtest/bios-tables-test: Prepare for addition of acpi pci hp tests
Quoted 10 lines · On Fri, 27 Jun 2025 11:55:19 +0200 Eric Auger <[email protected]> wrote:
From: Gustavo Romero <[email protected]>
Soon we will introduce new tests related to ACPI PCI hotplug and acpi-index that will use a new reference blob:
tests/data/acpi/aarch64/virt/DSDT.acpipcihp
tests/data/acpi/aarch64/virt/DSDT.hpoffacpiindexSigned-off-by Gustavo Romero <[email protected]>Signed-off-by Eric Auger <[email protected]>
PATCH v4 31/32 tests/qtest/bios-tables-test: Add aarch64 ACPI PCI hotplug test
In reply to Eric AugerFrom: Gustavo Romero <[email protected]>
Add 2 new tests:
- test_acpi_aarch64_virt_acpi_pci_hotplug tests the acpi pci hotplug using -global acpi-ged.acpi-pci-hotplug-with-bridge-support=on
- test_acpi_aarch64_virt_pcie_root_port_hpoff tests static-acpi index on a root port with disabled hotplug
---
v3 -> v4:
- add -device pci-testdev for the first test case
- fix the chassis
- add a test for static acpi-index
--- tests/qtest/bios-tables-test.c | 52 ++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+)
tests/qtest/bios-tables-test.c +52 -0
@@ -1643,6 +1643,54 @@ static void test_acpi_aarch64_virt_tcg_memhp(void) } +static void test_acpi_aarch64_virt_acpi_pci_hotplug (void ) +{ +test_data data = { + .machine ="virt" , + .arch ="aarch64" , + .tcg_only = true, + .uefi_fl1 ="pc-bios/edk2-aarch64-code.fd" , + .uefi_fl2 ="pc-bios/edk2-arm-vars.fd" , + .cd ="tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2" , + .ram_start =0x40000000ULL , + .scan_len =256ULL * MiB, + .variant =".acpipcihp" , + }; + +/* Use ACPI PCI Hotplug */ +test_acpi_one (" -global acpi-ged.acpi-pci-hotplug-with-bridge-support=on" +" -cpu cortex-a57" +" -device pcie-root-port,id=pcie.1,bus=pcie.0,chassis=0,slot=1,addr=7.0" +" -device pci-testdev,bus=pcie.1" , + &data); + +free_test_data (&data); +} + +static void test_acpi_aarch64_virt_pcie_root_port_hpoff (void ) +{ +test_data data = { + .machine ="virt" , + .arch ="aarch64" , + .tcg_only = true, + .uefi_fl1 ="pc-bios/edk2-aarch64-code.fd" , + .uefi_fl2 ="pc-bios/edk2-arm-vars.fd" , + .cd ="tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2" , + .ram_start =0x40000000ULL , + .scan_len =256ULL * MiB, + .variant =".hpoffacpiindex" , + }; + +/* turn hotplug off on the pcie-root-port and use static acpi-index*/ +test_acpi_one (" -device pcie-root-port,id=pcie.1,chassis=0," +"slot=1,hotplug=off,addr=7.0" +" -device pci-testdev,bus=pcie.1,acpi-index=12" +" -cpu cortex-a57" , + &data); + +free_test_data (&data); +} +static void test_acpi_microvm_prepare (test_data *data) { data->machine ="microvm" ;
@@ -2580,6 +2628,10 @@ int main(int argc, char *argv[])qtest_add_func ("acpi/virt/numamem" , test_acpi_aarch64_virt_tcg_numamem);qtest_add_func ("acpi/virt/memhp" , test_acpi_aarch64_virt_tcg_memhp); +qtest_add_func ("acpi/virt/acpipcihp" , + test_acpi_aarch64_virt_acpi_pci_hotplug); +qtest_add_func ("acpi/virt/hpoffacpiindex" , + test_acpi_aarch64_virt_pcie_root_port_hpoff);qtest_add_func ("acpi/virt/pxb" , test_acpi_aarch64_virt_tcg_pxb);qtest_add_func ("acpi/virt/oem-fields" , test_acpi_aarch64_virt_oem_fields);
Signature · 1 line
2.49.0
Re: [PATCH v4 31/32] tests/qtest/bios-tables-test: Add aarch64 ACPI PCI hotplug test
Quoted 10 lines · On Fri, 27 Jun 2025 11:55:20 +0200 Eric Auger <[email protected]> wrote:
From: Gustavo Romero <[email protected]>
Add 2 new tests:
-test_acpi_aarch64_virt_acpi_pci_hotplugtests the acpi pci hotplug using -global acpi-ged.acpi-pci-hotplug-with-bridge-support=on
-test_acpi_aarch64_virt_pcie_root_port_hpofftests static-acpi index on a root port with disabled hotplugSigned-off-by Gustavo Romero <[email protected]>Signed-off-by Eric Auger <[email protected]>
PATCH v4 32/32 qtest/bios-tables-test: Create DSDT acpipcihp and hpoffacpiindex variant blobs
In reply to Eric AugerHACK: waiting for the resolution of previous issue to put the disassembled data here.
--- tests/qtest/bios-tables-test-allowed-diff.h | 2 -- tests/data/acpi/aarch64/virt/DSDT.acpipcihp | Bin 0 -> 6294 bytes tests/data/acpi/aarch64/virt/DSDT.hpoffacpiindex | Bin 0 -> 5347 bytes 3 files changed, 2 deletions(-)
tests/qtest/bios-tables-test-allowed-diff.h +0 -2
@@ -1,3 +1 @@/* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/aarch64/virt/DSDT.acpipcihp" , -"tests/data/acpi/aarch64/virt/DSDT.hpoffacpiindex",
tests/data/acpi/aarch64/virt/DSDT.acpipcihp binary +0 -0
tests/data/acpi/aarch64/virt/DSDT.hpoffacpiindex binary +0 -0
Signature · 1 line
2.49.0