ACPI PCI Hotplug support on ARM
v3 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-v3
previous series:
https://github.com/eauger/qemu/tree/arm-acpi-pcihp-v2
History:
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 (25):
hw/i386/acpi-build: Make aml_pci_device_dsm() static hw/acpi/ged: Add a acpi-pci-hotplug-with-bridge-support property 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/pci-host/gpex-acpi: retrieve and use GED acpi_pcihp setting hw/i386/acpi-build: Turn build_q35_osc_method into a generic method hw/pci-host/gpex-acpi: Use build_pci_host_bridge_osc_method tests/qtest/bios-tables-test: Update DSDT blobs after GPEX _OSC change hw/i386/acpi-build: Introduce build_append_pcihp_resources() helper hw/acpi/pcihp: Add an AmlRegionSpace arg to build_acpi_pci_hotplug hw/i386/acpi-build: Move build_append_notification_callback to pcihp hw/i386/acpi-build: Move build_append_pci_bus_devices/pcihp_slots to
pcihp
hw/i386/acpi-build: Use AcpiPciHpState::root in acpi_set_pci_info hw/i386/acpi-build: Move aml_pci_edsm to a generic place hw/arm/virt-acpi-build: 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: Prepare the device to react to PCI hotplug events hw/acpi/ged: Call pcihp plug callbacks in hotplug handler
implementation
hw/acpi/ged: Support migration of AcpiPciHpState hw/core/sysbus: Introduce sysbus_mmio_map_name() helper hw/arm/virt: Use a SysBusDevice variable in create_acpi_ged() hw/arm/virt: Let virt support pci hotplug/unplug GED event hw/arm/virt: Plug pcihp hotplug/hotunplug callbacks
Gustavo Romero (4):
tests/qtest/bios-tables-test: Prepare for changes in the 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 qtest/bios-tables-test: Create DSDT 'acpipcihp" variant blob
hw/i386/acpi-build.h | 4 - include/hw/acpi/generic_event_device.h | 7 + include/hw/acpi/pci.h | 5 +- include/hw/acpi/pcihp.h | 17 +- include/hw/arm/virt.h | 1 + include/hw/pci-host/gpex.h | 1 + include/hw/sysbus.h | 1 + hw/acpi/generic_event_device.c | 68 +++ hw/acpi/pci-bridge.c | 54 ++ hw/acpi/pci.c | 50 ++ hw/acpi/pcihp.c | 435 ++++++++++++++- hw/arm/virt-acpi-build.c | 27 + hw/arm/virt.c | 100 +++- hw/core/sysbus.c | 11 + hw/i386/acpi-build.c | 528 +----------------- hw/pci-host/gpex-acpi.c | 74 +-- tests/qtest/bios-tables-test.c | 34 ++ hw/arm/Kconfig | 2 + 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.acpipcihp | Bin 0 -> 5973 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/x86/microvm/DSDT.pcie | Bin 3023 -> 2985 bytes 25 files changed, 817 insertions(+), 602 deletions(-) create mode 100644 tests/data/acpi/aarch64/virt/DSDT.acpipcihp
Signature · 1 line
2.49.0
PATCH v3 1/29 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 v3 2/29 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
Re: [PATCH v3 02/29] hw/acpi/ged: Add a acpi-pci-hotplug-with-bridge-support property
Quoted 4 lines · On Mon, 16 Jun 2025 11:46:31 +0200 Eric Auger <[email protected]> wrote:
A new boolean property is introduced. This will be used to turn ACPI PCI hotplug support. By default it is unset.
Signed-off-by Eric Auger <[email protected]>
I wonder a bit if it makes sense to do this so early rather than just before it is first used in the series? Doesn't really matter though. Just meant I read on a bit before giving an RB on this.
Quoted 38 lines
--- 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 = {
Igor Mammedov
Reviewed-byRe: [PATCH v3 02/29] hw/acpi/ged: Add a acpi-pci-hotplug-with-bridge-support property
Quoted 11 lines · On Fri, 20 Jun 2025 09:53:08 +0100 Jonathan Cameron…
Quoted 4 lines · On Mon, 16 Jun 2025 11:46:31 +0200 Eric Auger <[email protected]> wrote:
A new boolean property is introduced. This will be used to turn ACPI PCI hotplug support. By default it is unset.
Signed-off-by Eric Auger <[email protected]>I wonder a bit if it makes sense to do this so early rather than just before it is first used in the series? Doesn't really matter though. Just meant I read on a bit before giving an RB on this.
Just before would be better, but it doesn't really matter. I guess Eric can rearrange that if there would be need to respin.
Quoted 42 lines
Reviewed-by Jonathan Cameron <[email protected]>Quoted 38 lines
--- 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 = {
Re: [PATCH v3 02/29] hw/acpi/ged: Add a acpi-pci-hotplug-with-bridge-support property
Hi Jonathan, Igor,
Quoted 9 lines · Igor Mammedov
Quoted 6 lines · On Fri, 20 Jun 2025 09:53:08 +0100 Jonathan Cameron…
Quoted 3 lines · On Mon, 16 Jun 2025 11:46:31 +0200 Eric Auger <[email protected]> wrote:
A new boolean property is introduced. This will be used to turn ACPI PCI hotplug support. By default it is unset.
Quoted 6 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Eric Auger <[email protected]>I wonder a bit if it makes sense to do this so early rather than just before it is first used in the series? Doesn't really matter though. Just meant I read on a bit before giving an RB on this.
Just before would be better, but it doesn't really matter. I guess Eric can rearrange that if there would be need to respin.
Yes I can definitively rearrange the order.
Thank you for the review
Eric
Quoted 43 lines
Reviewed-by Igor Mammedov <[email protected]>Quoted 40 lines
Reviewed-by Jonathan Cameron <[email protected]>Quoted 38 lines
--- 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 = {
PATCH v3 3/29 hw/acpi: Rename and move build_x86_acpi_pci_hotplug to pcihp
In reply to Eric AugerWe plan to reuse build_x86_acpi_pci_hotplug() implementation for ARM so let's move the code to generic pcihp.
Associated static aml_pci_pdsm() helper is also moved along. build_x86_acpi_pci_hotplug is renamed into build_acpi_pci_hotplug().
No code change intended.
Also fix the reference to acpi_pci_hotplug.rst documentation
---
v1 -> v2:
- s/spec/specs in reference to rst (Gustavo)
- fixed double space in commit msg (Gustavo)
rfc -> v1:
- make build_append_pci_dsm_func0_common non static and move it to pcihp
--- hw/i386/acpi-build.h | 4 - include/hw/acpi/pcihp.h | 9 +- hw/acpi/pcihp.c | 174 ++++++++++++++++++++++++++++++++++++++- hw/i386/acpi-build.c | 176 +--------------------------------------- 4 files changed, 183 insertions(+), 180 deletions(-)
hw/i386/acpi-build.h +0 -4
@@ -5,10 +5,6 @@extern const struct AcpiGenericAddress x86_nvdimm_acpi_dsmio; -/* PCI Hot-plug registers' base. See docs/specs/acpi_pci_hotplug.rst */ -#define ACPI_PCIHP_SEJ_BASE 0x8 -#define ACPI_PCIHP_BNMR_BASE 0x10 -void acpi_setup (void );Object *acpi_get_i386_pci_host (void );
include/hw/acpi/pcihp.h +8 -1
@@ -3,7 +3,7 @@* * QEMU supports PCI hotplug via ACPI. This module * implements the interface between QEMU and the ACPI BIOS. -* Interface specification - see docs/specs/acpi_pci_hotplug.txt +* Interface specification - see docs/specs/acpi_pci_hotplug.rst * * Copyright (c) 2013, Red Hat Inc, Michael S. Tsirkin ([email protected]) * Copyright (c) 2006 Fabrice Bellard
@@ -33,6 +33,10 @@#define ACPI_PCIHP_IO_BASE_PROP "acpi-pcihp-io-base"#define ACPI_PCIHP_IO_LEN_PROP "acpi-pcihp-io-len" +/* PCI Hot-plug registers bases. See docs/specs/acpi_pci_hotplug.rst */ +#define ACPI_PCIHP_SEJ_BASE 0x8 +#define ACPI_PCIHP_BNMR_BASE 0x10 + typedef struct AcpiPciHpPciStatus { uint32_t up; uint32_t down;
@@ -69,6 +73,9 @@ void acpi_pcihp_device_unplug_request_cb(HotplugHandler *hotplug_dev, AcpiPciHpState *s, DeviceState *dev, Error **errp); +void build_acpi_pci_hotplug (Aml *table,uint64_t pcihp_addr); +void build_append_pci_dsm_func0_common (Aml *ctx,Aml *retvar); +/* Called on reset */ void acpi_pcihp_reset (AcpiPciHpState *s);
hw/acpi/pcihp.c +173 -1
186 lines not on this page · raw message
hw/i386/acpi-build.c +2 -174
206 lines not on this page · raw message
Signature · 1 line
2.49.0
PATCH v3 4/29 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
Re: [PATCH v3 04/29] hw/pci-host/gpex-acpi: Add native_pci_hotplug arg to acpi_dsdt_add_pci_osc
Quoted 6 lines · On Mon, 16 Jun 2025 11:46:33 +0200 Eric Auger <[email protected]> wrote:
Add a new argument to
acpi_dsdt_add_pci_oscto be able to disable native pci hotplug.Signed-off-by Eric Auger <[email protected]>Reviewed-by Gustavo Romero <[email protected]>Reviewed-by Igor Mammedov <[email protected]>
After discussion on earlier version I'm now fine with this.
Quoted 57 lines
---
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" )));
PATCH v3 5/29 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.
---
v2 -> v3:
- fox for microvm
--- 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/x86/microvm/DSDT.pcie",
Signature · 1 line
2.49.0
Re: [PATCH v3 05/29] tests/qtest/bios-tables-test: Prepare for changes in the DSDT table
Quoted 7 lines · On Mon, 16 Jun 2025 11:46:34 +0200 Eric Auger <[email protected]> wrote:
From: Gustavo Romero <[email protected]>
This commit adds DSDT blobs to the whilelist in the prospect to allow changes in the GPEX
_OSCmethod.Signed-off-by Gustavo Romero <[email protected]>Signed-off-by Eric Auger <[email protected]>
FWIW given what this is and the involvement of foxes ;)
Quoted 5 lines
---
v2 -> v3:
- fox for microvm
An excellent addition to any microvm.
Quoted 16 lines
--- 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/x86/microvm/DSDT.pcie",
Re: [PATCH v3 05/29] tests/qtest/bios-tables-test: Prepare for changes in the DSDT table
Quoted 11 lines · Jonathan Cameron
Quoted 7 lines · On Mon, 16 Jun 2025 11:46:34 +0200 Eric Auger <[email protected]> wrote:
From: Gustavo Romero <[email protected]>
This commit adds DSDT blobs to the whilelist in the prospect to allow changes in the GPEX
_OSCmethod.Signed-off-by Gustavo Romero <[email protected]>Signed-off-by Eric Auger <[email protected]>FWIW given what this is and the involvement of foxes ;)
:-)
Quoted 2 lines
Reviewed-by Jonathan Cameron <[email protected]>
Thanks!
Eric
Quoted 24 lines
Quoted 4 lines
---
v2 -> v3:
- fox for microvmAn excellent addition to any microvm.
Quoted 16 lines
--- 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/x86/microvm/DSDT.pcie",
Re: [PATCH v3 05/29] tests/qtest/bios-tables-test: Prepare for changes in the DSDT table
In reply to Eric AugerQuoted 7 lines · On Mon, 16 Jun 2025 11:46:34 +0200 Eric Auger <[email protected]> wrote:
From: Gustavo Romero <[email protected]>
This commit adds DSDT blobs to the whilelist in the prospect to allow changes in the GPEX
_OSCmethod.Signed-off-by Gustavo Romero <[email protected]>Signed-off-by Eric Auger <[email protected]>
Quoted 21 lines
---
v2 -> v3:
- fox for microvm--- 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/x86/microvm/DSDT.pcie",
PATCH v3 6/29 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
Re: [PATCH v3 06/29] hw/pci-host/gpex-acpi: Split host bridge OSC and DSM generation
Quoted 8 lines · On Mon, 16 Jun 2025 11:46:35 +0200 Eric Auger <[email protected]> wrote:
acpi_dsdt_add_pci_osc()name is confusing as it gives the impression it appends the_OSCmethod but in fact it also appends the_DSMmethod 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.
Quoted 7 lines
acpi_dsdt_add_host_bridge_methodsis a new top helper that generates both the_OSCand_DSMmethods.We take the opportunity to move SUPP and CTRL in the
_oscmethod that use them.Signed-off-by Eric Auger <[email protected]>
Re: [PATCH v3 06/29] hw/pci-host/gpex-acpi: Split host bridge OSC and DSM generation
In reply to Eric AugerQuoted 10 lines · On Mon, 16 Jun 2025 11:46:35 +0200 Eric Auger <[email protected]> wrote:
acpi_dsdt_add_pci_osc()name is confusing as it gives the impression it appends the_OSCmethod but in fact it also appends the_DSMmethod 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_methodsis a new top helper that generates both the_OSCand_DSMmethods.
I'd get rid of wrapper, but it's not something that worth to fight over, so
Quoted 92 lines
We take the opportunity to move SUPP and CTRL in the
_oscmethod that use them.Signed-off-by Eric Auger <[email protected]>---
v2 -> v3:
- movedaml_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" )));
PATCH v3 7/29 hw/pci-host/gpex-acpi: retrieve and use GED acpi_pcihp setting
In reply to Eric Augerretrieve the acpi_pcihp option value from the ged. In case acpi_pcihp is unset we configure pci native hotplug on pci0. For expander bridges we keep legacy pci native hotplug, as done on x86 q35.
---
v2 -> v3:
- don'use the virt arm machine option anymore.
--- include/hw/pci-host/gpex.h | 1 + hw/arm/virt-acpi-build.c | 5 +++++ hw/pci-host/gpex-acpi.c | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-)
include/hw/pci-host/gpex.h +1 -0
@@ -45,6 +45,7 @@ struct GPEXConfig {MemMapEntry pio;int irq;PCIBus *bus; +bool pci_native_hotplug; };typedef struct GPEXIrq GPEXIrq ;
hw/arm/virt-acpi-build.c +5 -0
@@ -123,12 +123,17 @@ static void acpi_dsdt_add_pci(Aml *scope, const MemMapEntry *memmap, uint32_t irq, VirtMachineState *vms) { int ecam_id = VIRT_ECAM_ID(vms->highmem_ecam); +AcpiGedState *acpi_ged_state =ACPI_GED (vms->acpi_dev); +AcpiPciHpState *pcihp_state = &acpi_ged_state->pcihp_state; + +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 = !pcihp_state->use_acpi_hotplug_bridge, };if (vms->highmem_mmio) {
hw/pci-host/gpex-acpi.c +2 -1
@@ -203,6 +203,7 @@ void acpi_dsdt_add_gpex(Aml *scope, struct GPEXConfig *cfg)if (is_cxl) {build_cxl_osc_method (dev); }else { +/* pxb bridges do not have ACPI PCI Hot-plug enabled */ acpi_dsdt_add_host_bridge_methods (dev, true); }
@@ -278,7 +279,7 @@ void acpi_dsdt_add_gpex(Aml *scope, struct GPEXConfig *cfg) }aml_append (dev,aml_name_decl ("_CRS" , rbuf)); -acpi_dsdt_add_host_bridge_methods (dev, true); +acpi_dsdt_add_host_bridge_methods (dev, cfg->pci_native_hotplug);Aml *dev_res0 =aml_device ("%s" ,"RES0" );aml_append (dev_res0,aml_name_decl ("_HID" ,aml_string ("PNP0C02" )));
Signature · 1 line
2.49.0
Re: [PATCH v3 07/29] hw/pci-host/gpex-acpi: retrieve and use GED acpi_pcihp setting
Quoted 6 lines · On Mon, 16 Jun 2025 11:46:36 +0200 Eric Auger <[email protected]> wrote:
retrieve the
acpi_pcihpoption value from the ged. In caseacpi_pcihpis unset we configure pci native hotplug on pci0. For expander bridges we keep legacy pci native hotplug, as done on x86 q35.Signed-off-by Eric Auger <[email protected]>
One minor thing inline
Quoted 28 lines
---
v2 -> v3:
- don'use the virt arm machine option anymore.--- include/hw/pci-host/gpex.h | 1 + hw/arm/virt-acpi-build.c | 5 +++++ hw/pci-host/gpex-acpi.c | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-)include/hw/pci-host/gpex.h +1
-0@@ -45,6 +45,7 @@ struct GPEXConfig {MemMapEntry pio;int irq;PCIBus *bus; +bool pci_native_hotplug; };typedef struct GPEXIrq GPEXIrq ;hw/arm/virt-acpi-build.c +0
-0
hw/arm/virt-acpi-build.c static void acpi_dsdt_add_pci(Aml *scope, const MemMapEntry *memmap, · line 128
Quoted 6 lines
hw/arm/virt-acpi-build.c +3
-0@@ -123,12 +123,17 @@ static void acpi_dsdt_add_pci(Aml *scope, const MemMapEntry *memmap, uint32_t irq, VirtMachineState *vms) { int ecam_id = VIRT_ECAM_ID(vms->highmem_ecam); +AcpiGedState *acpi_ged_state =ACPI_GED (vms->acpi_dev); +AcpiPciHpState *pcihp_state = &acpi_ged_state->pcihp_state; +
Trivial, but why 2 blank lines? One seems enough here.
Quoted 32 lines
hw/arm/virt-acpi-build.c +2
-0+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 = !pcihp_state->use_acpi_hotplug_bridge, };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" )));
Re: [PATCH v3 07/29] hw/pci-host/gpex-acpi: retrieve and use GED acpi_pcihp setting
In reply to Eric AugerQuoted 3 lines · On Mon, 16 Jun 2025 11:46:36 +0200 Eric Auger <[email protected]> wrote:
retrieve the
acpi_pcihpoption value from the ged. In caseacpi_pcihpis unset we configure pci native hotplug on pci0. For expander bridges we keep legacy pci native hotplug,
I guess it's remnants of from previous version
s/legacy//
Quoted 31 lines
as done on x86 q35.
Signed-off-by Eric Auger <[email protected]>---
v2 -> v3:
- don'use the virt arm machine option anymore.--- include/hw/pci-host/gpex.h | 1 + hw/arm/virt-acpi-build.c | 5 +++++ hw/pci-host/gpex-acpi.c | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-)include/hw/pci-host/gpex.h +1
-0@@ -45,6 +45,7 @@ struct GPEXConfig {MemMapEntry pio;int irq;PCIBus *bus; +bool pci_native_hotplug; };typedef struct GPEXIrq GPEXIrq ;hw/arm/virt-acpi-build.c +0
-0
hw/arm/virt-acpi-build.c static void acpi_dsdt_add_pci(Aml *scope, const MemMapEntry *memmap, · line 127
Quoted 5 lines
hw/arm/virt-acpi-build.c +2
-0@@ -123,12 +123,17 @@ static void acpi_dsdt_add_pci(Aml *scope, const MemMapEntry *memmap, uint32_t irq, VirtMachineState *vms) { int ecam_id = VIRT_ECAM_ID(vms->highmem_ecam); +AcpiGedState *acpi_ged_state =ACPI_GED (vms->acpi_dev); +AcpiPciHpState *pcihp_state = &acpi_ged_state->pcihp_state;
1)
hw/arm/virt-acpi-build.c static void acpi_dsdt_add_pci(Aml *scope, const MemMapEntry *memmap, · line 136
Quoted 8 lines
hw/arm/virt-acpi-build.c +2
-0+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 = !pcihp_state->use_acpi_hotplug_bridge,
I'd use property accessor here instead of poking into device internals. and get rind of [1]
Quoted 24 lines
hw/arm/virt-acpi-build.c +0
-0};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" )));
PATCH v3 8/29 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
Re: [PATCH v3 08/29] hw/i386/acpi-build: Turn build_q35_osc_method into a generic method
Quoted 8 lines · On Mon, 16 Jun 2025 11:46:37 +0200 Eric Auger <[email protected]> wrote:
GPEX
acpi_dsdt_add_pci_osc()does basically the same asbuild_q35_osc_method().Rename
build_q35_osc_method()intobuild_pci_host_bridge_osc_method()and move it intohw/acpi/pci.c. In a subsequent patch we will use this later in place ofacpi_dsdt_add_pci_osc().Signed-off-by Eric Auger <[email protected]>
New location makes sense.
Re: [PATCH v3 08/29] hw/i386/acpi-build: Turn build_q35_osc_method into a generic method
In reply to Eric AugerQuoted 8 lines · On Mon, 16 Jun 2025 11:46:37 +0200 Eric Auger <[email protected]> wrote:
GPEX
acpi_dsdt_add_pci_osc()does basically the same asbuild_q35_osc_method().Rename
build_q35_osc_method()intobuild_pci_host_bridge_osc_method()and move it intohw/acpi/pci.c. In a subsequent patch we will use this later in place ofacpi_dsdt_add_pci_osc().Signed-off-by Eric Auger <[email protected]>
Quoted 159 lines
---
v2 -> v3:
- move tohw/acpi/pci.cinstead ofaml-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@@ -301,3 +301,53 @@ void build_srat_generic_affinity_structures(GArray *table_data)object_child_foreach_recursive (object_get_root (), build_acpi_generic_port, table_data); } + +Aml *build_pci_host_bridge_osc_method (bool enable_native_pcie_hotplug) +{ +Aml *if_ctx; +Aml *if_ctx2; +Aml *else_ctx; +Aml *method; +Aml *a_cwd1 =aml_name ("CDW1" ); +Aml *a_ctrl =aml_local (0 ); + + method =aml_method ("_OSC" ,4 ,AML_NOTSERIALIZED ); +aml_append (method,aml_create_dword_field (aml_arg (3 ),aml_int (0 ),"CDW1" )); + + if_ctx =aml_if (aml_equal ( +aml_arg (0 ),aml_touuid ("33DB4D5B-1FF7-401C-9657-7441C03DD766" ))); +aml_append (if_ctx,aml_create_dword_field (aml_arg (3 ),aml_int (4 ),"CDW2" )); +aml_append (if_ctx,aml_create_dword_field (aml_arg (3 ),aml_int (8 ),"CDW3" )); + +aml_append (if_ctx,aml_store (aml_name ("CDW3" ), a_ctrl)); + +/* +* Always allow native PME, AER (no dependencies) +* Allow SHPC (PCI bridges can have SHPC controller) +* Disable PCIe Native Hot-plug if ACPI PCI Hot-plug is enabled. +*/ +aml_append (if_ctx,aml_and (a_ctrl, +aml_int (0x1E | (enable_native_pcie_hotplug ?0x1 :0x0 )), a_ctrl)); + + if_ctx2 =aml_if (aml_lnot (aml_equal (aml_arg (1 ),aml_int (1 )))); +/* Unknown revision */ +aml_append (if_ctx2,aml_or (a_cwd1,aml_int (0x08 ), a_cwd1)); +aml_append (if_ctx, if_ctx2); + + if_ctx2 =aml_if (aml_lnot (aml_equal (aml_name ("CDW3" ), a_ctrl))); +/* Capabilities bits were masked */ +aml_append (if_ctx2,aml_or (a_cwd1,aml_int (0x10 ), a_cwd1)); +aml_append (if_ctx, if_ctx2); + +/* Update DWORD3 in the buffer */ +aml_append (if_ctx,aml_store (a_ctrl,aml_name ("CDW3" ))); +aml_append (method, if_ctx); + + else_ctx =aml_else (); +/* Unrecognized UUID */ +aml_append (else_ctx,aml_or (a_cwd1,aml_int (4 ), a_cwd1)); +aml_append (method, else_ctx); + +aml_append (method,aml_return (aml_arg (3 ))); +return method; +}hw/i386/acpi-build.c +2
-52@@ -1111,56 +1111,6 @@ static Aml *build_q35_dram_controller(const AcpiMcfgInfo *mcfg)return dev; } -static Aml *build_q35_osc_method (bool enable_native_pcie_hotplug) -{ -Aml *if_ctx; -Aml *if_ctx2; -Aml *else_ctx; -Aml *method; -Aml *a_cwd1 =aml_name ("CDW1" ); -Aml *a_ctrl =aml_local (0 ); - - method =aml_method ("_OSC" ,4 ,AML_NOTSERIALIZED ); -aml_append (method,aml_create_dword_field (aml_arg (3 ),aml_int (0 ),"CDW1" )); - - if_ctx =aml_if (aml_equal ( -aml_arg (0 ),aml_touuid ("33DB4D5B-1FF7-401C-9657-7441C03DD766" ))); -aml_append (if_ctx,aml_create_dword_field (aml_arg (3 ),aml_int (4 ),"CDW2" )); -aml_append (if_ctx,aml_create_dword_field (aml_arg (3 ),aml_int (8 ),"CDW3" )); - -aml_append (if_ctx,aml_store (aml_name ("CDW3" ), a_ctrl)); - -/* -* Always allow native PME, AER (no dependencies) -* Allow SHPC (PCI bridges can have SHPC controller) -* Disable PCIe Native Hot-plug if ACPI PCI Hot-plug is enabled. -*/ -aml_append (if_ctx,aml_and (a_ctrl, -aml_int (0x1E | (enable_native_pcie_hotplug ?0x1 :0x0 )), a_ctrl)); - - if_ctx2 =aml_if (aml_lnot (aml_equal (aml_arg (1 ),aml_int (1 )))); -/* Unknown revision */ -aml_append (if_ctx2,aml_or (a_cwd1,aml_int (0x08 ), a_cwd1)); -aml_append (if_ctx, if_ctx2); - - if_ctx2 =aml_if (aml_lnot (aml_equal (aml_name ("CDW3" ), a_ctrl))); -/* Capabilities bits were masked */ -aml_append (if_ctx2,aml_or (a_cwd1,aml_int (0x10 ), a_cwd1)); -aml_append (if_ctx, if_ctx2); - -/* Update DWORD3 in the buffer */ -aml_append (if_ctx,aml_store (a_ctrl,aml_name ("CDW3" ))); -aml_append (method, if_ctx); - - else_ctx =aml_else (); -/* Unrecognized UUID */ -aml_append (else_ctx,aml_or (a_cwd1,aml_int (4 ), a_cwd1)); -aml_append (method, else_ctx); - -aml_append (method,aml_return (aml_arg (3 ))); -return method; -} -static void build_acpi0017 (Aml *table) {Aml *dev, *scope, *method;@@ -1231,7 +1181,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,aml_append (dev,aml_name_decl ("_HID" ,aml_eisaid ("PNP0A08" )));aml_append (dev,aml_name_decl ("_CID" ,aml_eisaid ("PNP0A03" )));aml_append (dev,aml_name_decl ("_UID" ,aml_int (pcmc->pci_root_uid))); -aml_append (dev,build_q35_osc_method (!pm->pcihp_bridge_en)); +aml_append (dev,build_pci_host_bridge_osc_method (!pm->pcihp_bridge_en));aml_append (dev,aml_pci_edsm ());aml_append (sb_scope, dev);if (mcfg_valid) {@@ -1353,7 +1303,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,aml_append (dev,aml_name_decl ("_CID" ,aml_eisaid ("PNP0A03" )));/* Expander bridges do not have ACPI PCI Hot-plug enabled */ -aml_append (dev,build_q35_osc_method (true)); +aml_append (dev,build_pci_host_bridge_osc_method (true)); }else {aml_append (dev,aml_name_decl ("_HID" ,aml_eisaid ("PNP0A03" ))); }
PATCH v3 9/29 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().
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
---
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 ++++------------------------------------- 1 file changed, 5 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)
Signature · 1 line
2.49.0
Re: [PATCH v3 09/29] hw/pci-host/gpex-acpi: Use build_pci_host_bridge_osc_method
Quoted 56 lines · On Mon, 16 Jun 2025 11:46:38 +0200 Eric Auger <[email protected]> wrote:
gpex
build_host_bridge_osc()and x86 originatedbuild_pci_host_bridge_osc_method()are mostly identical.In GPEX, SUPP is set to CDW2 but is not further used. CTRL is same as Local0.
So let gpex code reuse
build_pci_host_bridge_osc_method()and removebuild_host_bridge_osc().The disassembled DSDT difference is given below:
* Original Table Header:
* Signature "DSDT" - * Length 0x00001A4F (6735) + * Length 0x00001A35 (6709) * Revision 0x02 - * Checksum 0xBF + * Checksum 0xDD * OEM ID "BOCHS " * OEM Table ID "BXPC " * OEM Revision 0x00000001 (1)(quoted diff) +6
-7@@ -1849,27 +1849,26 @@ DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPC ", 0x00000001) { CreateDWordField (Arg3, 0x04, CDW2) CreateDWordField (Arg3, 0x08, CDW3) - SUPP = CDW2 /* \_SB_.PCI0._OSC.CDW2 */ - CTRL = CDW3 /* \_SB_.PCI0._OSC.CDW3 */ - CTRL &= 0x1F + Local0 = CDW3 /* \_SB_.PCI0._OSC.CDW3 */ + Local0 &= 0x1F If ((Arg1 != One)) { CDW1 |= 0x08 } - If ((CDW3 != CTRL)) + If ((CDW3 != Local0)) { CDW1 |= 0x10 } - CDW3 = CTRL /* \_SB_.PCI0.CTRL */ - Return (Arg3) + CDW3 = Local0 } Else { CDW1 |= 0x04 - Return (Arg3) } + + Return (Arg3) } Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific Method
Quoted 2 lines
Signed-off-by Eric Auger <[email protected]>Reviewed-by Igor Mammedov <[email protected]>
Re: [PATCH v3 09/29] hw/pci-host/gpex-acpi: Use build_pci_host_bridge_osc_method
In reply to Eric AugerQuoted 8 lines · On Mon, 16 Jun 2025 11:46:38 +0200 Eric Auger <[email protected]> wrote:
gpex
build_host_bridge_osc()and x86 originatedbuild_pci_host_bridge_osc_method()are mostly identical.In GPEX, SUPP is set to CDW2 but is not further used. CTRL is same as Local0.
So let gpex code reuse
build_pci_host_bridge_osc_method()and removebuild_host_bridge_osc().
qtest fails with
FAILED: qemu-system-mips64el
cc -m64 @qemu-system-mips64el.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: undefined reference to `build_pci_host_bridge_osc_method'
Quoted 146 lines
The disassembled DSDT difference is given below:
* Original Table Header:
* Signature "DSDT" - * Length 0x00001A4F (6735) + * Length 0x00001A35 (6709) * Revision 0x02 - * Checksum 0xBF + * Checksum 0xDD * OEM ID "BOCHS " * OEM Table ID "BXPC " * OEM Revision 0x00000001 (1)(quoted diff) +6
-7@@ -1849,27 +1849,26 @@ DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPC ", 0x00000001) { CreateDWordField (Arg3, 0x04, CDW2) CreateDWordField (Arg3, 0x08, CDW3) - SUPP = CDW2 /* \_SB_.PCI0._OSC.CDW2 */ - CTRL = CDW3 /* \_SB_.PCI0._OSC.CDW3 */ - CTRL &= 0x1F + Local0 = CDW3 /* \_SB_.PCI0._OSC.CDW3 */ + Local0 &= 0x1F If ((Arg1 != One)) { CDW1 |= 0x08 } - If ((CDW3 != CTRL)) + If ((CDW3 != Local0)) { CDW1 |= 0x10 } - CDW3 = CTRL /* \_SB_.PCI0.CTRL */ - Return (Arg3) + CDW3 = Local0 } Else { CDW1 |= 0x04 - Return (Arg3) } + + Return (Arg3) } Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific MethodSigned-off-by Eric Auger <[email protected]>Reviewed-by Igor Mammedov <[email protected]>---
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 ++++------------------------------------- 1 file changed, 5 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)
PATCH v3 10/29 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:
@@ -1798,6 +1798,8 @@
0x0000008000000000, // Length
,, , AddressRangeMemory, TypeStatic)
})+ Name (SUPP, Zero)
+ Name (CTRL, Zero)
Method (_OSC, 4, NotSerialized) // _OSC: Operating System Capabilities {
CreateDWordField (Arg3, Zero, CDW1)
@@ -1805,26 +1807,27 @@
{
CreateDWordField (Arg3, 0x04, CDW2)
CreateDWordField (Arg3, 0x08, CDW3)
- Local0 = CDW3 /* \_SB_.PCI0._OSC.CDW3 */
- Local0 &= 0x1F
+ SUPP = CDW2 /* \_SB_.PCI0._OSC.CDW2 */
+ CTRL = CDW3 /* \_SB_.PCI0._OSC.CDW3 */
+ CTRL &= 0x1F
If ((Arg1 != One))
{
CDW1 |= 0x08
}- If ((CDW3 != Local0))
+ If ((CDW3 != CTRL))
{
CDW1 |= 0x10
}- CDW3 = Local0
+ CDW3 = CTRL /* \_SB_.PCI0.CTRL */
+ Return (Arg3)
}
Else
{
CDW1 |= 0x04
+ Return (Arg3)
}-
- Return (Arg3)
}
Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific Method
--- tests/qtest/bios-tables-test-allowed-diff.h | 6 ------ 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/x86/microvm/DSDT.pcie | Bin 3023 -> 2985 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/x86/microvm/DSDT.pcie",
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/x86/microvm/DSDT.pcie binary +0 -0
Signature · 1 line
2.49.0
Re: [PATCH v3 10/29] tests/qtest/bios-tables-test: Update DSDT blobs after GPEX _OSC change
Quoted 4 lines · On Mon, 16 Jun 2025 11:46:39 +0200 Eric Auger <[email protected]> wrote:
Update the reference DSDT blobs after GPEX
_OSCchange. The_OSCchange affects the aarch64 'virt' and the x86 'microvm' machines.DSDT diff is the same for all the machines/tests:
Is this diff backwards? It's the opposite of the one in patch 9.
Quoted 146 lines
(quoted diff) +9
-6@@ -1798,6 +1798,8 @@ 0x0000008000000000, // Length ,, , AddressRangeMemory, TypeStatic) }) + Name (SUPP, Zero) + Name (CTRL, Zero) Method (_OSC, 4, NotSerialized) // _OSC: Operating System Capabilities { CreateDWordField (Arg3, Zero, CDW1)@@ -1805,26 +1807,27 @@ { CreateDWordField (Arg3, 0x04, CDW2) CreateDWordField (Arg3, 0x08, CDW3) - Local0 = CDW3 /* \_SB_.PCI0._OSC.CDW3 */ - Local0 &= 0x1F + SUPP = CDW2 /* \_SB_.PCI0._OSC.CDW2 */ + CTRL = CDW3 /* \_SB_.PCI0._OSC.CDW3 */ + CTRL &= 0x1F If ((Arg1 != One)) { CDW1 |= 0x08 } - If ((CDW3 != Local0)) + If ((CDW3 != CTRL)) { CDW1 |= 0x10 } - CDW3 = Local0 + CDW3 = CTRL /* \_SB_.PCI0.CTRL */ + Return (Arg3) } Else { CDW1 |= 0x04 + Return (Arg3) } - - Return (Arg3) } Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific MethodSigned-off-by Eric Auger <[email protected]>Signed-off-by Gustavo Romero <[email protected]>--- tests/qtest/bios-tables-test-allowed-diff.h | 6 ------ 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/x86/microvm/DSDT.pcie | Bin 3023 -> 2985 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/x86/microvm/DSDT.pcie",tests/data/acpi/aarch64/virt/DSDT binary +0
-0zF7RWWyjw
i#5kckflEGNfxx86nT)j{87>a6yzr#S&Mx72@o*>kXS(iNMs?;W@BMV FMgSUfAKd@|delta 152 zcmZ3caYlp7CD<jzM}&caNqQoeG*i3NMs+tXCWon;^SSgm<T!#u0|FR0oI
?q7)0DS z<Nbr3S-P?roL#~V7kIEwUN5BOX9QAG;Or7^3{q7MBDmy1<N|?7lQS7>L29;z&gYx bO@^t12n&FO3qXoN;!Cm@@@?i7mSh9~5Tq&5tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt binary +0
-0zT;Rt#Sx{KZ#5kckflEGNfxx86nT)j{87>a6yzr#S&Mx7`2@o*>kXS(iNMs?;=1yTr FMgUJNAb|h?
delta 152 zcmeyPu}G84CD<iokq83=(~XH-(oDVX8
bA<F*!#e3VO%LyjXjG$4S1!#O0#he5=R zGu}VgnWZb6!PzC;aDfN=WL9A<KO>Nm0%w<SW00z95Wyu6A{Piunw-g43sTF)0oEZl bX);V5L|6bMTmVuG5?_+NkZ*Icup}b@<J&8Btests/data/acpi/aarch64/virt/DSDT.memhp binary +0
-0zT;Rt#dAE?3iE%=80+)Qk0)a`BGZ||^GF%*BdErTuon69>6Ch#&AhCi3kjO%w&Bnr6 FYyg6XAvXX3
delta 152 zcmexvG}oBRCD<iot|S8klg&gfX{L_p8`a&om>i~V&gatOkmCpr4G3W1a1IIbVGwcS zjQ0<AX6ediaCQkdT;RbzdA*R9pAkq&fwN1vF-TQ4h~Sb3kqZPSP0nPj1*zrY0P7H& bG#RE2A}jzBE&wS8i7&}s$hVnSIExJcpiV0*
tests/data/acpi/aarch64/virt/DSDT.pxb binary +0
-0tests/data/acpi/aarch64/virt/DSDT.topology binary +0
-0zT;Rt#xm8%p#5kckflEGNfxx86nT)j{87>a6yzr#S&Mx7`2@o*>kXS(iNMs?;=D)&{ Fi~vUbAmso6
delta 152 zcmeyMIZcbpCD<iIOq79viGL!OG*hGhMs)#hCWon;ExGkL<T!#u0|FR0oI
?q7)0DS z<Nbr3S-P?roL#~V7kIEwtyetGXg0oaCQkd2C1qB5nS>ha)H34$(f9Ahlc^U>#zU bCd1T0gatst1t7&B@g>;{8Hn{mSh9~yBaCktests/data/acpi/x86/microvm/DSDT.pcie binary +0
-0zcmX>vzEYgaCD<ioB{u^D)Axy7(oD|VH>#&HG5Ji
+{YxqAtd6%97IQ%+i(3;Or7^ zxWJEf@*XZN6XS&H1TMLR1p<>MXEN4;WVkrM^1_oQJG+D%CqTpmKw<?6Ad!VUlTEm1 F0{}^9AprmYdelta 151 zcmZ1}eqNl*CD<k8JU0Ualj}q-X(rE|8`V>pn4BhW?qd?*kmCpr4G3W1a1IIbVGwcS zjQ0<AX6ediaCQkdT;Rbzc>|Z0pAkq&fwN1vF-TQ4h~Sb3kqZPSP0nPj1*zrY0P7H& aG#RE2A}jzBE&wS8i7&}s$Tyjfdo}=5#47aw
Re: [PATCH v3 10/29] tests/qtest/bios-tables-test: Update DSDT blobs after GPEX _OSC change
Hi Jonathan,
Quoted 8 lines · Jonathan Cameron
Quoted 4 lines · On Mon, 16 Jun 2025 11:46:39 +0200 Eric Auger <[email protected]> wrote:
Update the reference DSDT blobs after GPEX
_OSCchange. The_OSCchange affects the aarch64 'virt' and the x86 'microvm' machines.DSDT diff is the same for all the machines/tests:
Is this diff backwards? It's the opposite of the one in patch 9.
argh. Most probably. I must have messed with the diff :-(
Eric
Quoted 149 lines
Quoted 149 lines
(quoted diff) +9
-6@@ -1798,6 +1798,8 @@ 0x0000008000000000, // Length ,, , AddressRangeMemory, TypeStatic) }) + Name (SUPP, Zero) + Name (CTRL, Zero) Method (_OSC, 4, NotSerialized) // _OSC: Operating System Capabilities { CreateDWordField (Arg3, Zero, CDW1)@@ -1805,26 +1807,27 @@ { CreateDWordField (Arg3, 0x04, CDW2) CreateDWordField (Arg3, 0x08, CDW3) - Local0 = CDW3 /* \_SB_.PCI0._OSC.CDW3 */ - Local0 &= 0x1F + SUPP = CDW2 /* \_SB_.PCI0._OSC.CDW2 */ + CTRL = CDW3 /* \_SB_.PCI0._OSC.CDW3 */ + CTRL &= 0x1F If ((Arg1 != One)) { CDW1 |= 0x08 } - If ((CDW3 != Local0)) + If ((CDW3 != CTRL)) { CDW1 |= 0x10 } - CDW3 = Local0 + CDW3 = CTRL /* \_SB_.PCI0.CTRL */ + Return (Arg3) } Else { CDW1 |= 0x04 + Return (Arg3) } - - Return (Arg3) } Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific MethodSigned-off-by Eric Auger <[email protected]>Signed-off-by Gustavo Romero <[email protected]>--- tests/qtest/bios-tables-test-allowed-diff.h | 6 ------ 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/x86/microvm/DSDT.pcie | Bin 3023 -> 2985 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/x86/microvm/DSDT.pcie",tests/data/acpi/aarch64/virt/DSDT binary +0
-0zF7RWWyjw
i#5kckflEGNfxx86nT)j{87>a6yzr#S&Mx72@o*>kXS(iNMs?;W@BMV FMgSUfAKd@|delta 152 zcmZ3caYlp7CD<jzM}&caNqQoeG*i3NMs+tXCWon;^SSgm<T!#u0|FR0oI
?q7)0DS z<Nbr3S-P?roL#~V7kIEwUN5BOX9QAG;Or7^3{q7MBDmy1<N|?7lQS7>L29;z&gYx bO@^t12n&FO3qXoN;!Cm@@@?i7mSh9~5Tq&5tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt binary +0
-0zT;Rt#Sx{KZ#5kckflEGNfxx86nT)j{87>a6yzr#S&Mx7`2@o*>kXS(iNMs?;=1yTr FMgUJNAb|h?
delta 152 zcmeyPu}G84CD<iokq83=(~XH-(oDVX8
bA<F*!#e3VO%LyjXjG$4S1!#O0#he5=R zGu}VgnWZb6!PzC;aDfN=WL9A<KO>Nm0%w<SW00z95Wyu6A{Piunw-g43sTF)0oEZl bX);V5L|6bMTmVuG5?_+NkZ*Icup}b@<J&8Btests/data/acpi/aarch64/virt/DSDT.memhp binary +0
-0zT;Rt#dAE?3iE%=80+)Qk0)a`BGZ||^GF%*BdErTuon69>6Ch#&AhCi3kjO%w&Bnr6 FYyg6XAvXX3
delta 152 zcmexvG}oBRCD<iot|S8klg&gfX{L_p8`a&om>i~V&gatOkmCpr4G3W1a1IIbVGwcS zjQ0<AX6ediaCQkdT;RbzdA*R9pAkq&fwN1vF-TQ4h~Sb3kqZPSP0nPj1*zrY0P7H& bG#RE2A}jzBE&wS8i7&}s$hVnSIExJcpiV0*
tests/data/acpi/aarch64/virt/DSDT.pxb binary +0
-0tests/data/acpi/aarch64/virt/DSDT.topology binary +0
-0zT;Rt#xm8%p#5kckflEGNfxx86nT)j{87>a6yzr#S&Mx7`2@o*>kXS(iNMs?;=D)&{ Fi~vUbAmso6
delta 152 zcmeyMIZcbpCD<iIOq79viGL!OG*hGhMs)#hCWon;ExGkL<T!#u0|FR0oI
?q7)0DS z<Nbr3S-P?roL#~V7kIEwtyetGXg0oaCQkd2C1qB5nS>ha)H34$(f9Ahlc^U>#zU bCd1T0gatst1t7&B@g>;{8Hn{mSh9~yBaCktests/data/acpi/x86/microvm/DSDT.pcie binary +0
-0zcmX>vzEYgaCD<ioB{u^D)Axy7(oD|VH>#&HG5Ji
+{YxqAtd6%97IQ%+i(3;Or7^ zxWJEf@*XZN6XS&H1TMLR1p<>MXEN4;WVkrM^1_oQJG+D%CqTpmKw<?6Ad!VUlTEm1 F0{}^9AprmYdelta 151 zcmZ1}eqNl*CD<k8JU0Ualj}q-X(rE|8`V>pn4BhW?qd?*kmCpr4G3W1a1IIbVGwcS zjQ0<AX6ediaCQkdT;Rbzc>|Z0pAkq&fwN1vF-TQ4h~Sb3kqZPSP0nPj1*zrY0P7H& aG#RE2A}jzBE&wS8i7&}s$Tyjfdo}=5#47aw
PATCH v3 11/29 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 v3 12/29 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 v3 13/29 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 v3 14/29 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 v3 15/29 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
Re: [PATCH v3 15/29] hw/i386/acpi-build: Use AcpiPciHpState::root in acpi_set_pci_info
Quoted 8 lines · On Mon, 16 Jun 2025 11:46:44 +0200 Eric Auger <[email protected]> wrote:
pcihp
acpi_set_pci_info()generic code currently usesacpi_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.Signed-off-by Eric Auger <[email protected]>Suggested-by Igor Mammedov <[email protected]>
Nice
Quoted 52 lines
---
v2 -> v3:
- UseAcpiPciHpState::rootv1 -> v2
- described the fact we changed the implementation ofacpi_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); }
Re: [PATCH v3 15/29] hw/i386/acpi-build: Use AcpiPciHpState::root in acpi_set_pci_info
In reply to Eric AugerQuoted 8 lines · On Mon, 16 Jun 2025 11:46:44 +0200 Eric Auger <[email protected]> wrote:
pcihp
acpi_set_pci_info()generic code currently usesacpi_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.Signed-off-by Eric Auger <[email protected]>Suggested-by Igor Mammedov <[email protected]>
Quoted 52 lines
---
v2 -> v3:
- UseAcpiPciHpState::rootv1 -> v2
- described the fact we changed the implementation ofacpi_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); }
PATCH v3 16/29 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.
---
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 | 53 ------------------------------------------ 3 files changed, 55 insertions(+), 53 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 *aml_pci_edsm (void );#endif
hw/acpi/pci-bridge.c +54 -0
57 lines not on this page · raw message
hw/i386/acpi-build.c +0 -53
59 lines not on this page · raw message
Signature · 1 line
2.49.0
Re: [PATCH v3 16/29] hw/i386/acpi-build: Move aml_pci_edsm to a generic place
Quoted 4 lines · On Mon, 16 Jun 2025 11:46:45 +0200 Eric Auger <[email protected]> wrote:
Move
aml_pci_edsmtopci-bridge.csince we want to reuse that for ARM and acpi-index support.Signed-off-by Eric Auger <[email protected]>
A request for a bit of documentation inline. aml_pci_edsm() sounds like we should be able to grep the spec for edsm and find it but that's just internal method naming in qemu.
More interesting is I don't think this will ever be called as
the kernel has no idea how to call it and unlike on x86 the
blobs don't show wrapping the call in a _DSM() (see aml_pci_static_endpoint_dsm())
Did EDSM usage get dropped as this set evolved leaving this behind?
Quoted 27 lines
---
v2 -> v3:
- move topci-bridge.cinstead ofpcihp.c(Igor)--- include/hw/acpi/pci.h | 1 + hw/acpi/pci-bridge.c | 54 +++++++++++++++++++++++++++++++++++++++++++ hw/i386/acpi-build.c | 53 ------------------------------------------ 3 files changed, 55 insertions(+), 53 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 *aml_pci_edsm (void );#endif hw/acpi/pci-bridge.c +0
-0
hw/acpi/pci-bridge.c void build_pci_bridge_aml(AcpiDevAmlIf *adev, Aml *scope) · line 39
Quoted 5 lines
hw/acpi/pci-bridge.c +2
-0@@ -35,3 +35,57 @@ void build_pci_bridge_aml(AcpiDevAmlIf *adev, Aml *scope) } } } + +Aml *aml_pci_edsm (void )
Can we have some comments, or a more descriptive name than the resulting method name? There is stuff in the function obviously that associates it with the naming DSM but given this is moving to generic code maybe it needs a brief intro comment?
Quoted 116 lines
hw/acpi/pci-bridge.c +52
-0+{ +Aml *method, *ifctx; +Aml *zero =aml_int (0 ); +Aml *func =aml_arg (2 ); +Aml *ret =aml_local (0 ); +Aml *aidx =aml_local (1 ); +Aml *params =aml_arg (4 ); + + method =aml_method ("EDSM" ,5 ,AML_SERIALIZED ); + +/* get supported functions */ + ifctx =aml_if (aml_equal (func, zero)); + { +/* 1: have supported functions */ +/* 7: support for function 7 */ +const uint8_t caps =1 |BIT (7 ); +build_append_pci_dsm_func0_common (ifctx, ret); +aml_append (ifctx,aml_store (aml_int (caps),aml_index (ret, zero))); +aml_append (ifctx,aml_return (ret)); + } +aml_append (method, ifctx); + +/* handle specific functions requests */ +/* +* PCI Firmware Specification 3.1 +* 4.6.7. _DSM for Naming a PCI or PCI Express Device Under +* Operating Systems +*/ + ifctx =aml_if (aml_equal (func,aml_int (7 ))); + { +Aml *pkg =aml_package (2 ); +aml_append (pkg, zero); +/* optional, if not impl. should return null string */ +aml_append (pkg,aml_string ("%s" ,"" )); +aml_append (ifctx,aml_store (pkg, ret)); + +/* +* IASL is fine when initializing Package with computational data, +* however it makes guest unhappy /it fails to process such AML/. +* So use runtime assignment to set acpi-index after initializer +* to make OSPM happy. +*/ +aml_append (ifctx, +aml_store (aml_derefof (aml_index (params,aml_int (0 ))), aidx)); +aml_append (ifctx,aml_store (aidx,aml_index (ret, zero))); +aml_append (ifctx,aml_return (ret)); + } +aml_append (method, ifctx); + +return method; +} +hw/i386/acpi-build.c +0
-53@@ -338,59 +338,6 @@ build_facs(GArray *table_data)g_array_append_vals (table_data, reserved,40 );/* Reserved */ } -static Aml *aml_pci_edsm (void ) -{ -Aml *method, *ifctx; -Aml *zero =aml_int (0 ); -Aml *func =aml_arg (2 ); -Aml *ret =aml_local (0 ); -Aml *aidx =aml_local (1 ); -Aml *params =aml_arg (4 ); - - method =aml_method ("EDSM" ,5 ,AML_SERIALIZED ); - -/* get supported functions */ - ifctx =aml_if (aml_equal (func, zero)); - { -/* 1: have supported functions */ -/* 7: support for function 7 */ -const uint8_t caps =1 |BIT (7 ); -build_append_pci_dsm_func0_common (ifctx, ret); -aml_append (ifctx,aml_store (aml_int (caps),aml_index (ret, zero))); -aml_append (ifctx,aml_return (ret)); - } -aml_append (method, ifctx); - -/* handle specific functions requests */ -/* -* PCI Firmware Specification 3.1 -* 4.6.7. _DSM for Naming a PCI or PCI Express Device Under -* Operating Systems -*/ - ifctx =aml_if (aml_equal (func,aml_int (7 ))); - { -Aml *pkg =aml_package (2 ); -aml_append (pkg, zero); -/* optional, if not impl. should return null string */ -aml_append (pkg,aml_string ("%s" ,"" )); -aml_append (ifctx,aml_store (pkg, ret)); - -/* -* IASL is fine when initializing Package with computational data, -* however it makes guest unhappy /it fails to process such AML/. -* So use runtime assignment to set acpi-index after initializer -* to make OSPM happy. -*/ -aml_append (ifctx, -aml_store (aml_derefof (aml_index (params,aml_int (0 ))), aidx)); -aml_append (ifctx,aml_store (aidx,aml_index (ret, zero))); -aml_append (ifctx,aml_return (ret)); - } -aml_append (method, ifctx); - -return method; -} -/* * build_prt - Define interrupt routing rules *
Jonathan Cameron
Reviewed-byRe: [PATCH v3 16/29] hw/i386/acpi-build: Move aml_pci_edsm to a generic place
Quoted 13 lines · On Fri, 20 Jun 2025 10:19:36 +0100 Jonathan Cameron…
Quoted 4 lines · On Mon, 16 Jun 2025 11:46:45 +0200 Eric Auger <[email protected]> wrote:
Move
aml_pci_edsmtopci-bridge.csince we want to reuse that for ARM and acpi-index support.Signed-off-by Eric Auger <[email protected]>A request for a bit of documentation inline.
aml_pci_edsm()sounds like we should be able to grep the spec for edsm and find it but that's just internal method naming in qemu.
Quoted 5 lines
More interesting is I don't think this will ever be called as
the kernel has no idea how to call it and unlike on x86 the
blobs don't show wrapping the call in a_DSM()(seeaml_pci_static_endpoint_dsm())Did EDSM usage get dropped as this set evolved leaving this behind?
Doh. You moved and use build_append_pci_bus_devices().
So this is fine. Ignore me.
I'd still like a comment though - particularly as it turns up in the blobs with no callers because the examples don't use it yet.
Quoted 159 lines
Quoted 30 lines
---
v2 -> v3:
- move topci-bridge.cinstead ofpcihp.c(Igor)--- include/hw/acpi/pci.h | 1 + hw/acpi/pci-bridge.c | 54 +++++++++++++++++++++++++++++++++++++++++++ hw/i386/acpi-build.c | 53 ------------------------------------------ 3 files changed, 55 insertions(+), 53 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 *aml_pci_edsm (void );#endif hw/acpi/pci-bridge.c +0
-0hw/acpi/pci-bridge.c void build_pci_bridge_aml(AcpiDevAmlIf *adev, Aml *scope) · line 39
Quoted 5 lines
hw/acpi/pci-bridge.c +2
-0@@ -35,3 +35,57 @@ void build_pci_bridge_aml(AcpiDevAmlIf *adev, Aml *scope) } } } + +Aml *aml_pci_edsm (void )Can we have some comments, or a more descriptive name than the resulting method name? There is stuff in the function obviously that associates it with the naming DSM but given this is moving to generic code maybe it needs a brief intro comment?
Quoted 116 lines
hw/acpi/pci-bridge.c +52
-0+{ +Aml *method, *ifctx; +Aml *zero =aml_int (0 ); +Aml *func =aml_arg (2 ); +Aml *ret =aml_local (0 ); +Aml *aidx =aml_local (1 ); +Aml *params =aml_arg (4 ); + + method =aml_method ("EDSM" ,5 ,AML_SERIALIZED ); + +/* get supported functions */ + ifctx =aml_if (aml_equal (func, zero)); + { +/* 1: have supported functions */ +/* 7: support for function 7 */ +const uint8_t caps =1 |BIT (7 ); +build_append_pci_dsm_func0_common (ifctx, ret); +aml_append (ifctx,aml_store (aml_int (caps),aml_index (ret, zero))); +aml_append (ifctx,aml_return (ret)); + } +aml_append (method, ifctx); + +/* handle specific functions requests */ +/* +* PCI Firmware Specification 3.1 +* 4.6.7. _DSM for Naming a PCI or PCI Express Device Under +* Operating Systems +*/ + ifctx =aml_if (aml_equal (func,aml_int (7 ))); + { +Aml *pkg =aml_package (2 ); +aml_append (pkg, zero); +/* optional, if not impl. should return null string */ +aml_append (pkg,aml_string ("%s" ,"" )); +aml_append (ifctx,aml_store (pkg, ret)); + +/* +* IASL is fine when initializing Package with computational data, +* however it makes guest unhappy /it fails to process such AML/. +* So use runtime assignment to set acpi-index after initializer +* to make OSPM happy. +*/ +aml_append (ifctx, +aml_store (aml_derefof (aml_index (params,aml_int (0 ))), aidx)); +aml_append (ifctx,aml_store (aidx,aml_index (ret, zero))); +aml_append (ifctx,aml_return (ret)); + } +aml_append (method, ifctx); + +return method; +} +hw/i386/acpi-build.c +0
-53@@ -338,59 +338,6 @@ build_facs(GArray *table_data)g_array_append_vals (table_data, reserved,40 );/* Reserved */ } -static Aml *aml_pci_edsm (void ) -{ -Aml *method, *ifctx; -Aml *zero =aml_int (0 ); -Aml *func =aml_arg (2 ); -Aml *ret =aml_local (0 ); -Aml *aidx =aml_local (1 ); -Aml *params =aml_arg (4 ); - - method =aml_method ("EDSM" ,5 ,AML_SERIALIZED ); - -/* get supported functions */ - ifctx =aml_if (aml_equal (func, zero)); - { -/* 1: have supported functions */ -/* 7: support for function 7 */ -const uint8_t caps =1 |BIT (7 ); -build_append_pci_dsm_func0_common (ifctx, ret); -aml_append (ifctx,aml_store (aml_int (caps),aml_index (ret, zero))); -aml_append (ifctx,aml_return (ret)); - } -aml_append (method, ifctx); - -/* handle specific functions requests */ -/* -* PCI Firmware Specification 3.1 -* 4.6.7. _DSM for Naming a PCI or PCI Express Device Under -* Operating Systems -*/ - ifctx =aml_if (aml_equal (func,aml_int (7 ))); - { -Aml *pkg =aml_package (2 ); -aml_append (pkg, zero); -/* optional, if not impl. should return null string */ -aml_append (pkg,aml_string ("%s" ,"" )); -aml_append (ifctx,aml_store (pkg, ret)); - -/* -* IASL is fine when initializing Package with computational data, -* however it makes guest unhappy /it fails to process such AML/. -* So use runtime assignment to set acpi-index after initializer -* to make OSPM happy. -*/ -aml_append (ifctx, -aml_store (aml_derefof (aml_index (params,aml_int (0 ))), aidx)); -aml_append (ifctx,aml_store (aidx,aml_index (ret, zero))); -aml_append (ifctx,aml_return (ret)); - } -aml_append (method, ifctx); - -return method; -} -/* * build_prt - Define interrupt routing rules *
Re: [PATCH v3 16/29] hw/i386/acpi-build: Move aml_pci_edsm to a generic place
In reply to Jonathan CameronQuoted 11 lines · On Fri, 20 Jun 2025 10:19:36 +0100 Jonathan Cameron…
Quoted 4 lines · On Mon, 16 Jun 2025 11:46:45 +0200 Eric Auger <[email protected]> wrote:
Move
aml_pci_edsmtopci-bridge.csince we want to reuse that for ARM and acpi-index support.Signed-off-by Eric Auger <[email protected]>A request for a bit of documentation inline.
aml_pci_edsm()sounds like we should be able to grep the spec for edsm and find it but that's just internal method naming in qemu.
agree, aml_ prefix is typically reserved for ACPI spec items.
perhaps rename it to follow build_ prefix scheme?
Quoted 166 lines
More interesting is I don't think this will ever be called as
the kernel has no idea how to call it and unlike on x86 the
blobs don't show wrapping the call in a_DSM()(seeaml_pci_static_endpoint_dsm())Did EDSM usage get dropped as this set evolved leaving this behind?
Quoted 27 lines
---
v2 -> v3:
- move topci-bridge.cinstead ofpcihp.c(Igor)--- include/hw/acpi/pci.h | 1 + hw/acpi/pci-bridge.c | 54 +++++++++++++++++++++++++++++++++++++++++++ hw/i386/acpi-build.c | 53 ------------------------------------------ 3 files changed, 55 insertions(+), 53 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 *aml_pci_edsm (void );#endif hw/acpi/pci-bridge.c +0
-0hw/acpi/pci-bridge.c void build_pci_bridge_aml(AcpiDevAmlIf *adev, Aml *scope) · line 39
Quoted 5 lines
hw/acpi/pci-bridge.c +2
-0@@ -35,3 +35,57 @@ void build_pci_bridge_aml(AcpiDevAmlIf *adev, Aml *scope) } } } + +Aml *aml_pci_edsm (void )Can we have some comments, or a more descriptive name than the resulting method name? There is stuff in the function obviously that associates it with the naming DSM but given this is moving to generic code maybe it needs a brief intro comment?
Quoted 116 lines
hw/acpi/pci-bridge.c +52
-0+{ +Aml *method, *ifctx; +Aml *zero =aml_int (0 ); +Aml *func =aml_arg (2 ); +Aml *ret =aml_local (0 ); +Aml *aidx =aml_local (1 ); +Aml *params =aml_arg (4 ); + + method =aml_method ("EDSM" ,5 ,AML_SERIALIZED ); + +/* get supported functions */ + ifctx =aml_if (aml_equal (func, zero)); + { +/* 1: have supported functions */ +/* 7: support for function 7 */ +const uint8_t caps =1 |BIT (7 ); +build_append_pci_dsm_func0_common (ifctx, ret); +aml_append (ifctx,aml_store (aml_int (caps),aml_index (ret, zero))); +aml_append (ifctx,aml_return (ret)); + } +aml_append (method, ifctx); + +/* handle specific functions requests */ +/* +* PCI Firmware Specification 3.1 +* 4.6.7. _DSM for Naming a PCI or PCI Express Device Under +* Operating Systems +*/ + ifctx =aml_if (aml_equal (func,aml_int (7 ))); + { +Aml *pkg =aml_package (2 ); +aml_append (pkg, zero); +/* optional, if not impl. should return null string */ +aml_append (pkg,aml_string ("%s" ,"" )); +aml_append (ifctx,aml_store (pkg, ret)); + +/* +* IASL is fine when initializing Package with computational data, +* however it makes guest unhappy /it fails to process such AML/. +* So use runtime assignment to set acpi-index after initializer +* to make OSPM happy. +*/ +aml_append (ifctx, +aml_store (aml_derefof (aml_index (params,aml_int (0 ))), aidx)); +aml_append (ifctx,aml_store (aidx,aml_index (ret, zero))); +aml_append (ifctx,aml_return (ret)); + } +aml_append (method, ifctx); + +return method; +} +hw/i386/acpi-build.c +0
-53@@ -338,59 +338,6 @@ build_facs(GArray *table_data)g_array_append_vals (table_data, reserved,40 );/* Reserved */ } -static Aml *aml_pci_edsm (void ) -{ -Aml *method, *ifctx; -Aml *zero =aml_int (0 ); -Aml *func =aml_arg (2 ); -Aml *ret =aml_local (0 ); -Aml *aidx =aml_local (1 ); -Aml *params =aml_arg (4 ); - - method =aml_method ("EDSM" ,5 ,AML_SERIALIZED ); - -/* get supported functions */ - ifctx =aml_if (aml_equal (func, zero)); - { -/* 1: have supported functions */ -/* 7: support for function 7 */ -const uint8_t caps =1 |BIT (7 ); -build_append_pci_dsm_func0_common (ifctx, ret); -aml_append (ifctx,aml_store (aml_int (caps),aml_index (ret, zero))); -aml_append (ifctx,aml_return (ret)); - } -aml_append (method, ifctx); - -/* handle specific functions requests */ -/* -* PCI Firmware Specification 3.1 -* 4.6.7. _DSM for Naming a PCI or PCI Express Device Under -* Operating Systems -*/ - ifctx =aml_if (aml_equal (func,aml_int (7 ))); - { -Aml *pkg =aml_package (2 ); -aml_append (pkg, zero); -/* optional, if not impl. should return null string */ -aml_append (pkg,aml_string ("%s" ,"" )); -aml_append (ifctx,aml_store (pkg, ret)); - -/* -* IASL is fine when initializing Package with computational data, -* however it makes guest unhappy /it fails to process such AML/. -* So use runtime assignment to set acpi-index after initializer -* to make OSPM happy. -*/ -aml_append (ifctx, -aml_store (aml_derefof (aml_index (params,aml_int (0 ))), aidx)); -aml_append (ifctx,aml_store (aidx,aml_index (ret, zero))); -aml_append (ifctx,aml_return (ret)); - } -aml_append (method, ifctx); - -return method; -} -/* * build_prt - Define interrupt routing rules *
Re: [PATCH v3 16/29] hw/i386/acpi-build: Move aml_pci_edsm to a generic place
Hi Igor, Jonathan,
Quoted 6 lines · Igor Mammedov
Quoted 3 lines · On Fri, 20 Jun 2025 10:19:36 +0100 Jonathan Cameron…
On Mon, 16 Jun 2025 11:46:45 +0200
Eric Auger <[email protected]> wrote:
Quoted 8 lines
Quoted 7 lines
Quoted 4 lines
Move
aml_pci_edsmtopci-bridge.csince we want to reuse that for ARM and acpi-index support.Signed-off-by Eric Auger <[email protected]>A request for a bit of documentation inline.
aml_pci_edsm()sounds like we should be able to grep the spec for edsm and find it but that's just internal method naming in qemu.agree,
aml_prefix is typically reserved for ACPI spec items.
renamed into build_pci_bridge_edsm()
Thanks
Eric
Quoted 165 lines
perhaps rename it to follow
build_prefix scheme?Quoted 162 lines
More interesting is I don't think this will ever be called as
the kernel has no idea how to call it and unlike on x86 the
blobs don't show wrapping the call in a_DSM()(seeaml_pci_static_endpoint_dsm())Did EDSM usage get dropped as this set evolved leaving this behind?
Quoted 26 lines
---
v2 -> v3:
- move topci-bridge.cinstead ofpcihp.c(Igor)--- include/hw/acpi/pci.h | 1 + hw/acpi/pci-bridge.c | 54 +++++++++++++++++++++++++++++++++++++++++++ hw/i386/acpi-build.c | 53 ------------------------------------------ 3 files changed, 55 insertions(+), 53 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 *aml_pci_edsm (void );#endif hw/acpi/pci-bridge.c +0
-0hw/acpi/pci-bridge.c void build_pci_bridge_aml(AcpiDevAmlIf *adev, Aml *scope) · line 39
Quoted 5 lines
hw/acpi/pci-bridge.c +2
-0@@ -35,3 +35,57 @@ void build_pci_bridge_aml(AcpiDevAmlIf *adev, Aml *scope) } } } + +Aml *aml_pci_edsm (void )Can we have some comments, or a more descriptive name than the resulting method name? There is stuff in the function obviously that associates it with the naming DSM but given this is moving to generic code maybe it needs a brief intro comment?
Quoted 116 lines
hw/acpi/pci-bridge.c +52
-0+{ +Aml *method, *ifctx; +Aml *zero =aml_int (0 ); +Aml *func =aml_arg (2 ); +Aml *ret =aml_local (0 ); +Aml *aidx =aml_local (1 ); +Aml *params =aml_arg (4 ); + + method =aml_method ("EDSM" ,5 ,AML_SERIALIZED ); + +/* get supported functions */ + ifctx =aml_if (aml_equal (func, zero)); + { +/* 1: have supported functions */ +/* 7: support for function 7 */ +const uint8_t caps =1 |BIT (7 ); +build_append_pci_dsm_func0_common (ifctx, ret); +aml_append (ifctx,aml_store (aml_int (caps),aml_index (ret, zero))); +aml_append (ifctx,aml_return (ret)); + } +aml_append (method, ifctx); + +/* handle specific functions requests */ +/* +* PCI Firmware Specification 3.1 +* 4.6.7. _DSM for Naming a PCI or PCI Express Device Under +* Operating Systems +*/ + ifctx =aml_if (aml_equal (func,aml_int (7 ))); + { +Aml *pkg =aml_package (2 ); +aml_append (pkg, zero); +/* optional, if not impl. should return null string */ +aml_append (pkg,aml_string ("%s" ,"" )); +aml_append (ifctx,aml_store (pkg, ret)); + +/* +* IASL is fine when initializing Package with computational data, +* however it makes guest unhappy /it fails to process such AML/. +* So use runtime assignment to set acpi-index after initializer +* to make OSPM happy. +*/ +aml_append (ifctx, +aml_store (aml_derefof (aml_index (params,aml_int (0 ))), aidx)); +aml_append (ifctx,aml_store (aidx,aml_index (ret, zero))); +aml_append (ifctx,aml_return (ret)); + } +aml_append (method, ifctx); + +return method; +} +hw/i386/acpi-build.c +0
-53@@ -338,59 +338,6 @@ build_facs(GArray *table_data)g_array_append_vals (table_data, reserved,40 );/* Reserved */ } -static Aml *aml_pci_edsm (void ) -{ -Aml *method, *ifctx; -Aml *zero =aml_int (0 ); -Aml *func =aml_arg (2 ); -Aml *ret =aml_local (0 ); -Aml *aidx =aml_local (1 ); -Aml *params =aml_arg (4 ); - - method =aml_method ("EDSM" ,5 ,AML_SERIALIZED ); - -/* get supported functions */ - ifctx =aml_if (aml_equal (func, zero)); - { -/* 1: have supported functions */ -/* 7: support for function 7 */ -const uint8_t caps =1 |BIT (7 ); -build_append_pci_dsm_func0_common (ifctx, ret); -aml_append (ifctx,aml_store (aml_int (caps),aml_index (ret, zero))); -aml_append (ifctx,aml_return (ret)); - } -aml_append (method, ifctx); - -/* handle specific functions requests */ -/* -* PCI Firmware Specification 3.1 -* 4.6.7. _DSM for Naming a PCI or PCI Express Device Under -* Operating Systems -*/ - ifctx =aml_if (aml_equal (func,aml_int (7 ))); - { -Aml *pkg =aml_package (2 ); -aml_append (pkg, zero); -/* optional, if not impl. should return null string */ -aml_append (pkg,aml_string ("%s" ,"" )); -aml_append (ifctx,aml_store (pkg, ret)); - -/* -* IASL is fine when initializing Package with computational data, -* however it makes guest unhappy /it fails to process such AML/. -* So use runtime assignment to set acpi-index after initializer -* to make OSPM happy. -*/ -aml_append (ifctx, -aml_store (aml_derefof (aml_index (params,aml_int (0 ))), aidx)); -aml_append (ifctx,aml_store (aidx,aml_index (ret, zero))); -aml_append (ifctx,aml_return (ret)); - } -aml_append (method, ifctx); - -return method; -} -/* * build_prt - Define interrupt routing rules *
PATCH v3 17/29 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.
---
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/arm/virt-acpi-build.c | 22 ++++++++++++++++++++++ hw/arm/virt.c | 2 ++ hw/arm/Kconfig | 2 ++ 5 files changed, 29 insertions(+)
include/hw/acpi/pcihp.h +2 -0
@@ -38,6 +38,8 @@#define ACPI_PCIHP_SEJ_BASE 0x8#define ACPI_PCIHP_BNMR_BASE 0x10 +#define ACPI_PCIHP_SIZE 0x0018 + typedef struct AcpiPciHpPciStatus { uint32_t up; uint32_t down;
include/hw/arm/virt.h +1 -0
@@ -79,6 +79,7 @@ enum {VIRT_ACPI_GED ,VIRT_NVDIMM_ACPI ,VIRT_PVTIME , +VIRT_ACPI_PCIHP , VIRT_LOWMEMMAP_LAST, };
hw/arm/virt-acpi-build.c +22 -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"
@@ -809,6 +810,8 @@ static void build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) {VirtMachineClass *vmc =VIRT_MACHINE_GET_CLASS (vms); +AcpiGedState *acpi_ged_state =ACPI_GED (vms->acpi_dev); +AcpiPciHpState *pcihp_state = &acpi_ged_state->pcihp_state;Aml *scope, *dsdt;MachineState *ms =MACHINE (vms);const MemMapEntry *memmap = vms->memmap;
@@ -868,6 +871,25 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)aml_append (dsdt, scope); +if (pcihp_state->use_acpi_hotplug_bridge) { +Aml *pci0_scope =aml_scope ("\\_SB.PCI0" ); + +aml_append (pci0_scope,aml_pci_edsm ()); +build_acpi_pci_hotplug (dsdt,AML_SYSTEM_MEMORY , + memmap[VIRT_ACPI_PCIHP ].base); +build_append_pcihp_resources (pci0_scope, + memmap[VIRT_ACPI_PCIHP ].base, + memmap[VIRT_ACPI_PCIHP ].size); + +/* Scan all PCI buses. Generate tables to support hotplug. */ +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); + } +build_append_notification_callback (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/virt.c +2 -0
@@ -75,6 +75,7 @@#include "standard-headers/linux/input.h" #include "hw/arm/smmuv3.h" #include "hw/acpi/acpi.h" +#include "hw/acpi/pcihp.h" #include "target/arm/cpu-qom.h" #include "target/arm/internals.h" #include "target/arm/multiprocessing.h"
@@ -183,6 +184,7 @@ static const MemMapEntry base_memmap[] = { [VIRT_NVDIMM_ACPI] = { 0x09090000, NVDIMM_ACPI_IO_LEN}, [VIRT_PVTIME] = { 0x090a0000, 0x00010000 }, [VIRT_SECURE_GPIO] = { 0x090b0000, 0x00001000 }, + [VIRT_ACPI_PCIHP] = { 0x090c0000, ACPI_PCIHP_SIZE }, [VIRT_MMIO] = { 0x0a000000, 0x00000200 }, /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */ [VIRT_PLATFORM_BUS] = { 0x0c000000, 0x02000000 },
hw/arm/Kconfig +2 -0
@@ -34,6 +34,8 @@ config ARM_VIRT select ACPI_HW_REDUCED select ACPI_APEI select ACPI_VIOT + select ACPI_PCIHP + select ACPI_PCI_BRIDGE select VIRTIO_MEM_SUPPORTED select ACPI_CXL select ACPI_HMAT
Signature · 1 line
2.49.0
Re: [PATCH v3 17/29] hw/arm/virt-acpi-build: Modify the DSDT ACPI table to enable ACPI PCI hotplug
Quoted 8 lines · On Mon, 16 Jun 2025 11:46:46 +0200 Eric Auger <[email protected]> wrote:
Modify the DSDT ACPI table to enable ACPI PCI hotplug.
Signed-off-by Eric Auger <[email protected]>---
v2 -> v3:
- useACPI_PCIHP_SIZEinstead of0x1000(Igor)
- usecihp_state->use_acpi_hotplug_bridge
pcihp_state
Takes a bit of searching to find the various bits of the same support on x86 but this seems to match up. Exactly when things are built does vary but not I think in a way that matters. e.g. I think on x86 the EDSM stuff is built whether or not we have pcihp enabled whereas here you've made it conditional on using acpi hp. Perhaps a tiny bit more description on that would be useful if you do a v4?
Quoted 80 lines
--- include/hw/acpi/pcihp.h | 2 ++ include/hw/arm/virt.h | 1 + hw/arm/virt-acpi-build.c | 22 ++++++++++++++++++++++ hw/arm/virt.c | 2 ++ hw/arm/Kconfig | 2 ++ 5 files changed, 29 insertions(+)include/hw/acpi/pcihp.h +2
-0@@ -38,6 +38,8 @@#define ACPI_PCIHP_SEJ_BASE 0x8#define ACPI_PCIHP_BNMR_BASE 0x10 +#define ACPI_PCIHP_SIZE 0x0018 + typedef struct AcpiPciHpPciStatus { uint32_t up; uint32_t down;include/hw/arm/virt.h +1
-0@@ -79,6 +79,7 @@ enum {VIRT_ACPI_GED ,VIRT_NVDIMM_ACPI ,VIRT_PVTIME , +VIRT_ACPI_PCIHP , VIRT_LOWMEMMAP_LAST, };hw/arm/virt-acpi-build.c +22
-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" @@ -809,6 +810,8 @@ static void build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) {VirtMachineClass *vmc =VIRT_MACHINE_GET_CLASS (vms); +AcpiGedState *acpi_ged_state =ACPI_GED (vms->acpi_dev); +AcpiPciHpState *pcihp_state = &acpi_ged_state->pcihp_state;Aml *scope, *dsdt;MachineState *ms =MACHINE (vms);const MemMapEntry *memmap = vms->memmap;@@ -868,6 +871,25 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)aml_append (dsdt, scope); +if (pcihp_state->use_acpi_hotplug_bridge) { +Aml *pci0_scope =aml_scope ("\\_SB.PCI0" ); + +aml_append (pci0_scope,aml_pci_edsm ()); +build_acpi_pci_hotplug (dsdt,AML_SYSTEM_MEMORY , + memmap[VIRT_ACPI_PCIHP ].base); +build_append_pcihp_resources (pci0_scope, + memmap[VIRT_ACPI_PCIHP ].base, + memmap[VIRT_ACPI_PCIHP ].size); + +/* Scan all PCI buses. Generate tables to support hotplug. */ +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); + } +build_append_notification_callback (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);
Re: [PATCH v3 17/29] hw/arm/virt-acpi-build: Modify the DSDT ACPI table to enable ACPI PCI hotplug
Quoted 14 lines · On Fri, 20 Jun 2025 10:35:38 +0100 Jonathan Cameron…
Quoted 8 lines · On Mon, 16 Jun 2025 11:46:46 +0200 Eric Auger <[email protected]> wrote:
Modify the DSDT ACPI table to enable ACPI PCI hotplug.
Signed-off-by Eric Auger <[email protected]>---
v2 -> v3:
- useACPI_PCIHP_SIZEinstead of0x1000(Igor)
- usecihp_state->use_acpi_hotplug_bridge
pcihp_state
Quoted 8 lines
Takes a bit of searching to find the various bits of the same support on x86 but this seems to match up. Exactly when things are built does vary but not I think in a way that matters. e.g. I think on x86 the EDSM stuff is built whether or not we have pcihp enabled whereas here you've made it conditional on using acpi hp. Perhaps a tiny bit more description on that would be useful if you do a v4?
edsm should be built regardless of pcihp
(well intention was there, whether I messed it up or not I don't know)
idea is that non hotplug ports can have a static acpi-index, so it doesn't depend on pcihp.
Quoted 85 lines
Reviewed-by Jonathan Cameron <[email protected]>Quoted 80 lines
--- include/hw/acpi/pcihp.h | 2 ++ include/hw/arm/virt.h | 1 + hw/arm/virt-acpi-build.c | 22 ++++++++++++++++++++++ hw/arm/virt.c | 2 ++ hw/arm/Kconfig | 2 ++ 5 files changed, 29 insertions(+)include/hw/acpi/pcihp.h +2
-0@@ -38,6 +38,8 @@#define ACPI_PCIHP_SEJ_BASE 0x8#define ACPI_PCIHP_BNMR_BASE 0x10 +#define ACPI_PCIHP_SIZE 0x0018 + typedef struct AcpiPciHpPciStatus { uint32_t up; uint32_t down;include/hw/arm/virt.h +1
-0@@ -79,6 +79,7 @@ enum {VIRT_ACPI_GED ,VIRT_NVDIMM_ACPI ,VIRT_PVTIME , +VIRT_ACPI_PCIHP , VIRT_LOWMEMMAP_LAST, };hw/arm/virt-acpi-build.c +22
-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" @@ -809,6 +810,8 @@ static void build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) {VirtMachineClass *vmc =VIRT_MACHINE_GET_CLASS (vms); +AcpiGedState *acpi_ged_state =ACPI_GED (vms->acpi_dev); +AcpiPciHpState *pcihp_state = &acpi_ged_state->pcihp_state;Aml *scope, *dsdt;MachineState *ms =MACHINE (vms);const MemMapEntry *memmap = vms->memmap;@@ -868,6 +871,25 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)aml_append (dsdt, scope); +if (pcihp_state->use_acpi_hotplug_bridge) { +Aml *pci0_scope =aml_scope ("\\_SB.PCI0" ); + +aml_append (pci0_scope,aml_pci_edsm ()); +build_acpi_pci_hotplug (dsdt,AML_SYSTEM_MEMORY , + memmap[VIRT_ACPI_PCIHP ].base); +build_append_pcihp_resources (pci0_scope, + memmap[VIRT_ACPI_PCIHP ].base, + memmap[VIRT_ACPI_PCIHP ].size); + +/* Scan all PCI buses. Generate tables to support hotplug. */ +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); + } +build_append_notification_callback (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);
Re: [PATCH v3 17/29] hw/arm/virt-acpi-build: Modify the DSDT ACPI table to enable ACPI PCI hotplug
Quoted 26 lines · On Fri, 20 Jun 2025 14:38:22 +0200 Igor Mammedov <[email protected]> wrote:
Quoted 14 lines · On Fri, 20 Jun 2025 10:35:38 +0100 Jonathan Cameron…
Quoted 8 lines · On Mon, 16 Jun 2025 11:46:46 +0200 Eric Auger <[email protected]> wrote:
Modify the DSDT ACPI table to enable ACPI PCI hotplug.
Signed-off-by Eric Auger <[email protected]>---
v2 -> v3:
- useACPI_PCIHP_SIZEinstead of0x1000(Igor)
- usecihp_state->use_acpi_hotplug_bridge
pcihp_stateQuoted 8 lines
Takes a bit of searching to find the various bits of the same support on x86 but this seems to match up. Exactly when things are built does vary but not I think in a way that matters. e.g. I think on x86 the EDSM stuff is built whether or not we have pcihp enabled whereas here you've made it conditional on using acpi hp. Perhaps a tiny bit more description on that would be useful if you do a v4?
Quoted 5 lines
edsm should be built regardless of pcihp
(well intention was there, whether I messed it up or not I don't know)idea is that non hotplug ports can have a static acpi-index, so it doesn't depend on pcihp.
That makes sense - so here should that edsm feature be enabled whether or not we have pcihp_state->use_acpi_hotplug_bridge == true
i.e. is it really a separate thing from the rest of this series?
Thanks,
J
Quoted 88 lines
Quoted 86 lines
Reviewed-by Jonathan Cameron <[email protected]>Quoted 80 lines
--- include/hw/acpi/pcihp.h | 2 ++ include/hw/arm/virt.h | 1 + hw/arm/virt-acpi-build.c | 22 ++++++++++++++++++++++ hw/arm/virt.c | 2 ++ hw/arm/Kconfig | 2 ++ 5 files changed, 29 insertions(+)include/hw/acpi/pcihp.h +2
-0@@ -38,6 +38,8 @@#define ACPI_PCIHP_SEJ_BASE 0x8#define ACPI_PCIHP_BNMR_BASE 0x10 +#define ACPI_PCIHP_SIZE 0x0018 + typedef struct AcpiPciHpPciStatus { uint32_t up; uint32_t down;include/hw/arm/virt.h +1
-0@@ -79,6 +79,7 @@ enum {VIRT_ACPI_GED ,VIRT_NVDIMM_ACPI ,VIRT_PVTIME , +VIRT_ACPI_PCIHP , VIRT_LOWMEMMAP_LAST, };hw/arm/virt-acpi-build.c +22
-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" @@ -809,6 +810,8 @@ static void build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) {VirtMachineClass *vmc =VIRT_MACHINE_GET_CLASS (vms); +AcpiGedState *acpi_ged_state =ACPI_GED (vms->acpi_dev); +AcpiPciHpState *pcihp_state = &acpi_ged_state->pcihp_state;Aml *scope, *dsdt;MachineState *ms =MACHINE (vms);const MemMapEntry *memmap = vms->memmap;@@ -868,6 +871,25 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)aml_append (dsdt, scope); +if (pcihp_state->use_acpi_hotplug_bridge) { +Aml *pci0_scope =aml_scope ("\\_SB.PCI0" ); + +aml_append (pci0_scope,aml_pci_edsm ()); +build_acpi_pci_hotplug (dsdt,AML_SYSTEM_MEMORY , + memmap[VIRT_ACPI_PCIHP ].base); +build_append_pcihp_resources (pci0_scope, + memmap[VIRT_ACPI_PCIHP ].base, + memmap[VIRT_ACPI_PCIHP ].size); + +/* Scan all PCI buses. Generate tables to support hotplug. */ +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); + } +build_append_notification_callback (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);
Re: [PATCH v3 17/29] hw/arm/virt-acpi-build: Modify the DSDT ACPI table to enable ACPI PCI hotplug
Hi Igor, Jonathan,
Quoted 30 lines · Jonathan Cameron
Quoted 27 lines · On Fri, 20 Jun 2025 14:38:22 +0200 Igor Mammedov <[email protected]> wrote:
Quoted 13 lines · On Fri, 20 Jun 2025 10:35:38 +0100 Jonathan Cameron…
Quoted 8 lines · On Mon, 16 Jun 2025 11:46:46 +0200 Eric Auger <[email protected]> wrote:
Modify the DSDT ACPI table to enable ACPI PCI hotplug.
Signed-off-by Eric Auger <[email protected]>---
v2 -> v3:
- useACPI_PCIHP_SIZEinstead of0x1000(Igor)
- usecihp_state->use_acpi_hotplug_bridge
pcihp_stateQuoted 8 lines
Takes a bit of searching to find the various bits of the same support on x86 but this seems to match up. Exactly when things are built does vary but not I think in a way that matters. e.g. I think on x86 the EDSM stuff is built whether or not we have pcihp enabled whereas here you've made it conditional on using acpi hp. Perhaps a tiny bit more description on that would be useful if you do a v4?
edsm should be built regardless of pcihp
(well intention was there, whether I messed it up or not I don't know)
Quoted 6 lines
Quoted 2 lines
idea is that non hotplug ports can have a static acpi-index, so it doesn't depend on pcihp.
That makes sense - so here should that edsm feature be enabled whether or not we have
pcihp_state->use_acpi_hotplug_bridge== truei.e. is it really a separate thing from the rest of this series?
Further studying this comment,
EDSM is invoked by code generated in aml_pci_static_endpoint_dsm() whcih itself is invoked by build_append_pci_bus_devices()
So to me it means that if we generate edsm unconditionally we also need to call the following block unconditionnally
+ 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);
+ }
which seems to be done that way in hw/i386/acpi-build.c/build_dsdt()
Igor, if I recall correctly you said that addition changes related to "S%.02X" could change the guest ABI. And in that case this wouldn't be guarded by any new option/compat. So that's annoying.
By the way I tested static acpi-index on ARM with resulting code and it does not not seem to work - maybe I try with a wrong topology though (pcie root port + virtio-net acpi-index)-. I have not checked on x86 yet.
So I wonder if it makes sense to do that refinement now. Maybe we can check try to improve that afterwards?
What do you think?
Eric
Quoted 89 lines
Thanks,
J
Quoted 85 lines
Quoted 84 lines
Reviewed-by Jonathan Cameron <[email protected]>Quoted 80 lines
--- include/hw/acpi/pcihp.h | 2 ++ include/hw/arm/virt.h | 1 + hw/arm/virt-acpi-build.c | 22 ++++++++++++++++++++++ hw/arm/virt.c | 2 ++ hw/arm/Kconfig | 2 ++ 5 files changed, 29 insertions(+)include/hw/acpi/pcihp.h +2
-0@@ -38,6 +38,8 @@#define ACPI_PCIHP_SEJ_BASE 0x8#define ACPI_PCIHP_BNMR_BASE 0x10 +#define ACPI_PCIHP_SIZE 0x0018 + typedef struct AcpiPciHpPciStatus { uint32_t up; uint32_t down;include/hw/arm/virt.h +1
-0@@ -79,6 +79,7 @@ enum {VIRT_ACPI_GED ,VIRT_NVDIMM_ACPI ,VIRT_PVTIME , +VIRT_ACPI_PCIHP , VIRT_LOWMEMMAP_LAST, };hw/arm/virt-acpi-build.c +22
-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" @@ -809,6 +810,8 @@ static void build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) {VirtMachineClass *vmc =VIRT_MACHINE_GET_CLASS (vms); +AcpiGedState *acpi_ged_state =ACPI_GED (vms->acpi_dev); +AcpiPciHpState *pcihp_state = &acpi_ged_state->pcihp_state;Aml *scope, *dsdt;MachineState *ms =MACHINE (vms);const MemMapEntry *memmap = vms->memmap;@@ -868,6 +871,25 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)aml_append (dsdt, scope); +if (pcihp_state->use_acpi_hotplug_bridge) { +Aml *pci0_scope =aml_scope ("\\_SB.PCI0" ); + +aml_append (pci0_scope,aml_pci_edsm ()); +build_acpi_pci_hotplug (dsdt,AML_SYSTEM_MEMORY , + memmap[VIRT_ACPI_PCIHP ].base); +build_append_pcihp_resources (pci0_scope, + memmap[VIRT_ACPI_PCIHP ].base, + memmap[VIRT_ACPI_PCIHP ].size); + +/* Scan all PCI buses. Generate tables to support hotplug. */ +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); + } +build_append_notification_callback (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);
Re: [PATCH v3 17/29] hw/arm/virt-acpi-build: Modify the DSDT ACPI table to enable ACPI PCI hotplug
Hi Igor,
Quoted 56 lines · Eric Auger
Hi Igor, Jonathan,
Quoted 30 lines · Jonathan Cameron
Quoted 27 lines · On Fri, 20 Jun 2025 14:38:22 +0200 Igor Mammedov <[email protected]> wrote:
Quoted 13 lines · On Fri, 20 Jun 2025 10:35:38 +0100 Jonathan Cameron…
Quoted 8 lines · On Mon, 16 Jun 2025 11:46:46 +0200 Eric Auger <[email protected]> wrote:
Modify the DSDT ACPI table to enable ACPI PCI hotplug.
Signed-off-by Eric Auger <[email protected]>---
v2 -> v3:
- useACPI_PCIHP_SIZEinstead of0x1000(Igor)
- usecihp_state->use_acpi_hotplug_bridge
pcihp_stateQuoted 8 lines
Takes a bit of searching to find the various bits of the same support on x86 but this seems to match up. Exactly when things are built does vary but not I think in a way that matters. e.g. I think on x86 the EDSM stuff is built whether or not we have pcihp enabled whereas here you've made it conditional on using acpi hp. Perhaps a tiny bit more description on that would be useful if you do a v4?
edsm should be built regardless of pcihp
(well intention was there, whether I messed it up or not I don't know)Quoted 6 lines
Quoted 2 lines
idea is that non hotplug ports can have a static acpi-index, so it doesn't depend on pcihp.
That makes sense - so here should that edsm feature be enabled whether or not we have
pcihp_state->use_acpi_hotplug_bridge== truei.e. is it really a separate thing from the rest of this series?
Further studying this comment,
EDSM is invoked by code generated in
aml_pci_static_endpoint_dsm()whcih itself is invoked bybuild_append_pci_bus_devices()So to me it means that if we generate edsm unconditionally we also need to call the following block unconditionnally
+
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);
+ }which seems to be done that way in hw/i386/acpi-build.c/build_dsdt()
Quoted 7 lines
Igor, if I recall correctly you said that addition changes related to "S%.02X" could change the guest ABI. And in that case this wouldn't be guarded by any new option/compat. So that's annoying.
By the way I tested static acpi-index on ARM with resulting code and it does not not seem to work - maybe I try with a wrong topology though (pcie root port + virtio-net acpi-index)-. I have not checked on x86 yet.
I tested on x86 and if you turn off acpi pci hotplug by setting -global ICH9-LPC.acpi-pci-hotplug-with-bridge-support=off and you statically instantiate a virtio-net-pci device on a pcie root port with ,acpi-index=3, acpi-index does not work either. guest exposes enp5s0.
if you remove the global prop setting (acpi pcihp enabled by default), guest exposes eno3.
so static acpi-index also seems to be dependent on acpi-pcihp on x86.
So I intend to leave the code as is with edsm added within the acpi_pcihp conditional block. It is also simpler in terms of ref blob and most importantly with regards to compat handling.
Thanks
Eric
Quoted 100 lines
So I wonder if it makes sense to do that refinement now. Maybe we can check try to improve that afterwards?
What do you think?
Eric
Quoted 89 lines
Thanks,
J
Quoted 85 lines
Quoted 84 lines
Reviewed-by Jonathan Cameron <[email protected]>Quoted 80 lines
--- include/hw/acpi/pcihp.h | 2 ++ include/hw/arm/virt.h | 1 + hw/arm/virt-acpi-build.c | 22 ++++++++++++++++++++++ hw/arm/virt.c | 2 ++ hw/arm/Kconfig | 2 ++ 5 files changed, 29 insertions(+)include/hw/acpi/pcihp.h +2
-0@@ -38,6 +38,8 @@#define ACPI_PCIHP_SEJ_BASE 0x8#define ACPI_PCIHP_BNMR_BASE 0x10 +#define ACPI_PCIHP_SIZE 0x0018 + typedef struct AcpiPciHpPciStatus { uint32_t up; uint32_t down;include/hw/arm/virt.h +1
-0@@ -79,6 +79,7 @@ enum {VIRT_ACPI_GED ,VIRT_NVDIMM_ACPI ,VIRT_PVTIME , +VIRT_ACPI_PCIHP , VIRT_LOWMEMMAP_LAST, };hw/arm/virt-acpi-build.c +22
-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" @@ -809,6 +810,8 @@ static void build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) {VirtMachineClass *vmc =VIRT_MACHINE_GET_CLASS (vms); +AcpiGedState *acpi_ged_state =ACPI_GED (vms->acpi_dev); +AcpiPciHpState *pcihp_state = &acpi_ged_state->pcihp_state;Aml *scope, *dsdt;MachineState *ms =MACHINE (vms);const MemMapEntry *memmap = vms->memmap;@@ -868,6 +871,25 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)aml_append (dsdt, scope); +if (pcihp_state->use_acpi_hotplug_bridge) { +Aml *pci0_scope =aml_scope ("\\_SB.PCI0" ); + +aml_append (pci0_scope,aml_pci_edsm ()); +build_acpi_pci_hotplug (dsdt,AML_SYSTEM_MEMORY , + memmap[VIRT_ACPI_PCIHP ].base); +build_append_pcihp_resources (pci0_scope, + memmap[VIRT_ACPI_PCIHP ].base, + memmap[VIRT_ACPI_PCIHP ].size); + +/* Scan all PCI buses. Generate tables to support hotplug. */ +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); + } +build_append_notification_callback (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);
Re: [PATCH v3 17/29] hw/arm/virt-acpi-build: Modify the DSDT ACPI table to enable ACPI PCI hotplug
In reply to Igor MammedovQuoted 24 lines · Igor Mammedov
Quoted 13 lines · On Fri, 20 Jun 2025 10:35:38 +0100 Jonathan Cameron…
Quoted 8 lines · On Mon, 16 Jun 2025 11:46:46 +0200 Eric Auger <[email protected]> wrote:
Modify the DSDT ACPI table to enable ACPI PCI hotplug.
Signed-off-by Eric Auger <[email protected]>---
v2 -> v3:
- useACPI_PCIHP_SIZEinstead of0x1000(Igor)
- usecihp_state->use_acpi_hotplug_bridge
pcihp_stateQuoted 8 lines
Takes a bit of searching to find the various bits of the same support on x86 but this seems to match up. Exactly when things are built does vary but not I think in a way that matters. e.g. I think on x86 the EDSM stuff is built whether or not we have pcihp enabled whereas here you've made it conditional on using acpi hp. Perhaps a tiny bit more description on that would be useful if you do a v4?
Quoted 5 lines
edsm should be built regardless of pcihp
(well intention was there, whether I messed it up or not I don't know)idea is that non hotplug ports can have a static acpi-index, so it doesn't depend on pcihp.
OK I can make it unconditional. The drawback is that it will oblige to rebuild reference blobs again with native pci hotplug.
Eric
Quoted 84 lines
Quoted 84 lines
Reviewed-by Jonathan Cameron <[email protected]>Quoted 80 lines
--- include/hw/acpi/pcihp.h | 2 ++ include/hw/arm/virt.h | 1 + hw/arm/virt-acpi-build.c | 22 ++++++++++++++++++++++ hw/arm/virt.c | 2 ++ hw/arm/Kconfig | 2 ++ 5 files changed, 29 insertions(+)include/hw/acpi/pcihp.h +2
-0@@ -38,6 +38,8 @@#define ACPI_PCIHP_SEJ_BASE 0x8#define ACPI_PCIHP_BNMR_BASE 0x10 +#define ACPI_PCIHP_SIZE 0x0018 + typedef struct AcpiPciHpPciStatus { uint32_t up; uint32_t down;include/hw/arm/virt.h +1
-0@@ -79,6 +79,7 @@ enum {VIRT_ACPI_GED ,VIRT_NVDIMM_ACPI ,VIRT_PVTIME , +VIRT_ACPI_PCIHP , VIRT_LOWMEMMAP_LAST, };hw/arm/virt-acpi-build.c +22
-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" @@ -809,6 +810,8 @@ static void build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) {VirtMachineClass *vmc =VIRT_MACHINE_GET_CLASS (vms); +AcpiGedState *acpi_ged_state =ACPI_GED (vms->acpi_dev); +AcpiPciHpState *pcihp_state = &acpi_ged_state->pcihp_state;Aml *scope, *dsdt;MachineState *ms =MACHINE (vms);const MemMapEntry *memmap = vms->memmap;@@ -868,6 +871,25 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)aml_append (dsdt, scope); +if (pcihp_state->use_acpi_hotplug_bridge) { +Aml *pci0_scope =aml_scope ("\\_SB.PCI0" ); + +aml_append (pci0_scope,aml_pci_edsm ()); +build_acpi_pci_hotplug (dsdt,AML_SYSTEM_MEMORY , + memmap[VIRT_ACPI_PCIHP ].base); +build_append_pcihp_resources (pci0_scope, + memmap[VIRT_ACPI_PCIHP ].base, + memmap[VIRT_ACPI_PCIHP ].size); + +/* Scan all PCI buses. Generate tables to support hotplug. */ +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); + } +build_append_notification_callback (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);
Re: [PATCH v3 17/29] hw/arm/virt-acpi-build: Modify the DSDT ACPI table to enable ACPI PCI hotplug
In reply to Eric AugerQuoted 63 lines · On Mon, 16 Jun 2025 11:46:46 +0200 Eric Auger <[email protected]> wrote:
Modify the DSDT ACPI table to enable ACPI PCI hotplug.
Signed-off-by Eric Auger <[email protected]>---
v2 -> v3:
- useACPI_PCIHP_SIZEinstead of0x1000(Igor)
- usecihp_state->use_acpi_hotplug_bridge--- include/hw/acpi/pcihp.h | 2 ++ include/hw/arm/virt.h | 1 + hw/arm/virt-acpi-build.c | 22 ++++++++++++++++++++++ hw/arm/virt.c | 2 ++ hw/arm/Kconfig | 2 ++ 5 files changed, 29 insertions(+)include/hw/acpi/pcihp.h +2
-0@@ -38,6 +38,8 @@#define ACPI_PCIHP_SEJ_BASE 0x8#define ACPI_PCIHP_BNMR_BASE 0x10 +#define ACPI_PCIHP_SIZE 0x0018 + typedef struct AcpiPciHpPciStatus { uint32_t up; uint32_t down;include/hw/arm/virt.h +1
-0@@ -79,6 +79,7 @@ enum {VIRT_ACPI_GED ,VIRT_NVDIMM_ACPI ,VIRT_PVTIME , +VIRT_ACPI_PCIHP , VIRT_LOWMEMMAP_LAST, };hw/arm/virt-acpi-build.c +3
-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" @@ -809,6 +810,8 @@ static void build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) {VirtMachineClass *vmc =VIRT_MACHINE_GET_CLASS (vms); +AcpiGedState *acpi_ged_state =ACPI_GED (vms->acpi_dev); +AcpiPciHpState *pcihp_state = &acpi_ged_state->pcihp_state;Aml *scope, *dsdt;MachineState *ms =MACHINE (vms);const MemMapEntry *memmap = vms->memmap;
hw/arm/virt-acpi-build.c build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) · line 874
Quoted 4 lines
hw/arm/virt-acpi-build.c +1
-0@@ -868,6 +871,25 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)aml_append (dsdt, scope); +if (pcihp_state->use_acpi_hotplug_bridge) {
ditto, use property accessor
Quoted 54 lines
hw/arm/virt-acpi-build.c +18
-0+Aml *pci0_scope =aml_scope ("\\_SB.PCI0" ); + +aml_append (pci0_scope,aml_pci_edsm ()); +build_acpi_pci_hotplug (dsdt,AML_SYSTEM_MEMORY , + memmap[VIRT_ACPI_PCIHP ].base); +build_append_pcihp_resources (pci0_scope, + memmap[VIRT_ACPI_PCIHP ].base, + memmap[VIRT_ACPI_PCIHP ].size); + +/* Scan all PCI buses. Generate tables to support hotplug. */ +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); + } +build_append_notification_callback (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/virt.c +2
-0@@ -75,6 +75,7 @@#include "standard-headers/linux/input.h" #include "hw/arm/smmuv3.h" #include "hw/acpi/acpi.h" +#include "hw/acpi/pcihp.h" #include "target/arm/cpu-qom.h" #include "target/arm/internals.h" #include "target/arm/multiprocessing.h" @@ -183,6 +184,7 @@ static const MemMapEntry base_memmap[] = { [VIRT_NVDIMM_ACPI] = { 0x09090000, NVDIMM_ACPI_IO_LEN}, [VIRT_PVTIME] = { 0x090a0000, 0x00010000 }, [VIRT_SECURE_GPIO] = { 0x090b0000, 0x00001000 }, + [VIRT_ACPI_PCIHP] = { 0x090c0000, ACPI_PCIHP_SIZE }, [VIRT_MMIO] = { 0x0a000000, 0x00000200 }, /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */ [VIRT_PLATFORM_BUS] = { 0x0c000000, 0x02000000 },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
PATCH v3 18/29 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
Re: [PATCH v3 18/29] hw/acpi/ged: Add a bus link property
Quoted 4 lines · On Mon, 16 Jun 2025 11:46:47 +0200 Eric Auger <[email protected]> wrote:
This property will be set by the machine code on the object creation. It will be used by acpi pcihp hotplug code.
Signed-off-by Eric Auger <[email protected]>
Re: [PATCH v3 18/29] hw/acpi/ged: Add a bus link property
In reply to Eric AugerQuoted 4 lines · On Mon, 16 Jun 2025 11:46:47 +0200 Eric Auger <[email protected]> wrote:
This property will be set by the machine code on the object creation. It will be used by acpi pcihp hotplug code.
Signed-off-by Eric Auger <[email protected]>
also with that it's possible to end up with NULL root if someone forgets to wire it up.
I'd add assert somewhere in pcihp.c
so that we wouldn't end up with wounds from too much head scratching if it fails somewhere during runtime.
Quoted 25 lines
--- 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 = {
PATCH v3 19/29 hw/arm/virt: Pass the bus on the ged creation
In reply to Eric AugerThe bus will be needed on ged realize for acpi pci hp setup.
--- hw/arm/virt.c | 1 + 1 file changed, 1 insertion(+)
hw/arm/virt.c +1 -0
@@ -696,6 +696,7 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms) dev =qdev_new (TYPE_ACPI_GED );qdev_prop_set_uint32 (dev,"ged-event" , event); +object_property_set_link (OBJECT (dev),"bus" ,OBJECT (vms->bus), &error_abort);sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , vms->memmap[VIRT_ACPI_GED ].base);
Signature · 1 line
2.49.0
Re: [PATCH v3 19/29] hw/arm/virt: Pass the bus on the ged creation
Quoted 3 lines · On Mon, 16 Jun 2025 11:46:48 +0200 Eric Auger <[email protected]> wrote:
The bus will be needed on ged realize for acpi pci hp setup.
Signed-off-by Eric Auger <[email protected]>
I guess doing this in separate patches for previous and this one maybe makes it easier to backport the previous if someone just wants to enable this on a different arch. Otherwise I'd have smashed them together.
Quoted 16 lines
--- hw/arm/virt.c | 1 + 1 file changed, 1 insertion(+)hw/arm/virt.c +1
-0@@ -696,6 +696,7 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms) dev =qdev_new (TYPE_ACPI_GED );qdev_prop_set_uint32 (dev,"ged-event" , event); +object_property_set_link (OBJECT (dev),"bus" ,OBJECT (vms->bus), &error_abort);sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , vms->memmap[VIRT_ACPI_GED ].base);
Re: [PATCH v3 19/29] hw/arm/virt: Pass the bus on the ged creation
Hi Jonathan,
Quoted 10 lines · Jonathan Cameron
Quoted 3 lines · On Mon, 16 Jun 2025 11:46:48 +0200 Eric Auger <[email protected]> wrote:
The bus will be needed on ged realize for acpi pci hp setup.
Signed-off-by Eric Auger <[email protected]>I guess doing this in separate patches for previous and this one maybe makes it easier to backport the previous if someone just wants to enable this on a different arch. Otherwise I'd have smashed them together.
for me it is also a matter of maintainership/reviewer role separataion, virt and ged being maintained/reviewed by different people. So if you don't mind, I will keep it separate all the more so I collected R-b's on each ;-)
Eric
Quoted 18 lines
Reviewed-by Jonathan Cameron <[email protected]>Quoted 16 lines
--- hw/arm/virt.c | 1 + 1 file changed, 1 insertion(+)hw/arm/virt.c +1
-0@@ -696,6 +696,7 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms) dev =qdev_new (TYPE_ACPI_GED );qdev_prop_set_uint32 (dev,"ged-event" , event); +object_property_set_link (OBJECT (dev),"bus" ,OBJECT (vms->bus), &error_abort);sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , vms->memmap[VIRT_ACPI_GED ].base);
PATCH v3 20/29 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.
---
v2 -> v3:
- pcihp_init and reset are put in ged code instead of machine code (Igor)
v1 -> v2:
- Introduce ACPI_PCIHP_REGION_NAME
--- include/hw/acpi/generic_event_device.h | 4 ++++ hw/acpi/generic_event_device.c | 26 ++++++++++++++++++++++++++ hw/acpi/pcihp.c | 1 - 3 files changed, 30 insertions(+), 1 deletion(-)
include/hw/acpi/generic_event_device.h +4 -0
@@ -102,6 +102,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(AcpiGedState, ACPI_GED)#define ACPI_GED_PWR_DOWN_EVT 0x2#define ACPI_GED_NVDIMM_HOTPLUG_EVT 0x4#define ACPI_GED_CPU_HOTPLUG_EVT 0x8 +#define ACPI_GED_PCI_HOTPLUG_EVT 0x10 typedef struct GEDState { MemoryRegion evt;
@@ -109,6 +110,8 @@ typedef struct GEDState {uint32_t sel; } GEDState; +#define ACPI_PCIHP_REGION_NAME "pcihp container" +struct AcpiGedState {SysBusDevice parent_obj;MemHotplugState memhp_state;
@@ -116,6 +119,7 @@ struct AcpiGedState {CPUHotplugState cpuhp_state;MemoryRegion container_cpuhp;AcpiPciHpState pcihp_state; +MemoryRegion container_pcihp;GEDState ged_state;uint32_t ged_event_bitmap;qemu_irq irq;
hw/acpi/generic_event_device.c +26 -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"
@@ -27,6 +28,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, };/*
@@ -122,6 +124,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[]
@@ -300,6 +308,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);
@@ -433,6 +443,12 @@ 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->pcihp_state.root, &s->container_pcihp,0 ); } ged_events--; }
@@ -474,6 +490,15 @@ static void acpi_ged_initfn(Object *obj)sysbus_init_mmio (sbd, &ged_st->regs); } +static void ged_reset (DeviceState *dev) +{ +AcpiGedState *s =ACPI_GED (dev); + +if (s->pcihp_state.use_acpi_hotplug_bridge) { +acpi_pcihp_reset (&s->pcihp_state); + } +} +static void acpi_ged_class_init (ObjectClass *class,const void *data) {DeviceClass *dc =DEVICE_CLASS (class);
@@ -488,6 +513,7 @@ static void acpi_ged_class_init(ObjectClass *class, const void *data) hc->plug = acpi_ged_device_plug_cb; hc->unplug_request = acpi_ged_unplug_request_cb; hc->unplug = acpi_ged_unplug_cb; +device_class_set_legacy_reset (dc, ged_reset); adevc->ospm_status = acpi_ged_ospm_status; adevc->send_event = acpi_ged_send_event;
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
Signature · 1 line
2.49.0
Re: [PATCH v3 20/29] hw/acpi/ged: Prepare the device to react to PCI hotplug events
Quoted 5 lines · On Mon, 16 Jun 2025 11:46:49 +0200 Eric Auger <[email protected]> wrote:
QEMU will notify the OS about PCI hotplug/hotunplug events through GED interrupts. Let the GED device handle a new PCI hotplug event. On its occurrence it calls the \\_SB.PCI0.PCNT method with the BLCK mutex held.
Quoted 8 lines
The GED device uses a dedicated MMIO region that will be mapped by the machine code.
At this point the GED still does not support PCI device hotplug in its
TYPE_HOTPLUG_HANDLERimplementation. This will come in a subsequent patch.Signed-off-by Eric Auger <[email protected]>
Been a little while since I looked at how all this fits together but this looks right from what I can remember. Hopefully others can give a more definitive review!
One stray change that belongs in an earlier patch though. With that fixed up.
So with that in mind.
hw/acpi/pcihp.c line 46
Quoted 9 lines
hw/acpi/pcihp.c +0
-1@@ -43,7 +43,6 @@#include "qobject/qnum.h" #include "trace.h" -#define ACPI_PCIHP_SIZE 0x0018
It goes away from here, but doesn't get added anywhere?
Looks like this belongs in patch 17?
Quoted 3 lines
hw/acpi/pcihp.c +0
-0#define PCI_UP_BASE 0x0000#define PCI_DOWN_BASE 0x0004#define PCI_EJ_BASE 0x0008
Re: [PATCH v3 20/29] hw/acpi/ged: Prepare the device to react to PCI hotplug events
Quoted 20 lines · Jonathan Cameron
Quoted 5 lines · On Mon, 16 Jun 2025 11:46:49 +0200 Eric Auger <[email protected]> wrote:
QEMU will notify the OS about PCI hotplug/hotunplug events through GED interrupts. Let the GED device handle a new PCI hotplug event. On its occurrence it calls the \\_SB.PCI0.PCNT method with the BLCK mutex held.
Quoted 8 lines
The GED device uses a dedicated MMIO region that will be mapped by the machine code.
At this point the GED still does not support PCI device hotplug in its
TYPE_HOTPLUG_HANDLERimplementation. This will come in a subsequent patch.Signed-off-by Eric Auger <[email protected]>Been a little while since I looked at how all this fits together but this looks right from what I can remember. Hopefully others can give a more definitive review!
Quoted 5 lines
One stray change that belongs in an earlier patch though. With that fixed up.
So with that in mind.
Reviewed-by Jonathan Cameron <[email protected]>
thanks!
Quoted 11 lines
Quoted 11 lines
hw/acpi/pcihp.c +0
-0@@ -43,7 +43,6 @@#include "qobject/qnum.h" #include "trace.h"
Quoted 4 lines
hw/acpi/pcihp.c line 46
Quoted 1 line
hw/acpi/pcihp.c +0
-1-#define ACPI_PCIHP_SIZE 0x0018It goes away from here, but doesn't get added anywhere?
Looks like this belongs in patch 17?
removed from 17!
Eric
Quoted 4 lines
Quoted 4 lines
hw/acpi/pcihp.c +0
-0#define PCI_UP_BASE 0x0000#define PCI_DOWN_BASE 0x0004#define PCI_EJ_BASE 0x0008
Re: [PATCH v3 20/29] hw/acpi/ged: Prepare the device to react to PCI hotplug events
In reply to Eric AugerQuoted 5 lines · On Mon, 16 Jun 2025 11:46:49 +0200 Eric Auger <[email protected]> wrote:
QEMU will notify the OS about PCI hotplug/hotunplug events through GED interrupts. Let the GED device handle a new PCI hotplug event. On its occurrence it calls the \\_SB.PCI0.PCNT method with the BLCK mutex held.
Quoted 7 lines
The GED device uses a dedicated MMIO region that will be mapped by the machine code.
At this point the GED still does not support PCI device hotplug in its
TYPE_HOTPLUG_HANDLERimplementation. This will come in a subsequent patch.
looks out of order, perhaps it should be before this patch
Quoted 136 lines
Signed-off-by Eric Auger <[email protected]>---
v2 -> v3:
-pcihp_initand reset are put in ged code instead of machine code (Igor)v1 -> v2:
- IntroduceACPI_PCIHP_REGION_NAME--- include/hw/acpi/generic_event_device.h | 4 ++++ hw/acpi/generic_event_device.c | 26 ++++++++++++++++++++++++++ hw/acpi/pcihp.c | 1 - 3 files changed, 30 insertions(+), 1 deletion(-)include/hw/acpi/generic_event_device.h +4
-0@@ -102,6 +102,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(AcpiGedState, ACPI_GED)#define ACPI_GED_PWR_DOWN_EVT 0x2#define ACPI_GED_NVDIMM_HOTPLUG_EVT 0x4#define ACPI_GED_CPU_HOTPLUG_EVT 0x8 +#define ACPI_GED_PCI_HOTPLUG_EVT 0x10 typedef struct GEDState { MemoryRegion evt;@@ -109,6 +110,8 @@ typedef struct GEDState {uint32_t sel; } GEDState; +#define ACPI_PCIHP_REGION_NAME "pcihp container" +struct AcpiGedState {SysBusDevice parent_obj;MemHotplugState memhp_state;@@ -116,6 +119,7 @@ struct AcpiGedState {CPUHotplugState cpuhp_state;MemoryRegion container_cpuhp;AcpiPciHpState pcihp_state; +MemoryRegion container_pcihp;GEDState ged_state;uint32_t ged_event_bitmap;qemu_irq irq;hw/acpi/generic_event_device.c +26
-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" @@ -27,6 +28,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, };/* @@ -122,6 +124,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[] @@ -300,6 +308,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);@@ -433,6 +443,12 @@ 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->pcihp_state.root, &s->container_pcihp,0 ); } ged_events--; }@@ -474,6 +490,15 @@ static void acpi_ged_initfn(Object *obj)sysbus_init_mmio (sbd, &ged_st->regs); } +static void ged_reset (DeviceState *dev) +{ +AcpiGedState *s =ACPI_GED (dev); + +if (s->pcihp_state.use_acpi_hotplug_bridge) { +acpi_pcihp_reset (&s->pcihp_state); + } +} +static void acpi_ged_class_init (ObjectClass *class,const void *data) {DeviceClass *dc =DEVICE_CLASS (class);@@ -488,6 +513,7 @@ static void acpi_ged_class_init(ObjectClass *class, const void *data) hc->plug = acpi_ged_device_plug_cb; hc->unplug_request = acpi_ged_unplug_request_cb; hc->unplug = acpi_ged_unplug_cb; +device_class_set_legacy_reset (dc, ged_reset); adevc->ospm_status = acpi_ged_ospm_status; adevc->send_event = acpi_ged_send_event;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
Re: [PATCH v3 20/29] hw/acpi/ged: Prepare the device to react to PCI hotplug events
Quoted 8 lines · Igor Mammedov
Quoted 5 lines · On Mon, 16 Jun 2025 11:46:49 +0200 Eric Auger <[email protected]> wrote:
QEMU will notify the OS about PCI hotplug/hotunplug events through GED interrupts. Let the GED device handle a new PCI hotplug event. On its occurrence it calls the \\_SB.PCI0.PCNT method with the BLCK mutex held.
Quoted 7 lines
Quoted 6 lines
The GED device uses a dedicated MMIO region that will be mapped by the machine code.
At this point the GED still does not support PCI device hotplug in its
TYPE_HOTPLUG_HANDLERimplementation. This will come in a subsequent patch.looks out of order, perhaps it should be before this patch
done, swapped both patches.
Eric
Quoted 136 lines
Quoted 136 lines
Signed-off-by Eric Auger <[email protected]>---
v2 -> v3:
-pcihp_initand reset are put in ged code instead of machine code (Igor)v1 -> v2:
- IntroduceACPI_PCIHP_REGION_NAME--- include/hw/acpi/generic_event_device.h | 4 ++++ hw/acpi/generic_event_device.c | 26 ++++++++++++++++++++++++++ hw/acpi/pcihp.c | 1 - 3 files changed, 30 insertions(+), 1 deletion(-)include/hw/acpi/generic_event_device.h +4
-0@@ -102,6 +102,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(AcpiGedState, ACPI_GED)#define ACPI_GED_PWR_DOWN_EVT 0x2#define ACPI_GED_NVDIMM_HOTPLUG_EVT 0x4#define ACPI_GED_CPU_HOTPLUG_EVT 0x8 +#define ACPI_GED_PCI_HOTPLUG_EVT 0x10 typedef struct GEDState { MemoryRegion evt;@@ -109,6 +110,8 @@ typedef struct GEDState {uint32_t sel; } GEDState; +#define ACPI_PCIHP_REGION_NAME "pcihp container" +struct AcpiGedState {SysBusDevice parent_obj;MemHotplugState memhp_state;@@ -116,6 +119,7 @@ struct AcpiGedState {CPUHotplugState cpuhp_state;MemoryRegion container_cpuhp;AcpiPciHpState pcihp_state; +MemoryRegion container_pcihp;GEDState ged_state;uint32_t ged_event_bitmap;qemu_irq irq;hw/acpi/generic_event_device.c +26
-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" @@ -27,6 +28,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, };/* @@ -122,6 +124,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[] @@ -300,6 +308,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);@@ -433,6 +443,12 @@ 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->pcihp_state.root, &s->container_pcihp,0 ); } ged_events--; }@@ -474,6 +490,15 @@ static void acpi_ged_initfn(Object *obj)sysbus_init_mmio (sbd, &ged_st->regs); } +static void ged_reset (DeviceState *dev) +{ +AcpiGedState *s =ACPI_GED (dev); + +if (s->pcihp_state.use_acpi_hotplug_bridge) { +acpi_pcihp_reset (&s->pcihp_state); + } +} +static void acpi_ged_class_init (ObjectClass *class,const void *data) {DeviceClass *dc =DEVICE_CLASS (class);@@ -488,6 +513,7 @@ static void acpi_ged_class_init(ObjectClass *class, const void *data) hc->plug = acpi_ged_device_plug_cb; hc->unplug_request = acpi_ged_unplug_request_cb; hc->unplug = acpi_ged_unplug_cb; +device_class_set_legacy_reset (dc, ged_reset); adevc->ospm_status = acpi_ged_ospm_status; adevc->send_event = acpi_ged_send_event;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
Re: [PATCH v3 20/29] hw/acpi/ged: Prepare the device to react to PCI hotplug events
In reply to Eric AugerOn Mon, 16 Jun 2025 11:46:49 +0200
Eric Auger <[email protected]> wrote:
[...]
hw/acpi/generic_event_device.c static void acpi_ged_realize(DeviceState *dev, Error **errp) · line 451
Quoted 10 lines
hw/acpi/generic_event_device.c +6
-0@@ -433,6 +443,12 @@ 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->pcihp_state.root, &s->container_pcihp,0 );
bus flow looks weird,
I'd suggest to
* set root bus link on x86 as well for consistency reasons and proper ref accounting
* and then drop 'bus' from acpi_pcihp_init() its arguments
Quoted 3 lines
hw/acpi/generic_event_device.c +0
-0} ged_events--; }
[...]
PATCH v3 21/29 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 -> 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
@@ -18,6 +18,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"
@@ -236,6 +237,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) {
@@ -249,6 +258,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)));
@@ -265,6 +276,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)));
@@ -280,6 +294,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)));
@@ -510,6 +526,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
Re: [PATCH v3 21/29] hw/acpi/ged: Call pcihp plug callbacks in hotplug handler implementation
Quoted 8 lines · On Mon, 16 Jun 2025 11:46:50 +0200 Eric Auger <[email protected]> wrote:
Add PCI device related code in the
TYPE_HOTPLUG_HANDLERimplementation.For a PCI device hotplug/hotunplug event, the code routes to
acpi_pcihp_devicecallbacks (pre_plug_cb,plug_cb,unplug_request_cb,unplug_cb).Signed-off-by Eric Auger <[email protected]>
Re: [PATCH v3 21/29] hw/acpi/ged: Call pcihp plug callbacks in hotplug handler implementation
In reply to Eric AugerQuoted 8 lines · On Mon, 16 Jun 2025 11:46:50 +0200 Eric Auger <[email protected]> wrote:
Add PCI device related code in the
TYPE_HOTPLUG_HANDLERimplementation.For a PCI device hotplug/hotunplug event, the code routes to
acpi_pcihp_devicecallbacks (pre_plug_cb,plug_cb,unplug_request_cb,unplug_cb).Signed-off-by Eric Auger <[email protected]>
I'd put that before 20/29
Quoted 71 lines
---
v2 -> v3:
- remove else block inacpi_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@@ -18,6 +18,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" @@ -236,6 +237,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) {@@ -249,6 +258,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)));@@ -265,6 +276,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)));@@ -280,6 +294,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)));@@ -510,6 +526,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;
PATCH v3 22/29 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 v3 23/29 hw/core/sysbus: Introduce sysbus_mmio_map_name() helper
In reply to Eric AugerSome sysbus devices have conditionnal 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
Re: [PATCH v3 23/29] hw/core/sysbus: Introduce sysbus_mmio_map_name() helper
Quoted 1 line · On Mon, 16 Jun 2025 11:46:52 +0200 Eric Auger <[email protected]> wrote:
Some sysbus devices have conditionnal mmio regions. This
Spell check. conditional
Quoted 8 lines
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.
Signed-off-by Eric Auger <[email protected]>
Nice helper.
Quoted 39 lines
--- 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) {
PATCH v3 24/29 hw/arm/virt: Use a SysBusDevice variable in create_acpi_ged()
In reply to Eric AugerUse an intermediate SysBusDevice variable in create_acpi_ged(). This allows to get rid of multiple SYS_BUS_DEVICE() casts.
--- hw/arm/virt.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
hw/arm/virt.c +6 -4
@@ -683,6 +683,7 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms) {DeviceState *dev;MachineState *ms =MACHINE (vms); +SysBusDevice *sbdev;int irq = vms->irqmap[VIRT_ACPI_GED ];uint32_t event =ACPI_GED_PWR_DOWN_EVT ;
@@ -697,11 +698,12 @@ 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 (sbdev,0 , vms->memmap[VIRT_ACPI_GED ].base); +sysbus_mmio_map (sbdev,1 , vms->memmap[VIRT_PCDIMM_ACPI ].base); +sysbus_connect_irq (sbdev,0 ,qdev_get_gpio_in (vms->gic, irq));return dev; }
Signature · 1 line
2.49.0
Re: [PATCH v3 24/29] hw/arm/virt: Use a SysBusDevice variable in create_acpi_ged()
Quoted 4 lines · On Mon, 16 Jun 2025 11:46:53 +0200 Eric Auger <[email protected]> wrote:
Use an intermediate SysBusDevice variable in
create_acpi_ged(). This allows to get rid of multipleSYS_BUS_DEVICE()casts.Signed-off-by Eric Auger <[email protected]>
PATCH v3 25/29 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
--- include/hw/acpi/generic_event_device.h | 1 + hw/arm/virt.c | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 2 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 +17 -2
@@ -684,6 +684,8 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms)DeviceState *dev;MachineState *ms =MACHINE (vms);SysBusDevice *sbdev; +AcpiGedState *acpi_ged_state; +AcpiPciHpState *pcihp_state;int irq = vms->irqmap[VIRT_ACPI_GED ];uint32_t event =ACPI_GED_PWR_DOWN_EVT ;
@@ -696,13 +698,26 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms) } dev =qdev_new (TYPE_ACPI_GED ); + acpi_ged_state =ACPI_GED (dev); + pcihp_state = &acpi_ged_state->pcihp_state; +if (pcihp_state->use_acpi_hotplug_bridge) { + event |=ACPI_GED_PCI_HOTPLUG_EVT ; + }qdev_prop_set_uint32 (dev,"ged-event" , event);object_property_set_link (OBJECT (dev),"bus" ,OBJECT (vms->bus), &error_abort); sbdev =SYS_BUS_DEVICE (dev);sysbus_realize_and_unref (sbdev, &error_fatal); -sysbus_mmio_map (sbdev,0 , vms->memmap[VIRT_ACPI_GED ].base); -sysbus_mmio_map (sbdev,1 , vms->memmap[VIRT_PCDIMM_ACPI ].base); +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); +if (pcihp_state->use_acpi_hotplug_bridge) { +int pcihp_region_index; + + pcihp_region_index =sysbus_mmio_map_name (sbdev,ACPI_PCIHP_REGION_NAME , + vms->memmap[VIRT_ACPI_PCIHP ].base); +assert (pcihp_region_index >=0 ); + }sysbus_connect_irq (sbdev,0 ,qdev_get_gpio_in (vms->gic, irq));return dev;
Signature · 1 line
2.49.0
Re: [PATCH v3 25/29] hw/arm/virt: Let virt support pci hotplug/unplug GED event
Quoted 9 lines · On Mon, 16 Jun 2025 11:46:54 +0200 Eric Auger <[email protected]> wrote:
Set up the IO registers used to communicate between QEMU and ACPI.
Signed-off-by Eric Auger <[email protected]>---
v2 -> v3:
- removeacpi_ged_state->pcihp_state.use_acpi_hotplug_bridge= true;
- usesysbus_mmio_map_namefor all regs (Igor)
I'm very much in favor of this change but maybe break them out to a separate patch - perhaps even one that can run ahead of the rest of this series?
Mind you if this is going to land shortly perhaps not worth the bother.
Either way
Quoted 63 lines
-
create_pcieleft at its original placev1 -> v2:
- useACPI_PCIHP_REGION_NAME--- include/hw/acpi/generic_event_device.h | 1 + hw/arm/virt.c | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 2 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 +17
-2@@ -684,6 +684,8 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms)DeviceState *dev;MachineState *ms =MACHINE (vms);SysBusDevice *sbdev; +AcpiGedState *acpi_ged_state; +AcpiPciHpState *pcihp_state;int irq = vms->irqmap[VIRT_ACPI_GED ];uint32_t event =ACPI_GED_PWR_DOWN_EVT ;@@ -696,13 +698,26 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms) } dev =qdev_new (TYPE_ACPI_GED ); + acpi_ged_state =ACPI_GED (dev); + pcihp_state = &acpi_ged_state->pcihp_state; +if (pcihp_state->use_acpi_hotplug_bridge) { + event |=ACPI_GED_PCI_HOTPLUG_EVT ; + }qdev_prop_set_uint32 (dev,"ged-event" , event);object_property_set_link (OBJECT (dev),"bus" ,OBJECT (vms->bus), &error_abort); sbdev =SYS_BUS_DEVICE (dev);sysbus_realize_and_unref (sbdev, &error_fatal); -sysbus_mmio_map (sbdev,0 , vms->memmap[VIRT_ACPI_GED ].base); -sysbus_mmio_map (sbdev,1 , vms->memmap[VIRT_PCDIMM_ACPI ].base); +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); +if (pcihp_state->use_acpi_hotplug_bridge) { +int pcihp_region_index; + + pcihp_region_index =sysbus_mmio_map_name (sbdev,ACPI_PCIHP_REGION_NAME , + vms->memmap[VIRT_ACPI_PCIHP ].base); +assert (pcihp_region_index >=0 ); + }sysbus_connect_irq (sbdev,0 ,qdev_get_gpio_in (vms->gic, irq));return dev;
Re: [PATCH v3 25/29] hw/arm/virt: Let virt support pci hotplug/unplug GED event
Hi Jonathan,
Quoted 8 lines · Jonathan Cameron
Quoted 5 lines · On Mon, 16 Jun 2025 11:46:54 +0200 Eric Auger <[email protected]> wrote:
Set up the IO registers used to communicate between QEMU and ACPI.
Signed-off-by Eric Auger <[email protected]>
Quoted 7 lines
Quoted 4 lines
---
v2 -> v3:
- removeacpi_ged_state->pcihp_state.use_acpi_hotplug_bridge= true;
- usesysbus_mmio_map_namefor all regs (Igor)I'm very much in favor of this change but maybe break them out to a separate patch - perhaps even one that can run ahead of the rest of this series?
I split it in a separate patch.
Thanks!
Eric
Quoted 71 lines
Mind you if this is going to land shortly perhaps not worth the bother.
Either way
Reviewed-by Jonathan Cameron <[email protected]>Quoted 63 lines
-
create_pcieleft at its original placev1 -> v2:
- useACPI_PCIHP_REGION_NAME--- include/hw/acpi/generic_event_device.h | 1 + hw/arm/virt.c | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 2 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 +17
-2@@ -684,6 +684,8 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms)DeviceState *dev;MachineState *ms =MACHINE (vms);SysBusDevice *sbdev; +AcpiGedState *acpi_ged_state; +AcpiPciHpState *pcihp_state;int irq = vms->irqmap[VIRT_ACPI_GED ];uint32_t event =ACPI_GED_PWR_DOWN_EVT ;@@ -696,13 +698,26 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms) } dev =qdev_new (TYPE_ACPI_GED ); + acpi_ged_state =ACPI_GED (dev); + pcihp_state = &acpi_ged_state->pcihp_state; +if (pcihp_state->use_acpi_hotplug_bridge) { + event |=ACPI_GED_PCI_HOTPLUG_EVT ; + }qdev_prop_set_uint32 (dev,"ged-event" , event);object_property_set_link (OBJECT (dev),"bus" ,OBJECT (vms->bus), &error_abort); sbdev =SYS_BUS_DEVICE (dev);sysbus_realize_and_unref (sbdev, &error_fatal); -sysbus_mmio_map (sbdev,0 , vms->memmap[VIRT_ACPI_GED ].base); -sysbus_mmio_map (sbdev,1 , vms->memmap[VIRT_PCDIMM_ACPI ].base); +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); +if (pcihp_state->use_acpi_hotplug_bridge) { +int pcihp_region_index; + + pcihp_region_index =sysbus_mmio_map_name (sbdev,ACPI_PCIHP_REGION_NAME , + vms->memmap[VIRT_ACPI_PCIHP ].base); +assert (pcihp_region_index >=0 ); + }sysbus_connect_irq (sbdev,0 ,qdev_get_gpio_in (vms->gic, irq));return dev;
Re: [PATCH v3 25/29] hw/arm/virt: Let virt support pci hotplug/unplug GED event
In reply to Eric AugerQuoted 44 lines · On Mon, 16 Jun 2025 11:46:54 +0200 Eric Auger <[email protected]> wrote:
Set up the IO registers used to communicate between QEMU and ACPI.
Signed-off-by Eric Auger <[email protected]>---
v2 -> v3:
- removeacpi_ged_state->pcihp_state.use_acpi_hotplug_bridge= true;
- usesysbus_mmio_map_namefor all regs (Igor)
-create_pcieleft at its original placev1 -> v2:
- useACPI_PCIHP_REGION_NAME--- include/hw/acpi/generic_event_device.h | 1 + hw/arm/virt.c | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 2 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 +2
-0@@ -684,6 +684,8 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms)DeviceState *dev;MachineState *ms =MACHINE (vms);SysBusDevice *sbdev; +AcpiGedState *acpi_ged_state; +AcpiPciHpState *pcihp_state;int irq = vms->irqmap[VIRT_ACPI_GED ];uint32_t event =ACPI_GED_PWR_DOWN_EVT ;
hw/arm/virt.c static inline DeviceState *create_acpi_ged(VirtMachineState *vms) · line 706
Quoted 9 lines
hw/arm/virt.c +5
-0@@ -696,13 +698,26 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms) } dev =qdev_new (TYPE_ACPI_GED ); + acpi_ged_state =ACPI_GED (dev); + pcihp_state = &acpi_ged_state->pcihp_state; +if (pcihp_state->use_acpi_hotplug_bridge) { + event |=ACPI_GED_PCI_HOTPLUG_EVT ; + }
Doesn't it belong to ged_realize()?
hw/arm/virt.c static inline DeviceState *create_acpi_ged(VirtMachineState *vms) · line 714
Quoted 11 lines
hw/arm/virt.c +4
-2qdev_prop_set_uint32 (dev,"ged-event" , event);object_property_set_link (OBJECT (dev),"bus" ,OBJECT (vms->bus), &error_abort); sbdev =SYS_BUS_DEVICE (dev);sysbus_realize_and_unref (sbdev, &error_fatal); -sysbus_mmio_map (sbdev,0 , vms->memmap[VIRT_ACPI_GED ].base); -sysbus_mmio_map (sbdev,1 , vms->memmap[VIRT_PCDIMM_ACPI ].base); +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); +if (pcihp_state->use_acpi_hotplug_bridge) {
like elsewhere, use property accessor
Quoted 9 lines
hw/arm/virt.c +6
-0+int pcihp_region_index; + + pcihp_region_index =sysbus_mmio_map_name (sbdev,ACPI_PCIHP_REGION_NAME , + vms->memmap[VIRT_ACPI_PCIHP ].base); +assert (pcihp_region_index >=0 ); + }sysbus_connect_irq (sbdev,0 ,qdev_get_gpio_in (vms->gic, irq));return dev;
Re: [PATCH v3 25/29] hw/arm/virt: Let virt support pci hotplug/unplug GED event
Hi Igor,
Quoted 49 lines · Igor Mammedov
Quoted 46 lines · On Mon, 16 Jun 2025 11:46:54 +0200 Eric Auger <[email protected]> wrote:
Set up the IO registers used to communicate between QEMU and ACPI.
Signed-off-by Eric Auger <[email protected]>---
v2 -> v3:
- removeacpi_ged_state->pcihp_state.use_acpi_hotplug_bridge= true;
- usesysbus_mmio_map_namefor all regs (Igor)
-create_pcieleft at its original placev1 -> v2:
- useACPI_PCIHP_REGION_NAME--- include/hw/acpi/generic_event_device.h | 1 + hw/arm/virt.c | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 2 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 +2
-0@@ -684,6 +684,8 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms)DeviceState *dev;MachineState *ms =MACHINE (vms);SysBusDevice *sbdev; +AcpiGedState *acpi_ged_state; +AcpiPciHpState *pcihp_state;int irq = vms->irqmap[VIRT_ACPI_GED ];uint32_t event =ACPI_GED_PWR_DOWN_EVT ;@@ -696,13 +698,26 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms) }
Quoted 7 lines
hw/arm/virt.c static inline DeviceState *create_acpi_ged(VirtMachineState *vms) · line 705
Quoted 6 lines
hw/arm/virt.c +5
-0dev =qdev_new (TYPE_ACPI_GED ); + acpi_ged_state =ACPI_GED (dev); + pcihp_state = &acpi_ged_state->pcihp_state; +if (pcihp_state->use_acpi_hotplug_bridge) { + event |=ACPI_GED_PCI_HOTPLUG_EVT ; + }Doesn't it belong to
ged_realize()?
moved there
Quoted 6 lines
Quoted 6 lines
hw/arm/virt.c +0
-0qdev_prop_set_uint32 (dev,"ged-event" , event);object_property_set_link (OBJECT (dev),"bus" ,OBJECT (vms->bus), &error_abort); sbdev =SYS_BUS_DEVICE (dev);sysbus_realize_and_unref (sbdev, &error_fatal);
Quoted 7 lines
hw/arm/virt.c static inline DeviceState *create_acpi_ged(VirtMachineState *vms) · line 714
Quoted 6 lines
hw/arm/virt.c +4
-2-sysbus_mmio_map (sbdev,0 , vms->memmap[VIRT_ACPI_GED ].base); -sysbus_mmio_map (sbdev,1 , vms->memmap[VIRT_PCDIMM_ACPI ].base); +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); +if (pcihp_state->use_acpi_hotplug_bridge) {like elsewhere, use property accessor
yup
Thanks!
Eric
Quoted 10 lines
Quoted 10 lines
hw/arm/virt.c +6
-0+int pcihp_region_index; + + pcihp_region_index =sysbus_mmio_map_name (sbdev,ACPI_PCIHP_REGION_NAME , + vms->memmap[VIRT_ACPI_PCIHP ].base); +assert (pcihp_region_index >=0 ); + }sysbus_connect_irq (sbdev,0 ,qdev_get_gpio_in (vms->gic, irq));return dev;
PATCH v3 26/29 hw/arm/virt: Plug pcihp hotplug/hotunplug callbacks
In reply to Eric Auger---
v2 -> v3:
- fix cohabitation with virtio-mem-pci device and tested hotplug/unplug of this latter (Igor)
--- hw/arm/virt.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 69 insertions(+), 3 deletions(-)
hw/arm/virt.c +69 -3
@@ -1747,6 +1747,22 @@ static void virt_build_smbios(VirtMachineState *vms) } } +static AcpiPciHpState *get_acpi_pcihp_state (VirtMachineState *vms) +{ +AcpiGedState *acpi_ged_state; +AcpiPciHpState *pcihp_state; + +if (!vms->acpi_dev) { +return NULL ; + } + acpi_ged_state =ACPI_GED (vms->acpi_dev); + pcihp_state = &acpi_ged_state->pcihp_state; +if (pcihp_state->use_acpi_hotplug_bridge) { +return pcihp_state; + } +return NULL ; +} +static void virt_machine_done (Notifier *notifier,void *data) {
@@ -2907,6 +2923,13 @@ static void virt_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev, {VirtMachineState *vms =VIRT_MACHINE (hotplug_dev); +if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +if (get_acpi_pcihp_state (vms)) { +acpi_pcihp_device_pre_plug_cb (HOTPLUG_HANDLER (vms->acpi_dev), + dev, errp); + } + } +if (object_dynamic_cast (OBJECT (dev),TYPE_PC_DIMM )) {virt_memory_pre_plug (hotplug_dev, dev, errp); }else if (object_dynamic_cast (OBJECT (dev),TYPE_VIRTIO_MD_PCI )) {
@@ -2961,6 +2984,15 @@ static void virt_machine_device_plug_cb(HotplugHandler *hotplug_dev, } } +if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +AcpiPciHpState *pcihp_state =get_acpi_pcihp_state (vms); + +if (pcihp_state) { +acpi_pcihp_device_plug_cb (HOTPLUG_HANDLER (vms->acpi_dev), + pcihp_state, dev, errp); + } + } +if (object_dynamic_cast (OBJECT (dev),TYPE_PC_DIMM )) {virt_memory_plug (hotplug_dev, dev, errp); }else if (object_dynamic_cast (OBJECT (dev),TYPE_VIRTIO_MD_PCI )) {
@@ -3017,12 +3049,27 @@ out:static void virt_machine_device_unplug_request_cb (HotplugHandler *hotplug_dev,DeviceState *dev,Error **errp) { +bool supported = false; +if (object_dynamic_cast (OBJECT (dev),TYPE_PC_DIMM )) {virt_dimm_unplug_request (hotplug_dev, dev, errp); + supported = true; }else if (object_dynamic_cast (OBJECT (dev),TYPE_VIRTIO_MD_PCI )) {virtio_md_pci_unplug_request (VIRTIO_MD_PCI (dev),MACHINE (hotplug_dev), errp); - }else { + supported = true; + } +if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +VirtMachineState *vms =VIRT_MACHINE (hotplug_dev); +AcpiPciHpState *pcihp_state =get_acpi_pcihp_state (vms); + +if (pcihp_state) { +acpi_pcihp_device_unplug_request_cb (HOTPLUG_HANDLER (vms->acpi_dev), + pcihp_state, dev, errp); + supported = true; + } + } +if (!supported) {error_setg (errp,"device unplug request for unsupported device" " type: %s" ,object_get_typename (OBJECT (dev))); }
@@ -3031,11 +3078,27 @@ static void virt_machine_device_unplug_request_cb(HotplugHandler *hotplug_dev,static void virt_machine_device_unplug_cb (HotplugHandler *hotplug_dev,DeviceState *dev,Error **errp) { +bool supported = false; +if (object_dynamic_cast (OBJECT (dev),TYPE_PC_DIMM )) {virt_dimm_unplug (hotplug_dev, dev, errp); + supported = true; }else if (object_dynamic_cast (OBJECT (dev),TYPE_VIRTIO_MD_PCI )) {virtio_md_pci_unplug (VIRTIO_MD_PCI (dev),MACHINE (hotplug_dev), errp); - }else { + supported = true; + } +if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +VirtMachineState *vms =VIRT_MACHINE (hotplug_dev); + +AcpiPciHpState *pcihp_state =get_acpi_pcihp_state (vms); + +if (pcihp_state) { +acpi_pcihp_device_unplug_cb (HOTPLUG_HANDLER (vms->acpi_dev), + pcihp_state, dev, errp); + supported = true; + } + } +if (!supported) {error_setg (errp,"virt: device unplug for unsupported device" " type: %s" ,object_get_typename (OBJECT (dev))); }
@@ -3045,11 +3108,14 @@ static HotplugHandler *virt_machine_get_hotplug_handler(MachineState *machine, DeviceState *dev) {MachineClass *mc =MACHINE_GET_CLASS (machine); +VirtMachineState *vms =VIRT_MACHINE (machine);if (device_is_dynamic_sysbus (mc, dev) ||object_dynamic_cast (OBJECT (dev),TYPE_PC_DIMM ) ||object_dynamic_cast (OBJECT (dev),TYPE_VIRTIO_MD_PCI ) || -object_dynamic_cast (OBJECT (dev),TYPE_VIRTIO_IOMMU_PCI )) { +object_dynamic_cast (OBJECT (dev),TYPE_VIRTIO_IOMMU_PCI ) || + (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE ) && +get_acpi_pcihp_state (vms))) {return HOTPLUG_HANDLER (machine); }return NULL ;
Signature · 1 line
2.49.0
Re: [PATCH v3 26/29] hw/arm/virt: Plug pcihp hotplug/hotunplug callbacks
On Mon, 16 Jun 2025 11:46:55 +0200
Eric Auger <[email protected]> wrote:
Maybe needs a little bit of description.
Quoted 1 line
Signed-off-by Eric Auger <[email protected]>
A few trivial things inline.
Quoted 21 lines
---
v2 -> v3:
- fix cohabitation with virtio-mem-pci device and tested hotplug/unplug of this latter (Igor)--- hw/arm/virt.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 69 insertions(+), 3 deletions(-)hw/arm/virt.c +4
-0@@ -1747,6 +1747,22 @@ static void virt_build_smbios(VirtMachineState *vms) } } +static AcpiPciHpState *get_acpi_pcihp_state (VirtMachineState *vms) +{ +AcpiGedState *acpi_ged_state; +AcpiPciHpState *pcihp_state;
hw/arm/virt.c static void virt_build_smbios(VirtMachineState *vms) · line 1763
Quoted 10 lines
hw/arm/virt.c +10
-0+ +if (!vms->acpi_dev) { +return NULL ; + } + acpi_ged_state =ACPI_GED (vms->acpi_dev); + pcihp_state = &acpi_ged_state->pcihp_state; +if (pcihp_state->use_acpi_hotplug_bridge) { +return pcihp_state; + } +return NULL ;
Really trivial but if this isn't going to gain extra stuff I'd consider the NULL return the 'error' path and prefer that out of line for consistency. That is.
if(!pcihp_state->use_acpi_hotplug_bridge) {
return NULL;
}
return pcihp_state;That just ends up a tiny bit more consistent with the !vms->acpi_dev test earlier in the function.
hw/arm/virt.c static void virt_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev, · line 2925
Quoted 9 lines
hw/arm/virt.c +2
-0+} +static void virt_machine_done (Notifier *notifier,void *data) {@@ -2907,6 +2923,13 @@ static void virt_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev, {VirtMachineState *vms =VIRT_MACHINE (hotplug_dev);
Maybe add a comment on why this is not in the if/else stack. I assume because a few of those are also TYPE_PCI_DEVICE.
Something in the patch description would also work for me.
Quoted 84 lines
hw/arm/virt.c +49
-2+if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +if (get_acpi_pcihp_state (vms)) { +acpi_pcihp_device_pre_plug_cb (HOTPLUG_HANDLER (vms->acpi_dev), + dev, errp); + } + } +if (object_dynamic_cast (OBJECT (dev),TYPE_PC_DIMM )) {virt_memory_pre_plug (hotplug_dev, dev, errp); }else if (object_dynamic_cast (OBJECT (dev),TYPE_VIRTIO_MD_PCI )) {@@ -2961,6 +2984,15 @@ static void virt_machine_device_plug_cb(HotplugHandler *hotplug_dev, } } +if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +AcpiPciHpState *pcihp_state =get_acpi_pcihp_state (vms); + +if (pcihp_state) { +acpi_pcihp_device_plug_cb (HOTPLUG_HANDLER (vms->acpi_dev), + pcihp_state, dev, errp); + } + } +if (object_dynamic_cast (OBJECT (dev),TYPE_PC_DIMM )) {virt_memory_plug (hotplug_dev, dev, errp); }else if (object_dynamic_cast (OBJECT (dev),TYPE_VIRTIO_MD_PCI )) {@@ -3017,12 +3049,27 @@ out:static void virt_machine_device_unplug_request_cb (HotplugHandler *hotplug_dev,DeviceState *dev,Error **errp) { +bool supported = false; +if (object_dynamic_cast (OBJECT (dev),TYPE_PC_DIMM )) {virt_dimm_unplug_request (hotplug_dev, dev, errp); + supported = true; }else if (object_dynamic_cast (OBJECT (dev),TYPE_VIRTIO_MD_PCI )) {virtio_md_pci_unplug_request (VIRTIO_MD_PCI (dev),MACHINE (hotplug_dev), errp); - }else { + supported = true; + } +if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +VirtMachineState *vms =VIRT_MACHINE (hotplug_dev); +AcpiPciHpState *pcihp_state =get_acpi_pcihp_state (vms); + +if (pcihp_state) { +acpi_pcihp_device_unplug_request_cb (HOTPLUG_HANDLER (vms->acpi_dev), + pcihp_state, dev, errp); + supported = true; + } + } +if (!supported) {error_setg (errp,"device unplug request for unsupported device" " type: %s" ,object_get_typename (OBJECT (dev))); }@@ -3031,11 +3078,27 @@ static void virt_machine_device_unplug_request_cb(HotplugHandler *hotplug_dev,static void virt_machine_device_unplug_cb (HotplugHandler *hotplug_dev,DeviceState *dev,Error **errp) { +bool supported = false; +if (object_dynamic_cast (OBJECT (dev),TYPE_PC_DIMM )) {virt_dimm_unplug (hotplug_dev, dev, errp); + supported = true; }else if (object_dynamic_cast (OBJECT (dev),TYPE_VIRTIO_MD_PCI )) {virtio_md_pci_unplug (VIRTIO_MD_PCI (dev),MACHINE (hotplug_dev), errp); - }else { + supported = true; + } +if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +VirtMachineState *vms =VIRT_MACHINE (hotplug_dev); + +AcpiPciHpState *pcihp_state =get_acpi_pcihp_state (vms); + +if (pcihp_state) { +acpi_pcihp_device_unplug_cb (HOTPLUG_HANDLER (vms->acpi_dev), + pcihp_state, dev, errp); + supported = true; + } + } +if (!supported) {error_setg (errp,"virt: device unplug for unsupported device" " type: %s" ,object_get_typename (OBJECT (dev))); }
Re: [PATCH v3 26/29] hw/arm/virt: Plug pcihp hotplug/hotunplug callbacks
In reply to Eric AugerQuoted 1 line · On Mon, 16 Jun 2025 11:46:55 +0200 Eric Auger <[email protected]> wrote:
Signed-off-by Eric Auger <[email protected]>
why do we still need this?
pcihp code should override native pcie bus handlers, and then when device_add calls bus hotplug handlers it will be pcihp ones.
Quoted 139 lines
---
v2 -> v3:
- fix cohabitation with virtio-mem-pci device and tested hotplug/unplug of this latter (Igor)--- hw/arm/virt.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 69 insertions(+), 3 deletions(-)hw/arm/virt.c +69
-3@@ -1747,6 +1747,22 @@ static void virt_build_smbios(VirtMachineState *vms) } } +static AcpiPciHpState *get_acpi_pcihp_state (VirtMachineState *vms) +{ +AcpiGedState *acpi_ged_state; +AcpiPciHpState *pcihp_state; + +if (!vms->acpi_dev) { +return NULL ; + } + acpi_ged_state =ACPI_GED (vms->acpi_dev); + pcihp_state = &acpi_ged_state->pcihp_state; +if (pcihp_state->use_acpi_hotplug_bridge) { +return pcihp_state; + } +return NULL ; +} +static void virt_machine_done (Notifier *notifier,void *data) {@@ -2907,6 +2923,13 @@ static void virt_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev, {VirtMachineState *vms =VIRT_MACHINE (hotplug_dev); +if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +if (get_acpi_pcihp_state (vms)) { +acpi_pcihp_device_pre_plug_cb (HOTPLUG_HANDLER (vms->acpi_dev), + dev, errp); + } + } +if (object_dynamic_cast (OBJECT (dev),TYPE_PC_DIMM )) {virt_memory_pre_plug (hotplug_dev, dev, errp); }else if (object_dynamic_cast (OBJECT (dev),TYPE_VIRTIO_MD_PCI )) {@@ -2961,6 +2984,15 @@ static void virt_machine_device_plug_cb(HotplugHandler *hotplug_dev, } } +if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +AcpiPciHpState *pcihp_state =get_acpi_pcihp_state (vms); + +if (pcihp_state) { +acpi_pcihp_device_plug_cb (HOTPLUG_HANDLER (vms->acpi_dev), + pcihp_state, dev, errp); + } + } +if (object_dynamic_cast (OBJECT (dev),TYPE_PC_DIMM )) {virt_memory_plug (hotplug_dev, dev, errp); }else if (object_dynamic_cast (OBJECT (dev),TYPE_VIRTIO_MD_PCI )) {@@ -3017,12 +3049,27 @@ out:static void virt_machine_device_unplug_request_cb (HotplugHandler *hotplug_dev,DeviceState *dev,Error **errp) { +bool supported = false; +if (object_dynamic_cast (OBJECT (dev),TYPE_PC_DIMM )) {virt_dimm_unplug_request (hotplug_dev, dev, errp); + supported = true; }else if (object_dynamic_cast (OBJECT (dev),TYPE_VIRTIO_MD_PCI )) {virtio_md_pci_unplug_request (VIRTIO_MD_PCI (dev),MACHINE (hotplug_dev), errp); - }else { + supported = true; + } +if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +VirtMachineState *vms =VIRT_MACHINE (hotplug_dev); +AcpiPciHpState *pcihp_state =get_acpi_pcihp_state (vms); + +if (pcihp_state) { +acpi_pcihp_device_unplug_request_cb (HOTPLUG_HANDLER (vms->acpi_dev), + pcihp_state, dev, errp); + supported = true; + } + } +if (!supported) {error_setg (errp,"device unplug request for unsupported device" " type: %s" ,object_get_typename (OBJECT (dev))); }@@ -3031,11 +3078,27 @@ static void virt_machine_device_unplug_request_cb(HotplugHandler *hotplug_dev,static void virt_machine_device_unplug_cb (HotplugHandler *hotplug_dev,DeviceState *dev,Error **errp) { +bool supported = false; +if (object_dynamic_cast (OBJECT (dev),TYPE_PC_DIMM )) {virt_dimm_unplug (hotplug_dev, dev, errp); + supported = true; }else if (object_dynamic_cast (OBJECT (dev),TYPE_VIRTIO_MD_PCI )) {virtio_md_pci_unplug (VIRTIO_MD_PCI (dev),MACHINE (hotplug_dev), errp); - }else { + supported = true; + } +if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +VirtMachineState *vms =VIRT_MACHINE (hotplug_dev); + +AcpiPciHpState *pcihp_state =get_acpi_pcihp_state (vms); + +if (pcihp_state) { +acpi_pcihp_device_unplug_cb (HOTPLUG_HANDLER (vms->acpi_dev), + pcihp_state, dev, errp); + supported = true; + } + } +if (!supported) {error_setg (errp,"virt: device unplug for unsupported device" " type: %s" ,object_get_typename (OBJECT (dev))); }@@ -3045,11 +3108,14 @@ static HotplugHandler *virt_machine_get_hotplug_handler(MachineState *machine, DeviceState *dev) {MachineClass *mc =MACHINE_GET_CLASS (machine); +VirtMachineState *vms =VIRT_MACHINE (machine);if (device_is_dynamic_sysbus (mc, dev) ||object_dynamic_cast (OBJECT (dev),TYPE_PC_DIMM ) ||object_dynamic_cast (OBJECT (dev),TYPE_VIRTIO_MD_PCI ) || -object_dynamic_cast (OBJECT (dev),TYPE_VIRTIO_IOMMU_PCI )) { +object_dynamic_cast (OBJECT (dev),TYPE_VIRTIO_IOMMU_PCI ) || + (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE ) && +get_acpi_pcihp_state (vms))) {return HOTPLUG_HANDLER (machine); }return NULL ;
Re: [PATCH v3 26/29] hw/arm/virt: Plug pcihp hotplug/hotunplug callbacks
Hi Igor,
Quoted 8 lines · Igor Mammedov
Quoted 1 line · On Mon, 16 Jun 2025 11:46:55 +0200 Eric Auger <[email protected]> wrote:
Signed-off-by Eric Auger <[email protected]>why do we still need this?
pcihp code should override native pcie bus handlers, and then when
device_addcalls bus hotplug handlers it will be pcihp ones.
It was needed because I did not call qbus_set_hotplug_handler() as done in ich9.c. So I think I should be able to get rid of this patch
Thanks
Eric
Quoted 140 lines
Quoted 140 lines
---
v2 -> v3:
- fix cohabitation with virtio-mem-pci device and tested hotplug/unplug of this latter (Igor)--- hw/arm/virt.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 69 insertions(+), 3 deletions(-)hw/arm/virt.c +69
-3@@ -1747,6 +1747,22 @@ static void virt_build_smbios(VirtMachineState *vms) } } +static AcpiPciHpState *get_acpi_pcihp_state (VirtMachineState *vms) +{ +AcpiGedState *acpi_ged_state; +AcpiPciHpState *pcihp_state; + +if (!vms->acpi_dev) { +return NULL ; + } + acpi_ged_state =ACPI_GED (vms->acpi_dev); + pcihp_state = &acpi_ged_state->pcihp_state; +if (pcihp_state->use_acpi_hotplug_bridge) { +return pcihp_state; + } +return NULL ; +} +static void virt_machine_done (Notifier *notifier,void *data) {@@ -2907,6 +2923,13 @@ static void virt_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev, {VirtMachineState *vms =VIRT_MACHINE (hotplug_dev); +if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +if (get_acpi_pcihp_state (vms)) { +acpi_pcihp_device_pre_plug_cb (HOTPLUG_HANDLER (vms->acpi_dev), + dev, errp); + } + } +if (object_dynamic_cast (OBJECT (dev),TYPE_PC_DIMM )) {virt_memory_pre_plug (hotplug_dev, dev, errp); }else if (object_dynamic_cast (OBJECT (dev),TYPE_VIRTIO_MD_PCI )) {@@ -2961,6 +2984,15 @@ static void virt_machine_device_plug_cb(HotplugHandler *hotplug_dev, } } +if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +AcpiPciHpState *pcihp_state =get_acpi_pcihp_state (vms); + +if (pcihp_state) { +acpi_pcihp_device_plug_cb (HOTPLUG_HANDLER (vms->acpi_dev), + pcihp_state, dev, errp); + } + } +if (object_dynamic_cast (OBJECT (dev),TYPE_PC_DIMM )) {virt_memory_plug (hotplug_dev, dev, errp); }else if (object_dynamic_cast (OBJECT (dev),TYPE_VIRTIO_MD_PCI )) {@@ -3017,12 +3049,27 @@ out:static void virt_machine_device_unplug_request_cb (HotplugHandler *hotplug_dev,DeviceState *dev,Error **errp) { +bool supported = false; +if (object_dynamic_cast (OBJECT (dev),TYPE_PC_DIMM )) {virt_dimm_unplug_request (hotplug_dev, dev, errp); + supported = true; }else if (object_dynamic_cast (OBJECT (dev),TYPE_VIRTIO_MD_PCI )) {virtio_md_pci_unplug_request (VIRTIO_MD_PCI (dev),MACHINE (hotplug_dev), errp); - }else { + supported = true; + } +if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +VirtMachineState *vms =VIRT_MACHINE (hotplug_dev); +AcpiPciHpState *pcihp_state =get_acpi_pcihp_state (vms); + +if (pcihp_state) { +acpi_pcihp_device_unplug_request_cb (HOTPLUG_HANDLER (vms->acpi_dev), + pcihp_state, dev, errp); + supported = true; + } + } +if (!supported) {error_setg (errp,"device unplug request for unsupported device" " type: %s" ,object_get_typename (OBJECT (dev))); }@@ -3031,11 +3078,27 @@ static void virt_machine_device_unplug_request_cb(HotplugHandler *hotplug_dev,static void virt_machine_device_unplug_cb (HotplugHandler *hotplug_dev,DeviceState *dev,Error **errp) { +bool supported = false; +if (object_dynamic_cast (OBJECT (dev),TYPE_PC_DIMM )) {virt_dimm_unplug (hotplug_dev, dev, errp); + supported = true; }else if (object_dynamic_cast (OBJECT (dev),TYPE_VIRTIO_MD_PCI )) {virtio_md_pci_unplug (VIRTIO_MD_PCI (dev),MACHINE (hotplug_dev), errp); - }else { + supported = true; + } +if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +VirtMachineState *vms =VIRT_MACHINE (hotplug_dev); + +AcpiPciHpState *pcihp_state =get_acpi_pcihp_state (vms); + +if (pcihp_state) { +acpi_pcihp_device_unplug_cb (HOTPLUG_HANDLER (vms->acpi_dev), + pcihp_state, dev, errp); + supported = true; + } + } +if (!supported) {error_setg (errp,"virt: device unplug for unsupported device" " type: %s" ,object_get_typename (OBJECT (dev))); }@@ -3045,11 +3108,14 @@ static HotplugHandler *virt_machine_get_hotplug_handler(MachineState *machine, DeviceState *dev) {MachineClass *mc =MACHINE_GET_CLASS (machine); +VirtMachineState *vms =VIRT_MACHINE (machine);if (device_is_dynamic_sysbus (mc, dev) ||object_dynamic_cast (OBJECT (dev),TYPE_PC_DIMM ) ||object_dynamic_cast (OBJECT (dev),TYPE_VIRTIO_MD_PCI ) || -object_dynamic_cast (OBJECT (dev),TYPE_VIRTIO_IOMMU_PCI )) { +object_dynamic_cast (OBJECT (dev),TYPE_VIRTIO_IOMMU_PCI ) || + (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE ) && +get_acpi_pcihp_state (vms))) {return HOTPLUG_HANDLER (machine); }return NULL ;
PATCH v3 27/29 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 a new test related to ACPI PCI hotplug that will use a new reference blob:
tests/data/acpi/aarch64/virt/DSDT.acpipcihp
--- tests/qtest/bios-tables-test-allowed-diff.h | 1 + tests/data/acpi/aarch64/virt/DSDT.acpipcihp | 0 2 files changed, 1 insertion(+) create mode 100644 tests/data/acpi/aarch64/virt/DSDT.acpipcihp
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.acpipcihp",
tests/data/acpi/aarch64/virt/DSDT.acpipcihp new file +0 -0
Signature · 1 line
2.49.0
Re: [PATCH v3 27/29] tests/qtest/bios-tables-test: Prepare for addition of acpi pci hp tests
Quoted 9 lines · On Mon, 16 Jun 2025 11:46:56 +0200 Eric Auger <[email protected]> wrote:
From: Gustavo Romero <[email protected]>
Soon we will introduce a new test related to ACPI PCI hotplug that will use a new reference blob:
tests/data/acpi/aarch64/virt/DSDT.acpipcihp
Signed-off-by Eric Auger <[email protected]>Signed-off-by Gustavo Romero <[email protected]>
Unusual sign off chain. Eric is signing off as handling Gustavo's patch? I'd expect Eric's sign off to be second. Looks good in the next patch fo instance. With that fixed.
Quoted 16 lines
--- tests/qtest/bios-tables-test-allowed-diff.h | 1 + tests/data/acpi/aarch64/virt/DSDT.acpipcihp | 0 2 files changed, 1 insertion(+) create mode 100644 tests/data/acpi/aarch64/virt/DSDT.acpipcihptests/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.acpipcihp",tests/data/acpi/aarch64/virt/DSDT.acpipcihp new file +0
-0
Igor Mammedov
Reviewed-byRe: [PATCH v3 27/29] tests/qtest/bios-tables-test: Prepare for addition of acpi pci hp tests
Quoted 10 lines · On Fri, 20 Jun 2025 11:31:38 +0100 Jonathan Cameron…
Quoted 7 lines · On Mon, 16 Jun 2025 11:46:56 +0200 Eric Auger <[email protected]> wrote:
From: Gustavo Romero <[email protected]>
Soon we will introduce a new test related to ACPI PCI hotplug that will use a new reference blob:
tests/data/acpi/aarch64/virt/DSDT.acpipcihp
Quoted 8 lines
Quoted 2 lines
Signed-off-by Eric Auger <[email protected]>Signed-off-by Gustavo Romero <[email protected]>Unusual sign off chain. Eric is signing off as handling Gustavo's patch? I'd expect Eric's sign off to be second. Looks good in the next patch fo instance. With that fixed.
Reviewed-by Jonathan Cameron <[email protected]>
Quoted 18 lines
Quoted 17 lines
--- tests/qtest/bios-tables-test-allowed-diff.h | 1 + tests/data/acpi/aarch64/virt/DSDT.acpipcihp | 0 2 files changed, 1 insertion(+) create mode 100644 tests/data/acpi/aarch64/virt/DSDT.acpipcihptests/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.acpipcihp",tests/data/acpi/aarch64/virt/DSDT.acpipcihp new file +0
-0
Re: [PATCH v3 27/29] tests/qtest/bios-tables-test: Prepare for addition of acpi pci hp tests
In reply to Jonathan CameronHi Jonathan,
Quoted 8 lines · Jonathan Cameron
Quoted 5 lines · On Mon, 16 Jun 2025 11:46:56 +0200 Eric Auger <[email protected]> wrote:
From: Gustavo Romero <[email protected]>
Soon we will introduce a new test related to ACPI PCI hotplug that will use a new reference blob:
Quoted 7 lines
Quoted 4 lines
tests/data/acpi/aarch64/virt/DSDT.acpipcihp
Signed-off-by Eric Auger <[email protected]>Signed-off-by Gustavo Romero <[email protected]>Unusual sign off chain. Eric is signing off as handling Gustavo's patch? I'd expect Eric's sign off to be second. Looks good in the next patch fo instance. With that fixed.
Sure. sorry, unintentional. I did not know the rule either ;-)
Eric
Quoted 19 lines
Reviewed-by Jonathan Cameron <[email protected]>Quoted 16 lines
--- tests/qtest/bios-tables-test-allowed-diff.h | 1 + tests/data/acpi/aarch64/virt/DSDT.acpipcihp | 0 2 files changed, 1 insertion(+) create mode 100644 tests/data/acpi/aarch64/virt/DSDT.acpipcihptests/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.acpipcihp",tests/data/acpi/aarch64/virt/DSDT.acpipcihp new file +0
-0
PATCH v3 28/29 tests/qtest/bios-tables-test: Add aarch64 ACPI PCI hotplug test
In reply to Eric AugerFrom: Gustavo Romero <[email protected]>
The test uses -global acpi-ged.acpi-pci-hotplug-with-bridge-support=on to force the usage of ACPI PCI hotplug.
--- tests/qtest/bios-tables-test.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)
tests/qtest/bios-tables-test.c +34 -0
@@ -1643,6 +1643,38 @@ 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" +/* +* We just pick address=0x04 for the root port to avoid +* collisions with other PCI devices on the root bus (pcie.0). +* It could be any other value that doesn't collide. +* +* The 'chassis' and 'slot' options equal to 1 have no special +* meaning here, could be any integer, but we set them to known +* values to keep the test consistent. +*/ +" -device pcie-root-port,bus=pcie.0,chassis=1,slot=1,addr=0x04.0x00" , + &data); + +free_test_data (&data); +} +static void test_acpi_microvm_prepare (test_data *data) { data->machine ="microvm" ;
@@ -2580,6 +2612,8 @@ 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/pxb" , test_acpi_aarch64_virt_tcg_pxb);qtest_add_func ("acpi/virt/oem-fields" , test_acpi_aarch64_virt_oem_fields);
Signature · 1 line
2.49.0
Re: [PATCH v3 28/29] tests/qtest/bios-tables-test: Add aarch64 ACPI PCI hotplug test
Quoted 7 lines · On Mon, 16 Jun 2025 11:46:57 +0200 Eric Auger <[email protected]> wrote:
From: Gustavo Romero <[email protected]>
The test uses -global acpi-ged.acpi-pci-hotplug-with-bridge-support=on to force the usage of ACPI PCI hotplug.
Signed-off-by Gustavo Romero <[email protected]>Signed-off-by Eric Auger <[email protected]>
Could we add the necessary (I'm not quite sure what) to trigger the _DSM creation so EDSM gets used? I'm not keen on that being dead code wrt to tests on ARM.
Jonathan
Quoted 56 lines
--- tests/qtest/bios-tables-test.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)tests/qtest/bios-tables-test.c +34
-0@@ -1643,6 +1643,38 @@ 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" +/* +* We just pick address=0x04 for the root port to avoid +* collisions with other PCI devices on the root bus (pcie.0). +* It could be any other value that doesn't collide. +* +* The 'chassis' and 'slot' options equal to 1 have no special +* meaning here, could be any integer, but we set them to known +* values to keep the test consistent. +*/ +" -device pcie-root-port,bus=pcie.0,chassis=1,slot=1,addr=0x04.0x00" , + &data); + +free_test_data (&data); +} +static void test_acpi_microvm_prepare (test_data *data) { data->machine ="microvm" ;@@ -2580,6 +2612,8 @@ 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/pxb" , test_acpi_aarch64_virt_tcg_pxb);qtest_add_func ("acpi/virt/oem-fields" , test_acpi_aarch64_virt_oem_fields);
Re: [PATCH v3 28/29] tests/qtest/bios-tables-test: Add aarch64 ACPI PCI hotplug test
Quoted 8 lines · On Fri, 20 Jun 2025 11:40:29 +0100 Jonathan Cameron…
Quoted 5 lines · On Mon, 16 Jun 2025 11:46:57 +0200 Eric Auger <[email protected]> wrote:
From: Gustavo Romero <[email protected]>
The test uses -global acpi-ged.acpi-pci-hotplug-with-bridge-support=on to force the usage of ACPI PCI hotplug.
Quoted 6 lines
Quoted 2 lines
Signed-off-by Gustavo Romero <[email protected]>Signed-off-by Eric Auger <[email protected]>Could we add the necessary (I'm not quite sure what) to trigger the
_DSMcreation so EDSM gets used? I'm not keen on that being dead code wrt to tests on ARM.
relevant x86 example:
" -device pcie-root-port,id=nohprp,port=0x0,chassis=2,hotplug=off,"
"addr=7.0"
" -device pci-testdev,bus=nohprp,acpi-index=501" Quoted 62 lines
Jonathan
Quoted 56 lines
--- tests/qtest/bios-tables-test.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)tests/qtest/bios-tables-test.c +34
-0@@ -1643,6 +1643,38 @@ 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" +/* +* We just pick address=0x04 for the root port to avoid +* collisions with other PCI devices on the root bus (pcie.0). +* It could be any other value that doesn't collide. +* +* The 'chassis' and 'slot' options equal to 1 have no special +* meaning here, could be any integer, but we set them to known +* values to keep the test consistent. +*/ +" -device pcie-root-port,bus=pcie.0,chassis=1,slot=1,addr=0x04.0x00" , + &data); + +free_test_data (&data); +} +static void test_acpi_microvm_prepare (test_data *data) { data->machine ="microvm" ;@@ -2580,6 +2612,8 @@ 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/pxb" , test_acpi_aarch64_virt_tcg_pxb);qtest_add_func ("acpi/virt/oem-fields" , test_acpi_aarch64_virt_oem_fields);
Re: [PATCH v3 28/29] tests/qtest/bios-tables-test: Add aarch64 ACPI PCI hotplug test
Quoted 11 lines · Igor Mammedov
Quoted 8 lines · On Fri, 20 Jun 2025 11:40:29 +0100 Jonathan Cameron…
Quoted 5 lines · On Mon, 16 Jun 2025 11:46:57 +0200 Eric Auger <[email protected]> wrote:
From: Gustavo Romero <[email protected]>
The test uses -global acpi-ged.acpi-pci-hotplug-with-bridge-support=on to force the usage of ACPI PCI hotplug.
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
Signed-off-by Gustavo Romero <[email protected]>Signed-off-by Eric Auger <[email protected]>Could we add the necessary (I'm not quite sure what) to trigger the
_DSMcreation so EDSM gets used? I'm not keen on that being dead code wrt to tests on ARM.relevant x86 example:
" -device pcie-root-port,id=nohprp,port=0x0,chassis=2,hotplug=off,"
argh. I did not see hotplug=off.
So then static acpi-index also works on ARM. So I will make edsm independent on acpi pcihp
Sorry for the noise
Eric
Quoted 63 lines
"addr=7.0"
" -device pci-testdev,bus=nohprp,acpi-index=501"Quoted 60 lines
Jonathan
Quoted 56 lines
--- tests/qtest/bios-tables-test.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)tests/qtest/bios-tables-test.c +34
-0@@ -1643,6 +1643,38 @@ 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" +/* +* We just pick address=0x04 for the root port to avoid +* collisions with other PCI devices on the root bus (pcie.0). +* It could be any other value that doesn't collide. +* +* The 'chassis' and 'slot' options equal to 1 have no special +* meaning here, could be any integer, but we set them to known +* values to keep the test consistent. +*/ +" -device pcie-root-port,bus=pcie.0,chassis=1,slot=1,addr=0x04.0x00" , + &data); + +free_test_data (&data); +} +static void test_acpi_microvm_prepare (test_data *data) { data->machine ="microvm" ;@@ -2580,6 +2612,8 @@ 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/pxb" , test_acpi_aarch64_virt_tcg_pxb);qtest_add_func ("acpi/virt/oem-fields" , test_acpi_aarch64_virt_oem_fields);
Re: [PATCH v3 28/29] tests/qtest/bios-tables-test: Add aarch64 ACPI PCI hotplug test
In reply to Eric AugerQuoted 32 lines · On Mon, 16 Jun 2025 11:46:57 +0200 Eric Auger <[email protected]> wrote:
From: Gustavo Romero <[email protected]>
The test uses -global acpi-ged.acpi-pci-hotplug-with-bridge-support=on to force the usage of ACPI PCI hotplug.
Signed-off-by Gustavo Romero <[email protected]>Signed-off-by Eric Auger <[email protected]>--- tests/qtest/bios-tables-test.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)tests/qtest/bios-tables-test.c +13
-0@@ -1643,6 +1643,38 @@ 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" , + };
tests/qtest/bios-tables-test.c static void test_acpi_aarch64_virt_tcg_memhp(void) · line 1668
Quoted 10 lines
tests/qtest/bios-tables-test.c +10
-0+ +/* Use ACPI PCI Hotplug */ +test_acpi_one (" -global acpi-ged.acpi-pci-hotplug-with-bridge-support=on" +" -cpu cortex-a57" +/* +* We just pick address=0x04 for the root port to avoid +* collisions with other PCI devices on the root bus (pcie.0). +* It could be any other value that doesn't collide. +* +* The 'chassis' and 'slot' options equal to 1 have no special
shouldn't be slot be equal to 0 for pcie root ports?
Quoted 21 lines
tests/qtest/bios-tables-test.c +11
-0+* meaning here, could be any integer, but we set them to known +* values to keep the test consistent. +*/ +" -device pcie-root-port,bus=pcie.0,chassis=1,slot=1,addr=0x04.0x00" , + &data); + +free_test_data (&data); +} +static void test_acpi_microvm_prepare (test_data *data) { data->machine ="microvm" ;@@ -2580,6 +2612,8 @@ 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/pxb" , test_acpi_aarch64_virt_tcg_pxb);qtest_add_func ("acpi/virt/oem-fields" , test_acpi_aarch64_virt_oem_fields);
PATCH v3 29/29 qtest/bios-tables-test: Create DSDT 'acpipcihp" variant blob
In reply to Eric AugerFrom: Gustavo Romero <[email protected]>
Update the .acpipcihp blob variant for the aarch64 'virt' machine. Because this is a new blob, the diff is rather large.
@@ -1,2 +1,2110 @@
+/*
+ * 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 /tmp/aml-UTAS72, Sun Jun 15 10:03:40 2025
+ *
+ * Original Table Header:
+ * Signature "DSDT" + * Length 0x00001755 (5973) + * Revision 0x02 + * Checksum 0xF3 + * 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 (VR01)
+ {
+ Name (_HID, "LNRO0005") // _HID: Hardware ID
+ Name (_UID, One) // _UID: Unique ID
+ Name (_CCA, One) // _CCA: Cache Coherency Attribute
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ Memory32Fixed (ReadWrite,
+ 0x0A000200, // Address Base
+ 0x00000200, // Address Length
+ )+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x00000031,
+ }
+ })
+ }
+
+ Device (VR02)
+ {
+ Name (_HID, "LNRO0005") // _HID: Hardware ID
+ Name (_UID, 0x02) // _UID: Unique ID
+ Name (_CCA, One) // _CCA: Cache Coherency Attribute
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ Memory32Fixed (ReadWrite,
+ 0x0A000400, // Address Base
+ 0x00000200, // Address Length
+ )+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x00000032,
+ }
+ })
+ }
+
+ Device (VR03)
+ {
+ Name (_HID, "LNRO0005") // _HID: Hardware ID
+ Name (_UID, 0x03) // _UID: Unique ID
+ Name (_CCA, One) // _CCA: Cache Coherency Attribute
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ Memory32Fixed (ReadWrite,
+ 0x0A000600, // Address Base
+ 0x00000200, // Address Length
+ )+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x00000033,
+ }
+ })
+ }
+
+ Device (VR04)
+ {
+ Name (_HID, "LNRO0005") // _HID: Hardware ID
+ Name (_UID, 0x04) // _UID: Unique ID
+ Name (_CCA, One) // _CCA: Cache Coherency Attribute
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ Memory32Fixed (ReadWrite,
+ 0x0A000800, // Address Base
+ 0x00000200, // Address Length
+ )+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x00000034,
+ }
+ })
+ }
+
+ Device (VR05)
+ {
+ Name (_HID, "LNRO0005") // _HID: Hardware ID
+ Name (_UID, 0x05) // _UID: Unique ID
+ Name (_CCA, One) // _CCA: Cache Coherency Attribute
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ Memory32Fixed (ReadWrite,
+ 0x0A000A00, // Address Base
+ 0x00000200, // Address Length
+ )+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x00000035,
+ }
+ })
+ }
+
+ Device (VR06)
+ {
+ Name (_HID, "LNRO0005") // _HID: Hardware ID
+ Name (_UID, 0x06) // _UID: Unique ID
+ Name (_CCA, One) // _CCA: Cache Coherency Attribute
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ Memory32Fixed (ReadWrite,
+ 0x0A000C00, // Address Base
+ 0x00000200, // Address Length
+ )+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x00000036,
+ }
+ })
+ }
+
+ Device (VR07)
+ {
+ Name (_HID, "LNRO0005") // _HID: Hardware ID
+ Name (_UID, 0x07) // _UID: Unique ID
+ Name (_CCA, One) // _CCA: Cache Coherency Attribute
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ Memory32Fixed (ReadWrite,
+ 0x0A000E00, // Address Base
+ 0x00000200, // Address Length
+ )+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x00000037,
+ }
+ })
+ }
+
+ Device (VR08)
+ {
+ Name (_HID, "LNRO0005") // _HID: Hardware ID
+ Name (_UID, 0x08) // _UID: Unique ID
+ Name (_CCA, One) // _CCA: Cache Coherency Attribute
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ Memory32Fixed (ReadWrite,
+ 0x0A001000, // Address Base
+ 0x00000200, // Address Length
+ )+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x00000038,
+ }
+ })
+ }
+
+ Device (VR09)
+ {
+ Name (_HID, "LNRO0005") // _HID: Hardware ID
+ Name (_UID, 0x09) // _UID: Unique ID
+ Name (_CCA, One) // _CCA: Cache Coherency Attribute
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ Memory32Fixed (ReadWrite,
+ 0x0A001200, // Address Base
+ 0x00000200, // Address Length
+ )+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x00000039,
+ }
+ })
+ }
+
+ Device (VR10)
+ {
+ Name (_HID, "LNRO0005") // _HID: Hardware ID
+ Name (_UID, 0x0A) // _UID: Unique ID
+ Name (_CCA, One) // _CCA: Cache Coherency Attribute
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ Memory32Fixed (ReadWrite,
+ 0x0A001400, // Address Base
+ 0x00000200, // Address Length
+ )+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x0000003A,
+ }
+ })
+ }
+
+ Device (VR11)
+ {
+ Name (_HID, "LNRO0005") // _HID: Hardware ID
+ Name (_UID, 0x0B) // _UID: Unique ID
+ Name (_CCA, One) // _CCA: Cache Coherency Attribute
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ Memory32Fixed (ReadWrite,
+ 0x0A001600, // Address Base
+ 0x00000200, // Address Length
+ )+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x0000003B,
+ }
+ })
+ }
+
+ Device (VR12)
+ {
+ Name (_HID, "LNRO0005") // _HID: Hardware ID
+ Name (_UID, 0x0C) // _UID: Unique ID
+ Name (_CCA, One) // _CCA: Cache Coherency Attribute
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ Memory32Fixed (ReadWrite,
+ 0x0A001800, // Address Base
+ 0x00000200, // Address Length
+ )+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x0000003C,
+ }
+ })
+ }
+
+ Device (VR13)
+ {
+ Name (_HID, "LNRO0005") // _HID: Hardware ID
+ Name (_UID, 0x0D) // _UID: Unique ID
+ Name (_CCA, One) // _CCA: Cache Coherency Attribute
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ Memory32Fixed (ReadWrite,
+ 0x0A001A00, // Address Base
+ 0x00000200, // Address Length
+ )+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x0000003D,
+ }
+ })
+ }
+
+ Device (VR14)
+ {
+ Name (_HID, "LNRO0005") // _HID: Hardware ID
+ Name (_UID, 0x0E) // _UID: Unique ID
+ Name (_CCA, One) // _CCA: Cache Coherency Attribute
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ Memory32Fixed (ReadWrite,
+ 0x0A001C00, // Address Base
+ 0x00000200, // Address Length
+ )+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x0000003E,
+ }
+ })
+ }
+
+ Device (VR15)
+ {
+ Name (_HID, "LNRO0005") // _HID: Hardware ID
+ Name (_UID, 0x0F) // _UID: Unique ID
+ Name (_CCA, One) // _CCA: Cache Coherency Attribute
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ Memory32Fixed (ReadWrite,
+ 0x0A001E00, // Address Base
+ 0x00000200, // Address Length
+ )+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x0000003F,
+ }
+ })
+ }
+
+ Device (VR16)
+ {
+ Name (_HID, "LNRO0005") // _HID: Hardware ID
+ Name (_UID, 0x10) // _UID: Unique ID
+ Name (_CCA, One) // _CCA: Cache Coherency Attribute
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ Memory32Fixed (ReadWrite,
+ 0x0A002000, // Address Base
+ 0x00000200, // Address Length
+ )+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x00000040,
+ }
+ })
+ }
+
+ Device (VR17)
+ {
+ Name (_HID, "LNRO0005") // _HID: Hardware ID
+ Name (_UID, 0x11) // _UID: Unique ID
+ Name (_CCA, One) // _CCA: Cache Coherency Attribute
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ Memory32Fixed (ReadWrite,
+ 0x0A002200, // Address Base
+ 0x00000200, // Address Length
+ )+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x00000041,
+ }
+ })
+ }
+
+ Device (VR18)
+ {
+ Name (_HID, "LNRO0005") // _HID: Hardware ID
+ Name (_UID, 0x12) // _UID: Unique ID
+ Name (_CCA, One) // _CCA: Cache Coherency Attribute
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ Memory32Fixed (ReadWrite,
+ 0x0A002400, // Address Base
+ 0x00000200, // Address Length
+ )+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x00000042,
+ }
+ })
+ }
+
+ Device (VR19)
+ {
+ Name (_HID, "LNRO0005") // _HID: Hardware ID
+ Name (_UID, 0x13) // _UID: Unique ID
+ Name (_CCA, One) // _CCA: Cache Coherency Attribute
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ Memory32Fixed (ReadWrite,
+ 0x0A002600, // Address Base
+ 0x00000200, // Address Length
+ )+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x00000043,
+ }
+ })
+ }
+
+ Device (VR20)
+ {
+ Name (_HID, "LNRO0005") // _HID: Hardware ID
+ Name (_UID, 0x14) // _UID: Unique ID
+ Name (_CCA, One) // _CCA: Cache Coherency Attribute
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ Memory32Fixed (ReadWrite,
+ 0x0A002800, // Address Base
+ 0x00000200, // Address Length
+ )+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x00000044,
+ }
+ })
+ }
+
+ Device (VR21)
+ {
+ Name (_HID, "LNRO0005") // _HID: Hardware ID
+ Name (_UID, 0x15) // _UID: Unique ID
+ Name (_CCA, One) // _CCA: Cache Coherency Attribute
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ Memory32Fixed (ReadWrite,
+ 0x0A002A00, // Address Base
+ 0x00000200, // Address Length
+ )+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x00000045,
+ }
+ })
+ }
+
+ Device (VR22)
+ {
+ Name (_HID, "LNRO0005") // _HID: Hardware ID
+ Name (_UID, 0x16) // _UID: Unique ID
+ Name (_CCA, One) // _CCA: Cache Coherency Attribute
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ Memory32Fixed (ReadWrite,
+ 0x0A002C00, // Address Base
+ 0x00000200, // Address Length
+ )+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x00000046,
+ }
+ })
+ }
+
+ Device (VR23)
+ {
+ Name (_HID, "LNRO0005") // _HID: Hardware ID
+ Name (_UID, 0x17) // _UID: Unique ID
+ Name (_CCA, One) // _CCA: Cache Coherency Attribute
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ Memory32Fixed (ReadWrite,
+ 0x0A002E00, // Address Base
+ 0x00000200, // Address Length
+ )+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x00000047,
+ }
+ })
+ }
+
+ Device (VR24)
+ {
+ Name (_HID, "LNRO0005") // _HID: Hardware ID
+ Name (_UID, 0x18) // _UID: Unique ID
+ Name (_CCA, One) // _CCA: Cache Coherency Attribute
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ Memory32Fixed (ReadWrite,
+ 0x0A003000, // Address Base
+ 0x00000200, // Address Length
+ )+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x00000048,
+ }
+ })
+ }
+
+ Device (VR25)
+ {
+ Name (_HID, "LNRO0005") // _HID: Hardware ID
+ Name (_UID, 0x19) // _UID: Unique ID
+ Name (_CCA, One) // _CCA: Cache Coherency Attribute
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ Memory32Fixed (ReadWrite,
+ 0x0A003200, // Address Base
+ 0x00000200, // Address Length
+ )+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x00000049,
+ }
+ })
+ }
+
+ Device (VR26)
+ {
+ Name (_HID, "LNRO0005") // _HID: Hardware ID
+ Name (_UID, 0x1A) // _UID: Unique ID
+ Name (_CCA, One) // _CCA: Cache Coherency Attribute
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ Memory32Fixed (ReadWrite,
+ 0x0A003400, // Address Base
+ 0x00000200, // Address Length
+ )+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x0000004A,
+ }
+ })
+ }
+
+ Device (VR27)
+ {
+ Name (_HID, "LNRO0005") // _HID: Hardware ID
+ Name (_UID, 0x1B) // _UID: Unique ID
+ Name (_CCA, One) // _CCA: Cache Coherency Attribute
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ Memory32Fixed (ReadWrite,
+ 0x0A003600, // Address Base
+ 0x00000200, // Address Length
+ )+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x0000004B,
+ }
+ })
+ }
+
+ Device (VR28)
+ {
+ Name (_HID, "LNRO0005") // _HID: Hardware ID
+ Name (_UID, 0x1C) // _UID: Unique ID
+ Name (_CCA, One) // _CCA: Cache Coherency Attribute
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ Memory32Fixed (ReadWrite,
+ 0x0A003800, // Address Base
+ 0x00000200, // Address Length
+ )+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x0000004C,
+ }
+ })
+ }
+
+ Device (VR29)
+ {
+ Name (_HID, "LNRO0005") // _HID: Hardware ID
+ Name (_UID, 0x1D) // _UID: Unique ID
+ Name (_CCA, One) // _CCA: Cache Coherency Attribute
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ Memory32Fixed (ReadWrite,
+ 0x0A003A00, // Address Base
+ 0x00000200, // Address Length
+ )+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x0000004D,
+ }
+ })
+ }
+
+ Device (VR30)
+ {
+ Name (_HID, "LNRO0005") // _HID: Hardware ID
+ Name (_UID, 0x1E) // _UID: Unique ID
+ Name (_CCA, One) // _CCA: Cache Coherency Attribute
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ Memory32Fixed (ReadWrite,
+ 0x0A003C00, // Address Base
+ 0x00000200, // Address Length
+ )+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x0000004E,
+ }
+ })
+ }
+
+ Device (VR31)
+ {
+ Name (_HID, "LNRO0005") // _HID: Hardware ID
+ Name (_UID, 0x1F) // _UID: Unique ID
+ Name (_CCA, One) // _CCA: Cache Coherency Attribute
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ Memory32Fixed (ReadWrite,
+ 0x0A003E00, // Address Base
+ 0x00000200, // Address Length
+ )+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x0000004F,
+ }
+ })
+ }
+
+ 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 (L001)
+ {
+ Name (_HID, "PNP0C0F" /* PCI Interrupt Link Device */) // _HID: Hardware ID
+ Name (_UID, One) // _UID: Unique ID
+ Name (_PRS, ResourceTemplate () // _PRS: Possible Resource Settings
+ {+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x00000024,
+ }
+ })
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x00000024,
+ }
+ })
+ Method (_SRS, 1, NotSerialized) // _SRS: Set Resource Settings
+ {
+ }+ }
+
+ Device (L002)
+ {
+ Name (_HID, "PNP0C0F" /* PCI Interrupt Link Device */) // _HID: Hardware ID
+ Name (_UID, 0x02) // _UID: Unique ID
+ Name (_PRS, ResourceTemplate () // _PRS: Possible Resource Settings
+ {+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x00000025,
+ }
+ })
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x00000025,
+ }
+ })
+ Method (_SRS, 1, NotSerialized) // _SRS: Set Resource Settings
+ {
+ }+ }
+
+ Device (L003)
+ {
+ Name (_HID, "PNP0C0F" /* PCI Interrupt Link Device */) // _HID: Hardware ID
+ Name (_UID, 0x03) // _UID: Unique ID
+ Name (_PRS, ResourceTemplate () // _PRS: Possible Resource Settings
+ {+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x00000026,
+ }
+ })
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ 0x00000026,
+ }
+ })
+ 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+ },
+
+ Package (0x04)
+ {
+ 0xFFFF, + One, + L001, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0xFFFF, + 0x02, + L002, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0xFFFF, + 0x03, + L003, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0001FFFF, + Zero, + L001, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0001FFFF, + One, + L002, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0001FFFF, + 0x02, + L003, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0001FFFF, + 0x03, + L000, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0002FFFF, + Zero, + L002, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0002FFFF, + One, + L003, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0002FFFF, + 0x02, + L000, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0002FFFF, + 0x03, + L001, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0003FFFF, + Zero, + L003, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0003FFFF, + One, + L000, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0003FFFF, + 0x02, + L001, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0003FFFF, + 0x03, + L002, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0004FFFF, + Zero, + L000, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0004FFFF, + One, + L001, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0004FFFF, + 0x02, + L002, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0004FFFF, + 0x03, + L003, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0005FFFF, + Zero, + L001, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0005FFFF, + One, + L002, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0005FFFF, + 0x02, + L003, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0005FFFF, + 0x03, + L000, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0006FFFF, + Zero, + L002, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0006FFFF, + One, + L003, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0006FFFF, + 0x02, + L000, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0006FFFF, + 0x03, + L001, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0007FFFF, + Zero, + L003, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0007FFFF, + One, + L000, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0007FFFF, + 0x02, + L001, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0007FFFF, + 0x03, + L002, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0008FFFF, + Zero, + L000, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0008FFFF, + One, + L001, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0008FFFF, + 0x02, + L002, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0008FFFF, + 0x03, + L003, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0009FFFF, + Zero, + L001, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0009FFFF, + One, + L002, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0009FFFF, + 0x02, + L003, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0009FFFF, + 0x03, + L000, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x000AFFFF, + Zero, + L002, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x000AFFFF, + One, + L003, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x000AFFFF, + 0x02, + L000, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x000AFFFF, + 0x03, + L001, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x000BFFFF, + Zero, + L003, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x000BFFFF, + One, + L000, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x000BFFFF, + 0x02, + L001, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x000BFFFF, + 0x03, + L002, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x000CFFFF, + Zero, + L000, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x000CFFFF, + One, + L001, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x000CFFFF, + 0x02, + L002, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x000CFFFF, + 0x03, + L003, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x000DFFFF, + Zero, + L001, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x000DFFFF, + One, + L002, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x000DFFFF, + 0x02, + L003, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x000DFFFF, + 0x03, + L000, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x000EFFFF, + Zero, + L002, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x000EFFFF, + One, + L003, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x000EFFFF, + 0x02, + L000, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x000EFFFF, + 0x03, + L001, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x000FFFFF, + Zero, + L003, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x000FFFFF, + One, + L000, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x000FFFFF, + 0x02, + L001, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x000FFFFF, + 0x03, + L002, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0010FFFF, + Zero, + L000, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0010FFFF, + One, + L001, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0010FFFF, + 0x02, + L002, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0010FFFF, + 0x03, + L003, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0011FFFF, + Zero, + L001, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0011FFFF, + One, + L002, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0011FFFF, + 0x02, + L003, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0011FFFF, + 0x03, + L000, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0012FFFF, + Zero, + L002, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0012FFFF, + One, + L003, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0012FFFF, + 0x02, + L000, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0012FFFF, + 0x03, + L001, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0013FFFF, + Zero, + L003, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0013FFFF, + One, + L000, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0013FFFF, + 0x02, + L001, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0013FFFF, + 0x03, + L002, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0014FFFF, + Zero, + L000, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0014FFFF, + One, + L001, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0014FFFF, + 0x02, + L002, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0014FFFF, + 0x03, + L003, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0015FFFF, + Zero, + L001, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0015FFFF, + One, + L002, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0015FFFF, + 0x02, + L003, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0015FFFF, + 0x03, + L000, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0016FFFF, + Zero, + L002, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0016FFFF, + One, + L003, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0016FFFF, + 0x02, + L000, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0016FFFF, + 0x03, + L001, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0017FFFF, + Zero, + L003, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0017FFFF, + One, + L000, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0017FFFF, + 0x02, + L001, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0017FFFF, + 0x03, + L002, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0018FFFF, + Zero, + L000, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0018FFFF, + One, + L001, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0018FFFF, + 0x02, + L002, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0018FFFF, + 0x03, + L003, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0019FFFF, + Zero, + L001, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0019FFFF, + One, + L002, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0019FFFF, + 0x02, + L003, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x0019FFFF, + 0x03, + L000, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x001AFFFF, + Zero, + L002, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x001AFFFF, + One, + L003, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x001AFFFF, + 0x02, + L000, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x001AFFFF, + 0x03, + L001, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x001BFFFF, + Zero, + L003, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x001BFFFF, + One, + L000, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x001BFFFF, + 0x02, + L001, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x001BFFFF, + 0x03, + L002, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x001CFFFF, + Zero, + L000, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x001CFFFF, + One, + L001, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x001CFFFF, + 0x02, + L002, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x001CFFFF, + 0x03, + L003, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x001DFFFF, + Zero, + L001, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x001DFFFF, + One, + L002, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x001DFFFF, + 0x02, + L003, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x001DFFFF, + 0x03, + L000, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x001EFFFF, + Zero, + L002, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x001EFFFF, + One, + L003, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x001EFFFF, + 0x02, + L000, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x001EFFFF, + 0x03, + L001, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x001FFFFF, + Zero, + L003, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x001FFFFF, + One, + L000, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x001FFFFF, + 0x02, + L001, + Zero
+ },
+
+ Package (0x04)
+ {
+ 0x001FFFFF,
+ 0x03,
+ L002,
+ 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 (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
+ )+ })
+ }
+
+ Device (S00)
+ {
+ Name (_ADR, Zero) // _ADR: Address
+ }
+
+ Device (S08)
+ {
+ Name (_ADR, 0x00010000) // _ADR: Address
+ }
+
+ Device (S20)
+ {
+ Name (_ADR, 0x00040000) // _ADR: Address
+ Name (BSEL, Zero)
+ Device (S00)
+ {
+ Name (_ADR, Zero) // _ADR: Address
+ Name (ASUN, Zero)
+ Method (_DSM, 4, Serialized) // _DSM: Device-Specific Method
+ {+ Local0 = Package (0x02)
+ {
+ Zero,
+ Zero
+ }
+ Local0 [Zero] = BSEL /* \_SB_.PCI0.S20_.BSEL */
+ Local0 [One] = ASUN /* \_SB_.PCI0.S20_.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)
+ }
+ }
+ }
+
+ Scope (S20)
+ {
+ Method (PCNT, 0, NotSerialized)
+ {
+ BNUM = Zero + DVNT (PCIU, One) + DVNT (PCID, 0x03)
+ }
+ }
+
+ Method (PCNT, 0, NotSerialized)
+ {
+ ^S20.PCNT ()
+ }
+ }
+}
--- tests/qtest/bios-tables-test-allowed-diff.h | 1 - tests/data/acpi/aarch64/virt/DSDT.acpipcihp | Bin 0 -> 5973 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