ACPI PCI Hotplug support on ARM
v7 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-v7
previous series:
https://github.com/eauger/qemu/tree/arm-acpi-pcihp-v6
History:
v6 -> v7:
- rebased after minor contextual conflict introduced by "hw/arm/virt: Basic CXL enablement on pci_expander_bridge instances pxb-cxl" in hw/arm/virt-acpi-build.c (hw/pci-host/gpex-acpi: Use GED acpi pcihp property)
- collected last Igor's and Prasad's R-bs
v5 -> v6:
- collected Jonathan's R-bs
- cropped last 2 patch commit messages (Jonathan)
v4 -> v5:
- Collected Jonathan's R-bs (many thanks!)
- fixed the tests/qtest/bios-tables-test issue by creating a variant for the viot test
- use the 3 phase reset API
- fixed qom-test failures that were due to unconditionnal fetches of the GED property
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 (32):
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 qtest/bios-tables-test: Prepare for fixing the aarch64 viot test qtest/bios-tables-test: Add a variant to the aarch64 viot test qtest/bios-tables-test: Generate DSDT.viot 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: Generate reference blob for
DSDT.hpoffacpiindex
qtest/bios-tables-test: Generate reference blob for DSDT.acpipcihp
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 | 17 +- include/hw/acpi/pci.h | 5 +- include/hw/acpi/pcihp.h | 17 +- 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 | 77 +++ 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 | 38 ++ 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 | 53 ++ hw/arm/Kconfig | 2 + hw/pci-host/Kconfig | 1 + tests/data/acpi/aarch64/virt/DSDT | Bin 5196 -> 5293 bytes .../data/acpi/aarch64/virt/DSDT.acpihmatvirt | Bin 5282 -> 5379 bytes tests/data/acpi/aarch64/virt/DSDT.acpipcihp | Bin 0 -> 6202 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/aarch64/virt/DSDT.viot | Bin 0 -> 5310 bytes tests/data/acpi/riscv64/virt/DSDT | Bin 3576 -> 3538 bytes tests/data/acpi/x86/microvm/DSDT.pcie | Bin 3023 -> 2985 bytes 32 files changed, 811 insertions(+), 607 deletions(-) create mode 100644 tests/data/acpi/aarch64/virt/DSDT.acpipcihp create mode 100644 tests/data/acpi/aarch64/virt/DSDT.hpoffacpiindex create mode 100644 tests/data/acpi/aarch64/virt/DSDT.viot
Signature · 1 line
2.49.0
PATCH v7 1/36 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 v7 2/36 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 | 7 ++ hw/acpi/pcihp.c | 174 ++++++++++++++++++++++++++++++++++++++- hw/i386/acpi-build.c | 176 +--------------------------------------- 4 files changed, 182 insertions(+), 179 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 +7 -0
@@ -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 v7 3/36 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 v7 4/36 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 v7 5/36 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 v7 6/36 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 v7 7/36 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.
---
v4 -> v5:
- check vms->acpi_dev
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 | 9 +++++++++ hw/pci-host/gpex-acpi.c | 3 ++- 3 files changed, 12 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 +9 -0
@@ -144,12 +144,21 @@ static void acpi_dsdt_add_pci(Aml *scope, const MemMapEntry *memmap,int ecam_id =VIRT_ECAM_ID (vms->highmem_ecam);bool cxl_present = false;PCIBus *bus = vms->bus; +bool acpi_pcihp = false; + +if (vms->acpi_dev) { + 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
PATCH v7 8/36 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 v7 9/36 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 -> v4:
- 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 v7 09/36] hw/pci-host/gpex-acpi: Use build_pci_host_bridge_osc_method
Quoted 6 lines · Eric Auger
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.
Quoted 7 lines
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.
This patch somehow broke microvm-only build which is used by debian.
configure options used (trimmed a bit):
../configure \
--without-default-features \
--target-list=x86_64-softmmu \
--enable-kvm --disable-tcg \
--enable-pixman \
--enable-vnc \
--audio-drv-list="" \
--without-default-devices \
--with-devices-x86_64=microvm \
--enable-vhost-user
configs/devices/x86_64-softmmu/microvm.mak:
---- cut ----
# see configs/devices/i386-softmmu/default.mak # for additional devices which can be disabled # CONFIG_PCI_DEVICES=n
CONFIG_MICROVM=y
CONFIG_VIRTIO_BLK=yCONFIG_VIRTIO_SERIAL=yCONFIG_VIRTIO_INPUT=yCONFIG_VIRTIO_INPUT_HOST=yCONFIG_VHOST_USER_INPUT=yCONFIG_VIRTIO_NET=yCONFIG_VIRTIO_SCSI=yCONFIG_VIRTIO_RNG=yCONFIG_VIRTIO_CRYPTO=yCONFIG_VIRTIO_BALLOON=yCONFIG_VIRTIO_GPU=yCONFIG_VHOST_USER_GPU=y
---- cut ----
The result:
FAILED: qemu-system-x86_64
cc -m64 @qemu-system-x86_64.rsp/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:(.text+0x274): undefined reference to `build_pci_host_bridge_osc_method'
collect2: error: ld returned 1 exit status
Is it because my devices file wrong now, or some select FOO kconfig is missing?
Should this code be enabled with this configuration anyway?
Thanks,
/mjt
Re: [PATCH v7 09/36] hw/pci-host/gpex-acpi: Use build_pci_host_bridge_osc_method
Quoted 17 lines · Michael Tokarev
Quoted 9 lines · Eric Auger
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.This patch somehow broke microvm-only build which is used by debian.
configure options used (trimmed a bit):
../configure \ --without-default-features \ --target-list=x86_64- softmmu \ --enable-kvm --disable-tcg \ --enable-pixman \ --enable- vnc \ --audio-drv-list="" \ --without-default-devices \ --with- devices-x86_64=microvm \ --enable-vhost-user
Quoted 7 lines
configs/devices/x86_64-softmmu/microvm.mak: ---- cut ---- # see configs/devices/i386-softmmu/default.mak # for additional devices which can be disabled #
CONFIG_PCI_DEVICES=n
CONFIG_MICROVM=y
CONFIG_VIRTIO_BLK=yCONFIG_VIRTIO_SERIAL=yCONFIG_VIRTIO_INPUT=yCONFIG_VIRTIO_INPUT_HOST=yCONFIG_VHOST_USER_INPUT=yCONFIG_VIRTIO_NET=yCONFIG_VIRTIO_SCSI=yCONFIG_VIRTIO_RNG=yCONFIG_VIRTIO_CRYPTO=yCONFIG_VIRTIO_BALLOON=yCONFIG_VIRTIO_GPU=yCONFIG_VHOST_USER_GPU=y---- cut ----The result: FAILED: qemu-system-x86_64 cc -m64 @qemu-system- x86_64.rsp
/usr/bin/ld:libsystem.a.p/hw_pci-host_gpex-acpi.c.o: in functionacpi_dsdt_add_host_bridge_methods': hw/pci-host/gpex- acpi.c:83:(.text+0x274): undefined reference tobuild_pci_host_bridge_osc_method' collect2: error: ld returned 1 exit status
In hw/i386/Kconfig, MICROVM selects ACPI_HW_REDUCED (not ACPI or ACPI_PCI), *and* PCI_EXPRESS_GENERIC_BRIDGE. But in hw/pci/meson.build, pci.c (where the function in question is defined) is built when ACPI_PCI is enabled. Something's not right here.
Addig kraxel for 24db877ab6e6 "microvm: add pcie support".
Thanks
/mjt
Re: [PATCH v7 09/36] hw/pci-host/gpex-acpi: Use build_pci_host_bridge_osc_method
Hi Michael,
Quoted 44 lines · Michael Tokarev
Quoted 36 lines · Michael Tokarev
Quoted 6 lines · Eric Auger
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.
Quoted 7 lines
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.This patch somehow broke microvm-only build which is used by debian.
configure options used (trimmed a bit):
../configure \ --without-default-features \ --target-list=x86_64- softmmu \ --enable-kvm --disable-tcg \ --enable-pixman \ --enable- vnc \ --audio-drv-list="" \ --without-default-devices \ --with- devices-x86_64=microvm \ --enable-vhost-user
configs/devices/x86_64-softmmu/microvm.mak: ---- cut ---- # see configs/devices/i386-softmmu/default.mak # for additional devices which can be disabled #
CONFIG_PCI_DEVICES=n
CONFIG_MICROVM=y
CONFIG_VIRTIO_BLK=yCONFIG_VIRTIO_SERIAL=yCONFIG_VIRTIO_INPUT=yCONFIG_VIRTIO_INPUT_HOST=yCONFIG_VHOST_USER_INPUT=yCONFIG_VIRTIO_NET=yCONFIG_VIRTIO_SCSI=yCONFIG_VIRTIO_RNG=yCONFIG_VIRTIO_CRYPTO=yCONFIG_VIRTIO_BALLOON=yCONFIG_VIRTIO_GPU=yCONFIG_VHOST_USER_GPU=y---- cut ----Quoted 6 lines
The result: FAILED: qemu-system-x86_64 cc -m64 @qemu-system- x86_64.rsp
/usr/bin/ld:libsystem.a.p/hw_pci-host_gpex-acpi.c.o: in functionacpi_dsdt_add_host_bridge_methods': hw/pci-host/gpex- acpi.c:83:(.text+0x274): undefined reference tobuild_pci_host_bridge_osc_method' collect2: error: ld returned 1 exit status
Quoted 4 lines
In hw/i386/Kconfig, MICROVM selects
ACPI_HW_REDUCED(not ACPI orACPI_PCI), *and* PCI_EXPRESS_GENERIC_BRIDGE. But in hw/pci/meson.build,pci.c(where the function in question is defined) is built whenACPI_PCIis enabled. Something's not right here.
This commit added an imply ACPI_PCI to the PCI_EXPRESS_GENERIC_BRIDGE config in hw/pci-host/Kconfig:
config PCI_EXPRESS_GENERIC_BRIDGE
bool
select PCI_EXPRESS -> selects PCI
imply ACPI_PCI
In hw/acpi/Kconfig we have:
config ACPI_PCI
bool
depends on ACPI && PCI
ACPI is selected by ACPI_HW_REDUCED
config ACPI_HW_REDUCED
bool
select ACPI
select ACPI_MEMORY_HOTPLUG
select ACPI_NVDIMM
so logically the ACPI && PCI dependencies for ACPI_PCI should be resolved. What do I miss?
regards
Eric
Quoted 7 lines
Addig kraxel for
24db877ab6e6"microvm: add pcie support".Thanks
/mjt
Re: [PATCH v7 09/36] hw/pci-host/gpex-acpi: Use build_pci_host_bridge_osc_method
Quoted 1 line · Eric Auger
Hi Michael,
Hi!
Quoted 16 lines
This commit added an imply
ACPI_PCIto thePCI_EXPRESS_GENERIC_BRIDGEconfig in hw/pci-host/Kconfig:config
PCI_EXPRESS_GENERIC_BRIDGE
bool
select PCI_EXPRESS -> selects PCI
implyACPI_PCIIn hw/acpi/Kconfig we have:
config
ACPI_PCI
bool
depends on ACPI && PCIACPI is selected by
ACPI_HW_REDUCED
Quoted 8 lines
config
ACPI_HW_REDUCED
bool
select ACPI
selectACPI_MEMORY_HOTPLUG
selectACPI_NVDIMMso logically the ACPI && PCI dependencies for
ACPI_PCIshould be resolved. What do I miss?
I think it should be "select" not "imply", which seems to be stricter. With a devices file like I'm using - it looks like - only things which are selected gets enabled. But this commit brings hard dependency between the bridge device and ACPI_PCI, as demonstrated by my example. So when the bridge selects ACPI_PCI instead of implying it, whole thing works (I just verified it)
I wonder why we build microvm-only executable in debian... Initially it was a small binary aimed at very fast startup and light runtime. But with time it grew quite a lot of things...
Thanks,
/mjt
Re: [PATCH v7 09/36] hw/pci-host/gpex-acpi: Use build_pci_host_bridge_osc_method
Quoted 6 lines · Michael Tokarev
I think it should be "select" not "imply", which seems to be stricter. With a devices file like I'm using - it looks like - only things which are selected gets enabled. But this commit brings hard dependency between the bridge device and
ACPI_PCI, as demonstrated by my example. So when the bridge selectsACPI_PCIinstead of implying it, whole thing works (I just verified it)
I just sent a patch doing exactly that.
Alternatively this can be #ifdef ACPI_PCI in the code, - I dunno if that's possible now.
Thanks,
/mjt
Re: [PATCH v7 09/36] hw/pci-host/gpex-acpi: Use build_pci_host_bridge_osc_method
In reply to Michael TokarevHi Michael,
Quoted 30 lines · Michael Tokarev
Quoted 1 line · Eric Auger
Hi Michael,
Hi!
Quoted 16 lines
This commit added an imply
ACPI_PCIto thePCI_EXPRESS_GENERIC_BRIDGEconfig in hw/pci-host/Kconfig:config
PCI_EXPRESS_GENERIC_BRIDGE
bool
select PCI_EXPRESS -> selects PCI
implyACPI_PCIIn hw/acpi/Kconfig we have:
config
ACPI_PCI
bool
depends on ACPI && PCIACPI is selected by
ACPI_HW_REDUCEDQuoted 8 lines
config
ACPI_HW_REDUCED
bool
select ACPI
selectACPI_MEMORY_HOTPLUG
selectACPI_NVDIMMso logically the ACPI && PCI dependencies for
ACPI_PCIshould be resolved. What do I miss?
Quoted 6 lines
I think it should be "select" not "imply", which seems to be stricter. With a devices file like I'm using - it looks like - only things which are selected gets enabled. But this commit brings hard dependency between the bridge device and
ACPI_PCI, as demonstrated by my example. So when the bridge selectsACPI_PCIinstead of implying it, whole thing works (I just verified it)
build_pci_host_bridge_osc_method() is called from gpex-acpi.c
pci_ss.add(when: ['CONFIG_PCI_EXPRESS_GENERIC_BRIDGE', 'CONFIG_ACPI'],if_true: files('gpex-acpi.c'))
so the hard dependency exists only if ACPI is selected.
If you use "select" you will force ACPI_PCI even if ACPI is not set which does not sound what we want?
regards
Eric
Quoted 9 lines
I wonder why we build microvm-only executable in debian... Initially it was a small binary aimed at very fast startup and light runtime. But with time it grew quite a lot of things...
Thanks,
/mjt
Re: [PATCH v7 09/36] hw/pci-host/gpex-acpi: Use build_pci_host_bridge_osc_method
In reply to Eric AugerQuoted 73 lines · Eric Auger
Hi Michael,
Quoted 44 lines · Michael Tokarev
Quoted 36 lines · Michael Tokarev
Quoted 6 lines · Eric Auger
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.
Quoted 7 lines
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.This patch somehow broke microvm-only build which is used by debian.
configure options used (trimmed a bit):
../configure \ --without-default-features \ --target-list=x86_64- softmmu \ --enable-kvm --disable-tcg \ --enable-pixman \ --enable- vnc \ --audio-drv-list="" \ --without-default-devices \ --with- devices-x86_64=microvm \ --enable-vhost-user
configs/devices/x86_64-softmmu/microvm.mak: ---- cut ---- # see configs/devices/i386-softmmu/default.mak # for additional devices which can be disabled #
CONFIG_PCI_DEVICES=n
CONFIG_MICROVM=y
CONFIG_VIRTIO_BLK=yCONFIG_VIRTIO_SERIAL=yCONFIG_VIRTIO_INPUT=yCONFIG_VIRTIO_INPUT_HOST=yCONFIG_VHOST_USER_INPUT=yCONFIG_VIRTIO_NET=yCONFIG_VIRTIO_SCSI=yCONFIG_VIRTIO_RNG=yCONFIG_VIRTIO_CRYPTO=yCONFIG_VIRTIO_BALLOON=yCONFIG_VIRTIO_GPU=yCONFIG_VHOST_USER_GPU=y---- cut ----Quoted 6 lines
The result: FAILED: qemu-system-x86_64 cc -m64 @qemu-system- x86_64.rsp
/usr/bin/ld:libsystem.a.p/hw_pci-host_gpex-acpi.c.o: in functionacpi_dsdt_add_host_bridge_methods': hw/pci-host/gpex- acpi.c:83:(.text+0x274): undefined reference tobuild_pci_host_bridge_osc_method' collect2: error: ld returned 1 exit statusQuoted 4 lines
In hw/i386/Kconfig, MICROVM selects
ACPI_HW_REDUCED(not ACPI orACPI_PCI), *and* PCI_EXPRESS_GENERIC_BRIDGE. But in hw/pci/meson.build,pci.c(where the function in question is defined) is built whenACPI_PCIis enabled. Something's not right here.This commit added an imply
ACPI_PCIto thePCI_EXPRESS_GENERIC_BRIDGEconfig in hw/pci-host/Kconfig:config
PCI_EXPRESS_GENERIC_BRIDGE
bool
select PCI_EXPRESS -> selects PCI
implyACPI_PCIIn hw/acpi/Kconfig we have:
config
ACPI_PCI
bool
depends on ACPI && PCIACPI is selected by
ACPI_HW_REDUCEDconfig
ACPI_HW_REDUCED
bool
select ACPI
selectACPI_MEMORY_HOTPLUG
selectACPI_NVDIMM
Quoted 6 lines
so logically the ACPI && PCI dependencies for
ACPI_PCIshould be resolved. What do I miss?
regardsEric
Not sure I get what are you proposing?
Quoted 14 lines
Quoted 14 lines
Addig kraxel for
24db877ab6e6"microvm: add pcie support".Thanks
/mjt
Re: [PATCH v7 09/36] hw/pci-host/gpex-acpi: Use build_pci_host_bridge_osc_method
Hi Michael,
Quoted 72 lines · Michael S. Tsirkin
Quoted 71 lines · Eric Auger
Hi Michael,
Quoted 42 lines · Michael Tokarev
Quoted 35 lines · Michael Tokarev
Quoted 6 lines · Eric Auger
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.
Quoted 7 lines
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.This patch somehow broke microvm-only build which is used by debian.
configure options used (trimmed a bit):
../configure \ --without-default-features \ --target-list=x86_64- softmmu \ --enable-kvm --disable-tcg \ --enable-pixman \ --enable- vnc \ --audio-drv-list="" \ --without-default-devices \ --with- devices-x86_64=microvm \ --enable-vhost-user
configs/devices/x86_64-softmmu/microvm.mak: ---- cut ---- # see configs/devices/i386-softmmu/default.mak # for additional devices which can be disabled #
CONFIG_PCI_DEVICES=n
CONFIG_MICROVM=y
CONFIG_VIRTIO_BLK=yCONFIG_VIRTIO_SERIAL=yCONFIG_VIRTIO_INPUT=yCONFIG_VIRTIO_INPUT_HOST=yCONFIG_VHOST_USER_INPUT=yCONFIG_VIRTIO_NET=yCONFIG_VIRTIO_SCSI=yCONFIG_VIRTIO_RNG=yCONFIG_VIRTIO_CRYPTO=yCONFIG_VIRTIO_BALLOON=yCONFIG_VIRTIO_GPU=yCONFIG_VHOST_USER_GPU=y---- cut ----Quoted 6 lines
The result: FAILED: qemu-system-x86_64 cc -m64 @qemu-system- x86_64.rsp
/usr/bin/ld:libsystem.a.p/hw_pci-host_gpex-acpi.c.o: in functionacpi_dsdt_add_host_bridge_methods': hw/pci-host/gpex- acpi.c:83:(.text+0x274): undefined reference tobuild_pci_host_bridge_osc_method' collect2: error: ld returned 1 exit statusQuoted 4 lines
In hw/i386/Kconfig, MICROVM selects
ACPI_HW_REDUCED(not ACPI orACPI_PCI), *and* PCI_EXPRESS_GENERIC_BRIDGE. But in hw/pci/meson.build,pci.c(where the function in question is defined) is built whenACPI_PCIis enabled. Something's not right here.This commit added an imply
ACPI_PCIto thePCI_EXPRESS_GENERIC_BRIDGEconfig in hw/pci-host/Kconfig:config
PCI_EXPRESS_GENERIC_BRIDGE
bool
select PCI_EXPRESS -> selects PCI
implyACPI_PCIIn hw/acpi/Kconfig we have:
config
ACPI_PCI
bool
depends on ACPI && PCIACPI is selected by
ACPI_HW_REDUCEDconfig
ACPI_HW_REDUCED
bool
select ACPI
selectACPI_MEMORY_HOTPLUG
selectACPI_NVDIMM
Quoted 8 lines
Quoted 6 lines
so logically the ACPI && PCI dependencies for
ACPI_PCIshould be resolved. What do I miss?
regardsEric
Not sure I get what are you proposing?
I have not proposed anything ;-) - sorry I am on vacation - I was trying to enumerate the various config settings and to me dependencies should be resolved so I fail to understand. Unfortunately I cannot test because the problem happens with a custom microvm.mak. I would need this latter to reproduce and try to fix.
if the microvm.mak selects PCI_EXPRESS_GENERIC_BRIDGE (which selects PCI_EXPRESS which itself selects PCI) and ACPI_HW_REDUCED (which selects ACPI), the imply ACPI_PCI should end up as a selection because PCI and ACPI are resolved. At least that's my understanding. Reading it again, please can you check whether ACPI_HW_REDUCED is selected *before* PCI_EXPRESS_GENERIC_BRIDGE in the custom microvm.mak. Depending on the order of dependency resolution it might make a difference. Otherwise please can you send the full microvm.mak and configure command so that I can try reproducing. Thanks Eric
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
Addig kraxel for
24db877ab6e6"microvm: add pcie support".Thanks
/mjt
Re: [PATCH v7 09/36] hw/pci-host/gpex-acpi: Use build_pci_host_bridge_osc_method
On 03.08.2025 19:49, Eric Auger wrote:
...
Quoted 6 lines
I have not proposed anything ;-) - sorry I am on vacation - I was trying to enumerate the various config settings and to me dependencies should be resolved so I fail to understand. Unfortunately I cannot test because the problem happens with a custom microvm.mak. I would need this latter to reproduce and try to fix.
Quoted 9 lines
if the microvm.mak selects
PCI_EXPRESS_GENERIC_BRIDGE(which selectsPCI_EXPRESSwhich itself selects PCI) andACPI_HW_REDUCED(which selects ACPI), the implyACPI_PCIshould end up as a selection because PCI and ACPI are resolved. At least that's my understanding. Reading it again, please can you check whetherACPI_HW_REDUCEDis selected *before*PCI_EXPRESS_GENERIC_BRIDGEin the custom microvm.mak. Depending on the order of dependency resolution it might make a difference. Otherwise please can you send the full microvm.mak and configure command so that I can try reproducing. Thanks Eric
All the details were in my very first reply to the original patch:
https://lore.kernel.org/qemu-devel/[email protected]/
Thanks,
/mjt
Re: [PATCH v7 09/36] hw/pci-host/gpex-acpi: Use build_pci_host_bridge_osc_method
Hi Michael,
Quoted 18 lines · Michael Tokarev
On 03.08.2025 19:49, Eric Auger wrote:
...Quoted 6 lines
I have not proposed anything ;-) - sorry I am on vacation - I was trying to enumerate the various config settings and to me dependencies should be resolved so I fail to understand. Unfortunately I cannot test because the problem happens with a custom microvm.mak. I would need this latter to reproduce and try to fix.
Quoted 9 lines
if the microvm.mak selects
PCI_EXPRESS_GENERIC_BRIDGE(which selectsPCI_EXPRESSwhich itself selects PCI) andACPI_HW_REDUCED(which selects ACPI), the implyACPI_PCIshould end up as a selection because PCI and ACPI are resolved. At least that's my understanding. Reading it again, please can you check whetherACPI_HW_REDUCEDis selected *before*PCI_EXPRESS_GENERIC_BRIDGEin the custom microvm.mak. Depending on the order of dependency resolution it might make a difference. Otherwise please can you send the full microvm.mak and configure command so that I can try reproducing. Thanks Eric
Quoted 3 lines
All the details were in my very first reply to the original patch:
https://lore.kernel.org/qemu-devel/[email protected]/
Sorry I was confused by the fact the microvm.mak was not upstream and its content was cut in your original report.
I was able to reproduce and could check that both ACPI and PCI are set since objects that depend on them are compiled. However ACPI_PCI which depend on both and which is implied by PCI_EXPRESS_GENERIC_BRIDGE is not set as opposed to what I would have expected.
So I sent "[PATCH for 10.1] microvm: Explicitly select ACPI_PCI" as a tentative fix of your issue. It looks similar to PC setup. An alternative could be to set it in your .mak file.
Nevetheless I still fail to understand what prevents the imply from beeing active as a select here. Maybe that's due to the "eveythning unset by default".
Thanks
Eric
Quoted 5 lines
Thanks,
/mjt
PATCH v7 10/36 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
PATCH v7 11/36 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 v7 12/36 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 v7 13/36 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 v7 14/36 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 v7 15/36 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 v7 16/36 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
PATCH v7 17/36 qtest/bios-tables-test: Prepare for fixing the aarch64 viot test
In reply to Eric AugerThe test misses a variant and this puts the mess on subsequent rebuild-expected-aml.sh where a first DSDT reference blob is overriden by another one.
--- tests/qtest/bios-tables-test-allowed-diff.h | 1 + tests/data/acpi/aarch64/virt/DSDT.viot | 0 2 files changed, 1 insertion(+) create mode 100644 tests/data/acpi/aarch64/virt/DSDT.viot
tests/qtest/bios-tables-test-allowed-diff.h +1 -0
@@ -1 +1,2 @@/* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/aarch64/virt/DSDT.viot",
tests/data/acpi/aarch64/virt/DSDT.viot new file +0 -0
Signature · 1 line
2.49.0
PATCH v7 18/36 qtest/bios-tables-test: Add a variant to the aarch64 viot test
In reply to Eric Auger--- tests/qtest/bios-tables-test.c | 1 + 1 file changed, 1 insertion(+)
tests/qtest/bios-tables-test.c +1 -0
@@ -2237,6 +2237,7 @@ static void test_acpi_aarch64_virt_viot(void)test_data data = { .machine ="virt" , .arch ="aarch64" , + .variant =".viot" , .tcg_only = true, .uefi_fl1 ="pc-bios/edk2-aarch64-code.fd" , .uefi_fl2 ="pc-bios/edk2-arm-vars.fd" ,
Signature · 1 line
2.49.0
PATCH v7 19/36 qtest/bios-tables-test: Generate DSDT.viot
In reply to Eric AugerUse a specific DSDT.viot reference blob instead of relying on the default DSDT blob. The content is unchanged.
--- tests/qtest/bios-tables-test-allowed-diff.h | 1 - tests/data/acpi/aarch64/virt/DSDT.viot | Bin 0 -> 5158 bytes 2 files changed, 1 deletion(-)
tests/qtest/bios-tables-test-allowed-diff.h +0 -1
@@ -1,2 +1 @@/* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/aarch64/virt/DSDT.viot",
tests/data/acpi/aarch64/virt/DSDT.viot binary +0 -0
Signature · 1 line
2.49.0
PATCH v7 20/36 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 | 6 ++++++ 1 file changed, 6 insertions(+)
tests/qtest/bios-tables-test-allowed-diff.h +6 -0
@@ -1 +1,7 @@/* 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.viot",
Signature · 1 line
2.49.0
PATCH v7 21/36 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"
@@ -906,6 +907,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 ();
@@ -959,6 +961,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
PATCH v7 22/36 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
+ }
+ }
}
--- tests/qtest/bios-tables-test-allowed-diff.h | 6 ------ tests/data/acpi/aarch64/virt/DSDT | Bin 5158 -> 5293 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 tests/data/acpi/aarch64/virt/DSDT.viot | Bin 5158 -> 5310 bytes 7 files changed, 6 deletions(-)
tests/qtest/bios-tables-test-allowed-diff.h +0 -6
@@ -1,7 +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.viot",
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/aarch64/virt/DSDT.viot binary +0 -0
Signature · 1 line
2.49.0
PATCH v7 23/36 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.
---
v4 -> v5:
- protect the access to the ged property by an acpi_dev check
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 | 17 +++++++++++++++++ hw/arm/virt.c | 2 ++ 5 files changed, 22 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
@@ -80,6 +80,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 +17 -0
@@ -969,6 +969,23 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)build_append_pcihp_slots (pci0_scope, vms->bus); } +if (vms->acpi_dev) { +bool acpi_pcihp; + + acpi_pcihp =object_property_get_bool (OBJECT (vms->acpi_dev), +ACPI_PM_PROP_ACPI_PCIHP_BRIDGE , +NULL ); + +if (acpi_pcihp) { +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
@@ -76,6 +76,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"
@@ -186,6 +187,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
PATCH v7 24/36 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 v7 25/36 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
@@ -701,6 +701,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 v7 26/36 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 v7 27/36 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
PATCH v7 28/36 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.
---
v4 -> v5:
- Get rid of legacy reset API
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 | 14 ++++++++++- hw/acpi/generic_event_device.c | 35 ++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-)
include/hw/acpi/generic_event_device.h +13 -1
@@ -69,7 +69,7 @@#define ACPI_POWER_BUTTON_DEVICE "PWRB"#define TYPE_ACPI_GED "acpi-ged" -OBJECT_DECLARE_SIMPLE_TYPE(AcpiGedState, ACPI_GED) +OBJECT_DECLARE_TYPE(AcpiGedState, AcpiGedClass, ACPI_GED)#define ACPI_GED_EVT_SEL_OFFSET 0x0#define ACPI_GED_EVT_SEL_LEN 0x4
@@ -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,12 +119,21 @@ 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;AcpiGhesState ghes_state; }; +typedef struct AcpiGedClass { +/* <private> */ +SysBusDeviceClass parent_class; + +/*< public >*/ +ResettablePhases parent_phases; +}AcpiGedClass ; +void build_ged_aml (Aml *table,const char * name,HotplugHandler *hotplug_dev,uint32_t ged_irq,AmlRegionSpace rs,hwaddr ged_base);void acpi_dsdt_add_power_button (Aml *scope);
hw/acpi/generic_event_device.c +35 -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,11 +511,22 @@ static void acpi_ged_initfn(Object *obj)sysbus_init_mmio (sbd, &ged_st->regs); } +static void ged_reset_hold (Object *obj,ResetType type) +{ +AcpiGedState *s =ACPI_GED (obj); + +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);HotplugHandlerClass *hc =HOTPLUG_HANDLER_CLASS (class);AcpiDeviceIfClass *adevc =ACPI_DEVICE_IF_CLASS (class); +ResettableClass *rc =RESETTABLE_CLASS (class); +AcpiGedClass *gedc =ACPI_GED_CLASS (class); dc->desc ="ACPI Generic Event Device" ;device_class_set_props (dc, acpi_ged_properties);
@@ -505,6 +537,8 @@ 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; +resettable_class_set_parent_phases (rc,NULL , ged_reset_hold,NULL , + &gedc->parent_phases); adevc->ospm_status = acpi_ged_ospm_status; adevc->send_event = acpi_ged_send_event;
@@ -516,6 +550,7 @@ static const TypeInfo acpi_ged_info = { .instance_size = sizeof(AcpiGedState), .instance_init = acpi_ged_initfn, .class_init = acpi_ged_class_init, + .class_size = sizeof(AcpiGedClass), .interfaces = (const InterfaceInfo []) { {TYPE_HOTPLUG_HANDLER }, {TYPE_ACPI_DEVICE_IF },
Signature · 1 line
2.49.0
PATCH v7 29/36 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
PATCH v7 30/36 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 v7 31/36 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
@@ -688,6 +688,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 ;
@@ -702,11 +703,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
PATCH v7 32/36 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
@@ -691,6 +691,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 ;
@@ -709,6 +710,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
PATCH v7 33/36 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
PATCH v7 34/36 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" ;
@@ -2602,6 +2650,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
PATCH v7 35/36 qtest/bios-tables-test: Generate reference blob for DSDT.hpoffacpiindex
In reply to Eric AugerThe disassembled DSDT table is given below
* Original Table Header:
* Signature "DSDT"
* Length 0x000014E3 (5347)
* Revision 0x02
* Checksum 0x92
* 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
}
Device (COM0)
{
Name (_HID, "ARMH0011") // _HID: Hardware ID
Name (_UID, Zero) // _UID: Unique ID
Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
{
Memory32Fixed (ReadWrite,
0x09000000, // Address Base
0x00001000, // Address Length
)
Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
{
0x00000021,
}
})
}
Device (FWCF)
{
Name (_HID, "QEMU0002") // _HID: Hardware ID
Name (_STA, 0x0B) // _STA: Status
Name (_CCA, One) // _CCA: Cache Coherency Attribute
Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
{
Memory32Fixed (ReadWrite,
0x09020000, // Address Base
0x00000018, // Address Length
)
})
}
Device (VR00)
{
Name (_HID, "LNRO0005") // _HID: Hardware ID
Name (_UID, Zero) // _UID: Unique ID
Name (_CCA, One) // _CCA: Cache Coherency Attribute
Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
{
Memory32Fixed (ReadWrite,
0x0A000000, // Address Base
0x00000200, // Address Length
)
Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
{
0x00000030,
}
})
}../..
Device (L000)
{
Name (_HID, "PNP0C0F" /* PCI Interrupt Link Device */) // _HID: Hardware ID
Name (_UID, Zero) // _UID: Unique ID
Name (_PRS, ResourceTemplate () // _PRS: Possible Resource Settings
{
Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
{
0x00000023,
}
})
Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
{
Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
{
0x00000023,
}
})
Method (_SRS, 1, NotSerialized) // _SRS: Set Resource Settings
{
}
}../..
Device (PCI0)
{
Name (_HID, "PNP0A08" /* PCI Express Bus */) // _HID: Hardware ID
Name (_CID, "PNP0A03" /* PCI Bus */) // _CID: Compatible ID
Name (_SEG, Zero) // _SEG: PCI Segment
Name (_BBN, Zero) // _BBN: BIOS Bus Number
Name (_UID, Zero) // _UID: Unique ID
Name (_STR, Unicode ("PCIe 0 Device")) // _STR: Description String
Name (_CCA, One) // _CCA: Cache Coherency Attribute
Name (_PRT, Package (0x80) // _PRT: PCI Routing Table
{
Package (0x04)
{
0xFFFF,
Zero,
L000,
Zero
},../..
})
Method (_CBA, 0, NotSerialized) // _CBA: Configuration Base Address
{
Return (0x0000004010000000)
}
Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
{
WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDecode,
0x0000, // Granularity
0x0000, // Range Minimum
0x00FF, // Range Maximum
0x0000, // Translation Offset
0x0100, // Length
,, )
DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, NonCacheable, ReadWrite,
0x00000000, // Granularity
0x10000000, // Range Minimum
0x3EFEFFFF, // Range Maximum
0x00000000, // Translation Offset
0x2EFF0000, // Length
,, , AddressRangeMemory, TypeStatic)
DWordIO (ResourceProducer, MinFixed, MaxFixed, PosDecode, EntireRange,
0x00000000, // Granularity
0x00000000, // Range Minimum
0x0000FFFF, // Range Maximum
0x3EFF0000, // Translation Offset
0x00010000, // Length
,, , TypeStatic, DenseTranslation)
QWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, NonCacheable, ReadWrite,
0x0000000000000000, // Granularity
0x0000008000000000, // Range Minimum
0x000000FFFFFFFFFF, // Range Maximum
0x0000000000000000, // Translation Offset
0x0000008000000000, // Length
,, , AddressRangeMemory, TypeStatic)
})
Method (_OSC, 4, NotSerialized) // _OSC: Operating System Capabilities
{
CreateDWordField (Arg3, Zero, CDW1)
If ((Arg0 == ToUUID ("33db4d5b-1ff7-401c-9657-7441c03dd766") /* PCI Host Bridge Device */))
{
CreateDWordField (Arg3, 0x04, CDW2)
CreateDWordField (Arg3, 0x08, CDW3)
Local0 = CDW3 /* \_SB_.PCI0._OSC.CDW3 */
Local0 &= 0x1F
If ((Arg1 != One))
{
CDW1 |= 0x08
}
If ((CDW3 != Local0))
{
CDW1 |= 0x10
}
CDW3 = Local0
}
Else
{
CDW1 |= 0x04
}
Return (Arg3)
}
Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific Method
{
If ((Arg0 == ToUUID ("e5c937d0-3553-4d7a-9117-ea4d19c3434d") /* Device Labeling Interface */))
{
If ((Arg2 == Zero))
{
Return (Buffer (One)
{
0x01 // .
})
}
}
Return (Buffer (One)
{
0x00 // .
})
}
Device (RES0)
{
Name (_HID, "PNP0C02" /* PNP Motherboard Resources */) // _HID: Hardware ID
Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
{
QWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, NonCacheable, ReadWrite,
0x0000000000000000, // Granularity
0x0000004010000000, // Range Minimum
0x000000401FFFFFFF, // Range Maximum
0x0000000000000000, // Translation Offset
0x0000000010000000, // Length
,, , AddressRangeMemory, TypeStatic)
})
}
}
Device (\_SB.GED)
{
Name (_HID, "ACPI0013" /* Generic Event Device */) // _HID: Hardware ID
Name (_UID, "GED") // _UID: Unique ID
Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
{
Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, ,, )
{
0x00000029,
}
})
OperationRegion (EREG, SystemMemory, 0x09080000, 0x04)
Field (EREG, DWordAcc, NoLock, WriteAsZeros)
{
ESEL, 32
}
Method (_EVT, 1, Serialized) // _EVT: Event
{
Local0 = ESEL /* \_SB_.GED_.ESEL */
If (((Local0 & 0x02) == 0x02))
{
Notify (PWRB, 0x80) // Status Change
}
}
}
Device (PWRB)
{
Name (_HID, "PNP0C0C" /* Power Button Device */) // _HID: Hardware ID
Name (_UID, Zero) // _UID: Unique ID
}
}
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 (S38)
{
Name (_ADR, 0x00070000) // _ADR: Address
Device (S00)
{
Name (_ADR, Zero) // _ADR: Address
Method (_DSM, 4, Serialized) // _DSM: Device-Specific Method
{
Local0 = Package (0x01)
{
0x0C
}
Return (EDSM (Arg0, Arg1, Arg2, Arg3, Local0))
}
}
}
}
}---
v5 -> v6:
cropped the commit description
--- tests/qtest/bios-tables-test-allowed-diff.h | 1 - tests/data/acpi/aarch64/virt/DSDT.hpoffacpiindex | Bin 0 -> 5347 bytes 2 files changed, 1 deletion(-)
tests/qtest/bios-tables-test-allowed-diff.h +0 -1
@@ -1,3 +1,2 @@/* 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.hpoffacpiindex binary +0 -0
Signature · 1 line
2.49.0
PATCH v7 36/36 qtest/bios-tables-test: Generate reference blob for DSDT.acpipcihp
In reply to Eric AugerThe disassembled DSDT table is given below.
/*
* 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.acpipcihp, Thu Jul 3 05:16:27 2025 *
* Original Table Header:
* Signature "DSDT"
* Length 0x0000183A (6202)
* Revision 0x02
* Checksum 0x98
* 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
}
Device (COM0)
{
Name (_HID, "ARMH0011") // _HID: Hardware ID
Name (_UID, Zero) // _UID: Unique ID
Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
{
Memory32Fixed (ReadWrite,
0x09000000, // Address Base
0x00001000, // Address Length
)
Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
{
0x00000021,
}
})
}
Device (FWCF)
{
Name (_HID, "QEMU0002") // _HID: Hardware ID
Name (_STA, 0x0B) // _STA: Status
Name (_CCA, One) // _CCA: Cache Coherency Attribute
Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
{
Memory32Fixed (ReadWrite,
0x09020000, // Address Base
0x00000018, // Address Length
)
})
}
Device (VR00)
{
Name (_HID, "LNRO0005") // _HID: Hardware ID
Name (_UID, Zero) // _UID: Unique ID
Name (_CCA, One) // _CCA: Cache Coherency Attribute
Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
{
Memory32Fixed (ReadWrite,
0x0A000000, // Address Base
0x00000200, // Address Length
)
Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
{
0x00000030,
}
})
}../..
Device (L000)
{
Name (_HID, "PNP0C0F" /* PCI Interrupt Link Device */) // _HID: Hardware ID
Name (_UID, Zero) // _UID: Unique ID
Name (_PRS, ResourceTemplate () // _PRS: Possible Resource Settings
{
Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
{
0x00000023,
}
})
Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
{
Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
{
0x00000023,
}
})
Method (_SRS, 1, NotSerialized) // _SRS: Set Resource Settings
{
}
}../..
Device (PCI0)
{
Name (_HID, "PNP0A08" /* PCI Express Bus */) // _HID: Hardware ID
Name (_CID, "PNP0A03" /* PCI Bus */) // _CID: Compatible ID
Name (_SEG, Zero) // _SEG: PCI Segment
Name (_BBN, Zero) // _BBN: BIOS Bus Number
Name (_UID, Zero) // _UID: Unique ID
Name (_STR, Unicode ("PCIe 0 Device")) // _STR: Description String
Name (_CCA, One) // _CCA: Cache Coherency Attribute
Name (_PRT, Package (0x80) // _PRT: PCI Routing Table
{
Package (0x04)
{
0xFFFF,
Zero,
L000,
Zero
},../..
})
Method (_CBA, 0, NotSerialized) // _CBA: Configuration Base Address
{
Return (0x0000004010000000)
}
Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
{
WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDecode,
0x0000, // Granularity
0x0000, // Range Minimum
0x00FF, // Range Maximum
0x0000, // Translation Offset
0x0100, // Length
,, )
DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, NonCacheable, ReadWrite,
0x00000000, // Granularity
0x10000000, // Range Minimum
0x3EFEFFFF, // Range Maximum
0x00000000, // Translation Offset
0x2EFF0000, // Length
,, , AddressRangeMemory, TypeStatic)
DWordIO (ResourceProducer, MinFixed, MaxFixed, PosDecode, EntireRange,
0x00000000, // Granularity
0x00000000, // Range Minimum
0x0000FFFF, // Range Maximum
0x3EFF0000, // Translation Offset
0x00010000, // Length
,, , TypeStatic, DenseTranslation)
QWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, NonCacheable, ReadWrite,
0x0000000000000000, // Granularity
0x0000008000000000, // Range Minimum
0x000000FFFFFFFFFF, // Range Maximum
0x0000000000000000, // Translation Offset
0x0000008000000000, // Length
,, , AddressRangeMemory, TypeStatic)
})
Method (_OSC, 4, NotSerialized) // _OSC: Operating System Capabilities
{
CreateDWordField (Arg3, Zero, CDW1)
If ((Arg0 == ToUUID ("33db4d5b-1ff7-401c-9657-7441c03dd766") /* PCI Host Bridge Device */))
{
CreateDWordField (Arg3, 0x04, CDW2)
CreateDWordField (Arg3, 0x08, CDW3)
Local0 = CDW3 /* \_SB_.PCI0._OSC.CDW3 */
Local0 &= 0x1E
If ((Arg1 != One))
{
CDW1 |= 0x08
}
If ((CDW3 != Local0))
{
CDW1 |= 0x10
}
CDW3 = Local0
}
Else
{
CDW1 |= 0x04
}
Return (Arg3)
}
Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific Method
{
If ((Arg0 == ToUUID ("e5c937d0-3553-4d7a-9117-ea4d19c3434d") /* Device Labeling Interface */))
{
If ((Arg2 == Zero))
{
Return (Buffer (One)
{
0x01 // .
})
}
}
Return (Buffer (One)
{
0x00 // .
})
}
Device (RES0)
{
Name (_HID, "PNP0C02" /* PNP Motherboard Resources */) // _HID: Hardware ID
Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
{
QWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, NonCacheable, ReadWrite,
0x0000000000000000, // Granularity
0x0000004010000000, // Range Minimum
0x000000401FFFFFFF, // Range Maximum
0x0000000000000000, // Translation Offset
0x0000000010000000, // Length
,, , AddressRangeMemory, TypeStatic)
})
}
}
Device (\_SB.GED)
{
Name (_HID, "ACPI0013" /* Generic Event Device */) // _HID: Hardware ID
Name (_UID, "GED") // _UID: Unique ID
Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
{
Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, ,, )
{
0x00000029,
}
})
OperationRegion (EREG, SystemMemory, 0x09080000, 0x04)
Field (EREG, DWordAcc, NoLock, WriteAsZeros)
{
ESEL, 32
}
Method (_EVT, 1, Serialized) // _EVT: Event
{
Local0 = ESEL /* \_SB_.GED_.ESEL */
If (((Local0 & 0x02) == 0x02))
{
Notify (PWRB, 0x80) // Status Change
}
If (((Local0 & 0x10) == 0x10))
{
Acquire (\_SB.PCI0.BLCK, 0xFFFF)
\_SB.PCI0.PCNT ()
Release (\_SB.PCI0.BLCK)
}
}
}
Device (PWRB)
{
Name (_HID, "PNP0C0C" /* Power Button Device */) // _HID: Hardware ID
Name (_UID, Zero) // _UID: Unique ID
}
}
Scope (_SB.PCI0)
{
OperationRegion (PCST, SystemMemory, 0x090C0000, 0x08)
Field (PCST, DWordAcc, NoLock, WriteAsZeros)
{
PCIU, 32,
PCID, 32
}
OperationRegion (SEJ, SystemMemory, 0x090C0008, 0x04)
Field (SEJ, DWordAcc, NoLock, WriteAsZeros)
{
B0EJ, 32
}
OperationRegion (BNMR, SystemMemory, 0x090C0010, 0x08)
Field (BNMR, DWordAcc, NoLock, WriteAsZeros)
{
BNUM, 32,
PIDX, 32
}
Mutex (BLCK, 0x00)
Method (PCEJ, 2, NotSerialized)
{
Acquire (BLCK, 0xFFFF)
BNUM = Arg0
B0EJ = (One << Arg1)
Release (BLCK)
Return (Zero)
}
Method (AIDX, 2, NotSerialized)
{
Acquire (BLCK, 0xFFFF)
BNUM = Arg0
PIDX = (One << Arg1)
Local0 = PIDX /* \_SB_.PCI0.PIDX */
Release (BLCK)
Return (Local0)
}
Method (PDSM, 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)
}
Local1 = Zero
Local2 = AIDX (DerefOf (Arg4 [Zero]), DerefOf (Arg4 [One]
))
If (!((Local2 == Zero) | (Local2 == 0xFFFFFFFF)))
{
Local1 |= One
Local1 |= (One << 0x07)
}
Local0 [Zero] = Local1
Return (Local0)
}
If ((Arg2 == 0x07))
{
Local2 = AIDX (DerefOf (Arg4 [Zero]), DerefOf (Arg4 [One]
))
Local0 = Package (0x02) {}
If (!((Local2 == Zero) || (Local2 == 0xFFFFFFFF)))
{
Local0 [Zero] = Local2
Local0 [One] = ""
}
Return (Local0)
}
}
}
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 (S38)
{
Name (_ADR, 0x00070000) // _ADR: Address
Device (S00)
{
Name (_ADR, Zero) // _ADR: Address
}
Name (BSEL, One)
Scope (S00)
{
Name (ASUN, Zero)
Method (_DSM, 4, Serialized) // _DSM: Device-Specific Method
{
Local0 = Package (0x02)
{
Zero,
Zero
}
Local0 [Zero] = BSEL /* \_SB_.PCI0.S38_.BSEL */
Local0 [One] = ASUN /* \_SB_.PCI0.S38_.S00_.ASUN */
Return (PDSM (Arg0, Arg1, Arg2, Arg3, Local0))
}
Name (_SUN, Zero) // _SUN: Slot User Number
Method (_EJ0, 1, NotSerialized) // _EJx: Eject Device, x=0-9
{
PCEJ (BSEL, _SUN)
}
}
Method (DVNT, 2, NotSerialized)
{
If ((Arg0 & One))
{
Notify (S00, Arg1)
}
}
}
Name (BSEL, Zero)
Scope (S00)
{
Name (ASUN, Zero)
Method (_DSM, 4, Serialized) // _DSM: Device-Specific Method
{
Local0 = Package (0x02)
{
Zero,
Zero
}
Local0 [Zero] = BSEL /* \_SB_.PCI0.BSEL */
Local0 [One] = ASUN /* \_SB_.PCI0.S00_.ASUN */
Return (PDSM (Arg0, Arg1, Arg2, Arg3, Local0))
}
Name (_SUN, Zero) // _SUN: Slot User Number
Method (_EJ0, 1, NotSerialized) // _EJx: Eject Device, x=0-9
{
PCEJ (BSEL, _SUN)
}
}
Scope (S08)
{
Name (ASUN, One)
Method (_DSM, 4, Serialized) // _DSM: Device-Specific Method
{
Local0 = Package (0x02)
{
Zero,
Zero
}
Local0 [Zero] = BSEL /* \_SB_.PCI0.BSEL */
Local0 [One] = ASUN /* \_SB_.PCI0.S08_.ASUN */
Return (PDSM (Arg0, Arg1, Arg2, Arg3, Local0))
}
Name (_SUN, One) // _SUN: Slot User Number
Method (_EJ0, 1, NotSerialized) // _EJx: Eject Device, x=0-9
{
PCEJ (BSEL, _SUN)
}
}
Method (DVNT, 2, NotSerialized)
{
If ((Arg0 & One))
{
Notify (S00, Arg1)
}
If ((Arg0 & 0x02))
{
Notify (S08, Arg1)
}
}
Device (PHPR)
{
Name (_HID, "PNP0A06" /* Generic Container Device */) // _HID: Hardware ID
Name (_UID, "PCI Hotplug resources") // _UID: Unique ID
Name (_STA, 0x0B) // _STA: Status
Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
{
IO (Decode16,
0x0000, // Range Minimum
0x0000, // Range Maximum
0x01, // Alignment
0x18, // Length
)
})
}
Scope (S38)
{
Method (PCNT, 0, NotSerialized)
{
BNUM = One
DVNT (PCIU, One)
DVNT (PCID, 0x03)
}
}
Method (PCNT, 0, NotSerialized)
{
BNUM = Zero
DVNT (PCIU, One)
DVNT (PCID, 0x03)
^S38.PCNT ()
}
}
}---
v5 -> v6:
- cropped the commit message
--- tests/qtest/bios-tables-test-allowed-diff.h | 1 - tests/data/acpi/aarch64/virt/DSDT.acpipcihp | Bin 0 -> 6202 bytes 2 files changed, 1 deletion(-)
tests/qtest/bios-tables-test-allowed-diff.h +0 -1
@@ -1,2 +1 @@/* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/aarch64/virt/DSDT.acpipcihp",
tests/data/acpi/aarch64/virt/DSDT.acpipcihp binary +0 -0
Signature · 1 line
2.49.0
Quoted 15 lines · On Mon, 14 Jul 2025 10:04:44 +0200 Eric Auger <[email protected]> wrote:
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.cto a generic place and slightly adapting it to make it usable on ARM. The DSDT table is augmented to support ACPI PCI hotplug elements.
Quoted 6 lines
On ARM we use use a GED event to notify the OS about hotplug events.
Best Regards
Eric
Hi Eric,
I guess you probably already know this but there is some impact on loongarch64 when their ACPI tables tests are added.
Rather oddly I'm getting intermittent failures on Michael's gitlab tree but looks like the unification of _OSC affects them as well. (should be every time, but they aren't!)
Should just be updating their 4 DSDT variants.
If I had a stable test setup I'd send them. Will try again tomorrow if not resolved.
Jonathan
Quoted 151 lines
This series can be found at:
https://github.com/eauger/qemu/tree/arm-acpi-pcihp-v7previous series:
https://github.com/eauger/qemu/tree/arm-acpi-pcihp-v6History:
v6 -> v7:
- rebased after minor contextual conflict introduced by "hw/arm/virt: Basic CXL enablement onpci_expander_bridgeinstances pxb-cxl" inhw/arm/virt-acpi-build.c(hw/pci-host/gpex-acpi: Use GED acpi pcihp property)
- collected last Igor's and Prasad's R-bsv5 -> v6:
- collected Jonathan's R-bs
- cropped last 2 patch commit messages (Jonathan)v4 -> v5:
- Collected Jonathan's R-bs (many thanks!)
- fixed the tests/qtest/bios-tables-test issue by creating a variant for the viot test
- use the 3 phase reset API
- fixed qom-test failures that were due to unconditionnal fetches of the GED propertyv3 -> 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 regressionv1 -> 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 ofaml_pci_edsmwhich was not called in RFC
- acpi-index feature is now fixed.vms->buswas not set onacpi_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 (32):
hw/i386/acpi-build: Makeaml_pci_device_dsm()static hw/acpi: Rename and movebuild_x86_acpi_pci_hotplugto pcihp hw/pci-host/gpex-acpi: Addnative_pci_hotplugarg 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: Turnbuild_q35_osc_methodinto a generic method hw/pci-host/gpex-acpi: Usebuild_pci_host_bridge_osc_methodtests/qtest/bios-tables-test: Update DSDT blobs after GPEX_OSCchange hw/i386/acpi-build: Introducebuild_append_pcihp_resources()helper hw/acpi/pcihp: Add an AmlRegionSpace arg tobuild_acpi_pci_hotplughw/i386/acpi-build: Movebuild_append_notification_callbackto pcihp hw/i386/acpi-build: Move build_append_pci_bus_devices/pcihp_slots to
pcihp
hw/i386/acpi-build: UseAcpiPciHpState::rootinacpi_set_pci_infohw/i386/acpi-build: Moveaml_pci_edsmto a generic place qtest/bios-tables-test: Prepare for fixing the aarch64 viot test qtest/bios-tables-test: Add a variant to the aarch64 viot test qtest/bios-tables-test: Generate DSDT.viot 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 inacpi_pcihp_inithw/acpi/ged: Prepare the device to react to PCI hotplug events hw/acpi/ged: Support migration of AcpiPciHpState hw/core/sysbus: Introducesysbus_mmio_map_name()helper hw/arm/virt: Minor code reshuffling increate_acpi_gedhw/arm/virt: Let virt support pci hotplug/unplug GED event qtest/bios-tables-test: Generate reference blob for
DSDT.hpoffacpiindex
qtest/bios-tables-test: Generate reference blob for DSDT.acpipcihpGustavo 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 testhw/i386/acpi-build.h | 4 - include/hw/acpi/generic_event_device.h | 17 +- include/hw/acpi/pci.h | 5 +- include/hw/acpi/pcihp.h | 17 +- 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 | 77 +++ 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 | 38 ++ 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 | 53 ++ hw/arm/Kconfig | 2 + hw/pci-host/Kconfig | 1 + tests/data/acpi/aarch64/virt/DSDT | Bin 5196 -> 5293 bytes .../data/acpi/aarch64/virt/DSDT.acpihmatvirt | Bin 5282 -> 5379 bytes tests/data/acpi/aarch64/virt/DSDT.acpipcihp | Bin 0 -> 6202 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/aarch64/virt/DSDT.viot | Bin 0 -> 5310 bytes tests/data/acpi/riscv64/virt/DSDT | Bin 3576 -> 3538 bytes tests/data/acpi/x86/microvm/DSDT.pcie | Bin 3023 -> 2985 bytes 32 files changed, 811 insertions(+), 607 deletions(-) create mode 100644 tests/data/acpi/aarch64/virt/DSDT.acpipcihp create mode 100644 tests/data/acpi/aarch64/virt/DSDT.hpoffacpiindex create mode 100644 tests/data/acpi/aarch64/virt/DSDT.viot
Hi Jonathan,
Quoted 26 lines · Jonathan Cameron
Quoted 15 lines · On Mon, 14 Jul 2025 10:04:44 +0200 Eric Auger <[email protected]> wrote:
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.cto a generic place and slightly adapting it to make it usable on ARM. The DSDT table is augmented to support ACPI PCI hotplug elements.Quoted 6 lines
On ARM we use use a GED event to notify the OS about hotplug events.
Best Regards
Eric
Hi Eric,
Quoted 8 lines
I guess you probably already know this but there is some impact on loongarch64 when their ACPI tables tests are added.
Rather oddly I'm getting intermittent failures on Michael's gitlab tree but looks like the unification of
_OSCaffects them as well. (should be every time, but they aren't!)Should just be updating their 4 DSDT variants.
thank you for the notice.
I have executed make check with a qemu configured for all archs and I got not failures.
I guess the tests you are talking about are not merged yet? Anyway I can add update their DSDT variants once the series is merged.
Thanks
Eric
Quoted 158 lines
If I had a stable test setup I'd send them. Will try again tomorrow if not resolved.
Jonathan
Quoted 150 lines
This series can be found at:
https://github.com/eauger/qemu/tree/arm-acpi-pcihp-v7previous series:
https://github.com/eauger/qemu/tree/arm-acpi-pcihp-v6History:
v6 -> v7:
- rebased after minor contextual conflict introduced by "hw/arm/virt: Basic CXL enablement onpci_expander_bridgeinstances pxb-cxl" inhw/arm/virt-acpi-build.c(hw/pci-host/gpex-acpi: Use GED acpi pcihp property)
- collected last Igor's and Prasad's R-bsv5 -> v6:
- collected Jonathan's R-bs
- cropped last 2 patch commit messages (Jonathan)v4 -> v5:
- Collected Jonathan's R-bs (many thanks!)
- fixed the tests/qtest/bios-tables-test issue by creating a variant for the viot test
- use the 3 phase reset API
- fixed qom-test failures that were due to unconditionnal fetches of the GED propertyv3 -> 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 regressionv1 -> 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 ofaml_pci_edsmwhich was not called in RFC
- acpi-index feature is now fixed.vms->buswas not set onacpi_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 (32):
hw/i386/acpi-build: Makeaml_pci_device_dsm()static hw/acpi: Rename and movebuild_x86_acpi_pci_hotplugto pcihp hw/pci-host/gpex-acpi: Addnative_pci_hotplugarg 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: Turnbuild_q35_osc_methodinto a generic method hw/pci-host/gpex-acpi: Usebuild_pci_host_bridge_osc_methodtests/qtest/bios-tables-test: Update DSDT blobs after GPEX_OSCchange hw/i386/acpi-build: Introducebuild_append_pcihp_resources()helper hw/acpi/pcihp: Add an AmlRegionSpace arg tobuild_acpi_pci_hotplughw/i386/acpi-build: Movebuild_append_notification_callbackto pcihp hw/i386/acpi-build: Move build_append_pci_bus_devices/pcihp_slots to
pcihp
hw/i386/acpi-build: UseAcpiPciHpState::rootinacpi_set_pci_infohw/i386/acpi-build: Moveaml_pci_edsmto a generic place qtest/bios-tables-test: Prepare for fixing the aarch64 viot test qtest/bios-tables-test: Add a variant to the aarch64 viot test qtest/bios-tables-test: Generate DSDT.viot 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 inacpi_pcihp_inithw/acpi/ged: Prepare the device to react to PCI hotplug events hw/acpi/ged: Support migration of AcpiPciHpState hw/core/sysbus: Introducesysbus_mmio_map_name()helper hw/arm/virt: Minor code reshuffling increate_acpi_gedhw/arm/virt: Let virt support pci hotplug/unplug GED event qtest/bios-tables-test: Generate reference blob for
DSDT.hpoffacpiindex
qtest/bios-tables-test: Generate reference blob for DSDT.acpipcihpGustavo 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 testhw/i386/acpi-build.h | 4 - include/hw/acpi/generic_event_device.h | 17 +- include/hw/acpi/pci.h | 5 +- include/hw/acpi/pcihp.h | 17 +- 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 | 77 +++ 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 | 38 ++ 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 | 53 ++ hw/arm/Kconfig | 2 + hw/pci-host/Kconfig | 1 + tests/data/acpi/aarch64/virt/DSDT | Bin 5196 -> 5293 bytes .../data/acpi/aarch64/virt/DSDT.acpihmatvirt | Bin 5282 -> 5379 bytes tests/data/acpi/aarch64/virt/DSDT.acpipcihp | Bin 0 -> 6202 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/aarch64/virt/DSDT.viot | Bin 0 -> 5310 bytes tests/data/acpi/riscv64/virt/DSDT | Bin 3576 -> 3538 bytes tests/data/acpi/x86/microvm/DSDT.pcie | Bin 3023 -> 2985 bytes 32 files changed, 811 insertions(+), 607 deletions(-) create mode 100644 tests/data/acpi/aarch64/virt/DSDT.acpipcihp create mode 100644 tests/data/acpi/aarch64/virt/DSDT.hpoffacpiindex create mode 100644 tests/data/acpi/aarch64/virt/DSDT.viot
Hi Jonathan,
Quoted 29 lines · Jonathan Cameron
Quoted 15 lines · On Mon, 14 Jul 2025 10:04:44 +0200 Eric Auger <[email protected]> wrote:
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.cto a generic place and slightly adapting it to make it usable on ARM. The DSDT table is augmented to support ACPI PCI hotplug elements.Quoted 6 lines
On ARM we use use a GED event to notify the OS about hotplug events.
Best Regards
Eric
Hi Eric,
I guess you probably already know this but there is some impact on loongarch64 when their ACPI tables tests are added.
Quoted 8 lines
Rather oddly I'm getting intermittent failures on Michael's gitlab tree but looks like the unification of
_OSCaffects them as well. (should be every time, but they aren't!)Should just be updating their 4 DSDT variants.
If I had a stable test setup I'd send them. Will try again tomorrow if not resolved.
just to make sure are we talking about
[PATCH v3 0/5] Add bios-tables-test for LoongArch system <https://lore.kernel.org/all/[email protected]/>
https://lore.kernel.org/all/[email protected]/
Thanks
Eric
Quoted 155 lines
Jonathan
Quoted 150 lines
This series can be found at:
https://github.com/eauger/qemu/tree/arm-acpi-pcihp-v7previous series:
https://github.com/eauger/qemu/tree/arm-acpi-pcihp-v6History:
v6 -> v7:
- rebased after minor contextual conflict introduced by "hw/arm/virt: Basic CXL enablement onpci_expander_bridgeinstances pxb-cxl" inhw/arm/virt-acpi-build.c(hw/pci-host/gpex-acpi: Use GED acpi pcihp property)
- collected last Igor's and Prasad's R-bsv5 -> v6:
- collected Jonathan's R-bs
- cropped last 2 patch commit messages (Jonathan)v4 -> v5:
- Collected Jonathan's R-bs (many thanks!)
- fixed the tests/qtest/bios-tables-test issue by creating a variant for the viot test
- use the 3 phase reset API
- fixed qom-test failures that were due to unconditionnal fetches of the GED propertyv3 -> 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 regressionv1 -> 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 ofaml_pci_edsmwhich was not called in RFC
- acpi-index feature is now fixed.vms->buswas not set onacpi_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 (32):
hw/i386/acpi-build: Makeaml_pci_device_dsm()static hw/acpi: Rename and movebuild_x86_acpi_pci_hotplugto pcihp hw/pci-host/gpex-acpi: Addnative_pci_hotplugarg 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: Turnbuild_q35_osc_methodinto a generic method hw/pci-host/gpex-acpi: Usebuild_pci_host_bridge_osc_methodtests/qtest/bios-tables-test: Update DSDT blobs after GPEX_OSCchange hw/i386/acpi-build: Introducebuild_append_pcihp_resources()helper hw/acpi/pcihp: Add an AmlRegionSpace arg tobuild_acpi_pci_hotplughw/i386/acpi-build: Movebuild_append_notification_callbackto pcihp hw/i386/acpi-build: Move build_append_pci_bus_devices/pcihp_slots to
pcihp
hw/i386/acpi-build: UseAcpiPciHpState::rootinacpi_set_pci_infohw/i386/acpi-build: Moveaml_pci_edsmto a generic place qtest/bios-tables-test: Prepare for fixing the aarch64 viot test qtest/bios-tables-test: Add a variant to the aarch64 viot test qtest/bios-tables-test: Generate DSDT.viot 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 inacpi_pcihp_inithw/acpi/ged: Prepare the device to react to PCI hotplug events hw/acpi/ged: Support migration of AcpiPciHpState hw/core/sysbus: Introducesysbus_mmio_map_name()helper hw/arm/virt: Minor code reshuffling increate_acpi_gedhw/arm/virt: Let virt support pci hotplug/unplug GED event qtest/bios-tables-test: Generate reference blob for
DSDT.hpoffacpiindex
qtest/bios-tables-test: Generate reference blob for DSDT.acpipcihpGustavo 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 testhw/i386/acpi-build.h | 4 - include/hw/acpi/generic_event_device.h | 17 +- include/hw/acpi/pci.h | 5 +- include/hw/acpi/pcihp.h | 17 +- 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 | 77 +++ 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 | 38 ++ 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 | 53 ++ hw/arm/Kconfig | 2 + hw/pci-host/Kconfig | 1 + tests/data/acpi/aarch64/virt/DSDT | Bin 5196 -> 5293 bytes .../data/acpi/aarch64/virt/DSDT.acpihmatvirt | Bin 5282 -> 5379 bytes tests/data/acpi/aarch64/virt/DSDT.acpipcihp | Bin 0 -> 6202 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/aarch64/virt/DSDT.viot | Bin 0 -> 5310 bytes tests/data/acpi/riscv64/virt/DSDT | Bin 3576 -> 3538 bytes tests/data/acpi/x86/microvm/DSDT.pcie | Bin 3023 -> 2985 bytes 32 files changed, 811 insertions(+), 607 deletions(-) create mode 100644 tests/data/acpi/aarch64/virt/DSDT.acpipcihp create mode 100644 tests/data/acpi/aarch64/virt/DSDT.hpoffacpiindex create mode 100644 tests/data/acpi/aarch64/virt/DSDT.viot
Quoted 40 lines · Eric Auger
Hi Jonathan,
Quoted 29 lines · Jonathan Cameron
Quoted 15 lines · On Mon, 14 Jul 2025 10:04:44 +0200 Eric Auger <[email protected]> wrote:
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.cto a generic place and slightly adapting it to make it usable on ARM. The DSDT table is augmented to support ACPI PCI hotplug elements.Quoted 6 lines
On ARM we use use a GED event to notify the OS about hotplug events.
Best Regards
Eric
Hi Eric,
I guess you probably already know this but there is some impact on loongarch64 when their ACPI tables tests are added.
Quoted 8 lines
Rather oddly I'm getting intermittent failures on Michael's gitlab tree but looks like the unification of
_OSCaffects them as well. (should be every time, but they aren't!)Should just be updating their 4 DSDT variants.
If I had a stable test setup I'd send them. Will try again tomorrow if not resolved.
Quoted 8 lines
just to make sure are we talking about
[PATCH v3 0/5] Add bios-tables-test for LoongArch system <https://lore.kernel.org/all/[email protected]/>
https://lore.kernel.org/all/[email protected]/Thanks
Eric
I fixed this up, don't worry.
Quoted 157 lines
Quoted 157 lines
Jonathan
Quoted 150 lines
This series can be found at:
https://github.com/eauger/qemu/tree/arm-acpi-pcihp-v7previous series:
https://github.com/eauger/qemu/tree/arm-acpi-pcihp-v6History:
v6 -> v7:
- rebased after minor contextual conflict introduced by "hw/arm/virt: Basic CXL enablement onpci_expander_bridgeinstances pxb-cxl" inhw/arm/virt-acpi-build.c(hw/pci-host/gpex-acpi: Use GED acpi pcihp property)
- collected last Igor's and Prasad's R-bsv5 -> v6:
- collected Jonathan's R-bs
- cropped last 2 patch commit messages (Jonathan)v4 -> v5:
- Collected Jonathan's R-bs (many thanks!)
- fixed the tests/qtest/bios-tables-test issue by creating a variant for the viot test
- use the 3 phase reset API
- fixed qom-test failures that were due to unconditionnal fetches of the GED propertyv3 -> 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 regressionv1 -> 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 ofaml_pci_edsmwhich was not called in RFC
- acpi-index feature is now fixed.vms->buswas not set onacpi_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 (32):
hw/i386/acpi-build: Makeaml_pci_device_dsm()static hw/acpi: Rename and movebuild_x86_acpi_pci_hotplugto pcihp hw/pci-host/gpex-acpi: Addnative_pci_hotplugarg 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: Turnbuild_q35_osc_methodinto a generic method hw/pci-host/gpex-acpi: Usebuild_pci_host_bridge_osc_methodtests/qtest/bios-tables-test: Update DSDT blobs after GPEX_OSCchange hw/i386/acpi-build: Introducebuild_append_pcihp_resources()helper hw/acpi/pcihp: Add an AmlRegionSpace arg tobuild_acpi_pci_hotplughw/i386/acpi-build: Movebuild_append_notification_callbackto pcihp hw/i386/acpi-build: Move build_append_pci_bus_devices/pcihp_slots to
pcihp
hw/i386/acpi-build: UseAcpiPciHpState::rootinacpi_set_pci_infohw/i386/acpi-build: Moveaml_pci_edsmto a generic place qtest/bios-tables-test: Prepare for fixing the aarch64 viot test qtest/bios-tables-test: Add a variant to the aarch64 viot test qtest/bios-tables-test: Generate DSDT.viot 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 inacpi_pcihp_inithw/acpi/ged: Prepare the device to react to PCI hotplug events hw/acpi/ged: Support migration of AcpiPciHpState hw/core/sysbus: Introducesysbus_mmio_map_name()helper hw/arm/virt: Minor code reshuffling increate_acpi_gedhw/arm/virt: Let virt support pci hotplug/unplug GED event qtest/bios-tables-test: Generate reference blob for
DSDT.hpoffacpiindex
qtest/bios-tables-test: Generate reference blob for DSDT.acpipcihpGustavo 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 testhw/i386/acpi-build.h | 4 - include/hw/acpi/generic_event_device.h | 17 +- include/hw/acpi/pci.h | 5 +- include/hw/acpi/pcihp.h | 17 +- 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 | 77 +++ 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 | 38 ++ 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 | 53 ++ hw/arm/Kconfig | 2 + hw/pci-host/Kconfig | 1 + tests/data/acpi/aarch64/virt/DSDT | Bin 5196 -> 5293 bytes .../data/acpi/aarch64/virt/DSDT.acpihmatvirt | Bin 5282 -> 5379 bytes tests/data/acpi/aarch64/virt/DSDT.acpipcihp | Bin 0 -> 6202 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/aarch64/virt/DSDT.viot | Bin 0 -> 5310 bytes tests/data/acpi/riscv64/virt/DSDT | Bin 3576 -> 3538 bytes tests/data/acpi/x86/microvm/DSDT.pcie | Bin 3023 -> 2985 bytes 32 files changed, 811 insertions(+), 607 deletions(-) create mode 100644 tests/data/acpi/aarch64/virt/DSDT.acpipcihp create mode 100644 tests/data/acpi/aarch64/virt/DSDT.hpoffacpiindex create mode 100644 tests/data/acpi/aarch64/virt/DSDT.viot
Quoted 43 lines · Michael S. Tsirkin
Quoted 42 lines · Eric Auger
Hi Jonathan,
Quoted 29 lines · Jonathan Cameron
Quoted 15 lines · On Mon, 14 Jul 2025 10:04:44 +0200 Eric Auger <[email protected]> wrote:
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.cto a generic place and slightly adapting it to make it usable on ARM. The DSDT table is augmented to support ACPI PCI hotplug elements.Quoted 6 lines
On ARM we use use a GED event to notify the OS about hotplug events.
Best Regards
Eric
Hi Eric,
I guess you probably already know this but there is some impact on loongarch64 when their ACPI tables tests are added.
Quoted 8 lines
Rather oddly I'm getting intermittent failures on Michael's gitlab tree but looks like the unification of
_OSCaffects them as well. (should be every time, but they aren't!)Should just be updating their 4 DSDT variants.
If I had a stable test setup I'd send them. Will try again tomorrow if not resolved.
just to make sure are we talking about
Quoted 7 lines
Quoted 6 lines
[PATCH v3 0/5] Add bios-tables-test for LoongArch system <https://lore.kernel.org/all/[email protected]/>
https://lore.kernel.org/all/[email protected]/Thanks
Eric
I fixed this up, don't worry.
Thanks!
Eric
Quoted 156 lines
Quoted 156 lines
Quoted 156 lines
Jonathan
Quoted 150 lines
This series can be found at:
https://github.com/eauger/qemu/tree/arm-acpi-pcihp-v7previous series:
https://github.com/eauger/qemu/tree/arm-acpi-pcihp-v6History:
v6 -> v7:
- rebased after minor contextual conflict introduced by "hw/arm/virt: Basic CXL enablement onpci_expander_bridgeinstances pxb-cxl" inhw/arm/virt-acpi-build.c(hw/pci-host/gpex-acpi: Use GED acpi pcihp property)
- collected last Igor's and Prasad's R-bsv5 -> v6:
- collected Jonathan's R-bs
- cropped last 2 patch commit messages (Jonathan)v4 -> v5:
- Collected Jonathan's R-bs (many thanks!)
- fixed the tests/qtest/bios-tables-test issue by creating a variant for the viot test
- use the 3 phase reset API
- fixed qom-test failures that were due to unconditionnal fetches of the GED propertyv3 -> 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 regressionv1 -> 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 ofaml_pci_edsmwhich was not called in RFC
- acpi-index feature is now fixed.vms->buswas not set onacpi_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 (32):
hw/i386/acpi-build: Makeaml_pci_device_dsm()static hw/acpi: Rename and movebuild_x86_acpi_pci_hotplugto pcihp hw/pci-host/gpex-acpi: Addnative_pci_hotplugarg 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: Turnbuild_q35_osc_methodinto a generic method hw/pci-host/gpex-acpi: Usebuild_pci_host_bridge_osc_methodtests/qtest/bios-tables-test: Update DSDT blobs after GPEX_OSCchange hw/i386/acpi-build: Introducebuild_append_pcihp_resources()helper hw/acpi/pcihp: Add an AmlRegionSpace arg tobuild_acpi_pci_hotplughw/i386/acpi-build: Movebuild_append_notification_callbackto pcihp hw/i386/acpi-build: Move build_append_pci_bus_devices/pcihp_slots to
pcihp
hw/i386/acpi-build: UseAcpiPciHpState::rootinacpi_set_pci_infohw/i386/acpi-build: Moveaml_pci_edsmto a generic place qtest/bios-tables-test: Prepare for fixing the aarch64 viot test qtest/bios-tables-test: Add a variant to the aarch64 viot test qtest/bios-tables-test: Generate DSDT.viot 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 inacpi_pcihp_inithw/acpi/ged: Prepare the device to react to PCI hotplug events hw/acpi/ged: Support migration of AcpiPciHpState hw/core/sysbus: Introducesysbus_mmio_map_name()helper hw/arm/virt: Minor code reshuffling increate_acpi_gedhw/arm/virt: Let virt support pci hotplug/unplug GED event qtest/bios-tables-test: Generate reference blob for
DSDT.hpoffacpiindex
qtest/bios-tables-test: Generate reference blob for DSDT.acpipcihpGustavo 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 testhw/i386/acpi-build.h | 4 - include/hw/acpi/generic_event_device.h | 17 +- include/hw/acpi/pci.h | 5 +- include/hw/acpi/pcihp.h | 17 +- 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 | 77 +++ 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 | 38 ++ 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 | 53 ++ hw/arm/Kconfig | 2 + hw/pci-host/Kconfig | 1 + tests/data/acpi/aarch64/virt/DSDT | Bin 5196 -> 5293 bytes .../data/acpi/aarch64/virt/DSDT.acpihmatvirt | Bin 5282 -> 5379 bytes tests/data/acpi/aarch64/virt/DSDT.acpipcihp | Bin 0 -> 6202 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/aarch64/virt/DSDT.viot | Bin 0 -> 5310 bytes tests/data/acpi/riscv64/virt/DSDT | Bin 3576 -> 3538 bytes tests/data/acpi/x86/microvm/DSDT.pcie | Bin 3023 -> 2985 bytes 32 files changed, 811 insertions(+), 607 deletions(-) create mode 100644 tests/data/acpi/aarch64/virt/DSDT.acpipcihp create mode 100644 tests/data/acpi/aarch64/virt/DSDT.hpoffacpiindex create mode 100644 tests/data/acpi/aarch64/virt/DSDT.viot