Use ACPI PCI hot-plug for Q35
v5 cover Use ACPI PCI hot-plug for Q35
The patch set consists of two parts:
patches 1-4: introduce new feature
'acpi-pci-hotplug-with-bridge-support' on Q35
patches 5-7: make the feature default along with changes in ACPI tables
With the feature disabled Q35 falls back to the native hot-plug.
Pros
* no racy behavior during boot (see 110c477c2ed)
* eject is possible - according to PCIe spec, attention button press should lead to power off, and then the adapter should be removed manually. As there is no power down state exists in QEMU, we cannot distinguish between an eject and a power down request.
* no delay during deleting - after the actual power off software must wait at least 1 second before indicating about it. This case is quite important for users, it even has its own bug:
https://bugzilla.redhat.com/show_bug.cgi?id=1594168
* no timer-based behavior - in addition to the previous example, the attention button has a 5-second waiting period, during which the operation can be canceled with a second press. While this looks fine for manual button control, automation will result in the need to queue or drop events, and the software receiving events in all sort of unspecified combinations of attention/power indicator states, which is racy and uppredictable.
* fixes or reduces the likelihood of the bugs:
* https://bugzilla.redhat.com/show_bug.cgi?id=1833187
* https://bugzilla.redhat.com/show_bug.cgi?id=1657077
* https://bugzilla.redhat.com/show_bug.cgi?id=1669931
* https://bugzilla.redhat.com/show_bug.cgi?id=1678290
Cons:
* no access to possible features presented in slot capabilities (this is only surprise removal AFAIK)
v5:
* make sugar property on TYPE_PCIE_SLOT
instead of old TYPE_MACHINE property [Igor]
* minor style changes
v4:
* regain per-port control over hot-plug
* rebased over acpi-index changes
* set property on machine type to
make pci code more generic [Igor, Michael]
v3:
* drop change of _OSC to allow SHPC on hotplugged bridges
* use 'acpi-root-pci-hotplug'
* add migration states [Igor]
* minor style changes
v2:
* new ioport range for acpiphp [Gerd]
* drop find_pci_host() [Igor]
* explain magic numbers in _OSC [Igor]
* drop build_q35_pci_hotplug() wrapper [Igor]
Julia Suvorova (7):
hw/acpi/pcihp: Enhance acpi_pcihp_disable_root_bus() to support Q35 hw/i386/acpi-build: Add ACPI PCI hot-plug methods to Q35 hw/acpi/ich9: Enable ACPI PCI hot-plug
hw/pci/pcie: Do not set HPC flag if acpihp is used
bios-tables-test: Allow changes in DSDT ACPI tables hw/acpi/ich9: Set ACPI PCI hot-plug as default on Q35
bios-tables-test: Update golden binaries
hw/i386/acpi-build.h | 5 +++ include/hw/acpi/ich9.h | 5 +++ include/hw/acpi/pcihp.h | 3 +- include/hw/pci/pcie_port.h | 5 ++- hw/acpi/ich9.c | 67 ++++++++++++++++++++++++++++++ hw/acpi/pcihp.c | 22 +++++++--- hw/acpi/piix4.c | 4 +- hw/core/machine.c | 1 - hw/i386/acpi-build.c | 32 ++++++++------ hw/i386/pc.c | 1 + hw/i386/pc_q35.c | 11 +++++ hw/pci/pcie.c | 8 +++- hw/pci/pcie_port.c | 1 + tests/data/acpi/q35/DSDT | Bin 7859 -> 8289 bytes tests/data/acpi/q35/DSDT.acpihmat | Bin 9184 -> 9614 bytes tests/data/acpi/q35/DSDT.bridge | Bin 7877 -> 11003 bytes tests/data/acpi/q35/DSDT.cphp | Bin 8323 -> 8753 bytes tests/data/acpi/q35/DSDT.dimmpxm | Bin 9513 -> 9943 bytes tests/data/acpi/q35/DSDT.ipmibt | Bin 7934 -> 8364 bytes tests/data/acpi/q35/DSDT.memhp | Bin 9218 -> 9648 bytes tests/data/acpi/q35/DSDT.mmio64 | Bin 8990 -> 9419 bytes tests/data/acpi/q35/DSDT.nohpet | Bin 7717 -> 8147 bytes tests/data/acpi/q35/DSDT.numamem | Bin 7865 -> 8295 bytes tests/data/acpi/q35/DSDT.tis | Bin 8465 -> 8894 bytes 24 files changed, 143 insertions(+), 22 deletions(-)
Signature · 1 line
2.30.2
PATCH v5 1/7 hw/acpi/pcihp: Enhance acpi_pcihp_disable_root_bus() to support Q35
PCI Express does not allow hot-plug on pcie.0. Check for Q35 in acpi_pcihp_disable_root_bus() to be able to forbid hot-plug using the 'acpi-root-pci-hotplug' flag.
--- hw/acpi/pcihp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
hw/acpi/pcihp.c +2 -1
@@ -122,13 +122,14 @@ static void acpi_set_pci_info(void)static void acpi_pcihp_disable_root_bus (void ) {static bool root_hp_disabled; +Object *host =acpi_get_i386_pci_host ();PCIBus *bus;if (root_hp_disabled) {return ; } - bus =find_i440fx (); + bus =PCI_HOST_BRIDGE (host)->bus;if (bus) {/* setting the hotplug handler to NULL makes the bus non-hotpluggable */ qbus_set_hotplug_handler (BUS (bus),NULL );
Signature · 1 line
2.30.2
Re: [PATCH v5 1/7] hw/acpi/pcihp: Enhance acpi_pcihp_disable_root_bus() to support Q35
Quoted 30 lines · Julia Suvorova
PCI Express does not allow hot-plug on pcie.0. Check for Q35 in
acpi_pcihp_disable_root_bus()to be able to forbid hot-plug using the 'acpi-root-pci-hotplug' flag.Signed-off-by Julia Suvorova <[email protected]>Reviewed-by Igor Mammedov <[email protected]>--- hw/acpi/pcihp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)hw/acpi/pcihp.c +2
-1@@ -122,13 +122,14 @@ static void acpi_set_pci_info(void)static void acpi_pcihp_disable_root_bus (void ) {static bool root_hp_disabled; +Object *host =acpi_get_i386_pci_host ();PCIBus *bus;if (root_hp_disabled) {return ; } - bus =find_i440fx (); + bus =PCI_HOST_BRIDGE (host)->bus;if (bus) {/* setting the hotplug handler to NULL makes the bus non-hotpluggable */
Quoted 5 lines
qbus_set_hotplug_handler(BUS(bus), NULL);--
2.30.2
Thanks,
Marcel
Re: [PATCH v5 1/7] hw/acpi/pcihp: Enhance acpi_pcihp_disable_root_bus() to support Q35
In reply to Julia SuvorovaQuoted 7 lines · Julia Suvorova
PCI Express does not allow hot-plug on pcie.0. Check for Q35 in
acpi_pcihp_disable_root_bus()to be able to forbid hot-plug using the 'acpi-root-pci-hotplug' flag.Signed-off-by Julia Suvorova <[email protected]>Reviewed-by Igor Mammedov <[email protected]>Reviewed-by Marcel Apfelbaum <[email protected]>
Quoted 24 lines
--- hw/acpi/pcihp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)hw/acpi/pcihp.c +2
-1@@ -122,13 +122,14 @@ static void acpi_set_pci_info(void)static void acpi_pcihp_disable_root_bus (void ) {static bool root_hp_disabled; +Object *host =acpi_get_i386_pci_host ();PCIBus *bus;if (root_hp_disabled) {return ; } - bus =find_i440fx (); + bus =PCI_HOST_BRIDGE (host)->bus;if (bus) {/* setting the hotplug handler to NULL makes the bus non-hotpluggable */ qbus_set_hotplug_handler (BUS (bus),NULL );
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Re: [PATCH v5 1/7] hw/acpi/pcihp: Enhance acpi_pcihp_disable_root_bus() to support Q35
In reply to Julia SuvorovaQuoted 15 lines · Julia Suvorova
PCI Express does not allow hot-plug on pcie.0. Check for Q35 in
acpi_pcihp_disable_root_bus()to be able to forbid hot-plug using the 'acpi-root-pci-hotplug' flag.Signed-off-by Julia Suvorova <[email protected]>Reviewed-by Igor Mammedov <[email protected]>--- hw/acpi/pcihp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)hw/acpi/pcihp.c +0
-0
hw/acpi/pcihp.c static void acpi_set_pci_info(void) · line 126
Quoted 5 lines
hw/acpi/pcihp.c +1
-0@@ -122,13 +122,14 @@ static void acpi_set_pci_info(void)static void acpi_pcihp_disable_root_bus (void ) {static bool root_hp_disabled; +Object *host =acpi_get_i386_pci_host ();PCIBus *bus;
This breaks build for mips malta which needs piix4.c and thus uses pcihp.c
Just try a full build you will see the failure.
I suggest changing the API to return the actual bus.
Quoted 12 lines
hw/acpi/pcihp.c +1
-1if (root_hp_disabled) {return ; } - bus =find_i440fx (); + bus =PCI_HOST_BRIDGE (host)->bus;if (bus) {/* setting the hotplug handler to NULL makes the bus non-hotpluggable */ qbus_set_hotplug_handler (BUS (bus),NULL );Signature · 1 line
2.30.2
Re: [PATCH v5 1/7] hw/acpi/pcihp: Enhance acpi_pcihp_disable_root_bus() to support Q35
In reply to Julia SuvorovaQuoted 20 lines · Julia Suvorova
PCI Express does not allow hot-plug on pcie.0. Check for Q35 in
acpi_pcihp_disable_root_bus()to be able to forbid hot-plug using the 'acpi-root-pci-hotplug' flag.Signed-off-by Julia Suvorova <[email protected]>Reviewed-by Igor Mammedov <[email protected]>--- hw/acpi/pcihp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)hw/acpi/pcihp.c +1
-0@@ -122,13 +122,14 @@ static void acpi_set_pci_info(void)static void acpi_pcihp_disable_root_bus (void ) {static bool root_hp_disabled; +Object *host =acpi_get_i386_pci_host ();PCIBus *bus;
hw/acpi/pcihp.c static void acpi_set_pci_info(void) · line 135
Quoted 10 lines
hw/acpi/pcihp.c +1
-1if (root_hp_disabled) {return ; } - bus =find_i440fx (); + bus =PCI_HOST_BRIDGE (host)->bus;if (bus) {/* setting the hotplug handler to NULL makes the bus non-hotpluggable */ qbus_set_hotplug_handler (BUS (bus),NULL );
../hw/acpi/pcihp.c: In function ‘acpi_pcihp_disable_root_bus’:../hw/acpi/pcihp.c:125:20: error: implicit declaration of function ‘acpi_get_i386_pci_host’ [-Werror=implicit-function-declaration]
125 | Object *host = acpi_get_i386_pci_host();
| ^~~~~~~~~~~~~~~~~~~~~~
../hw/acpi/pcihp.c:125:20: error: nested extern declaration of ‘acpi_get_i386_pci_host’ [-Werror=nested-externs]
../hw/acpi/pcihp.c:125:20: error: initialization of ‘Object *’ from ‘int’ makes pointer from integer without a cast [-Werror=int-conversion]
../hw/acpi/pcihp.c:132:11: error: implicit declaration of function ‘PCI_HOST_BRIDGE’; did you mean ‘PCI_BRIDGE’? [-Werror=implicit-function-declaration]
132 | bus = PCI_HOST_BRIDGE(host)->bus;
| ^~~~~~~~~~~~~~~
| PCI_BRIDGE../hw/acpi/pcihp.c:132:11: error: nested extern declaration of ‘PCI_HOST_BRIDGE’ [-Werror=nested-externs] ../hw/acpi/pcihp.c:132:32: error: invalid type argument of ‘->’ (have ‘int’)
132 | bus = PCI_HOST_BRIDGE(host)->bus;
| ^~
cc1: all warnings being treated as errors
since acpi_get_i386_pci_host is not defined yet in this patch.
Quoted 2 lines
Signature · 1 line
2.30.2
PATCH v5 2/7 hw/i386/acpi-build: Add ACPI PCI hot-plug methods to Q35
In reply to Julia SuvorovaImplement notifications and gpe to support q35 ACPI PCI hot-plug. Use 0xcc4 - 0xcd7 range for 'acpi-pci-hotplug' io ports.
--- hw/i386/acpi-build.h | 4 ++++ include/hw/acpi/ich9.h | 2 ++ include/hw/acpi/pcihp.h | 3 ++- hw/acpi/pcihp.c | 6 +++--- hw/acpi/piix4.c | 4 +++- hw/i386/acpi-build.c | 30 +++++++++++++++++++----------- 6 files changed, 33 insertions(+), 16 deletions(-)
hw/i386/acpi-build.h +4 -0
@@ -5,6 +5,10 @@extern const struct AcpiGenericAddress x86_nvdimm_acpi_dsmio; +/* PCI Hot-plug registers bases. See docs/spec/acpi_pci_hotplug.txt */ +#define ACPI_PCIHP_SEJ_BASE 0x8 +#define ACPI_PCIHP_BNMR_BASE 0x10 +void acpi_setup (void );#endif
include/hw/acpi/ich9.h +2 -0
@@ -28,6 +28,8 @@#include "hw/acpi/acpi_dev_interface.h" #include "hw/acpi/tco.h" +#define ACPI_PCIHP_ADDR_ICH9 0x0cc4 + typedef struct ICH9LPCPMRegs { /* * In ich9 spec says that pm1_cnt register is 32bit width and
include/hw/acpi/pcihp.h +2 -1
@@ -55,7 +55,8 @@ typedef struct AcpiPciHpState { } AcpiPciHpState;void acpi_pcihp_init (Object *owner,AcpiPciHpState *,PCIBus *root, -MemoryRegion *address_space_io,bool bridges_enabled); +MemoryRegion *address_space_io,bool bridges_enabled, +uint16_t io_base);void acpi_pcihp_device_pre_plug_cb (HotplugHandler *hotplug_dev,DeviceState *dev,Error **errp);
hw/acpi/pcihp.c +3 -3
@@ -37,7 +37,6 @@#include "qom/qom-qobject.h" #include "trace.h" -#define ACPI_PCIHP_ADDR 0xae00#define ACPI_PCIHP_SIZE 0x0018#define PCI_UP_BASE 0x0000#define PCI_DOWN_BASE 0x0004
@@ -489,10 +488,11 @@ static const MemoryRegionOps acpi_pcihp_io_ops = { };void acpi_pcihp_init (Object *owner,AcpiPciHpState *s,PCIBus *root_bus, -MemoryRegion *address_space_io,bool bridges_enabled) +MemoryRegion *address_space_io,bool bridges_enabled, +uint16_t io_base) { s->io_len =ACPI_PCIHP_SIZE ; - s->io_base =ACPI_PCIHP_ADDR ; + s->io_base = io_base; s->root = root_bus; s->legacy_piix = !bridges_enabled;
hw/acpi/piix4.c +3 -1
@@ -49,6 +49,8 @@#define GPE_BASE 0xafe0#define GPE_LEN 4 +#define ACPI_PCIHP_ADDR_PIIX4 0xae00 +struct pci_status {uint32_t up;/* deprecated, maintained for migration compatibility */ uint32_t down;
@@ -607,7 +609,7 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion *parent,if (s->use_acpi_hotplug_bridge || s->use_acpi_root_pci_hotplug) {acpi_pcihp_init (OBJECT (s), &s->acpi_pci_hotplug, bus, parent, - s->use_acpi_hotplug_bridge); + s->use_acpi_hotplug_bridge,ACPI_PCIHP_ADDR_PIIX4 ); } s->cpu_hotplug_legacy = true;
hw/i386/acpi-build.c +19 -11
@@ -219,10 +219,6 @@ static void acpi_get_pm_info(MachineState *machine, AcpiPmInfo *pm)/* w2k requires FADT(rev1) or it won't boot, keep PC compatible */ pm->fadt.rev =1 ; pm->cpu_hp_io_base =PIIX4_CPU_HOTPLUG_IO_BASE ; - pm->pcihp_io_base = -object_property_get_uint (obj,ACPI_PCIHP_IO_BASE_PROP ,NULL ); - pm->pcihp_io_len = -object_property_get_uint (obj,ACPI_PCIHP_IO_LEN_PROP ,NULL ); }if (lpc) { uint64_t smi_features = object_property_get_uint(lpc,
@@ -238,6 +234,10 @@ static void acpi_get_pm_info(MachineState *machine, AcpiPmInfo *pm) pm->smi_on_cpu_unplug = !!(smi_features &BIT_ULL (ICH9_LPC_SMI_F_CPU_HOT_UNPLUG_BIT )); } + pm->pcihp_io_base = +object_property_get_uint (obj,ACPI_PCIHP_IO_BASE_PROP ,NULL ); + pm->pcihp_io_len = +object_property_get_uint (obj,ACPI_PCIHP_IO_LEN_PROP ,NULL );/* The above need not be conditional on machine type because the reset port * happens to be the same on PIIX (pc) and ICH9 (q35). */
@@ -392,6 +392,9 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,if (!pdev) {if (bsel) {/* add hotplug slots for non present devices */ +if (pci_bus_is_express (bus) && slot >0 ) { +break ; + } dev =aml_device ("S%.02X" ,PCI_DEVFN (slot,0 ));aml_append (dev,aml_name_decl ("_SUN" ,aml_int (slot)));aml_append (dev,aml_name_decl ("_ADR" ,aml_int (slot <<16 )));
@@ -516,7 +519,7 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus, QLIST_FOREACH(sec, &bus->child, sibling) {int32_t devfn = sec->parent_dev->devfn; -if (pci_bus_is_root (sec) ||pci_bus_is_express (sec)) { +if (pci_bus_is_root (sec)) {continue ; }
@@ -1246,7 +1249,7 @@ static void build_piix4_isa_bridge(Aml *table)aml_append (table, scope); } -static void build_piix4_pci_hotplug (Aml *table) +static void build_x86_acpi_pci_hotplug (Aml *table,uint64_t pcihp_addr) {Aml *scope;Aml *field;
@@ -1255,20 +1258,22 @@ static void build_piix4_pci_hotplug(Aml *table) scope =aml_scope ("_SB.PCI0" );aml_append (scope, -aml_operation_region ("PCST" ,AML_SYSTEM_IO ,aml_int (0xae00 ),0x08 )); +aml_operation_region ("PCST" ,AML_SYSTEM_IO ,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_int (0xae08 ),0x04 )); +aml_operation_region ("SEJ" ,AML_SYSTEM_IO , +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_int (0xae10 ),0x08 )); +aml_operation_region ("BNMR" ,AML_SYSTEM_IO , +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 ));aml_append (field,aml_named_field ("PIDX" ,32 ));
@@ -1402,7 +1407,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,build_piix4_isa_bridge (dsdt);build_isa_devices_aml (dsdt);if (pm->pcihp_bridge_en || pm->pcihp_root_en) { -build_piix4_pci_hotplug (dsdt); +build_x86_acpi_pci_hotplug (dsdt, pm->pcihp_io_base); }build_piix4_pci0_int (dsdt); }else {
@@ -1450,6 +1455,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, }build_q35_isa_bridge (dsdt);build_isa_devices_aml (dsdt); +if (pm->pcihp_bridge_en) { +build_x86_acpi_pci_hotplug (dsdt, pm->pcihp_io_base); + }build_q35_pci0_int (dsdt);if (pcms->smbus && !pcmc->do_not_add_smb_acpi) {build_smb0 (dsdt, pcms->smbus,ICH9_SMB_DEV ,ICH9_SMB_FUNC );
@@ -1484,7 +1492,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, {aml_append (scope,aml_name_decl ("_HID" ,aml_string ("ACPI0006" ))); -if (misc->is_piix4 && (pm->pcihp_bridge_en || pm->pcihp_root_en)) { +if (pm->pcihp_bridge_en || pm->pcihp_root_en) { method =aml_method ("_E01" ,0 ,AML_NOTSERIALIZED );aml_append (method,aml_acquire (aml_name ("\\_SB.PCI0.BLCK" ),0xFFFF ));
Signature · 1 line
2.30.2
Re: [PATCH v5 2/7] hw/i386/acpi-build: Add ACPI PCI hot-plug methods to Q35
Quoted 159 lines · Julia Suvorova
Implement notifications and gpe to support q35 ACPI PCI hot-plug. Use
0xcc4-0xcd7range for 'acpi-pci-hotplug' io ports.Signed-off-by Julia Suvorova <[email protected]>Reviewed-by Igor Mammedov <[email protected]>--- hw/i386/acpi-build.h | 4 ++++ include/hw/acpi/ich9.h | 2 ++ include/hw/acpi/pcihp.h | 3 ++- hw/acpi/pcihp.c | 6 +++--- hw/acpi/piix4.c | 4 +++- hw/i386/acpi-build.c | 30 +++++++++++++++++++----------- 6 files changed, 33 insertions(+), 16 deletions(-)hw/i386/acpi-build.h +4
-0@@ -5,6 +5,10 @@extern const struct AcpiGenericAddress x86_nvdimm_acpi_dsmio; +/* PCI Hot-plug registers bases. See docs/spec/acpi_pci_hotplug.txt */ +#define ACPI_PCIHP_SEJ_BASE 0x8 +#define ACPI_PCIHP_BNMR_BASE 0x10 +void acpi_setup (void );#endif include/hw/acpi/ich9.h +2
-0@@ -28,6 +28,8 @@#include "hw/acpi/acpi_dev_interface.h" #include "hw/acpi/tco.h" +#define ACPI_PCIHP_ADDR_ICH9 0x0cc4 + typedef struct ICH9LPCPMRegs { /* * In ich9 spec says that pm1_cnt register is 32bit width andinclude/hw/acpi/pcihp.h +2
-1@@ -55,7 +55,8 @@ typedef struct AcpiPciHpState { } AcpiPciHpState;void acpi_pcihp_init (Object *owner,AcpiPciHpState *,PCIBus *root, -MemoryRegion *address_space_io,bool bridges_enabled ); + MemoryRegion *address_space_io, bool bridges_enabled, + uint16_t io_base); void acpi_pcihp_device_pre_plug_cb(HotplugHandler *hotplug_dev,DeviceState *dev, Error **errp);hw/acpi/pcihp.c +3
-3@@ -37,7 +37,6 @@#include "qom/qom-qobject.h" #include "trace.h" -#define ACPI_PCIHP_ADDR 0xae00#define ACPI_PCIHP_SIZE 0x0018#define PCI_UP_BASE 0x0000#define PCI_DOWN_BASE 0x0004@@ -489,10 +488,11 @@ static const MemoryRegionOps acpi_pcihp_io_ops = { };void acpi_pcihp_init (Object *owner,AcpiPciHpState *s,PCIBus *root_bus, -MemoryRegion *address_space_io,bool bridges_enabled) +MemoryRegion *address_space_io,bool bridges_enabled, +uint16_t io_base) { s->io_len =ACPI_PCIHP_SIZE ; - s->io_base =ACPI_PCIHP_ADDR ; + s->io_base = io_base; s->root = root_bus; s->legacy_piix = !bridges_enabled;hw/acpi/piix4.c +3
-1@@ -49,6 +49,8 @@#define GPE_BASE 0xafe0#define GPE_LEN 4 +#define ACPI_PCIHP_ADDR_PIIX4 0xae00 +struct pci_status {uint32_t up;/* deprecated, maintained for migration compatibility */ uint32_t down;@@ -607,7 +609,7 @@ static voidpiix4_acpi_system_hot_add_init (MemoryRegion *parent, if (s->use_acpi_hotplug_bridge || s->use_acpi_root_pci_hotplug) {acpi_pcihp_init (OBJECT (s), &s->acpi_pci_hotplug, bus, parent, - s->use_acpi_hotplug_bridge); + s->use_acpi_hotplug_bridge,ACPI_PCIHP_ADDR_PIIX4 ); }s->cpu_hotplug_legacy = true;hw/i386/acpi-build.c +0
-4@@ -219,10 +219,6 @@ static void acpi_get_pm_info(MachineState *machine, AcpiPmInfo *pm)/* w2k requires FADT(rev1) or it won't boot, keep PC compatible */ pm->fadt.rev = 1; pm->cpu_hp_io_base =PIIX4_CPU_HOTPLUG_IO_BASE ; - pm->pcihp_io_base = -object_property_get_uint (obj,ACPI_PCIHP_IO_BASE_PROP ,NULL ); - pm->pcihp_io_len = -object_property_get_uint (obj,ACPI_PCIHP_IO_LEN_PROP ,NULL ); }if (lpc) {
uint64_tsmi_features= object_property_get_uint(lpc,hw/i386/acpi-build.c +4
-0@@ -238,6 +234,10 @@ static void acpi_get_pm_info(MachineState *machine, AcpiPmInfo *pm) pm->smi_on_cpu_unplug = !!(smi_features &BIT_ULL (ICH9_LPC_SMI_F_CPU_HOT_UNPLUG_BIT )); } + pm->pcihp_io_base = +object_property_get_uint (obj,ACPI_PCIHP_IO_BASE_PROP ,NULL ); + pm->pcihp_io_len = +object_property_get_uint (obj,ACPI_PCIHP_IO_LEN_PROP ,NULL );/* The above need not be conditional on machine type because the reset port
* happens to be the same on PIIX (pc) and ICH9 (q35). */hw/i386/acpi-build.c +3
-0@@ -392,6 +392,9 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus, if (!pdev) {if (bsel) {/* add hotplug slots for non present devices */ +if (pci_bus_is_express (bus) && slot >0 ) { +break ; + } dev =aml_device ("S%.02X" ,PCI_DEVFN (slot,0 ));aml_append (dev,aml_name_decl ("_SUN" ,aml_int (slot)));aml_append(dev, aml_name_decl("_ADR", aml_int(slot <<16)));
hw/i386/acpi-build.c +1
-1@@ -516,7 +519,7 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus, QLIST_FOREACH(sec, &bus->child, sibling) {int32_t devfn = sec->parent_dev->devfn; -if (pci_bus_is_root (sec) ||pci_bus_is_express (sec)) { +if (pci_bus_is_root (sec)) {continue ; }
hw/i386/acpi-build.c static void build_piix4_isa_bridge(Aml *table) · line 1253
Quoted 6 lines
hw/i386/acpi-build.c +1
-1@@ -1246,7 +1249,7 @@ static void build_piix4_isa_bridge(Aml *table)aml_append (table, scope); } -static void build_piix4_pci_hotplug (Aml *table) +static void build_x86_acpi_pci_hotplug (Aml *table,uint64_t pcihp_addr)
I think "build_acpi_pci_hotplug" would be enough, I don't think it is x86 specific
however it is not worth a re-spin only for the name.
Quoted 67 lines
hw/i386/acpi-build.c +0
-0{Aml *scope;Aml *field;hw/i386/acpi-build.c +3
-3@@ -1255,20 +1258,22 @@ static void build_piix4_pci_hotplug(Aml *table) scope =aml_scope ("_SB.PCI0" );aml_append (scope, -aml_operation_region ("PCST" ,AML_SYSTEM_IO ,aml_int (0xae00 ), 0x08)); +aml_operation_region ("PCST" ,AML_SYSTEM_IO ,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_int (0xae08 ), 0x04)); +aml_operation_region ("SEJ" ,AML_SYSTEM_IO , +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_int(0xae10),
0x08));hw/i386/acpi-build.c +2
-0+ aml_operation_region("BNMR", AML_SYSTEM_IO, + 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)); aml_append(field, aml_named_field("PIDX", 32));hw/i386/acpi-build.c +5
-2@@ -1402,7 +1407,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,build_piix4_isa_bridge (dsdt);build_isa_devices_aml (dsdt);if (pm->pcihp_bridge_en || pm->pcihp_root_en) { -build_piix4_pci_hotplug (dsdt); +build_x86_acpi_pci_hotplug (dsdt, pm->pcihp_io_base); }build_piix4_pci0_int (dsdt); }else {@@ -1450,6 +1455,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, }build_q35_isa_bridge (dsdt);build_isa_devices_aml (dsdt); +if (pm->pcihp_bridge_en) { +build_x86_acpi_pci_hotplug (dsdt, pm->pcihp_io_base); + }build_q35_pci0_int (dsdt);if (pcms->smbus && !pcmc->do_not_add_smb_acpi) {build_smb0 (dsdt, pcms->smbus,ICH9_SMB_DEV ,ICH9_SMB_FUNC );@@ -1484,7 +1492,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, {aml_append (scope,aml_name_decl ("_HID" ,aml_string ("ACPI0006" ))); -if (misc->is_piix4 && (pm->pcihp_bridge_en || pm->pcihp_root_en)) { +if (pm->pcihp_bridge_en || pm->pcihp_root_en) { method =aml_method ("_E01" ,0 ,AML_NOTSERIALIZED ); aml_append(method,aml_acquire(aml_name("\\_SB.PCI0.BLCK"), 0xFFFF));
Quoted 4 lines
--
2.30.2
Thanks,
Marcel
Re: [PATCH v5 2/7] hw/i386/acpi-build: Add ACPI PCI hot-plug methods to Q35
In reply to Julia SuvorovaQuoted 6 lines · Julia Suvorova
Implement notifications and gpe to support q35 ACPI PCI hot-plug. Use
0xcc4-0xcd7range for 'acpi-pci-hotplug' io ports.Signed-off-by Julia Suvorova <[email protected]>Reviewed-by Igor Mammedov <[email protected]>Reviewed-by Marcel Apfelbaum <[email protected]>
I don't know ACPI or x86 particular well, so I could well have missed something, but..
[snip]
Quoted 11 lines
hw/i386/acpi-build.c +3
-0@@ -392,6 +392,9 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,if (!pdev) {if (bsel) {/* add hotplug slots for non present devices */ +if (pci_bus_is_express (bus) && slot >0 ) { +break ; + } dev =aml_device ("S%.02X" ,PCI_DEVFN (slot,0 ));aml_append (dev,aml_name_decl ("_SUN" ,aml_int (slot)));aml_append (dev,aml_name_decl ("_ADR" ,aml_int (slot <<16 )));
hw/i386/acpi-build.c static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus, · line 524
Quoted 7 lines
hw/i386/acpi-build.c +1
-1@@ -516,7 +519,7 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus, QLIST_FOREACH(sec, &bus->child, sibling) {int32_t devfn = sec->parent_dev->devfn; -if (pci_bus_is_root (sec) ||pci_bus_is_express (sec)) { +if (pci_bus_is_root (sec)) {continue ; }
.. what will this logic do if we encounter a PCIe-switch. AIUI, it should be possible to hotplug 1 slot under each downstream port, but we can't hotplug anything directly under the upstream port. AFAICT both the upstream and downstream ports will show up as 'is_bridge' though.
So, IIUC we want to traverse a PCIe upstream switch port, but not generate hotplug slots until we encounter the downstream ports below it.
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Re: [PATCH v5 2/7] hw/i386/acpi-build: Add ACPI PCI hot-plug methods to Q35
Quoted 37 lines · David Gibson
Quoted 6 lines · Julia Suvorova
Implement notifications and gpe to support q35 ACPI PCI hot-plug. Use
0xcc4-0xcd7range for 'acpi-pci-hotplug' io ports.Signed-off-by Julia Suvorova <[email protected]>Reviewed-by Igor Mammedov <[email protected]>Reviewed-by Marcel Apfelbaum <[email protected]>I don't know ACPI or x86 particular well, so I could well have missed something, but..
[snip]
Quoted 11 lines
hw/i386/acpi-build.c +3
-0@@ -392,6 +392,9 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,if (!pdev) {if (bsel) {/* add hotplug slots for non present devices */ +if (pci_bus_is_express (bus) && slot >0 ) { +break ; + } dev =aml_device ("S%.02X" ,PCI_DEVFN (slot,0 ));aml_append (dev,aml_name_decl ("_SUN" ,aml_int (slot)));aml_append (dev,aml_name_decl ("_ADR" ,aml_int (slot <<16 )));hw/i386/acpi-build.c static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus, · line 524
Quoted 7 lines
hw/i386/acpi-build.c +1
-1@@ -516,7 +519,7 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus, QLIST_FOREACH(sec, &bus->child, sibling) {int32_t devfn = sec->parent_dev->devfn; -if (pci_bus_is_root (sec) ||pci_bus_is_express (sec)) { +if (pci_bus_is_root (sec)) {continue ; }.. what will this logic do if we encounter a PCIe-switch. AIUI, it should be possible to hotplug 1 slot under each downstream port, but we can't hotplug anything directly under the upstream port. AFAICT both the upstream and downstream ports will show up as '
is_bridge' though.
Quoted 3 lines
So, IIUC we want to traverse a PCIe upstream switch port, but not generate hotplug slots until we encounter the downstream ports below it.
Julia could you comment on this please?
I already applied the patches so patch on top if necessary please ...
Quoted 5 lines
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
PATCH v5 3/7 hw/acpi/ich9: Enable ACPI PCI hot-plug
In reply to Julia SuvorovaAdd acpi_pcihp to ich9_pm as part of 'acpi-pci-hotplug-with-bridge-support' option. Set default to false.
--- hw/i386/acpi-build.h | 1 + include/hw/acpi/ich9.h | 3 ++ hw/acpi/ich9.c | 67 ++++++++++++++++++++++++++++++++++++++++++ hw/acpi/pcihp.c | 5 +++- hw/i386/acpi-build.c | 2 +- 5 files changed, 76 insertions(+), 2 deletions(-)
hw/i386/acpi-build.h +1 -0
@@ -10,5 +10,6 @@ extern const struct AcpiGenericAddress x86_nvdimm_acpi_dsmio;#define ACPI_PCIHP_BNMR_BASE 0x10void acpi_setup (void ); +Object *acpi_get_i386_pci_host (void );#endif
include/hw/acpi/ich9.h +3 -0
@@ -24,6 +24,7 @@#include "hw/acpi/acpi.h" #include "hw/acpi/cpu_hotplug.h" #include "hw/acpi/cpu.h" +#include "hw/acpi/pcihp.h" #include "hw/acpi/memory_hotplug.h" #include "hw/acpi/acpi_dev_interface.h" #include "hw/acpi/tco.h"
@@ -55,6 +56,8 @@ typedef struct ICH9LPCPMRegs {AcpiCpuHotplug gpe_cpu;CPUHotplugState cpuhp_state; +bool use_acpi_hotplug_bridge; +AcpiPciHpState acpi_pci_hotplug;MemHotplugState acpi_memory_hotplug;uint8_t disable_s3;
hw/acpi/ich9.c +67 -0
133 lines not on this page · raw message
hw/acpi/pcihp.c +4 -1
@@ -30,6 +30,8 @@#include "hw/pci-host/i440fx.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bridge.h" +#include "hw/pci/pci_host.h" +#include "hw/i386/acpi-build.h" #include "hw/acpi/acpi.h" #include "hw/pci/pci_bus.h" #include "migration/vmstate.h"
@@ -103,6 +105,7 @@ static void *acpi_set_bsel(PCIBus *bus, void *opaque)static void acpi_set_pci_info (void ) {static bool bsel_is_set; +Object *host =acpi_get_i386_pci_host ();PCIBus *bus;unsigned bsel_alloc =ACPI_PCIHP_BSEL_DEFAULT ;
@@ -111,7 +114,7 @@ static void acpi_set_pci_info(void) } bsel_is_set = true; - bus =find_i440fx ();/* TODO: Q35 support */ + bus =PCI_HOST_BRIDGE (host)->bus;if (bus) {/* Scan all PCI buses. Set property to enable acpi based hotplug. */ pci_for_each_bus_depth_first (bus, acpi_set_bsel,NULL , &bsel_alloc);
hw/i386/acpi-build.c +1 -1
@@ -299,7 +299,7 @@ static void acpi_get_misc_info(AcpiMiscInfo *info)* Because of the PXB hosts we cannot simply query TYPE_PCI_HOST_BRIDGE. * On i386 arch we only have two pci hosts, so we can look only for them. */ -static Object *acpi_get_i386_pci_host (void ) +Object *acpi_get_i386_pci_host (void ) {PCIHostState *host;
Signature · 1 line
2.30.2
Re: [PATCH v5 3/7] hw/acpi/ich9: Enable ACPI PCI hot-plug
Quoted 255 lines · Julia Suvorova
Add
acpi_pcihptoich9_pmas part of 'acpi-pci-hotplug-with-bridge-support' option. Set default to false.Signed-off-by Julia Suvorova <[email protected]>Reviewed-by Igor Mammedov <[email protected]>--- hw/i386/acpi-build.h | 1 + include/hw/acpi/ich9.h | 3 ++ hw/acpi/ich9.c | 67 ++++++++++++++++++++++++++++++++++++++++++ hw/acpi/pcihp.c | 5 +++- hw/i386/acpi-build.c | 2 +- 5 files changed, 76 insertions(+), 2 deletions(-)hw/i386/acpi-build.h +1
-0@@ -10,5 +10,6 @@ extern const struct AcpiGenericAddress x86_nvdimm_acpi_dsmio;#define ACPI_PCIHP_BNMR_BASE 0x10void acpi_setup (void ); +Object *acpi_get_i386_pci_host (void );#endif
include/hw/acpi/ich9.h +3
-0@@ -24,6 +24,7 @@#include "hw/acpi/acpi.h" #include "hw/acpi/cpu_hotplug.h" #include "hw/acpi/cpu.h" +#include "hw/acpi/pcihp.h" #include "hw/acpi/memory_hotplug.h" #include "hw/acpi/acpi_dev_interface.h" #include "hw/acpi/tco.h" @@ -55,6 +56,8 @@ typedef struct ICH9LPCPMRegs {AcpiCpuHotplug gpe_cpu;CPUHotplugState cpuhp_state; +bool use_acpi_hotplug_bridge; +AcpiPciHpState acpi_pci_hotplug;MemHotplugState acpi_memory_hotplug;uint8_t disable_s3;hw/acpi/ich9.c +20
-0@@ -217,6 +217,26 @@ static const VMStateDescription vmstate_cpuhp_state = { } }; +static bool vmstate_test_use_pcihp (void *opaque) +{ +ICH9LPCPMRegs *s = opaque; + +return s->use_acpi_hotplug_bridge; +} + +static const VMStateDescription vmstate_pcihp_state = { + .name ="ich9_pm/pcihp" , + .version_id =1 , + .minimum_version_id =1 , + .needed = vmstate_test_use_pcihp, + .fields = (VMStateField []) { +VMSTATE_PCI_HOTPLUG (acpi_pci_hotplug, + ICH9LPCPMRegs, +NULL ,NULL ), +VMSTATE_END_OF_LIST () + } +}; +const VMStateDescription vmstate_ich9_pm = { .name ="ich9_pm" ,.version_id = 1,hw/acpi/ich9.c +14
-0@@ -238,6 +258,7 @@ const VMStateDescription vmstate_ich9_pm = { &vmstate_memhp_state, &vmstate_tco_io_state, &vmstate_cpuhp_state, + &vmstate_pcihp_state, NULL } };@@ -259,6 +280,7 @@ static void pm_reset(void *opaque) } pm->smi_en_wmask = ~0 ; +acpi_pcihp_reset (&pm->acpi_pci_hotplug, true);acpi_update_sci (&pm->acpi_regs, pm->irq); }@@ -297,6 +319,18 @@ void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm, pm->enable_tco = true;acpi_pm_tco_init (&pm->tco_regs, &pm->io); +if (pm->use_acpi_hotplug_bridge) { +acpi_pcihp_init (OBJECT (lpc_pci), + &pm->acpi_pci_hotplug, +pci_get_bus (lpc_pci), +pci_address_space_io (lpc_pci), + true, +ACPI_PCIHP_ADDR_ICH9 ); + +qbus_set_hotplug_handler (BUS (pci_get_bus (lpc_pci)), +OBJECT (lpc_pci)); + } + pm->irq = sci_irq;qemu_register_reset (pm_reset, pm);pm->powerdown_notifier.notify = pm_powerdown_req;hw/acpi/ich9.c +14
-0@@ -368,6 +402,20 @@ static void ich9_pm_set_enable_tco(Object *obj, bool value, Error **errp) s->pm.enable_tco = value; } +static bool ich9_pm_get_acpi_pci_hotplug (Object *obj,Error **errp) +{ +ICH9LPCState *s =ICH9_LPC_DEVICE (obj); + +return s->pm.use_acpi_hotplug_bridge; +} + +static void ich9_pm_set_acpi_pci_hotplug (Object *obj,bool value,Error **errp) +{ +ICH9LPCState *s =ICH9_LPC_DEVICE (obj); + + s->pm.use_acpi_hotplug_bridge = value; +} +void ich9_pm_add_properties (Object *obj,ICH9LPCPMRegs *pm){ static const uint32_t gpe0_len = ICH9_PMIO_GPE0_LEN;hw/acpi/ich9.c +1
-0@@ -376,6 +424,7 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm) pm->disable_s3 =0 ; pm->disable_s4 =0 ; pm->s4_val =2 ; + pm->use_acpi_hotplug_bridge = false; object_property_add_uint32_ptr(obj, ACPI_PM_PROP_PM_IO_BASE,&pm->pm_io_base, OBJ_PROP_FLAG_READ);hw/acpi/ich9.c +3
-0@@ -399,6 +448,9 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm)object_property_add_bool (obj,ACPI_PM_PROP_TCO_ENABLED , ich9_pm_get_enable_tco, ich9_pm_set_enable_tco); +object_property_add_bool (obj,"acpi-pci-hotplug-with-bridge-support" , + ich9_pm_get_acpi_pci_hotplug, + ich9_pm_set_acpi_pci_hotplug); }void ich9_pm_device_pre_plug_cb(HotplugHandler
*hotplug_dev, DeviceState
*dev,hw/acpi/ich9.c +5
-0@@ -406,6 +458,11 @@ void ich9_pm_device_pre_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, { ICH9LPCState *lpc =ICH9_LPC_DEVICE (hotplug_dev); +if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +acpi_pcihp_device_pre_plug_cb (hotplug_dev, dev, errp); +return ; + } +if (object_dynamic_cast (OBJECT (dev),TYPE_PC_DIMM ) && !lpc->pm.acpi_memory_hotplug.is_enabled) {error_setg(errp,
hw/acpi/ich9.c +3
-0@@ -441,6 +498,9 @@ void ich9_pm_device_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, } else {acpi_cpu_plug_cb (hotplug_dev, &lpc->pm.cpuhp_state, dev, errp); } + }else if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +acpi_pcihp_device_plug_cb (hotplug_dev, &lpc->pm.acpi_pci_hotplug, + dev, errp); }else {error_setg(errp, "acpi: device plug request for not supported
device"" type: %s", object_get_typename(OBJECT(dev)));hw/acpi/ich9.c +4
-0@@ -473,6 +533,10 @@ void ich9_pm_device_unplug_request_cb(HotplugHandler *hotplug_dev,acpi_cpu_unplug_request_cb (hotplug_dev, &lpc->pm.cpuhp_state, dev, errp); + }else if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +acpi_pcihp_device_unplug_request_cb (hotplug_dev, + &lpc->pm.acpi_pci_hotplug, + dev, errp); }else { error_setg(errp, "acpi: device unplug request for not supporteddevice"
" type: %s", object_get_typename(OBJECT(dev)));hw/acpi/ich9.c +3
-0@@ -490,6 +554,9 @@ void ich9_pm_device_unplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU) && !lpc->pm.cpu_hotplug_legacy) {acpi_cpu_unplug_cb (&lpc->pm.cpuhp_state, dev, errp); + }else if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +acpi_pcihp_device_unplug_cb (hotplug_dev, &lpc->pm.acpi_pci_hotplug, + dev, errp); }else {error_setg(errp, "acpi: device unplug for not supported device"
" type: %s", object_get_typename(OBJECT(dev)));hw/acpi/pcihp.c +4
-1@@ -30,6 +30,8 @@#include "hw/pci-host/i440fx.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bridge.h" +#include "hw/pci/pci_host.h" +#include "hw/i386/acpi-build.h" #include "hw/acpi/acpi.h" #include "hw/pci/pci_bus.h" #include "migration/vmstate.h" @@ -103,6 +105,7 @@ static void *acpi_set_bsel(PCIBus *bus, void *opaque)static void acpi_set_pci_info (void ) {static bool bsel_is_set; +Object *host =acpi_get_i386_pci_host ();PCIBus *bus;unsigned bsel_alloc =ACPI_PCIHP_BSEL_DEFAULT ;@@ -111,7 +114,7 @@ static void acpi_set_pci_info(void) } bsel_is_set = true; - bus =find_i440fx ();/* TODO: Q35 support */ + bus =PCI_HOST_BRIDGE (host)->bus;if (bus) {/* Scan all PCI buses. Set property to enable acpi based hotplug. */ pci_for_each_bus_depth_first(bus,
acpi_set_bsel, NULL,&bsel_alloc);hw/i386/acpi-build.c +1
-2@@ -299,7 +299,7 @@ static void acpi_get_misc_info(AcpiMiscInfo *info)* Because of the PXB hosts we cannot simply query TYPE_PCI_HOST_BRIDGE. * On i386 arch we only have two pci hosts, so we can look only for them. */ -static Object *acpi_get_i386_pci_host (void ) +Object *acpi_get_i386_pci_host (void ) {PCIHostState *host; --
Quoted 3 lines
2.30.2
Thanks,
Marcel
Re: [PATCH v5 3/7] hw/acpi/ich9: Enable ACPI PCI hot-plug
In reply to Julia SuvorovaQuoted 86 lines · Julia Suvorova
Add
acpi_pcihptoich9_pmas part of 'acpi-pci-hotplug-with-bridge-support' option. Set default to false.Signed-off-by Julia Suvorova <[email protected]>Reviewed-by Igor Mammedov <[email protected]>Reviewed-by Marcel Apfelbaum <[email protected]>--- hw/i386/acpi-build.h | 1 + include/hw/acpi/ich9.h | 3 ++ hw/acpi/ich9.c | 67 ++++++++++++++++++++++++++++++++++++++++++ hw/acpi/pcihp.c | 5 +++- hw/i386/acpi-build.c | 2 +- 5 files changed, 76 insertions(+), 2 deletions(-)hw/i386/acpi-build.h +1
-0@@ -10,5 +10,6 @@ extern const struct AcpiGenericAddress x86_nvdimm_acpi_dsmio;#define ACPI_PCIHP_BNMR_BASE 0x10void acpi_setup (void ); +Object *acpi_get_i386_pci_host (void );#endif include/hw/acpi/ich9.h +3
-0@@ -24,6 +24,7 @@#include "hw/acpi/acpi.h" #include "hw/acpi/cpu_hotplug.h" #include "hw/acpi/cpu.h" +#include "hw/acpi/pcihp.h" #include "hw/acpi/memory_hotplug.h" #include "hw/acpi/acpi_dev_interface.h" #include "hw/acpi/tco.h" @@ -55,6 +56,8 @@ typedef struct ICH9LPCPMRegs {AcpiCpuHotplug gpe_cpu;CPUHotplugState cpuhp_state; +bool use_acpi_hotplug_bridge; +AcpiPciHpState acpi_pci_hotplug;MemHotplugState acpi_memory_hotplug;uint8_t disable_s3;hw/acpi/ich9.c +21
-0@@ -217,6 +217,26 @@ static const VMStateDescription vmstate_cpuhp_state = { } }; +static bool vmstate_test_use_pcihp (void *opaque) +{ +ICH9LPCPMRegs *s = opaque; + +return s->use_acpi_hotplug_bridge; +} + +static const VMStateDescription vmstate_pcihp_state = { + .name ="ich9_pm/pcihp" , + .version_id =1 , + .minimum_version_id =1 , + .needed = vmstate_test_use_pcihp, + .fields = (VMStateField []) { +VMSTATE_PCI_HOTPLUG (acpi_pci_hotplug, + ICH9LPCPMRegs, +NULL ,NULL ), +VMSTATE_END_OF_LIST () + } +}; +const VMStateDescription vmstate_ich9_pm = { .name ="ich9_pm" , .version_id =1 ,@@ -238,6 +258,7 @@ const VMStateDescription vmstate_ich9_pm = { &vmstate_memhp_state, &vmstate_tco_io_state, &vmstate_cpuhp_state, + &vmstate_pcihp_state, NULL } };
hw/acpi/ich9.c static void pm_reset(void *opaque) · line 283
Quoted 4 lines
hw/acpi/ich9.c +1
-0@@ -259,6 +280,7 @@ static void pm_reset(void *opaque) } pm->smi_en_wmask = ~0 ; +acpi_pcihp_reset (&pm->acpi_pci_hotplug, true);
Doesn't this need to be protected by if (pm->use_acpi_hotplug_bridge) ? Otherwise pm->acpi_pci_hotplug won't be initialized.
Quoted 126 lines
hw/acpi/ich9.c +45
-0acpi_update_sci (&pm->acpi_regs, pm->irq); }@@ -297,6 +319,18 @@ void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm, pm->enable_tco = true;acpi_pm_tco_init (&pm->tco_regs, &pm->io); +if (pm->use_acpi_hotplug_bridge) { +acpi_pcihp_init (OBJECT (lpc_pci), + &pm->acpi_pci_hotplug, +pci_get_bus (lpc_pci), +pci_address_space_io (lpc_pci), + true, +ACPI_PCIHP_ADDR_ICH9 ); + +qbus_set_hotplug_handler (BUS (pci_get_bus (lpc_pci)), +OBJECT (lpc_pci)); + } + pm->irq = sci_irq;qemu_register_reset (pm_reset, pm); pm->powerdown_notifier.notify = pm_powerdown_req;@@ -368,6 +402,20 @@ static void ich9_pm_set_enable_tco(Object *obj, bool value, Error **errp) s->pm.enable_tco = value; } +static bool ich9_pm_get_acpi_pci_hotplug (Object *obj,Error **errp) +{ +ICH9LPCState *s =ICH9_LPC_DEVICE (obj); + +return s->pm.use_acpi_hotplug_bridge; +} + +static void ich9_pm_set_acpi_pci_hotplug (Object *obj,bool value,Error **errp) +{ +ICH9LPCState *s =ICH9_LPC_DEVICE (obj); + + s->pm.use_acpi_hotplug_bridge = value; +} +void ich9_pm_add_properties (Object *obj,ICH9LPCPMRegs *pm) {static const uint32_t gpe0_len =ICH9_PMIO_GPE0_LEN ;@@ -376,6 +424,7 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm) pm->disable_s3 =0 ; pm->disable_s4 =0 ; pm->s4_val =2 ; + pm->use_acpi_hotplug_bridge = false;object_property_add_uint32_ptr (obj,ACPI_PM_PROP_PM_IO_BASE , &pm->pm_io_base,OBJ_PROP_FLAG_READ );@@ -399,6 +448,9 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm)object_property_add_bool (obj,ACPI_PM_PROP_TCO_ENABLED , ich9_pm_get_enable_tco, ich9_pm_set_enable_tco); +object_property_add_bool (obj,"acpi-pci-hotplug-with-bridge-support" , + ich9_pm_get_acpi_pci_hotplug, + ich9_pm_set_acpi_pci_hotplug); } void ich9_pm_device_pre_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,@@ -406,6 +458,11 @@ void ich9_pm_device_pre_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, {ICH9LPCState *lpc =ICH9_LPC_DEVICE (hotplug_dev); +if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +acpi_pcihp_device_pre_plug_cb (hotplug_dev, dev, errp); +return ; + } +if (object_dynamic_cast (OBJECT (dev),TYPE_PC_DIMM ) && !lpc->pm.acpi_memory_hotplug.is_enabled) { error_setg(errp,@@ -441,6 +498,9 @@ void ich9_pm_device_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, }else {acpi_cpu_plug_cb (hotplug_dev, &lpc->pm.cpuhp_state, dev, errp); } + }else if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +acpi_pcihp_device_plug_cb (hotplug_dev, &lpc->pm.acpi_pci_hotplug, + dev, errp); }else {error_setg (errp,"acpi: device plug request for not supported device" " type: %s" ,object_get_typename (OBJECT (dev)));@@ -473,6 +533,10 @@ void ich9_pm_device_unplug_request_cb(HotplugHandler *hotplug_dev,acpi_cpu_unplug_request_cb (hotplug_dev, &lpc->pm.cpuhp_state, dev, errp); + }else if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +acpi_pcihp_device_unplug_request_cb (hotplug_dev, + &lpc->pm.acpi_pci_hotplug, + dev, errp); }else {error_setg (errp,"acpi: device unplug request for not supported device" " type: %s" ,object_get_typename (OBJECT (dev)));@@ -490,6 +554,9 @@ void ich9_pm_device_unplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, }else if (object_dynamic_cast (OBJECT (dev),TYPE_CPU ) && !lpc->pm.cpu_hotplug_legacy) {acpi_cpu_unplug_cb (&lpc->pm.cpuhp_state, dev, errp); + }else if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +acpi_pcihp_device_unplug_cb (hotplug_dev, &lpc->pm.acpi_pci_hotplug, + dev, errp); }else {error_setg (errp,"acpi: device unplug for not supported device" " type: %s" ,object_get_typename (OBJECT (dev)));hw/acpi/pcihp.c +3
-0@@ -30,6 +30,8 @@#include "hw/pci-host/i440fx.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bridge.h" +#include "hw/pci/pci_host.h" +#include "hw/i386/acpi-build.h" #include "hw/acpi/acpi.h" #include "hw/pci/pci_bus.h" #include "migration/vmstate.h" @@ -103,6 +105,7 @@ static void *acpi_set_bsel(PCIBus *bus, void *opaque)static void acpi_set_pci_info (void ) {static bool bsel_is_set; +Object *host =acpi_get_i386_pci_host ();PCIBus *bus;unsigned bsel_alloc =ACPI_PCIHP_BSEL_DEFAULT ;
hw/acpi/pcihp.c static void acpi_set_pci_info(void) · line 117
Quoted 5 lines
hw/acpi/pcihp.c +1
-1@@ -111,7 +114,7 @@ static void acpi_set_pci_info(void) } bsel_is_set = true; - bus =find_i440fx ();/* TODO: Q35 support */ + bus =PCI_HOST_BRIDGE (host)->bus;
Would it make more sense for this change to go in patch #1, along with the similar change to acpi_pcihp_disable_root_bus().
Quoted 16 lines
hw/acpi/pcihp.c +0
-0if (bus) {/* Scan all PCI buses. Set property to enable acpi based hotplug. */ pci_for_each_bus_depth_first (bus, acpi_set_bsel,NULL , &bsel_alloc);hw/i386/acpi-build.c +1
-1@@ -299,7 +299,7 @@ static void acpi_get_misc_info(AcpiMiscInfo *info)* Because of the PXB hosts we cannot simply query TYPE_PCI_HOST_BRIDGE. * On i386 arch we only have two pci hosts, so we can look only for them. */ -static Object *acpi_get_i386_pci_host (void ) +Object *acpi_get_i386_pci_host (void ) {PCIHostState *host;
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Re: [PATCH v5 3/7] hw/acpi/ich9: Enable ACPI PCI hot-plug
Quoted 90 lines · David Gibson
Quoted 89 lines · Julia Suvorova
Add
acpi_pcihptoich9_pmas part of 'acpi-pci-hotplug-with-bridge-support' option. Set default to false.Signed-off-by Julia Suvorova <[email protected]>Reviewed-by Igor Mammedov <[email protected]>Reviewed-by Marcel Apfelbaum <[email protected]>--- hw/i386/acpi-build.h | 1 + include/hw/acpi/ich9.h | 3 ++ hw/acpi/ich9.c | 67 ++++++++++++++++++++++++++++++++++++++++++ hw/acpi/pcihp.c | 5 +++- hw/i386/acpi-build.c | 2 +- 5 files changed, 76 insertions(+), 2 deletions(-)hw/i386/acpi-build.h +1
-0@@ -10,5 +10,6 @@ extern const struct AcpiGenericAddress x86_nvdimm_acpi_dsmio;#define ACPI_PCIHP_BNMR_BASE 0x10void acpi_setup (void ); +Object *acpi_get_i386_pci_host (void );#endif include/hw/acpi/ich9.h +3
-0@@ -24,6 +24,7 @@#include "hw/acpi/acpi.h" #include "hw/acpi/cpu_hotplug.h" #include "hw/acpi/cpu.h" +#include "hw/acpi/pcihp.h" #include "hw/acpi/memory_hotplug.h" #include "hw/acpi/acpi_dev_interface.h" #include "hw/acpi/tco.h" @@ -55,6 +56,8 @@ typedef struct ICH9LPCPMRegs {AcpiCpuHotplug gpe_cpu;CPUHotplugState cpuhp_state; +bool use_acpi_hotplug_bridge; +AcpiPciHpState acpi_pci_hotplug;MemHotplugState acpi_memory_hotplug;uint8_t disable_s3;hw/acpi/ich9.c +21
-0@@ -217,6 +217,26 @@ static const VMStateDescription vmstate_cpuhp_state = { } }; +static bool vmstate_test_use_pcihp (void *opaque) +{ +ICH9LPCPMRegs *s = opaque; + +return s->use_acpi_hotplug_bridge; +} + +static const VMStateDescription vmstate_pcihp_state = { + .name ="ich9_pm/pcihp" , + .version_id =1 , + .minimum_version_id =1 , + .needed = vmstate_test_use_pcihp, + .fields = (VMStateField []) { +VMSTATE_PCI_HOTPLUG (acpi_pci_hotplug, + ICH9LPCPMRegs, +NULL ,NULL ), +VMSTATE_END_OF_LIST () + } +}; +const VMStateDescription vmstate_ich9_pm = { .name ="ich9_pm" , .version_id =1 ,@@ -238,6 +258,7 @@ const VMStateDescription vmstate_ich9_pm = { &vmstate_memhp_state, &vmstate_tco_io_state, &vmstate_cpuhp_state, + &vmstate_pcihp_state, NULL } };@@ -259,6 +280,7 @@ static void pm_reset(void *opaque) } pm->smi_en_wmask = ~0 ;
Quoted 4 lines
hw/acpi/ich9.c static void pm_reset(void *opaque) · line 283
Quoted 1 line
hw/acpi/ich9.c +1
-0+acpi_pcihp_reset (&pm->acpi_pci_hotplug, true);Doesn't this need to be protected by if (
pm->use_acpi_hotplug_bridge) ? Otherwisepm->acpi_pci_hotplugwon't be initialized.
Julia can you comment on this pls? Patch on top if appropriate ...
Quoted 129 lines
Quoted 129 lines
hw/acpi/ich9.c +45
-0acpi_update_sci (&pm->acpi_regs, pm->irq); }@@ -297,6 +319,18 @@ void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm, pm->enable_tco = true;acpi_pm_tco_init (&pm->tco_regs, &pm->io); +if (pm->use_acpi_hotplug_bridge) { +acpi_pcihp_init (OBJECT (lpc_pci), + &pm->acpi_pci_hotplug, +pci_get_bus (lpc_pci), +pci_address_space_io (lpc_pci), + true, +ACPI_PCIHP_ADDR_ICH9 ); + +qbus_set_hotplug_handler (BUS (pci_get_bus (lpc_pci)), +OBJECT (lpc_pci)); + } + pm->irq = sci_irq;qemu_register_reset (pm_reset, pm); pm->powerdown_notifier.notify = pm_powerdown_req;@@ -368,6 +402,20 @@ static void ich9_pm_set_enable_tco(Object *obj, bool value, Error **errp) s->pm.enable_tco = value; } +static bool ich9_pm_get_acpi_pci_hotplug (Object *obj,Error **errp) +{ +ICH9LPCState *s =ICH9_LPC_DEVICE (obj); + +return s->pm.use_acpi_hotplug_bridge; +} + +static void ich9_pm_set_acpi_pci_hotplug (Object *obj,bool value,Error **errp) +{ +ICH9LPCState *s =ICH9_LPC_DEVICE (obj); + + s->pm.use_acpi_hotplug_bridge = value; +} +void ich9_pm_add_properties (Object *obj,ICH9LPCPMRegs *pm) {static const uint32_t gpe0_len =ICH9_PMIO_GPE0_LEN ;@@ -376,6 +424,7 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm) pm->disable_s3 =0 ; pm->disable_s4 =0 ; pm->s4_val =2 ; + pm->use_acpi_hotplug_bridge = false;object_property_add_uint32_ptr (obj,ACPI_PM_PROP_PM_IO_BASE , &pm->pm_io_base,OBJ_PROP_FLAG_READ );@@ -399,6 +448,9 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm)object_property_add_bool (obj,ACPI_PM_PROP_TCO_ENABLED , ich9_pm_get_enable_tco, ich9_pm_set_enable_tco); +object_property_add_bool (obj,"acpi-pci-hotplug-with-bridge-support" , + ich9_pm_get_acpi_pci_hotplug, + ich9_pm_set_acpi_pci_hotplug); } void ich9_pm_device_pre_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,@@ -406,6 +458,11 @@ void ich9_pm_device_pre_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, {ICH9LPCState *lpc =ICH9_LPC_DEVICE (hotplug_dev); +if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +acpi_pcihp_device_pre_plug_cb (hotplug_dev, dev, errp); +return ; + } +if (object_dynamic_cast (OBJECT (dev),TYPE_PC_DIMM ) && !lpc->pm.acpi_memory_hotplug.is_enabled) { error_setg(errp,@@ -441,6 +498,9 @@ void ich9_pm_device_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, }else {acpi_cpu_plug_cb (hotplug_dev, &lpc->pm.cpuhp_state, dev, errp); } + }else if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +acpi_pcihp_device_plug_cb (hotplug_dev, &lpc->pm.acpi_pci_hotplug, + dev, errp); }else {error_setg (errp,"acpi: device plug request for not supported device" " type: %s" ,object_get_typename (OBJECT (dev)));@@ -473,6 +533,10 @@ void ich9_pm_device_unplug_request_cb(HotplugHandler *hotplug_dev,acpi_cpu_unplug_request_cb (hotplug_dev, &lpc->pm.cpuhp_state, dev, errp); + }else if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +acpi_pcihp_device_unplug_request_cb (hotplug_dev, + &lpc->pm.acpi_pci_hotplug, + dev, errp); }else {error_setg (errp,"acpi: device unplug request for not supported device" " type: %s" ,object_get_typename (OBJECT (dev)));@@ -490,6 +554,9 @@ void ich9_pm_device_unplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, }else if (object_dynamic_cast (OBJECT (dev),TYPE_CPU ) && !lpc->pm.cpu_hotplug_legacy) {acpi_cpu_unplug_cb (&lpc->pm.cpuhp_state, dev, errp); + }else if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +acpi_pcihp_device_unplug_cb (hotplug_dev, &lpc->pm.acpi_pci_hotplug, + dev, errp); }else {error_setg (errp,"acpi: device unplug for not supported device" " type: %s" ,object_get_typename (OBJECT (dev)));hw/acpi/pcihp.c +3
-0@@ -30,6 +30,8 @@#include "hw/pci-host/i440fx.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bridge.h" +#include "hw/pci/pci_host.h" +#include "hw/i386/acpi-build.h" #include "hw/acpi/acpi.h" #include "hw/pci/pci_bus.h" #include "migration/vmstate.h" @@ -103,6 +105,7 @@ static void *acpi_set_bsel(PCIBus *bus, void *opaque)static void acpi_set_pci_info (void ) {static bool bsel_is_set; +Object *host =acpi_get_i386_pci_host ();PCIBus *bus;unsigned bsel_alloc =ACPI_PCIHP_BSEL_DEFAULT ;@@ -111,7 +114,7 @@ static void acpi_set_pci_info(void) } bsel_is_set = true;
Quoted 5 lines
hw/acpi/pcihp.c static void acpi_set_pci_info(void) · line 117
Quoted 2 lines
hw/acpi/pcihp.c +1
-1- bus =find_i440fx ();/* TODO: Q35 support */ + bus =PCI_HOST_BRIDGE (host)->bus;Would it make more sense for this change to go in patch #1, along with the similar change to
acpi_pcihp_disable_root_bus().
I guess this is not too bad ...
Quoted 22 lines
Quoted 16 lines
hw/acpi/pcihp.c +0
-0if (bus) {/* Scan all PCI buses. Set property to enable acpi based hotplug. */ pci_for_each_bus_depth_first (bus, acpi_set_bsel,NULL , &bsel_alloc);hw/i386/acpi-build.c +1
-1@@ -299,7 +299,7 @@ static void acpi_get_misc_info(AcpiMiscInfo *info)* Because of the PXB hosts we cannot simply query TYPE_PCI_HOST_BRIDGE. * On i386 arch we only have two pci hosts, so we can look only for them. */ -static Object *acpi_get_i386_pci_host (void ) +Object *acpi_get_i386_pci_host (void ) {PCIHostState *host;Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Re: [PATCH v5 3/7] hw/acpi/ich9: Enable ACPI PCI hot-plug
In reply to David GibsonQuoted 91 lines · David Gibson
Quoted 89 lines · Julia Suvorova
Add
acpi_pcihptoich9_pmas part of 'acpi-pci-hotplug-with-bridge-support' option. Set default to false.Signed-off-by Julia Suvorova <[email protected]>Reviewed-by Igor Mammedov <[email protected]>Reviewed-by Marcel Apfelbaum <[email protected]>--- hw/i386/acpi-build.h | 1 + include/hw/acpi/ich9.h | 3 ++ hw/acpi/ich9.c | 67 ++++++++++++++++++++++++++++++++++++++++++ hw/acpi/pcihp.c | 5 +++- hw/i386/acpi-build.c | 2 +- 5 files changed, 76 insertions(+), 2 deletions(-)hw/i386/acpi-build.h +1
-0@@ -10,5 +10,6 @@ extern const struct AcpiGenericAddress x86_nvdimm_acpi_dsmio;#define ACPI_PCIHP_BNMR_BASE 0x10void acpi_setup (void ); +Object *acpi_get_i386_pci_host (void );#endif include/hw/acpi/ich9.h +3
-0@@ -24,6 +24,7 @@#include "hw/acpi/acpi.h" #include "hw/acpi/cpu_hotplug.h" #include "hw/acpi/cpu.h" +#include "hw/acpi/pcihp.h" #include "hw/acpi/memory_hotplug.h" #include "hw/acpi/acpi_dev_interface.h" #include "hw/acpi/tco.h" @@ -55,6 +56,8 @@ typedef struct ICH9LPCPMRegs {AcpiCpuHotplug gpe_cpu;CPUHotplugState cpuhp_state; +bool use_acpi_hotplug_bridge; +AcpiPciHpState acpi_pci_hotplug;MemHotplugState acpi_memory_hotplug;uint8_t disable_s3;hw/acpi/ich9.c +21
-0@@ -217,6 +217,26 @@ static const VMStateDescription vmstate_cpuhp_state = { } }; +static bool vmstate_test_use_pcihp (void *opaque) +{ +ICH9LPCPMRegs *s = opaque; + +return s->use_acpi_hotplug_bridge; +} + +static const VMStateDescription vmstate_pcihp_state = { + .name ="ich9_pm/pcihp" , + .version_id =1 , + .minimum_version_id =1 , + .needed = vmstate_test_use_pcihp, + .fields = (VMStateField []) { +VMSTATE_PCI_HOTPLUG (acpi_pci_hotplug, + ICH9LPCPMRegs, +NULL ,NULL ), +VMSTATE_END_OF_LIST () + } +}; +const VMStateDescription vmstate_ich9_pm = { .name ="ich9_pm" , .version_id =1 ,@@ -238,6 +258,7 @@ const VMStateDescription vmstate_ich9_pm = { &vmstate_memhp_state, &vmstate_tco_io_state, &vmstate_cpuhp_state, + &vmstate_pcihp_state, NULL } };@@ -259,6 +280,7 @@ static void pm_reset(void *opaque) } pm->smi_en_wmask = ~0 ;
Quoted 4 lines
hw/acpi/ich9.c static void pm_reset(void *opaque) · line 283
Quoted 1 line
hw/acpi/ich9.c +1
-0+acpi_pcihp_reset (&pm->acpi_pci_hotplug, true);Doesn't this need to be protected by if (
pm->use_acpi_hotplug_bridge) ? Otherwisepm->acpi_pci_hotplugwon't be initialized.
Yes, you're right. Although it doesn't affect anything now, it should be fixed. I'll send a patch on top.
Quoted 129 lines
Quoted 129 lines
hw/acpi/ich9.c +45
-0acpi_update_sci (&pm->acpi_regs, pm->irq); }@@ -297,6 +319,18 @@ void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm, pm->enable_tco = true;acpi_pm_tco_init (&pm->tco_regs, &pm->io); +if (pm->use_acpi_hotplug_bridge) { +acpi_pcihp_init (OBJECT (lpc_pci), + &pm->acpi_pci_hotplug, +pci_get_bus (lpc_pci), +pci_address_space_io (lpc_pci), + true, +ACPI_PCIHP_ADDR_ICH9 ); + +qbus_set_hotplug_handler (BUS (pci_get_bus (lpc_pci)), +OBJECT (lpc_pci)); + } + pm->irq = sci_irq;qemu_register_reset (pm_reset, pm); pm->powerdown_notifier.notify = pm_powerdown_req;@@ -368,6 +402,20 @@ static void ich9_pm_set_enable_tco(Object *obj, bool value, Error **errp) s->pm.enable_tco = value; } +static bool ich9_pm_get_acpi_pci_hotplug (Object *obj,Error **errp) +{ +ICH9LPCState *s =ICH9_LPC_DEVICE (obj); + +return s->pm.use_acpi_hotplug_bridge; +} + +static void ich9_pm_set_acpi_pci_hotplug (Object *obj,bool value,Error **errp) +{ +ICH9LPCState *s =ICH9_LPC_DEVICE (obj); + + s->pm.use_acpi_hotplug_bridge = value; +} +void ich9_pm_add_properties (Object *obj,ICH9LPCPMRegs *pm) {static const uint32_t gpe0_len =ICH9_PMIO_GPE0_LEN ;@@ -376,6 +424,7 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm) pm->disable_s3 =0 ; pm->disable_s4 =0 ; pm->s4_val =2 ; + pm->use_acpi_hotplug_bridge = false;object_property_add_uint32_ptr (obj,ACPI_PM_PROP_PM_IO_BASE , &pm->pm_io_base,OBJ_PROP_FLAG_READ );@@ -399,6 +448,9 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm)object_property_add_bool (obj,ACPI_PM_PROP_TCO_ENABLED , ich9_pm_get_enable_tco, ich9_pm_set_enable_tco); +object_property_add_bool (obj,"acpi-pci-hotplug-with-bridge-support" , + ich9_pm_get_acpi_pci_hotplug, + ich9_pm_set_acpi_pci_hotplug); } void ich9_pm_device_pre_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,@@ -406,6 +458,11 @@ void ich9_pm_device_pre_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, {ICH9LPCState *lpc =ICH9_LPC_DEVICE (hotplug_dev); +if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +acpi_pcihp_device_pre_plug_cb (hotplug_dev, dev, errp); +return ; + } +if (object_dynamic_cast (OBJECT (dev),TYPE_PC_DIMM ) && !lpc->pm.acpi_memory_hotplug.is_enabled) { error_setg(errp,@@ -441,6 +498,9 @@ void ich9_pm_device_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, }else {acpi_cpu_plug_cb (hotplug_dev, &lpc->pm.cpuhp_state, dev, errp); } + }else if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +acpi_pcihp_device_plug_cb (hotplug_dev, &lpc->pm.acpi_pci_hotplug, + dev, errp); }else {error_setg (errp,"acpi: device plug request for not supported device" " type: %s" ,object_get_typename (OBJECT (dev)));@@ -473,6 +533,10 @@ void ich9_pm_device_unplug_request_cb(HotplugHandler *hotplug_dev,acpi_cpu_unplug_request_cb (hotplug_dev, &lpc->pm.cpuhp_state, dev, errp); + }else if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +acpi_pcihp_device_unplug_request_cb (hotplug_dev, + &lpc->pm.acpi_pci_hotplug, + dev, errp); }else {error_setg (errp,"acpi: device unplug request for not supported device" " type: %s" ,object_get_typename (OBJECT (dev)));@@ -490,6 +554,9 @@ void ich9_pm_device_unplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, }else if (object_dynamic_cast (OBJECT (dev),TYPE_CPU ) && !lpc->pm.cpu_hotplug_legacy) {acpi_cpu_unplug_cb (&lpc->pm.cpuhp_state, dev, errp); + }else if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +acpi_pcihp_device_unplug_cb (hotplug_dev, &lpc->pm.acpi_pci_hotplug, + dev, errp); }else {error_setg (errp,"acpi: device unplug for not supported device" " type: %s" ,object_get_typename (OBJECT (dev)));hw/acpi/pcihp.c +3
-0@@ -30,6 +30,8 @@#include "hw/pci-host/i440fx.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bridge.h" +#include "hw/pci/pci_host.h" +#include "hw/i386/acpi-build.h" #include "hw/acpi/acpi.h" #include "hw/pci/pci_bus.h" #include "migration/vmstate.h" @@ -103,6 +105,7 @@ static void *acpi_set_bsel(PCIBus *bus, void *opaque)static void acpi_set_pci_info (void ) {static bool bsel_is_set; +Object *host =acpi_get_i386_pci_host ();PCIBus *bus;unsigned bsel_alloc =ACPI_PCIHP_BSEL_DEFAULT ;@@ -111,7 +114,7 @@ static void acpi_set_pci_info(void) } bsel_is_set = true;
Quoted 5 lines
hw/acpi/pcihp.c static void acpi_set_pci_info(void) · line 117
Quoted 2 lines
hw/acpi/pcihp.c +1
-1- bus =find_i440fx ();/* TODO: Q35 support */ + bus =PCI_HOST_BRIDGE (host)->bus;Would it make more sense for this change to go in patch #1, along with the similar change to
acpi_pcihp_disable_root_bus().
Not really. This is exactly what enables ACPI hotplug, and should be done with other changes here. The first patch could be merged in this one, though.
Best regards, Julia Suvorova.
Quoted 22 lines
Quoted 8 lines
hw/acpi/pcihp.c +0
-0if (bus) {/* Scan all PCI buses. Set property to enable acpi based hotplug. */ pci_for_each_bus_depth_first (bus, acpi_set_bsel,NULL , &bsel_alloc);hw/i386/acpi-build.c +0
-0hw/i386/acpi-build.c static void acpi_get_misc_info(AcpiMiscInfo *info) · line 305
Quoted 8 lines
hw/i386/acpi-build.c +1
-1@@ -299,7 +299,7 @@ static void acpi_get_misc_info(AcpiMiscInfo *info)* Because of the PXB hosts we cannot simply query TYPE_PCI_HOST_BRIDGE. * On i386 arch we only have two pci hosts, so we can look only for them. */ -static Object *acpi_get_i386_pci_host (void ) +Object *acpi_get_i386_pci_host (void ) {PCIHostState *host;--
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_!
Re: [PATCH v5 3/7] hw/acpi/ich9: Enable ACPI PCI hot-plug
Quoted 5 lines · Julia Suvorova
Quoted 2 lines
Doesn't this need to be protected by if (
pm->use_acpi_hotplug_bridge) ? Otherwisepm->acpi_pci_hotplugwon't be initialized.Yes, you're right. Although it doesn't affect anything now, it should be fixed. I'll send a patch on top.
This is all in my tree pci branch. Pls base your patchset on that. Thanks!
Signature · 1 line
MST
Re: [PATCH v5 3/7] hw/acpi/ich9: Enable ACPI PCI hot-plug
In reply to Julia SuvorovaQuoted 235 lines · Julia Suvorova
Quoted 91 lines · David Gibson
Quoted 89 lines · Julia Suvorova
Add
acpi_pcihptoich9_pmas part of 'acpi-pci-hotplug-with-bridge-support' option. Set default to false.Signed-off-by Julia Suvorova <[email protected]>Reviewed-by Igor Mammedov <[email protected]>Reviewed-by Marcel Apfelbaum <[email protected]>--- hw/i386/acpi-build.h | 1 + include/hw/acpi/ich9.h | 3 ++ hw/acpi/ich9.c | 67 ++++++++++++++++++++++++++++++++++++++++++ hw/acpi/pcihp.c | 5 +++- hw/i386/acpi-build.c | 2 +- 5 files changed, 76 insertions(+), 2 deletions(-)hw/i386/acpi-build.h +1
-0@@ -10,5 +10,6 @@ extern const struct AcpiGenericAddress x86_nvdimm_acpi_dsmio;#define ACPI_PCIHP_BNMR_BASE 0x10void acpi_setup (void ); +Object *acpi_get_i386_pci_host (void );#endif include/hw/acpi/ich9.h +3
-0@@ -24,6 +24,7 @@#include "hw/acpi/acpi.h" #include "hw/acpi/cpu_hotplug.h" #include "hw/acpi/cpu.h" +#include "hw/acpi/pcihp.h" #include "hw/acpi/memory_hotplug.h" #include "hw/acpi/acpi_dev_interface.h" #include "hw/acpi/tco.h" @@ -55,6 +56,8 @@ typedef struct ICH9LPCPMRegs {AcpiCpuHotplug gpe_cpu;CPUHotplugState cpuhp_state; +bool use_acpi_hotplug_bridge; +AcpiPciHpState acpi_pci_hotplug;MemHotplugState acpi_memory_hotplug;uint8_t disable_s3;hw/acpi/ich9.c +21
-0@@ -217,6 +217,26 @@ static const VMStateDescription vmstate_cpuhp_state = { } }; +static bool vmstate_test_use_pcihp (void *opaque) +{ +ICH9LPCPMRegs *s = opaque; + +return s->use_acpi_hotplug_bridge; +} + +static const VMStateDescription vmstate_pcihp_state = { + .name ="ich9_pm/pcihp" , + .version_id =1 , + .minimum_version_id =1 , + .needed = vmstate_test_use_pcihp, + .fields = (VMStateField []) { +VMSTATE_PCI_HOTPLUG (acpi_pci_hotplug, + ICH9LPCPMRegs, +NULL ,NULL ), +VMSTATE_END_OF_LIST () + } +}; +const VMStateDescription vmstate_ich9_pm = { .name ="ich9_pm" , .version_id =1 ,@@ -238,6 +258,7 @@ const VMStateDescription vmstate_ich9_pm = { &vmstate_memhp_state, &vmstate_tco_io_state, &vmstate_cpuhp_state, + &vmstate_pcihp_state, NULL } };@@ -259,6 +280,7 @@ static void pm_reset(void *opaque) } pm->smi_en_wmask = ~0 ;Quoted 4 lines
hw/acpi/ich9.c static void pm_reset(void *opaque) · line 283
Quoted 1 line
hw/acpi/ich9.c +1
-0+acpi_pcihp_reset (&pm->acpi_pci_hotplug, true);Doesn't this need to be protected by if (
pm->use_acpi_hotplug_bridge) ? Otherwisepm->acpi_pci_hotplugwon't be initialized.Yes, you're right. Although it doesn't affect anything now, it should be fixed. I'll send a patch on top.
Quoted 129 lines
Quoted 129 lines
hw/acpi/ich9.c +45
-0acpi_update_sci (&pm->acpi_regs, pm->irq); }@@ -297,6 +319,18 @@ void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm, pm->enable_tco = true;acpi_pm_tco_init (&pm->tco_regs, &pm->io); +if (pm->use_acpi_hotplug_bridge) { +acpi_pcihp_init (OBJECT (lpc_pci), + &pm->acpi_pci_hotplug, +pci_get_bus (lpc_pci), +pci_address_space_io (lpc_pci), + true, +ACPI_PCIHP_ADDR_ICH9 ); + +qbus_set_hotplug_handler (BUS (pci_get_bus (lpc_pci)), +OBJECT (lpc_pci)); + } + pm->irq = sci_irq;qemu_register_reset (pm_reset, pm); pm->powerdown_notifier.notify = pm_powerdown_req;@@ -368,6 +402,20 @@ static void ich9_pm_set_enable_tco(Object *obj, bool value, Error **errp) s->pm.enable_tco = value; } +static bool ich9_pm_get_acpi_pci_hotplug (Object *obj,Error **errp) +{ +ICH9LPCState *s =ICH9_LPC_DEVICE (obj); + +return s->pm.use_acpi_hotplug_bridge; +} + +static void ich9_pm_set_acpi_pci_hotplug (Object *obj,bool value,Error **errp) +{ +ICH9LPCState *s =ICH9_LPC_DEVICE (obj); + + s->pm.use_acpi_hotplug_bridge = value; +} +void ich9_pm_add_properties (Object *obj,ICH9LPCPMRegs *pm) {static const uint32_t gpe0_len =ICH9_PMIO_GPE0_LEN ;@@ -376,6 +424,7 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm) pm->disable_s3 =0 ; pm->disable_s4 =0 ; pm->s4_val =2 ; + pm->use_acpi_hotplug_bridge = false;object_property_add_uint32_ptr (obj,ACPI_PM_PROP_PM_IO_BASE , &pm->pm_io_base,OBJ_PROP_FLAG_READ );@@ -399,6 +448,9 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm)object_property_add_bool (obj,ACPI_PM_PROP_TCO_ENABLED , ich9_pm_get_enable_tco, ich9_pm_set_enable_tco); +object_property_add_bool (obj,"acpi-pci-hotplug-with-bridge-support" , + ich9_pm_get_acpi_pci_hotplug, + ich9_pm_set_acpi_pci_hotplug); } void ich9_pm_device_pre_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,@@ -406,6 +458,11 @@ void ich9_pm_device_pre_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, {ICH9LPCState *lpc =ICH9_LPC_DEVICE (hotplug_dev); +if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +acpi_pcihp_device_pre_plug_cb (hotplug_dev, dev, errp); +return ; + } +if (object_dynamic_cast (OBJECT (dev),TYPE_PC_DIMM ) && !lpc->pm.acpi_memory_hotplug.is_enabled) { error_setg(errp,@@ -441,6 +498,9 @@ void ich9_pm_device_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, }else {acpi_cpu_plug_cb (hotplug_dev, &lpc->pm.cpuhp_state, dev, errp); } + }else if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +acpi_pcihp_device_plug_cb (hotplug_dev, &lpc->pm.acpi_pci_hotplug, + dev, errp); }else {error_setg (errp,"acpi: device plug request for not supported device" " type: %s" ,object_get_typename (OBJECT (dev)));@@ -473,6 +533,10 @@ void ich9_pm_device_unplug_request_cb(HotplugHandler *hotplug_dev,acpi_cpu_unplug_request_cb (hotplug_dev, &lpc->pm.cpuhp_state, dev, errp); + }else if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +acpi_pcihp_device_unplug_request_cb (hotplug_dev, + &lpc->pm.acpi_pci_hotplug, + dev, errp); }else {error_setg (errp,"acpi: device unplug request for not supported device" " type: %s" ,object_get_typename (OBJECT (dev)));@@ -490,6 +554,9 @@ void ich9_pm_device_unplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, }else if (object_dynamic_cast (OBJECT (dev),TYPE_CPU ) && !lpc->pm.cpu_hotplug_legacy) {acpi_cpu_unplug_cb (&lpc->pm.cpuhp_state, dev, errp); + }else if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { +acpi_pcihp_device_unplug_cb (hotplug_dev, &lpc->pm.acpi_pci_hotplug, + dev, errp); }else {error_setg (errp,"acpi: device unplug for not supported device" " type: %s" ,object_get_typename (OBJECT (dev)));hw/acpi/pcihp.c +3
-0@@ -30,6 +30,8 @@#include "hw/pci-host/i440fx.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bridge.h" +#include "hw/pci/pci_host.h" +#include "hw/i386/acpi-build.h" #include "hw/acpi/acpi.h" #include "hw/pci/pci_bus.h" #include "migration/vmstate.h" @@ -103,6 +105,7 @@ static void *acpi_set_bsel(PCIBus *bus, void *opaque)static void acpi_set_pci_info (void ) {static bool bsel_is_set; +Object *host =acpi_get_i386_pci_host ();PCIBus *bus;unsigned bsel_alloc =ACPI_PCIHP_BSEL_DEFAULT ;@@ -111,7 +114,7 @@ static void acpi_set_pci_info(void) } bsel_is_set = true;Quoted 5 lines
hw/acpi/pcihp.c static void acpi_set_pci_info(void) · line 117
Quoted 2 lines
hw/acpi/pcihp.c +1
-1- bus =find_i440fx ();/* TODO: Q35 support */ + bus =PCI_HOST_BRIDGE (host)->bus;Would it make more sense for this change to go in patch #1, along with the similar change to
acpi_pcihp_disable_root_bus().
Quoted 3 lines
Not really. This is exactly what enables ACPI hotplug, and should be done with other changes here. The first patch could be merged in this one, though.
Ok, understood.
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
PATCH v5 4/7 hw/pci/pcie: Do not set HPC flag if acpihp is used
In reply to Julia SuvorovaInstead of changing the hot-plug type in _OSC register, do not set the 'Hot-Plug Capable' flag. This way guest will choose ACPI hot-plug if it is preferred and leave the option to use SHPC with pcie-pci-bridge.
The ability to control hot-plug for each downstream port is retained, while 'hotplug=off' on the port means all hot-plug types are disabled.
--- include/hw/pci/pcie_port.h | 5 ++++- hw/acpi/pcihp.c | 8 ++++++++ hw/core/machine.c | 1 - hw/i386/pc_q35.c | 11 +++++++++++ hw/pci/pcie.c | 8 +++++++- hw/pci/pcie_port.c | 1 + 6 files changed, 31 insertions(+), 3 deletions(-)
include/hw/pci/pcie_port.h +4 -1
@@ -57,8 +57,11 @@ struct PCIESlot {/* Disable ACS (really for a pcie_root_port) */ bool disable_acs; -/* Indicates whether hot-plug is enabled on the slot */ +/* Indicates whether any type of hot-plug is allowed on the slot */ bool hotplug; + +bool native_hotplug; +QLIST_ENTRY (PCIESlot) next; };
hw/acpi/pcihp.c +8 -0
@@ -31,6 +31,7 @@#include "hw/pci/pci.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_host.h" +#include "hw/pci/pcie_port.h" #include "hw/i386/acpi-build.h" #include "hw/acpi/acpi.h" #include "hw/pci/pci_bus.h"
@@ -332,6 +333,13 @@ void acpi_pcihp_device_plug_cb(HotplugHandler *hotplug_dev, AcpiPciHpState *s, object_dynamic_cast(OBJECT(dev), TYPE_PCI_BRIDGE)) {PCIBus *sec =pci_bridge_get_sec_bus (PCI_BRIDGE (pdev)); +/* Remove all hot-plug handlers if hot-plug is disabled on slot */ +if (object_dynamic_cast (OBJECT (dev),TYPE_PCIE_SLOT ) && + !PCIE_SLOT (pdev)->hotplug) { +qbus_set_hotplug_handler (BUS (sec),NULL ); +return ; + } +qbus_set_hotplug_handler (BUS (sec),OBJECT (hotplug_dev));/* We don't have to overwrite any other hotplug handler yet */ assert (QLIST_EMPTY (&sec->child));
hw/core/machine.c +0 -1
@@ -582,7 +582,6 @@ static void machine_set_memdev(Object *obj, const char *value, Error **errp) ms->ram_memdev_id =g_strdup (value); } -static void machine_init_notify (Notifier *notifier,void *data) {MachineState *machine =MACHINE (qdev_get_machine ());
hw/i386/pc_q35.c +11 -0
@@ -37,6 +37,7 @@#include "sysemu/kvm.h" #include "hw/kvm/clock.h" #include "hw/pci-host/q35.h" +#include "hw/pci/pcie_port.h" #include "hw/qdev-properties.h" #include "hw/i386/x86.h" #include "hw/i386/pc.h"
@@ -136,6 +137,7 @@ static void pc_q35_init(MachineState *machine)ram_addr_t lowmem;DriveInfo *hd[MAX_SATA_PORTS ];MachineClass *mc =MACHINE_GET_CLASS (machine); +bool acpi_pcihp;/* Check whether RAM fits below 4G (leaving 1/2 GByte for IO memory * and 256 Mbytes for PCI Express Enhanced Configuration Access Mapping
@@ -236,6 +238,15 @@ static void pc_q35_init(MachineState *machine)object_property_set_link (OBJECT (machine),PC_MACHINE_ACPI_DEVICE_PROP ,OBJECT (lpc), &error_abort); + acpi_pcihp =object_property_get_bool (OBJECT (lpc), +"acpi-pci-hotplug-with-bridge-support" , +NULL ); + +if (acpi_pcihp) { +object_register_sugar_prop (TYPE_PCIE_SLOT ,"enable-native-hotplug" , +"false" , true); + } +/* irq lines */ gsi_state =pc_gsi_create (&x86ms->gsi, pcmc->pci_enabled);
hw/pci/pcie.c +7 -1
@@ -529,7 +529,13 @@ void pcie_cap_slot_init(PCIDevice *dev, PCIESlot *s)PCI_EXP_SLTCAP_PIP |PCI_EXP_SLTCAP_AIP | PCI_EXP_SLTCAP_ABP); -if (s->hotplug) { + +/* +* Enable native hot-plug on all hot-plugged bridges unless +* hot-plug is disabled on the slot. +*/ +if (s->hotplug && + (s->native_hotplug ||DEVICE (dev)->hotplugged)) {pci_long_test_and_set_mask (dev->config + pos +PCI_EXP_SLTCAP ,PCI_EXP_SLTCAP_HPS |PCI_EXP_SLTCAP_HPC );
hw/pci/pcie_port.c +1 -0
@@ -148,6 +148,7 @@ static Property pcie_slot_props[] = {DEFINE_PROP_UINT8 ("chassis" , PCIESlot, chassis,0 ),DEFINE_PROP_UINT16 ("slot" , PCIESlot, slot,0 ),DEFINE_PROP_BOOL ("hotplug" , PCIESlot, hotplug, true), +DEFINE_PROP_BOOL ("enable-native-hotplug" , PCIESlot, native_hotplug, true), DEFINE_PROP_END_OF_LIST() };
Signature · 1 line
2.30.2
Re: [PATCH v5 4/7] hw/pci/pcie: Do not set HPC flag if acpihp is used
Quoted 9 lines · Julia Suvorova
Instead of changing the hot-plug type in
_OSCregister, do not set the 'Hot-Plug Capable' flag. This way guest will choose ACPI hot-plug if it is preferred and leave the option to use SHPC with pcie-pci-bridge.The ability to control hot-plug for each downstream port is retained, while 'hotplug=off' on the port means all hot-plug types are disabled.
Signed-off-by Julia Suvorova <[email protected]>
Marcel want to review this?
Quoted 133 lines
--- include/hw/pci/pcie_port.h | 5 ++++- hw/acpi/pcihp.c | 8 ++++++++ hw/core/machine.c | 1 - hw/i386/pc_q35.c | 11 +++++++++++ hw/pci/pcie.c | 8 +++++++- hw/pci/pcie_port.c | 1 + 6 files changed, 31 insertions(+), 3 deletions(-)include/hw/pci/pcie_port.h +4
-1@@ -57,8 +57,11 @@ struct PCIESlot {/* Disable ACS (really for a pcie_root_port) */ bool disable_acs; -/* Indicates whether hot-plug is enabled on the slot */ +/* Indicates whether any type of hot-plug is allowed on the slot */ bool hotplug; + +bool native_hotplug; +QLIST_ENTRY (PCIESlot) next; };hw/acpi/pcihp.c +8
-0@@ -31,6 +31,7 @@#include "hw/pci/pci.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_host.h" +#include "hw/pci/pcie_port.h" #include "hw/i386/acpi-build.h" #include "hw/acpi/acpi.h" #include "hw/pci/pci_bus.h" @@ -332,6 +333,13 @@ void acpi_pcihp_device_plug_cb(HotplugHandler *hotplug_dev, AcpiPciHpState *s, object_dynamic_cast(OBJECT(dev), TYPE_PCI_BRIDGE)) {PCIBus *sec =pci_bridge_get_sec_bus (PCI_BRIDGE (pdev)); +/* Remove all hot-plug handlers if hot-plug is disabled on slot */ +if (object_dynamic_cast (OBJECT (dev),TYPE_PCIE_SLOT ) && + !PCIE_SLOT (pdev)->hotplug) { +qbus_set_hotplug_handler (BUS (sec),NULL ); +return ; + } +qbus_set_hotplug_handler (BUS (sec),OBJECT (hotplug_dev));/* We don't have to overwrite any other hotplug handler yet */ assert (QLIST_EMPTY (&sec->child));hw/core/machine.c +0
-1@@ -582,7 +582,6 @@ static void machine_set_memdev(Object *obj, const char *value, Error **errp) ms->ram_memdev_id =g_strdup (value); } -static void machine_init_notify (Notifier *notifier,void *data) {MachineState *machine =MACHINE (qdev_get_machine ());hw/i386/pc_q35.c +11
-0@@ -37,6 +37,7 @@#include "sysemu/kvm.h" #include "hw/kvm/clock.h" #include "hw/pci-host/q35.h" +#include "hw/pci/pcie_port.h" #include "hw/qdev-properties.h" #include "hw/i386/x86.h" #include "hw/i386/pc.h" @@ -136,6 +137,7 @@ static void pc_q35_init(MachineState *machine)ram_addr_t lowmem;DriveInfo *hd[MAX_SATA_PORTS ];MachineClass *mc =MACHINE_GET_CLASS (machine); +bool acpi_pcihp;/* Check whether RAM fits below 4G (leaving 1/2 GByte for IO memory * and 256 Mbytes for PCI Express Enhanced Configuration Access Mapping @@ -236,6 +238,15 @@ static void pc_q35_init(MachineState *machine)object_property_set_link (OBJECT (machine),PC_MACHINE_ACPI_DEVICE_PROP ,OBJECT (lpc), &error_abort); + acpi_pcihp =object_property_get_bool (OBJECT (lpc), +"acpi-pci-hotplug-with-bridge-support" , +NULL ); + +if (acpi_pcihp) { +object_register_sugar_prop (TYPE_PCIE_SLOT ,"enable-native-hotplug" , +"false" , true); + } +/* irq lines */ gsi_state =pc_gsi_create (&x86ms->gsi, pcmc->pci_enabled);hw/pci/pcie.c +7
-1@@ -529,7 +529,13 @@ void pcie_cap_slot_init(PCIDevice *dev, PCIESlot *s)PCI_EXP_SLTCAP_PIP |PCI_EXP_SLTCAP_AIP | PCI_EXP_SLTCAP_ABP); -if (s->hotplug) { + +/* +* Enable native hot-plug on all hot-plugged bridges unless +* hot-plug is disabled on the slot. +*/ +if (s->hotplug && + (s->native_hotplug ||DEVICE (dev)->hotplugged)) {pci_long_test_and_set_mask (dev->config + pos +PCI_EXP_SLTCAP ,PCI_EXP_SLTCAP_HPS |PCI_EXP_SLTCAP_HPC );hw/pci/pcie_port.c +1
-0@@ -148,6 +148,7 @@ static Property pcie_slot_props[] = {DEFINE_PROP_UINT8 ("chassis" , PCIESlot, chassis,0 ),DEFINE_PROP_UINT16 ("slot" , PCIESlot, slot,0 ),DEFINE_PROP_BOOL ("hotplug" , PCIESlot, hotplug, true), +DEFINE_PROP_BOOL ("enable-native-hotplug" , PCIESlot, native_hotplug, true), DEFINE_PROP_END_OF_LIST() };Signature · 1 line
2.30.2
Marcel Apfelbaum
Reviewed-byRe: [PATCH v5 4/7] hw/pci/pcie: Do not set HPC flag if acpihp is used
Quoted 6 lines · Michael S. Tsirkin
Quoted 5 lines · Julia Suvorova
Instead of changing the hot-plug type in
_OSCregister, do not set the 'Hot-Plug Capable' flag. This way guest will choose ACPI hot-plug if it is preferred and leave the option to use SHPC with pcie-pci-bridge.
Quoted 8 lines
Quoted 4 lines
The ability to control hot-plug for each downstream port is retained, while 'hotplug=off' on the port means all hot-plug types are disabled.
Signed-off-by Julia Suvorova <[email protected]>Marcel want to review this?
Sure
Quoted 129 lines
hw/acpi/pcihp.c void acpi_pcihp_device_plug_cb(HotplugHandler
Quoted 39 lines
--- include/hw/pci/pcie_port.h | 5 ++++- hw/acpi/pcihp.c | 8 ++++++++ hw/core/machine.c | 1 - hw/i386/pc_q35.c | 11 +++++++++++ hw/pci/pcie.c | 8 +++++++- hw/pci/pcie_port.c | 1 + 6 files changed, 31 insertions(+), 3 deletions(-)include/hw/pci/pcie_port.h +4
-1@@ -57,8 +57,11 @@ struct PCIESlot {/* Disable ACS (really for a pcie_root_port) */ bool disable_acs; -/* Indicates whether hot-plug is enabled on the slot */ +/* Indicates whether any type of hot-plug is allowed on the slot */ bool hotplug; + +bool native_hotplug; +QLIST_ENTRY (PCIESlot) next; };hw/acpi/pcihp.c +1
-0@@ -31,6 +31,7 @@#inhw /pci/pcie.cclude "hw/pci/pci.h"#include "hw/pci/pci_bridge.h" #include "hw/pci/pci_host.h" +#include "hw/pci/pcie_port.h" #include "hw/i386/acpi-build.h" #include "hw/acpi/acpi.h" #include "hw/pci/pci_bus.h" @@ -332,6 +333,13 @@ void acpi_pcihp_device_plug_cb(HotplugHandler
*hotplug_dev, AcpiPciHpState *s,hw/acpi/pcihp.c void acpi_pcihp_device_plug_cb(HotplugHandler *hotplug_dev, AcpiPciHpState *s,
Quoted 4 lines
hw/acpi/pcihp.c +1
-0object_dynamic_cast(OBJECT(dev), TYPE_PCI_BRIDGE)) {PCIBus *sec =pci_bridge_get_sec_bus (PCI_BRIDGE (pdev)); +/* Remove all hot-plug handlers if hot-plug is disabled on slot */
hw/acpi/pcihp.c void acpi_pcihp_device_plug_cb(HotplugHandler *hotplug_dev, AcpiPciHpState *s,
Quoted 8 lines
hw/acpi/pcihp.c +6
-0+if (object_dynamic_cast (OBJECT (dev),TYPE_PCIE_SLOT ) && + !PCIE_SLOT (pdev)->hotplug) { +qbus_set_hotplug_handler (BUS (sec),NULL ); +return ; + } +qbus_set_hotplug_handler (BUS (sec),OBJECT (hotplug_dev));/* We don't have to overwrite any other hotplug handler yet */
hw/core/machine.c static void machine_set_memdev(Object *obj, const
Quoted 6 lines
hw/acpi/pcihp.c +0
-0assert (QLIST_EMPTY (&sec->child));hw/core/machine.c +0
-0@@ -582,7 +582,6 @@ static void machine_set_memdev(Object *obj, constchar *value, Error **errp)
Quoted 20 lines
hw/core/machine.c +0
-1ms->ram_memdev_id =g_strdup (value); } -static void machine_init_notify (Notifier *notifier,void *data) {MachineState *machine =MACHINE (qdev_get_machine ());hw/i386/pc_q35.c +1
-0@@ -37,6 +37,7 @@#include "sysemu/kvm.h" #include "hw/kvm/clock.h" #include "hw/pci-host/q35.h" +#include "hw/pci/pcie_port.h" #include "hw/qdev-properties.h" #include "hw/i386/x86.h" #include "hw/i386/pc.h" hw/i386/pc_q35.c static void pc_q35_init(MachineState *machine) · line 143
Quoted 7 lines
hw/i386/pc_q35.c +1
-0@@ -136,6 +137,7 @@ static void pc_q35_init(MachineState *machine)ram_addr_t lowmem;DriveInfo *hd[MAX_SATA_PORTS ];MachineClass *mc =MACHINE_GET_CLASS (machine); +bool acpi_pcihp;/* Check whether RAM fits below 4G (leaving 1/2 GByte for IO memory * and 256 Mbytes for PCI Express Enhanced Configuration Access Mapping
hw/i386/pc_q35.c static void pc_q35_init(MachineState *machine) · line 238
Quoted 2 lines
hw/i386/pc_q35.c +0
-0@@ -236,6 +238,15 @@ static void pc_q35_init(MachineState *machine) object_property_set_link(OBJECT(machine),
PC_MACHINE_ACPI_DEVICE_PROP,hw/i386/pc_q35.c static void pc_q35_init(MachineState *machine) · line 244
Quoted 4 lines
hw/i386/pc_q35.c +2
-0OBJECT(lpc), &error_abort); + acpi_pcihp = object_property_get_bool(OBJECT(lpc), +"acpi-pci-hotplug-with-bridge-support",
hw/i386/pc_q35.c static void pc_q35_init(MachineState *machine)
Quoted 4 lines
hw/i386/pc_q35.c +4
-0+ NULL); + +if (acpi_pcihp) { + object_register_sugar_prop(TYPE_PCIE_SLOT,"enable-native-hotplug",
Quoted 27 lines
hw/i386/pc_q35.c +3
-0+ "false", true); + } +/* irq lines */ gsi_state =pc_gsi_create (&x86ms->gsi, pcmc->pci_enabled);hw/pci/pcie.c +7
-1@@ -529,7 +529,13 @@ void pcie_cap_slot_init(PCIDevice *dev, PCIESlot *s)PCI_EXP_SLTCAP_PIP |PCI_EXP_SLTCAP_AIP | PCI_EXP_SLTCAP_ABP); -if (s->hotplug) { + +/* +* Enable native hot-plug on all hot-plugged bridges unless +* hot-plug is disabled on the slot. +*/ +if (s->hotplug && + (s->native_hotplug ||DEVICE (dev)->hotplugged)) {pci_long_test_and_set_mask (dev->config + pos +PCI_EXP_SLTCAP ,PCI_EXP_SLTCAP_HPS |PCI_EXP_SLTCAP_HPC );hw/pci/pcie_port.c +0
-0
Quoted 15 lines
hw/pci/pcie_port.c static Property pcie_slot_props[] = { · line 151
Quoted 7 lines
hw/pci/pcie_port.c +1
-0@@ -148,6 +148,7 @@ static Property pcie_slot_props[] = {DEFINE_PROP_UINT8 ("chassis" , PCIESlot, chassis,0 ),DEFINE_PROP_UINT16 ("slot" , PCIESlot, slot,0 ),DEFINE_PROP_BOOL ("hotplug" , PCIESlot, hotplug, true), + DEFINE_PROP_BOOL("enable-native-hotplug", PCIESlot, native_hotplug,true),
Quoted 5 lines
hw/pci/pcie_port.c +0
-1DEFINE_PROP_END_OF_LIST() }; --2.30.2
Looks good to me.
I also like Igor's comment (rename native-hotplug), a patch on top is just fine.
Thanks,
Marcel
Re: [PATCH v5 4/7] hw/pci/pcie: Do not set HPC flag if acpihp is used
In reply to Julia SuvorovaQuoted 94 lines · On Thu, 17 Jun 2021 21:07:36 +0200 Julia Suvorova <[email protected]> wrote:
Instead of changing the hot-plug type in
_OSCregister, do not set the 'Hot-Plug Capable' flag. This way guest will choose ACPI hot-plug if it is preferred and leave the option to use SHPC with pcie-pci-bridge.The ability to control hot-plug for each downstream port is retained, while 'hotplug=off' on the port means all hot-plug types are disabled.
Signed-off-by Julia Suvorova <[email protected]>--- include/hw/pci/pcie_port.h | 5 ++++- hw/acpi/pcihp.c | 8 ++++++++ hw/core/machine.c | 1 - hw/i386/pc_q35.c | 11 +++++++++++ hw/pci/pcie.c | 8 +++++++- hw/pci/pcie_port.c | 1 + 6 files changed, 31 insertions(+), 3 deletions(-)include/hw/pci/pcie_port.h +4
-1@@ -57,8 +57,11 @@ struct PCIESlot {/* Disable ACS (really for a pcie_root_port) */ bool disable_acs; -/* Indicates whether hot-plug is enabled on the slot */ +/* Indicates whether any type of hot-plug is allowed on the slot */ bool hotplug; + +bool native_hotplug; +QLIST_ENTRY (PCIESlot) next; };hw/acpi/pcihp.c +8
-0@@ -31,6 +31,7 @@#include "hw/pci/pci.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_host.h" +#include "hw/pci/pcie_port.h" #include "hw/i386/acpi-build.h" #include "hw/acpi/acpi.h" #include "hw/pci/pci_bus.h" @@ -332,6 +333,13 @@ void acpi_pcihp_device_plug_cb(HotplugHandler *hotplug_dev, AcpiPciHpState *s, object_dynamic_cast(OBJECT(dev), TYPE_PCI_BRIDGE)) {PCIBus *sec =pci_bridge_get_sec_bus (PCI_BRIDGE (pdev)); +/* Remove all hot-plug handlers if hot-plug is disabled on slot */ +if (object_dynamic_cast (OBJECT (dev),TYPE_PCIE_SLOT ) && + !PCIE_SLOT (pdev)->hotplug) { +qbus_set_hotplug_handler (BUS (sec),NULL ); +return ; + } +qbus_set_hotplug_handler (BUS (sec),OBJECT (hotplug_dev));/* We don't have to overwrite any other hotplug handler yet */ assert (QLIST_EMPTY (&sec->child));hw/core/machine.c +0
-1@@ -582,7 +582,6 @@ static void machine_set_memdev(Object *obj, const char *value, Error **errp) ms->ram_memdev_id =g_strdup (value); } -static void machine_init_notify (Notifier *notifier,void *data) {MachineState *machine =MACHINE (qdev_get_machine ());hw/i386/pc_q35.c +2
-0@@ -37,6 +37,7 @@#include "sysemu/kvm.h" #include "hw/kvm/clock.h" #include "hw/pci-host/q35.h" +#include "hw/pci/pcie_port.h" #include "hw/qdev-properties.h" #include "hw/i386/x86.h" #include "hw/i386/pc.h" @@ -136,6 +137,7 @@ static void pc_q35_init(MachineState *machine)ram_addr_t lowmem;DriveInfo *hd[MAX_SATA_PORTS ];MachineClass *mc =MACHINE_GET_CLASS (machine); +bool acpi_pcihp;/* Check whether RAM fits below 4G (leaving 1/2 GByte for IO memory * and 256 Mbytes for PCI Express Enhanced Configuration Access Mapping
hw/i386/pc_q35.c static void pc_q35_init(MachineState *machine) · line 246
Quoted 9 lines
hw/i386/pc_q35.c +6
-0@@ -236,6 +238,15 @@ static void pc_q35_init(MachineState *machine)object_property_set_link (OBJECT (machine),PC_MACHINE_ACPI_DEVICE_PROP ,OBJECT (lpc), &error_abort); + acpi_pcihp =object_property_get_bool (OBJECT (lpc), +"acpi-pci-hotplug-with-bridge-support" , +NULL ); + +if (acpi_pcihp) { + object_register_sugar_prop(TYPE_PCIE_SLOT, "enable-native-hotplug",
I'd s/enable-native-hotplug/native-hotplug/
which is more concise and consistent with other similar properties. Perhaps Michael can fix it up on merge.
[...]
hw/i386/pc_q35.c static void pc_q35_init(MachineState *machine) · line 250
Quoted 4 lines
hw/i386/pc_q35.c +1
-0+DEFINE_PROP_BOOL ("enable-native-hotplug" , PCIESlot, native_hotplug, true), DEFINE_PROP_END_OF_LIST() };
Otherwise looks good to me, so with this or without above nitpicking:
Re: [PATCH v5 4/7] hw/pci/pcie: Do not set HPC flag if acpihp is used
Quoted 110 lines · Igor Mammedov
Quoted 94 lines · On Thu, 17 Jun 2021 21:07:36 +0200 Julia Suvorova <[email protected]> wrote:
Instead of changing the hot-plug type in
_OSCregister, do not set the 'Hot-Plug Capable' flag. This way guest will choose ACPI hot-plug if it is preferred and leave the option to use SHPC with pcie-pci-bridge.The ability to control hot-plug for each downstream port is retained, while 'hotplug=off' on the port means all hot-plug types are disabled.
Signed-off-by Julia Suvorova <[email protected]>--- include/hw/pci/pcie_port.h | 5 ++++- hw/acpi/pcihp.c | 8 ++++++++ hw/core/machine.c | 1 - hw/i386/pc_q35.c | 11 +++++++++++ hw/pci/pcie.c | 8 +++++++- hw/pci/pcie_port.c | 1 + 6 files changed, 31 insertions(+), 3 deletions(-)include/hw/pci/pcie_port.h +4
-1@@ -57,8 +57,11 @@ struct PCIESlot {/* Disable ACS (really for a pcie_root_port) */ bool disable_acs; -/* Indicates whether hot-plug is enabled on the slot */ +/* Indicates whether any type of hot-plug is allowed on the slot */ bool hotplug; + +bool native_hotplug; +QLIST_ENTRY (PCIESlot) next; };hw/acpi/pcihp.c +8
-0@@ -31,6 +31,7 @@#include "hw/pci/pci.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_host.h" +#include "hw/pci/pcie_port.h" #include "hw/i386/acpi-build.h" #include "hw/acpi/acpi.h" #include "hw/pci/pci_bus.h" @@ -332,6 +333,13 @@ void acpi_pcihp_device_plug_cb(HotplugHandler *hotplug_dev, AcpiPciHpState *s, object_dynamic_cast(OBJECT(dev), TYPE_PCI_BRIDGE)) {PCIBus *sec =pci_bridge_get_sec_bus (PCI_BRIDGE (pdev)); +/* Remove all hot-plug handlers if hot-plug is disabled on slot */ +if (object_dynamic_cast (OBJECT (dev),TYPE_PCIE_SLOT ) && + !PCIE_SLOT (pdev)->hotplug) { +qbus_set_hotplug_handler (BUS (sec),NULL ); +return ; + } +qbus_set_hotplug_handler (BUS (sec),OBJECT (hotplug_dev));/* We don't have to overwrite any other hotplug handler yet */ assert (QLIST_EMPTY (&sec->child));hw/core/machine.c +0
-1@@ -582,7 +582,6 @@ static void machine_set_memdev(Object *obj, const char *value, Error **errp) ms->ram_memdev_id =g_strdup (value); } -static void machine_init_notify (Notifier *notifier,void *data) {MachineState *machine =MACHINE (qdev_get_machine ());hw/i386/pc_q35.c +2
-0@@ -37,6 +37,7 @@#include "sysemu/kvm.h" #include "hw/kvm/clock.h" #include "hw/pci-host/q35.h" +#include "hw/pci/pcie_port.h" #include "hw/qdev-properties.h" #include "hw/i386/x86.h" #include "hw/i386/pc.h" @@ -136,6 +137,7 @@ static void pc_q35_init(MachineState *machine)ram_addr_t lowmem;DriveInfo *hd[MAX_SATA_PORTS ];MachineClass *mc =MACHINE_GET_CLASS (machine); +bool acpi_pcihp;/* Check whether RAM fits below 4G (leaving 1/2 GByte for IO memory * and 256 Mbytes for PCI Express Enhanced Configuration Access Mapping hw/i386/pc_q35.c static void pc_q35_init(MachineState *machine) · line 246
Quoted 9 lines
hw/i386/pc_q35.c +6
-0@@ -236,6 +238,15 @@ static void pc_q35_init(MachineState *machine)object_property_set_link (OBJECT (machine),PC_MACHINE_ACPI_DEVICE_PROP ,OBJECT (lpc), &error_abort); + acpi_pcihp =object_property_get_bool (OBJECT (lpc), +"acpi-pci-hotplug-with-bridge-support" , +NULL ); + +if (acpi_pcihp) { + object_register_sugar_prop(TYPE_PCIE_SLOT, "enable-native-hotplug",I'd s/enable-native-hotplug/native-hotplug/
which is more concise and consistent with other similar properties. Perhaps Michael can fix it up on merge.
Quoted 1 line
[...]
Can be a patch on top - I don't like tweaking code on merge.
Quoted 7 lines
Quoted 4 lines
+
DEFINE_PROP_BOOL("enable-native-hotplug", PCIESlot, native_hotplug, true),
DEFINE_PROP_END_OF_LIST()
};Otherwise looks good to me, so with this or without above nitpicking:
Reviewed-by Igor Mammedov <[email protected]>
Re: [PATCH v5 4/7] hw/pci/pcie: Do not set HPC flag if acpihp is used
In reply to Julia SuvorovaQuoted 10 lines · Julia Suvorova
Instead of changing the hot-plug type in
_OSCregister, do not set the 'Hot-Plug Capable' flag. This way guest will choose ACPI hot-plug if it is preferred and leave the option to use SHPC with pcie-pci-bridge.The ability to control hot-plug for each downstream port is retained, while 'hotplug=off' on the port means all hot-plug types are disabled.
Signed-off-by Julia Suvorova <[email protected]>Reviewed-by Igor Mammedov <[email protected]>
Quoted 131 lines
--- include/hw/pci/pcie_port.h | 5 ++++- hw/acpi/pcihp.c | 8 ++++++++ hw/core/machine.c | 1 - hw/i386/pc_q35.c | 11 +++++++++++ hw/pci/pcie.c | 8 +++++++- hw/pci/pcie_port.c | 1 + 6 files changed, 31 insertions(+), 3 deletions(-)include/hw/pci/pcie_port.h +4
-1@@ -57,8 +57,11 @@ struct PCIESlot {/* Disable ACS (really for a pcie_root_port) */ bool disable_acs; -/* Indicates whether hot-plug is enabled on the slot */ +/* Indicates whether any type of hot-plug is allowed on the slot */ bool hotplug; + +bool native_hotplug; +QLIST_ENTRY (PCIESlot) next; };hw/acpi/pcihp.c +8
-0@@ -31,6 +31,7 @@#include "hw/pci/pci.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_host.h" +#include "hw/pci/pcie_port.h" #include "hw/i386/acpi-build.h" #include "hw/acpi/acpi.h" #include "hw/pci/pci_bus.h" @@ -332,6 +333,13 @@ void acpi_pcihp_device_plug_cb(HotplugHandler *hotplug_dev, AcpiPciHpState *s, object_dynamic_cast(OBJECT(dev), TYPE_PCI_BRIDGE)) {PCIBus *sec =pci_bridge_get_sec_bus (PCI_BRIDGE (pdev)); +/* Remove all hot-plug handlers if hot-plug is disabled on slot */ +if (object_dynamic_cast (OBJECT (dev),TYPE_PCIE_SLOT ) && + !PCIE_SLOT (pdev)->hotplug) { +qbus_set_hotplug_handler (BUS (sec),NULL ); +return ; + } +qbus_set_hotplug_handler (BUS (sec),OBJECT (hotplug_dev));/* We don't have to overwrite any other hotplug handler yet */ assert (QLIST_EMPTY (&sec->child));hw/core/machine.c +0
-1@@ -582,7 +582,6 @@ static void machine_set_memdev(Object *obj, const char *value, Error **errp) ms->ram_memdev_id =g_strdup (value); } -static void machine_init_notify (Notifier *notifier,void *data) {MachineState *machine =MACHINE (qdev_get_machine ());hw/i386/pc_q35.c +11
-0@@ -37,6 +37,7 @@#include "sysemu/kvm.h" #include "hw/kvm/clock.h" #include "hw/pci-host/q35.h" +#include "hw/pci/pcie_port.h" #include "hw/qdev-properties.h" #include "hw/i386/x86.h" #include "hw/i386/pc.h" @@ -136,6 +137,7 @@ static void pc_q35_init(MachineState *machine)ram_addr_t lowmem;DriveInfo *hd[MAX_SATA_PORTS ];MachineClass *mc =MACHINE_GET_CLASS (machine); +bool acpi_pcihp;/* Check whether RAM fits below 4G (leaving 1/2 GByte for IO memory * and 256 Mbytes for PCI Express Enhanced Configuration Access Mapping @@ -236,6 +238,15 @@ static void pc_q35_init(MachineState *machine)object_property_set_link (OBJECT (machine),PC_MACHINE_ACPI_DEVICE_PROP ,OBJECT (lpc), &error_abort); + acpi_pcihp =object_property_get_bool (OBJECT (lpc), +"acpi-pci-hotplug-with-bridge-support" , +NULL ); + +if (acpi_pcihp) { +object_register_sugar_prop (TYPE_PCIE_SLOT ,"enable-native-hotplug" , +"false" , true); + } +/* irq lines */ gsi_state =pc_gsi_create (&x86ms->gsi, pcmc->pci_enabled);hw/pci/pcie.c +7
-1@@ -529,7 +529,13 @@ void pcie_cap_slot_init(PCIDevice *dev, PCIESlot *s)PCI_EXP_SLTCAP_PIP |PCI_EXP_SLTCAP_AIP | PCI_EXP_SLTCAP_ABP); -if (s->hotplug) { + +/* +* Enable native hot-plug on all hot-plugged bridges unless +* hot-plug is disabled on the slot. +*/ +if (s->hotplug && + (s->native_hotplug ||DEVICE (dev)->hotplugged)) {pci_long_test_and_set_mask (dev->config + pos +PCI_EXP_SLTCAP ,PCI_EXP_SLTCAP_HPS |PCI_EXP_SLTCAP_HPC );hw/pci/pcie_port.c +1
-0@@ -148,6 +148,7 @@ static Property pcie_slot_props[] = {DEFINE_PROP_UINT8 ("chassis" , PCIESlot, chassis,0 ),DEFINE_PROP_UINT16 ("slot" , PCIESlot, slot,0 ),DEFINE_PROP_BOOL ("hotplug" , PCIESlot, hotplug, true), +DEFINE_PROP_BOOL ("enable-native-hotplug" , PCIESlot, native_hotplug, true), DEFINE_PROP_END_OF_LIST() };
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
PATCH v5 5/7 bios-tables-test: Allow changes in DSDT ACPI tables
In reply to Julia SuvorovaAll DSDT Q35 tables will be modified because ACPI hot-plug is enabled by default.
--- tests/qtest/bios-tables-test-allowed-diff.h | 11 +++++++++++ 1 file changed, 11 insertions(+)
tests/qtest/bios-tables-test-allowed-diff.h +11 -0
@@ -1 +1,12 @@/* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/q35/DSDT" , +"tests/data/acpi/q35/DSDT.tis" , +"tests/data/acpi/q35/DSDT.bridge" , +"tests/data/acpi/q35/DSDT.mmio64" , +"tests/data/acpi/q35/DSDT.ipmibt" , +"tests/data/acpi/q35/DSDT.cphp" , +"tests/data/acpi/q35/DSDT.memhp" , +"tests/data/acpi/q35/DSDT.acpihmat" , +"tests/data/acpi/q35/DSDT.numamem" , +"tests/data/acpi/q35/DSDT.dimmpxm" , +"tests/data/acpi/q35/DSDT.nohpet",
Signature · 1 line
2.30.2
Re: [PATCH v5 5/7] bios-tables-test: Allow changes in DSDT ACPI tables
Quoted 28 lines · Julia Suvorova
All DSDT Q35 tables will be modified because ACPI hot-plug is enabled by default.
Signed-off-by Julia Suvorova <[email protected]>Reviewed-by Igor Mammedov <[email protected]>--- tests/qtest/bios-tables-test-allowed-diff.h | 11 +++++++++++ 1 file changed, 11 insertions(+)tests/qtest/bios-tables-test-allowed-diff.h +11
-1@@ -1 +1,12 @@/* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/q35/DSDT" , +"tests/data/acpi/q35/DSDT.tis" , +"tests/data/acpi/q35/DSDT.bridge" , +"tests/data/acpi/q35/DSDT.mmio64" , +"tests/data/acpi/q35/DSDT.ipmibt" , +"tests/data/acpi/q35/DSDT.cphp" , +"tests/data/acpi/q35/DSDT.memhp" , +"tests/data/acpi/q35/DSDT.acpihmat" , +"tests/data/acpi/q35/DSDT.numamem" , +"tests/data/acpi/q35/DSDT.dimmpxm" , +"tests/data/acpi/q35/DSDT.nohpet", --
Quoted 3 lines
2.30.2
Thanks,
Marcel
PATCH v5 6/7 hw/acpi/ich9: Set ACPI PCI hot-plug as default on Q35
In reply to Julia SuvorovaQ35 has three different types of PCI devices hot-plug: PCIe Native, SHPC Native and ACPI hot-plug. This patch changes the default choice for cold-plugged bridges from PCIe Native to ACPI Hot-plug with ability to use SHPC and PCIe Native for hot-plugged bridges.
This is a list of the PCIe Native hot-plug issues that led to this change:
* no racy behavior during boot (see 110c477c2ed)
* no delay during deleting - after the actual power off software must wait at least 1 second before indicating about it. This case is quite important for users, it even has its own bug:
https://bugzilla.redhat.com/show_bug.cgi?id=1594168
* no timer-based behavior - in addition to the previous example, the attention button has a 5-second waiting period, during which the operation can be canceled with a second press. While this looks fine for manual button control, automation will result in the need to queue or drop events, and the software receiving events in all sort of unspecified combinations of attention/power indicator states, which is racy and uppredictable.
* fixes:
* https://bugzilla.redhat.com/show_bug.cgi?id=1752465
* https://bugzilla.redhat.com/show_bug.cgi?id=1690256
To return to PCIe Native hot-plug:
-global ICH9-LPC.acpi-pci-hotplug-with-bridge-support=off
--- hw/acpi/ich9.c | 2 +- hw/i386/pc.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
hw/acpi/ich9.c +1 -1
@@ -424,7 +424,7 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm) pm->disable_s3 =0 ; pm->disable_s4 =0 ; pm->s4_val =2 ; - pm->use_acpi_hotplug_bridge = false; + pm->use_acpi_hotplug_bridge = true;object_property_add_uint32_ptr (obj,ACPI_PM_PROP_PM_IO_BASE , &pm->pm_io_base,OBJ_PROP_FLAG_READ );
hw/i386/pc.c +1 -0
@@ -98,6 +98,7 @@ GlobalProperty pc_compat_6_0[] = { { "qemu64" "-" TYPE_X86_CPU, "family", "6" }, { "qemu64" "-" TYPE_X86_CPU, "model", "6" }, { "qemu64" "-" TYPE_X86_CPU, "stepping", "3" }, + { "ICH9-LPC", "acpi-pci-hotplug-with-bridge-support", "off" }, };const size_t pc_compat_6_0_len =G_N_ELEMENTS (pc_compat_6_0);
Signature · 1 line
2.30.2
Re: [PATCH v5 6/7] hw/acpi/ich9: Set ACPI PCI hot-plug as default on Q35
Quoted 6 lines · Julia Suvorova
Q35 has three different types of PCI devices hot-plug: PCIe Native, SHPC Native and ACPI hot-plug. This patch changes the default choice for cold-plugged bridges from PCIe Native to ACPI Hot-plug with ability to use SHPC and PCIe Native for hot-plugged bridges.
I personally think the best of all worlds is to have as default:
- Native PCIe hotplug for pcie-root-ports
- ACPI hotplug for devices behind PCI bridges (pcie-pci bridge or pci-pci
bridge).
Having ACPI hotplug *as default* for pcie-root-ports seems weird even if it solves existing bugs (we should solve them...).
I am not against having a property to force ACPI hotplug even for pcie root-ports,
just not being the default. It doesn't have to be part of this series, it can be a patch on
top.
I would leave APCI hotplug as an option and not as the default, giving us time to test it,
come up with a fix for the pcie-hotplug race and a patch for allowing ACPI hotplug
only for the bridges.
Thanks,
Marcel
Quoted 58 lines
This is a list of the PCIe Native hot-plug issues that led to this change:
* no racy behavior during boot (see110c477c2ed)
* no delay during deleting - after the actual power off software must wait at least 1 second before indicating about it. This case is quite important for users, it even has its own bug:
https://bugzilla.redhat.com/show_bug.cgi?id=1594168
* no timer-based behavior - in addition to the previous example, the attention button has a 5-second waiting period, during which the operation can be canceled with a second press. While this looks fine for manual button control, automation will result in the need to queue or drop events, and the software receiving events in all sort of unspecified combinations of attention/power indicator states, which is racy and uppredictable.
* fixes:
* https://bugzilla.redhat.com/show_bug.cgi?id=1752465
* https://bugzilla.redhat.com/show_bug.cgi?id=1690256To return to PCIe Native hot-plug:
-global ICH9-LPC.acpi-pci-hotplug-with-bridge-support=offSigned-off-by Julia Suvorova <[email protected]>Reviewed-by Igor Mammedov <[email protected]>--- hw/acpi/ich9.c | 2 +- hw/i386/pc.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)hw/acpi/ich9.c +1
-1@@ -424,7 +424,7 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm) pm->disable_s3 =0 ; pm->disable_s4 =0 ; pm->s4_val =2 ; - pm->use_acpi_hotplug_bridge = false; + pm->use_acpi_hotplug_bridge = true; object_property_add_uint32_ptr(obj, ACPI_PM_PROP_PM_IO_BASE,&pm->pm_io_base, OBJ_PROP_FLAG_READ);hw/i386/pc.c +1
-1@@ -98,6 +98,7 @@ GlobalProperty pc_compat_6_0[] = { { "qemu64" "-" TYPE_X86_CPU, "family", "6" }, { "qemu64" "-" TYPE_X86_CPU, "model", "6" }, { "qemu64" "-" TYPE_X86_CPU, "stepping", "3" }, + { "ICH9-LPC", "acpi-pci-hotplug-with-bridge-support", "off" }, };const size_t pc_compat_6_0_len =G_N_ELEMENTS (pc_compat_6_0); --2.30.2
PATCH v5 7/7 bios-tables-test: Update golden binaries
In reply to Julia SuvorovaAdd ACPI hot-plug registers to DSDT Q35 tables.
Changes in the tables:
+ Scope (_SB.PCI0)
+ {
+ OperationRegion (PCST, SystemIO, 0x0CC4, 0x08)
+ Field (PCST, DWordAcc, NoLock, WriteAsZeros)
+ {
+ PCIU, 32,
+ PCID, 32
+ }
+
+ OperationRegion (SEJ, SystemIO, 0x0CCC, 0x04)
+ Field (SEJ, DWordAcc, NoLock, WriteAsZeros)
+ {
+ B0EJ, 32
+ }
+
+ OperationRegion (BNMR, SystemIO, 0x0CD4, 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, 6, Serialized)
+ {
+ If ((Arg0 == ToUUID ("e5c937d0-3553-4d7a-9117-ea4d19c3434d") /* Device Labeling Interface */))
+ {
+ Local0 = AIDX (Arg4, Arg5)
+ If ((Arg2 == Zero))
+ {+ If ((Arg1 == 0x02))
+ {
+ If (!((Local0 == Zero) | (Local0 == 0xFFFFFFFF)))
+ {
+ Return (Buffer (One)
+ {
+ 0x81 // .
+ })
+ }
+ }
+
+ Return (Buffer (One)
+ {
+ 0x00 // .
+ })
+ }
+ ElseIf ((Arg2 == 0x07))
+ {+ Local1 = Package (0x02)
+ {
+ Zero,
+ ""
+ }
+ Local1 [Zero] = Local0
+ Return (Local1)
+ }
+ }
+ }
+ }
+
...
Scope (_GPE)
{
Name (_HID, "ACPI0006" /* GPE Block Device */) // _HID: Hardware ID
+ Method (_E01, 0, NotSerialized) // _Exx: Edge-Triggered GPE, xx=0x00-0xFF
+ {
+ Acquire (\_SB.PCI0.BLCK, 0xFFFF)
+ \_SB.PCI0.PCNT ()
+ Release (\_SB.PCI0.BLCK)+ }
...
+
+ 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,
+ 0x0CC4, // Range Minimum
+ 0x0CC4, // Range Maximum
+ 0x01, // Alignment
+ 0x18, // Length
+ )
+ })
+ }
}...
And if there is a port in configuration:
Device (S10)
{
Name (_ADR, 0x00020000) // _ADR: Address
+ Name (BSEL, Zero)
+ Device (S00)
+ {
+ Name (_SUN, Zero) // _SUN: Slot User Number
+ Name (_ADR, Zero) // _ADR: Address
+ Method (_EJ0, 1, NotSerialized) // _EJx: Eject Device, x=0-9
+ {+ PCEJ (BSEL, _SUN)
+ }
+
+ Method (_DSM, 4, Serialized) // _DSM: Device-Specific Method
+ {
+ Return (PDSM (Arg0, Arg1, Arg2, Arg3, BSEL, _SUN))
+ }
+ }
+
...
+ Method (DVNT, 2, NotSerialized)
+ {
+ If ((Arg0 & One))
+ {
+ Notify (S00, Arg1)
+ }
...
--- tests/qtest/bios-tables-test-allowed-diff.h | 11 ----------- tests/data/acpi/q35/DSDT | Bin 7859 -> 8289 bytes tests/data/acpi/q35/DSDT.acpihmat | Bin 9184 -> 9614 bytes tests/data/acpi/q35/DSDT.bridge | Bin 7877 -> 11003 bytes tests/data/acpi/q35/DSDT.cphp | Bin 8323 -> 8753 bytes tests/data/acpi/q35/DSDT.dimmpxm | Bin 9513 -> 9943 bytes tests/data/acpi/q35/DSDT.ipmibt | Bin 7934 -> 8364 bytes tests/data/acpi/q35/DSDT.memhp | Bin 9218 -> 9648 bytes tests/data/acpi/q35/DSDT.mmio64 | Bin 8990 -> 9419 bytes tests/data/acpi/q35/DSDT.nohpet | Bin 7717 -> 8147 bytes tests/data/acpi/q35/DSDT.numamem | Bin 7865 -> 8295 bytes tests/data/acpi/q35/DSDT.tis | Bin 8465 -> 8894 bytes 12 files changed, 11 deletions(-)
tests/qtest/bios-tables-test-allowed-diff.h +0 -11
@@ -1,12 +1 @@/* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/q35/DSDT" , -"tests/data/acpi/q35/DSDT.tis" , -"tests/data/acpi/q35/DSDT.bridge" , -"tests/data/acpi/q35/DSDT.mmio64" , -"tests/data/acpi/q35/DSDT.ipmibt" , -"tests/data/acpi/q35/DSDT.cphp" , -"tests/data/acpi/q35/DSDT.memhp" , -"tests/data/acpi/q35/DSDT.acpihmat" , -"tests/data/acpi/q35/DSDT.numamem" , -"tests/data/acpi/q35/DSDT.dimmpxm" , -"tests/data/acpi/q35/DSDT.nohpet",
tests/data/acpi/q35/DSDT binary +0 -0
tests/data/acpi/q35/DSDT.acpihmat binary +0 -0
tests/data/acpi/q35/DSDT.bridge binary +0 -0
tests/data/acpi/q35/DSDT.cphp binary +0 -0
tests/data/acpi/q35/DSDT.dimmpxm binary +0 -0
tests/data/acpi/q35/DSDT.ipmibt binary +0 -0
tests/data/acpi/q35/DSDT.memhp binary +0 -0
tests/data/acpi/q35/DSDT.mmio64 binary +0 -0
tests/data/acpi/q35/DSDT.nohpet binary +0 -0
tests/data/acpi/q35/DSDT.numamem binary +0 -0
tests/data/acpi/q35/DSDT.tis binary +0 -0
Signature · 1 line
2.30.2
Re: [PATCH v5 7/7] bios-tables-test: Update golden binaries
Quoted 168 lines · Julia Suvorova
Add ACPI hot-plug registers to DSDT Q35 tables.
Changes in the tables:(quoted diff) +101
-0+ Scope (_SB.PCI0) + { + OperationRegion (PCST, SystemIO, 0x0CC4, 0x08) + Field (PCST, DWordAcc, NoLock, WriteAsZeros) + { + PCIU, 32, + PCID, 32 + } + + OperationRegion (SEJ, SystemIO, 0x0CCC, 0x04) + Field (SEJ, DWordAcc, NoLock, WriteAsZeros) + { + B0EJ, 32 + } + + OperationRegion (BNMR, SystemIO, 0x0CD4, 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, 6, Serialized) + { + If ((Arg0 == ToUUID ("e5c937d0-3553-4d7a-9117-ea4d19c3434d") /* Device Labeling Interface */)) + { + Local0 = AIDX (Arg4, Arg5) + If ((Arg2 == Zero)) + { + If ((Arg1 == 0x02)) + { + If (!((Local0 == Zero) | (Local0 == 0xFFFFFFFF))) + { + Return (Buffer (One) + { + 0x81 // . + }) + } + } + + Return (Buffer (One) + { + 0x00 // . + }) + } + ElseIf ((Arg2 == 0x07)) + { + Local1 = Package (0x02) + { + Zero, + "" + } + Local1 [Zero] = Local0 + Return (Local1) + } + } + } + } + Scope (_GPE) { Name (_HID, "ACPI0006" /* GPE Block Device */) // _HID: Hardware ID + Method (_E01, 0, NotSerialized) // _Exx: Edge-Triggered GPE, xx=0x00-0xFF + { + Acquire (\_SB.PCI0.BLCK, 0xFFFF) + \_SB.PCI0.PCNT () + Release (\_SB.PCI0.BLCK) + } + + 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, + 0x0CC4, // Range Minimum + 0x0CC4, // Range Maximum + 0x01, // Alignment + 0x18, // Length + ) + }) + } }And if there is a port in configuration:
Device (S10) { Name (_ADR, 0x00020000) // _ADR: Address(quoted diff) +22
-0+ Name (BSEL, Zero) + Device (S00) + { + Name (_SUN, Zero) // _SUN: Slot User Number + Name (_ADR, Zero) // _ADR: Address + Method (_EJ0, 1, NotSerialized) // _EJx: Eject Device, x=0-9 + { + PCEJ (BSEL, _SUN) + } + + Method (_DSM, 4, Serialized) // _DSM: Device-Specific Method + { + Return (PDSM (Arg0, Arg1, Arg2, Arg3, BSEL, _SUN)) + } + } + + Method (DVNT, 2, NotSerialized) + { + If ((Arg0 & One)) + { + Notify (S00, Arg1) + }Signed-off-by Julia Suvorova <[email protected]>--- tests/qtest/bios-tables-test-allowed-diff.h | 11 ----------- tests/data/acpi/q35/DSDT | Bin 7859 -> 8289 bytes tests/data/acpi/q35/DSDT.acpihmat | Bin 9184 -> 9614 bytes tests/data/acpi/q35/DSDT.bridge | Bin 7877 -> 11003 bytes tests/data/acpi/q35/DSDT.cphp | Bin 8323 -> 8753 bytes tests/data/acpi/q35/DSDT.dimmpxm | Bin 9513 -> 9943 bytes tests/data/acpi/q35/DSDT.ipmibt | Bin 7934 -> 8364 bytes tests/data/acpi/q35/DSDT.memhp | Bin 9218 -> 9648 bytes tests/data/acpi/q35/DSDT.mmio64 | Bin 8990 -> 9419 bytes tests/data/acpi/q35/DSDT.nohpet | Bin 7717 -> 8147 bytes tests/data/acpi/q35/DSDT.numamem | Bin 7865 -> 8295 bytes tests/data/acpi/q35/DSDT.tis | Bin 8465 -> 8894 bytes 12 files changed, 11 deletions(-)tests/qtest/bios-tables-test-allowed-diff.h +0
-1@@ -1,12 +1 @@/* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/q35/DSDT",
tests/qtest/bios-tables-test-allowed-diff.h line 12
Quoted 10 lines
tests/qtest/bios-tables-test-allowed-diff.h +0
-10-"tests/data/acpi/q35/DSDT.tis" , -"tests/data/acpi/q35/DSDT.bridge" , -"tests/data/acpi/q35/DSDT.mmio64" , -"tests/data/acpi/q35/DSDT.ipmibt" , -"tests/data/acpi/q35/DSDT.cphp" , -"tests/data/acpi/q35/DSDT.memhp" , -"tests/data/acpi/q35/DSDT.acpihmat" , -"tests/data/acpi/q35/DSDT.numamem" , -"tests/data/acpi/q35/DSDT.dimmpxm" , -"tests/data/acpi/q35/DSDT.nohpet",
It seems odd to add all these, then remove them again 2 patches later. But I don't really understand what these tests are doing, so maybe that's ok.
Quoted 202 lines
tests/data/acpi/q35/DSDT binary +0
-0tests/data/acpi/q35/DSDT.acpihmat binary +0
-0tests/data/acpi/q35/DSDT.bridge binary +0
-0tests/data/acpi/q35/DSDT.cphp binary +0
-0tests/data/acpi/q35/DSDT.dimmpxm binary +0
-0tests/data/acpi/q35/DSDT.ipmibt binary +0
-0tests/data/acpi/q35/DSDT.memhp binary +0
-0tests/data/acpi/q35/DSDT.mmio64 binary +0
-0tests/data/acpi/q35/DSDT.nohpet binary +0
-0tests/data/acpi/q35/DSDT.numamem binary +0
-0tests/data/acpi/q35/DSDT.tis binary +0
-0
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Re: [PATCH v5 7/7] bios-tables-test: Update golden binaries
Quoted 174 lines · On Thu, 1 Jul 2021 14:54:36 +1000 David Gibson <[email protected]>…
Quoted 173 lines · Julia Suvorova
Add ACPI hot-plug registers to DSDT Q35 tables.
Changes in the tables:(quoted diff) +101
-0+ Scope (_SB.PCI0) + { + OperationRegion (PCST, SystemIO, 0x0CC4, 0x08) + Field (PCST, DWordAcc, NoLock, WriteAsZeros) + { + PCIU, 32, + PCID, 32 + } + + OperationRegion (SEJ, SystemIO, 0x0CCC, 0x04) + Field (SEJ, DWordAcc, NoLock, WriteAsZeros) + { + B0EJ, 32 + } + + OperationRegion (BNMR, SystemIO, 0x0CD4, 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, 6, Serialized) + { + If ((Arg0 == ToUUID ("e5c937d0-3553-4d7a-9117-ea4d19c3434d") /* Device Labeling Interface */)) + { + Local0 = AIDX (Arg4, Arg5) + If ((Arg2 == Zero)) + { + If ((Arg1 == 0x02)) + { + If (!((Local0 == Zero) | (Local0 == 0xFFFFFFFF))) + { + Return (Buffer (One) + { + 0x81 // . + }) + } + } + + Return (Buffer (One) + { + 0x00 // . + }) + } + ElseIf ((Arg2 == 0x07)) + { + Local1 = Package (0x02) + { + Zero, + "" + } + Local1 [Zero] = Local0 + Return (Local1) + } + } + } + } + Scope (_GPE) { Name (_HID, "ACPI0006" /* GPE Block Device */) // _HID: Hardware ID + Method (_E01, 0, NotSerialized) // _Exx: Edge-Triggered GPE, xx=0x00-0xFF + { + Acquire (\_SB.PCI0.BLCK, 0xFFFF) + \_SB.PCI0.PCNT () + Release (\_SB.PCI0.BLCK) + } + + 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, + 0x0CC4, // Range Minimum + 0x0CC4, // Range Maximum + 0x01, // Alignment + 0x18, // Length + ) + }) + } }And if there is a port in configuration:
Device (S10) { Name (_ADR, 0x00020000) // _ADR: Address(quoted diff) +22
-0+ Name (BSEL, Zero) + Device (S00) + { + Name (_SUN, Zero) // _SUN: Slot User Number + Name (_ADR, Zero) // _ADR: Address + Method (_EJ0, 1, NotSerialized) // _EJx: Eject Device, x=0-9 + { + PCEJ (BSEL, _SUN) + } + + Method (_DSM, 4, Serialized) // _DSM: Device-Specific Method + { + Return (PDSM (Arg0, Arg1, Arg2, Arg3, BSEL, _SUN)) + } + } + + Method (DVNT, 2, NotSerialized) + { + If ((Arg0 & One)) + { + Notify (S00, Arg1) + }Signed-off-by Julia Suvorova <[email protected]>--- tests/qtest/bios-tables-test-allowed-diff.h | 11 ----------- tests/data/acpi/q35/DSDT | Bin 7859 -> 8289 bytes tests/data/acpi/q35/DSDT.acpihmat | Bin 9184 -> 9614 bytes tests/data/acpi/q35/DSDT.bridge | Bin 7877 -> 11003 bytes tests/data/acpi/q35/DSDT.cphp | Bin 8323 -> 8753 bytes tests/data/acpi/q35/DSDT.dimmpxm | Bin 9513 -> 9943 bytes tests/data/acpi/q35/DSDT.ipmibt | Bin 7934 -> 8364 bytes tests/data/acpi/q35/DSDT.memhp | Bin 9218 -> 9648 bytes tests/data/acpi/q35/DSDT.mmio64 | Bin 8990 -> 9419 bytes tests/data/acpi/q35/DSDT.nohpet | Bin 7717 -> 8147 bytes tests/data/acpi/q35/DSDT.numamem | Bin 7865 -> 8295 bytes tests/data/acpi/q35/DSDT.tis | Bin 8465 -> 8894 bytes 12 files changed, 11 deletions(-)tests/qtest/bios-tables-test-allowed-diff.h +0
-6@@ -1,12 +1 @@/* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/q35/DSDT" , -"tests/data/acpi/q35/DSDT.tis" , -"tests/data/acpi/q35/DSDT.bridge" , -"tests/data/acpi/q35/DSDT.mmio64" , -"tests/data/acpi/q35/DSDT.ipmibt" , -"tests/data/acpi/q35/DSDT.cphp",
Quoted 8 lines
tests/qtest/bios-tables-test-allowed-diff.h line 12
Quoted 5 lines
tests/qtest/bios-tables-test-allowed-diff.h +0
-5-"tests/data/acpi/q35/DSDT.memhp" , -"tests/data/acpi/q35/DSDT.acpihmat" , -"tests/data/acpi/q35/DSDT.numamem" , -"tests/data/acpi/q35/DSDT.dimmpxm" , -"tests/data/acpi/q35/DSDT.nohpet",It seems odd to add all these, then remove them again 2 patches later.
this helps with bisection,
* we first white-list expected blobs, so that mismatch won't break 'make check'
* then change ACPI tables, one can see diff if tests are run with V=1
* update/commit expected blobs with new modifications,
and remove them from white-list. If later on we change ACPI tables intentionally, 'make check' will error out
Quoted 206 lines
But I don't really understand what these tests are doing, so
maybe that's ok.Quoted 202 lines
tests/data/acpi/q35/DSDT binary +0
-0z01*jLwFx3FYymF8zI+ROSSM!)3UdiuFhBV;*tE)bqWCLc$-~aR1t7C>auXIPPtIak zAUQdci)n%Iq}s^|43iUh{sRHS5=B8~#>OQ;f?=Wf0@2A?T<irxtV|5N42cB^9f=GK zOA<G;GT)YD@@JX+P)68R#4_I1z>pzYIYyru7HSX=AqfOH
-McSBME?12>6O_{w~AM zs2<(q#S-8V5X2Gh;pxH~;1^)vXkf;5g!WTIeRL2<d+oWl%`L9C@af$gy#qkqr_wu axlArUmKczQ0&Xmm%j9g?Mc6>LFaQ7^vWU|Fdelta 57 zcmaFpu-TT&CD<iovm65h<GYPqznM0xu-ukp6q(E@C(JD1D7ZOLj-PSz8u@fiH<p<A NV5fKiyUDT&wgCMJ5G4Qr
tests/data/acpi/q35/DSDT.acpihmat binary +0
-0tests/data/acpi/q35/DSDT.bridge binary +0
-0zcmb7{PjBNy7{<qr)4Gn+I*q$&cAGY+LX|*TvUJ;~5-Xb6L2YP^RW}I9E1aH4$|7<A zA*j%#J*>Ebzd(?3;ItCjk3cyfap1s>(;m2R;mDzf?)%1mvr$RXI0q}wJmcRyGxq%P zuaB<kis_igS8p&T{QI+VC34M5-S?cbXB!6vw__X5v5>e_71=%4P#92N&%?#cyB()e z^@POlsv^1P2^2=TP^p4ZwrWR0;?LkV6h_&q*Yfs(
BB~#%7@1LOn==rDpk>4M|FMO zZeor0*IZ~Zgt!}6-edZkCAjH-)u0x_+IVS%bsM@lW1CKGzIzz=o2j&-{ju}g-_F)I zweK_k)Uv-AwKlSzeAei$=_j%^;?SAP5<z%-(Y@2y@ns_y_Sjz=RLTvA2Z!0|5TZ6 zFUCcdWGC&$cPEVXPM*hOeUoFB>%-qjNitRSFN7yZ-pC7>!!cpilXu#Vl0p#rR- z)s~+Bx3VB?xEEE)-nWlrZ~wqd+Lm1?6}Fk|)lnG-TftoXg~S#6aPgnH*=|8s=~4_ zt)9+3dyMUAd(Zr@R^R2;PtJpaCwnFHNM%f9a@naIGWX&gr+~#y-2x(*OkeaW)q;Ry zk5$moGaihZ+QYGHwoX5#a&PnIfY_yyFhGV6oQXul%*gUG^B_G5l2BLGr}B7j2N*Y z2Arc5ajJ}EEI_#(hy`y1_g-|BhGXlWmF-^CIy)x$V}uQn-pYL_IU8zXCp%%QV^Mf z$k7=^kN00OWsV?oks(_YL?MO}fx#{J0)};qh9p6dL<C5{*rp&VG1S``e0bJCkZlT* zBuMgh$PLC01(_$t{8$DbIej6>4h2~t$ii62I7X3zXvENNGWg_m1cDSPNQxk-n~+-> zyA))R7>gl;Pr0B$kX;IrCP+GRkP-#aLk4GhbO;4mq999=8RaktSMCtxPIL$b$q*wG zmBAf@hGdx_%TXbYK|!*_$WF=N{f(@@2ACA&E<x^22^nHgkbA_qH<h2?ws(VRVc^zK~^S1MlmQzju^R-3_f-Xham4!kX3@Lj)Y8PP>?lZtPL|bof*dM;kuPGKeUd;ZsM#d zu%~zX?4}JrXr#!hC%X$C$v8QIMm7fZaQA@+ipJ1F^};>Yzd^dDcuYYzcO_P+?OK z2OhQsn@;FqW3YRK3R{DHAXL~KEa;)a_F!oa6}AU!EN^ue&YE!Y5*QS~f=OEJYrHw| zCDgEvk(T@Vm9L?O<%RrwU%&GAP{XVzzth)6J}Bt-873oDfV1FJoLB>m{f0R*(AaZx z$j83Jt2^-XsE7PL(C|hL{0?dyR(%c6xvb6bAde3lzZ8V<kEz6T_<jKY<NNrC@$XB% CMohN=delta 73 zcmewzdeoN7CD<k8s2l?WWBW#~-%OiTSZ+%)icDsd6J{206x<vr$Im!<jeG_tYfOBw dQ@nr!>ttC4dw%|4LxXsZct@8Y9tH*`1^^Ot5>o&G
tests/data/acpi/q35/DSDT.cphp binary +0
-0zcmZp6+~~sP66_LUsKmg)=(&;WH&eZUpP*iRuv2`1v!_9HLx6K|2qX6q9xjgPMgb7V z87LmA03=)#q8ox;z2X_U&+u@uL^pDSIL=N6u3kV1CqLgHM(!&RZ6J=blV7N>LV%}B zghDi<laI4EgNSN?v#S?Vv@(eI|9?RSNJT+qJ!2*V$dG7tkoXb?5p74HCJbdjRUpF( zKtuvmZGwmkTYyWjFW&+m*2x)y!dwCu%uhZIHm&lVDE
V<^02dS0m!VJ+=K<nld~8W zNKVe=Vp<?PsdjP#!{h{>|3JX7L{X5Lv2h8IU|1-=Ky-2z7khyaD-#1RLt;TfM<N5m zlElrd%&VoD{8=V%loPfUv5a>$Fl2~Uj?rg^g&M>|NCE-Qej(B7NCF@g0=}Y~kIV5h zsz*0@u>^Po1aZWBc)IWg_yrg^8kjL~#D{-&YlV$`6UH8rRkG5%FD7H;W@&?C^7kp Zd?uG4OAN?D0XLS(ZVI;SB5WXA7y#g;hnxTadelta 57 zcmdn!((K6P66_MvtiZs)7_^b=H
8VnmetaXB9kx53o{Ei3T{?Z;Afm%qnOU=#u5B N>=Z9xH~FoiEdbPr5E}phtests/data/acpi/q35/DSDT.dimmpxm binary +0
-0z01*jLwFx3FYymF8zI+ROSSM!)3UdiuFhBV;*tE)bqWCLc$-~aR1t7C>auXIPPtIak zAUQdci)n%Iq}s^|43iUh{sRHS5=B8~#>OQ;f?=Wf0@2A?T<irxtV|5N42cB^9f=GK zOA<G;GTSPoIkUyP2e@*?dw9C=Iywh<8W<RuF^E{kyBZiWL@USWGsD6V;yomR0B66D zXmun3kO~oDpiUEpwis~O
-Qm#aWx3|if+zT=4VuoZtLY@CXQk*cRXyVBiR}j3Yi2 zXg4q>6g=v3UW%*Cx@%ZvK?$!ow&rxk@FI%a0`n<Ol&bmdS5aY}rNFKsGY~09jj* AH2?qrdelta 75 zcmccayV8rxCD<iIQ<Z^%QFbHOZ>G&EEVc?F8u9J{t{m|mo-VwO&H<hV1_ovflQ*b{ fGC2xvKCZ&gI9W+8ozsmaCO+6HUchehWHnm=`KA-;
tests/data/acpi/q35/DSDT.ipmibt binary +0
-0z#i*!}ON^Wvj1MF+MtU+Qi0O5efuWL1$1J%p{wj$A>BTugx@MNxhi+R{7=Is)ae{Qa zZmGCv?5hOoWwZyBMU2c+h-5h%4*eE)_@@
J4R{F2alH?er92z@XJalN=5z3VyEx3 zu;EyfL3x6<k||Ms+kE+S*3Yb)*)J>oj4YpLbq~EDOFJM))3z82Qn%;S1Jsj-?1BD5 zG7Nit2H<Wsn4ujp>Q7IEKms&<@45*<zxjy6AL(jEaCfm8a|=Zykw>_wY1#%*wp>$N z10>s64gcM6wBDG2kzFIXF@ZZ|Yvxg(pMp7ZRT6LkS4YX%##){Q$J{#WVOLiRN5_8m i<bW<<|6}XAi+6W$+SgVXz)ULN1#uc?WhvrE#L<Umx=ddelta 71 zcmZ4E_|KNhCD<k8pBw
NqtZq$H|EXxEVmaMdIB9Tsh)BJY9GlodY}#3=GT|1RMo7 b&ynM2ocvurozsmaCO+6HUchd0hJq~s<(w1ftests/data/acpi/q35/DSDT.memhp binary +0
-0z01*jLwFx3FYymF8zI+ROSSM!)3UdiuFhBV;*tE)bqWCLc$-~aR1t7C>auXIPPtIak zAUQdci)n%Iq}s^|43iUh{sRHS5=B8~#>OQ;f?=Wf0@2A?T<irxtV|5N42cB^9f=GK zOA<G;GHb~P
Lo2k2e@*?dw9C=Iywh<8W<RuF^E{kyBZiWL@USWGsD6V;yomR0B66D zXmun3kO~1(amm3{EX_+O<pVk9sxlRlLPz$3><+5bHs-N?E!|mf=7NyK~8D<WCLYc jwj(@8co-!n2P<cCLV=+EEI5KnS4~)mR*DmWD5fTV<d8delta 71 zcmdns-Q>aL66_Mfq{6_!cz+|;Z>G&EEL!s7BJu74t{m|mo-VwO&H<hV1_ovf0*->4 b7bx>HPX4Wu&gsSy6CdmpFJL!0N7WVpu^|&B
tests/data/acpi/q35/DSDT.mmio64 binary +0
-0zcmZWl%}T>S7~Ji@Y1C9x)PoXRr3XPH_=Db>O|+>dU78kztt36!iee6WP!L;BUUlyh zp)Vjlg1v}>9()BazJiCkOBDq7Ffg<8&G3D<8_%YoJ9_1L1^
I!g|E<sWT)mM{_YU zRno%9sla4c6cVH@ae|m$RT$_BX*ovGg~=CDh>&)Y6Qrp|k$q^kRffs;{un1nv#XYZ zO?^ipP}@dZK%T|OD27OuvtG|{aEE_-0h@q_kQ~=LK%UF9p?@~!;$c1q@5k%OdJOB1 zH56<|X(Kf%NN=l8AI|cbbv^cJO*|sY=UE4bUXZ2xAef*{Ary?>oKp_PwcS=I@75z zY<C!dyRjfm_l3AW5)FYtQ1v7Isl#eLo~cJRW3!O>89Gf~gPY5jIs-T><i%Yp9EW zWNQoI-y8PVy*gvS4i%Uz#Wp6e!$biFh?$n5nRCKeloVPnrFcYx5|3h)s@20v43!~ hN7plxv98z^;W*vRGzUu28ZVSK>1(DGmt(vHd;|L@ije>Sdelta 71 zcmX@@InRyDCD<iIPMLv$amq%n-%OiTSWM)^MdIB9Tsh)BJY9GlodY}#3=GT|1RMo7 buTtV?oXo0{&gsD#6CdmpFW@k_RK*_vr*sly
tests/data/acpi/q35/DSDT.nohpet binary +0
-0z01*jLwFx3FYymF8zI+ROSSM!)3UdiuFhBV;*tE)bqWCLc$-~aR1t7C>auXIPPtIak zAUQdci)n%Iq}s^|43iUh{sRHS5=B8~#>OQ;f?=Wf0@2A?T<irxtV|5N42cB^9f=GK zOA<GiGu@U9@@I*64{+s(_waP#b#xB!G%zqQV-T^7cQr6%h*pl#XNH9##Cu2r0nUCQ z(dtM7AQb|>qMI{i_!+&To4i;8JOY9sCI|Qh7&rnA=7<jk+5-%A1&{oaf}GNHg
(8r z{L-T2)MB7qaEK!pH%Gj4P_Q57neKZ5uPJFj1rT}WHY(^SYkj95pZLf{6f~2U4#u} GI|BgciIJ56delta 71 zcmca?zto1yCD<iIRgQsyar;KDT&B&_m~Tspi^RJJxN^jMc)IX9ItO?f7#Nr_2sjFE bJ}k@6I9X0UozsmaCO+6HUchd0zq~B~$tDvn
tests/data/acpi/q35/DSDT.numamem binary +0
-0tests/data/acpi/q35/DSDT.tis binary +0
-0zcmbQ}w9l2xCD<iopArKD<JpZ|znSU<
~>ylgPr07oIMSq8v>kzLm0V_@NjWNHwu6_ z&Oq@{1t8&~5Zw^$>Jt(eTIjNCAyIt#Bp{qaP<O8IQjVoF>+slXajMao%}+56#_h6 zA{3$-oqU|V8AMbAoL#+qLo3s|NjdzKq?9<>lrf{K!!xCgT$9Gh-f<kHDM?Nssb5S z03s5gY7<0U*aBRFefbvnuujep6y_4RV1DvxuxXX=MDbU?l82pr3qWS&<R&aoo}9(7 zKyq>>7t;daNwt#7$zt1{09PtC5nQ~jEzfx1j9n{1)I)xY!GXSeY1j84?Q;IuaQe zmLzUwWxg%R<j*qsp^UJth-JL1fgwY*a*RGREYu(#LJ|mY_6vztM-l+35bzY+{9Q(x zQ9ZiJizUD#Ac!O0!_$Q~z%RhS(ZGy>BR&+wbM{p5$S*0#DNUdJR#ukn2+t87Mv2J+ da+#d|nlT^?1>7e$$=Rquz@Vuyk9Pe2>{`!ixL0;delta 62 zcmdnzI?;*CCD<iIP?3RwasNiH-%OiTSZ+%)icDsd6J{3h72F&sC(Sr{hkQDxhh|KC Suv5H%!(<HwyUn=@flL4**AWN+
Quoted 31 lines · Julia Suvorova
The patch set consists of two parts:
patches 1-4: introduce new feature
'acpi-pci-hotplug-with-bridge-support' on Q35
patches 5-7: make the feature default along with changes in ACPI tablesWith the feature disabled Q35 falls back to the native hot-plug.
Pros
* no racy behavior during boot (see110c477c2ed)
* eject is possible - according to PCIe spec, attention button press should lead to power off, and then the adapter should be removed manually. As there is no power down state exists in QEMU, we cannot distinguish between an eject and a power down request.
* no delay during deleting - after the actual power off software must wait at least 1 second before indicating about it. This case is quite important for users, it even has its own bug:
https://bugzilla.redhat.com/show_bug.cgi?id=1594168
* no timer-based behavior - in addition to the previous example, the attention button has a 5-second waiting period, during which the operation can be canceled with a second press. While this looks fine for manual button control, automation will result in the need to queue or drop events, and the software receiving events in all sort of unspecified combinations of attention/power indicator states, which is racy and uppredictable.
* fixes or reduces the likelihood of the bugs:
* https://bugzilla.redhat.com/show_bug.cgi?id=1833187
* https://bugzilla.redhat.com/show_bug.cgi?id=1657077
* https://bugzilla.redhat.com/show_bug.cgi?id=1669931
* https://bugzilla.redhat.com/show_bug.cgi?id=1678290
Quoted 3 lines
Cons:
* no access to possible features presented in slot capabilities (this is only surprise removal AFAIK)
This all looks quite nice to me.
Let's give people a bit of time for review, then I'll merge.
Quoted 59 lines
v5:
* make sugar property onTYPE_PCIE_SLOT
instead of oldTYPE_MACHINEproperty [Igor]
* minor style changes
v4:
* regain per-port control over hot-plug
* rebased over acpi-index changes
* set property on machine type to
make pci code more generic [Igor, Michael]v3:
* drop change of_OSCto allow SHPC on hotplugged bridges
* use 'acpi-root-pci-hotplug'
* add migration states [Igor]
* minor style changesv2:
* new ioport range for acpiphp [Gerd]
* dropfind_pci_host()[Igor]
* explain magic numbers in_OSC[Igor]
* dropbuild_q35_pci_hotplug()wrapper [Igor]Julia Suvorova (7):
hw/acpi/pcihp: Enhanceacpi_pcihp_disable_root_bus()to support Q35 hw/i386/acpi-build: Add ACPI PCI hot-plug methods to Q35 hw/acpi/ich9: Enable ACPI PCI hot-plug
hw/pci/pcie: Do not set HPC flag if acpihp is used
bios-tables-test: Allow changes in DSDT ACPI tables hw/acpi/ich9: Set ACPI PCI hot-plug as default on Q35
bios-tables-test: Update golden binarieshw/i386/acpi-build.h | 5 +++ include/hw/acpi/ich9.h | 5 +++ include/hw/acpi/pcihp.h | 3 +- include/hw/pci/pcie_port.h | 5 ++- hw/acpi/ich9.c | 67 ++++++++++++++++++++++++++++++ hw/acpi/pcihp.c | 22 +++++++--- hw/acpi/piix4.c | 4 +- hw/core/machine.c | 1 - hw/i386/acpi-build.c | 32 ++++++++------ hw/i386/pc.c | 1 + hw/i386/pc_q35.c | 11 +++++ hw/pci/pcie.c | 8 +++- hw/pci/pcie_port.c | 1 + tests/data/acpi/q35/DSDT | Bin 7859 -> 8289 bytes tests/data/acpi/q35/DSDT.acpihmat | Bin 9184 -> 9614 bytes tests/data/acpi/q35/DSDT.bridge | Bin 7877 -> 11003 bytes tests/data/acpi/q35/DSDT.cphp | Bin 8323 -> 8753 bytes tests/data/acpi/q35/DSDT.dimmpxm | Bin 9513 -> 9943 bytes tests/data/acpi/q35/DSDT.ipmibt | Bin 7934 -> 8364 bytes tests/data/acpi/q35/DSDT.memhp | Bin 9218 -> 9648 bytes tests/data/acpi/q35/DSDT.mmio64 | Bin 8990 -> 9419 bytes tests/data/acpi/q35/DSDT.nohpet | Bin 7717 -> 8147 bytes tests/data/acpi/q35/DSDT.numamem | Bin 7865 -> 8295 bytes tests/data/acpi/q35/DSDT.tis | Bin 8465 -> 8894 bytes 24 files changed, 143 insertions(+), 22 deletions(-)Signature · 1 line
2.30.2
PATCH 1/1 hw/pci/pcie_port: Rename "enable-native-hotplug" property
In reply to Julia SuvorovaPCIE_SLOT property renamed to "native-hotplug" to be more concise and consistent with other properties.
--- hw/i386/pc_q35.c | 4 ++-- hw/pci/pcie_port.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
hw/i386/pc_q35.c +2 -2
@@ -243,8 +243,8 @@ static void pc_q35_init(MachineState *machine) NULL);if (acpi_pcihp) { -object_register_sugar_prop (TYPE_PCIE_SLOT ,"enable-native-hotplug" , -"false" , true); +object_register_sugar_prop (TYPE_PCIE_SLOT ,"native-hotplug" , +"false" , true); }/* irq lines */
hw/pci/pcie_port.c +1 -1
@@ -148,7 +148,7 @@ static Property pcie_slot_props[] = {DEFINE_PROP_UINT8 ("chassis" , PCIESlot, chassis,0 ),DEFINE_PROP_UINT16 ("slot" , PCIESlot, slot,0 ),DEFINE_PROP_BOOL ("hotplug" , PCIESlot, hotplug, true), -DEFINE_PROP_BOOL ("enable-native-hotplug" , PCIESlot, native_hotplug, true), +DEFINE_PROP_BOOL ("native-hotplug" , PCIESlot, native_hotplug, true), DEFINE_PROP_END_OF_LIST() };
Signature · 1 line
2.30.2
Re: [PATCH] hw/pci/pcie_port: Rename "enable-native-hotplug" property
Quoted 4 lines · On Wed, 23 Jun 2021 16:47:47 +0200 Julia Suvorova <[email protected]> wrote:
PCIE_SLOTproperty renamed to "native-hotplug" to be more concise and consistent with other properties.Signed-off-by Julia Suvorova <[email protected]>
Quoted 33 lines
--- hw/i386/pc_q35.c | 4 ++-- hw/pci/pcie_port.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)hw/i386/pc_q35.c +2
-2@@ -243,8 +243,8 @@ static void pc_q35_init(MachineState *machine) NULL);if (acpi_pcihp) { -object_register_sugar_prop (TYPE_PCIE_SLOT ,"enable-native-hotplug" , -"false" , true); +object_register_sugar_prop (TYPE_PCIE_SLOT ,"native-hotplug" , +"false" , true); }/* irq lines */ hw/pci/pcie_port.c +1
-1@@ -148,7 +148,7 @@ static Property pcie_slot_props[] = {DEFINE_PROP_UINT8 ("chassis" , PCIESlot, chassis,0 ),DEFINE_PROP_UINT16 ("slot" , PCIESlot, slot,0 ),DEFINE_PROP_BOOL ("hotplug" , PCIESlot, hotplug, true), -DEFINE_PROP_BOOL ("enable-native-hotplug" , PCIESlot, native_hotplug, true), +DEFINE_PROP_BOOL ("native-hotplug" , PCIESlot, native_hotplug, true), DEFINE_PROP_END_OF_LIST() };
Re: [PATCH] hw/pci/pcie_port: Rename "enable-native-hotplug" property
In reply to Julia SuvorovaQuoted 40 lines · Julia Suvorova
PCIE_SLOTproperty renamed to "native-hotplug" to be more concise and consistent with other properties.Signed-off-by Julia Suvorova <[email protected]>--- hw/i386/pc_q35.c | 4 ++-- hw/pci/pcie_port.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)hw/i386/pc_q35.c +2
-2@@ -243,8 +243,8 @@ static void pc_q35_init(MachineState *machine) NULL);if (acpi_pcihp) { -object_register_sugar_prop (TYPE_PCIE_SLOT ,"enable-native-hotplug" , -"false" , true); +object_register_sugar_prop (TYPE_PCIE_SLOT ,"native-hotplug" , +"false" , true); }/* irq lines */hw/pci/pcie_port.c +1
-2@@ -148,7 +148,7 @@ static Property pcie_slot_props[] = { DEFINE_PROP_UINT8("chassis", PCIESlot, chassis, 0), DEFINE_PROP_UINT16("slot", PCIESlot, slot, 0), DEFINE_PROP_BOOL("hotplug", PCIESlot, hotplug, true), -DEFINE_PROP_BOOL ("enable-native-hotplug" , PCIESlot, native_hotplug, true), + DEFINE_PROP_BOOL("native-hotplug", PCIESlot, native_hotplug, true), DEFINE_PROP_END_OF_LIST() }; --
Quoted 3 lines
2.30.2
Thanks,
Marcel
Re: [PATCH] hw/pci/pcie_port: Rename "enable-native-hotplug" property
In reply to Julia SuvorovaQuoted 6 lines · Julia Suvorova
PCIE_SLOTproperty renamed to "native-hotplug" to be more concise and consistent with other properties.Signed-off-by Julia Suvorova <[email protected]>Reviewed-by Igor Mammedov <[email protected]>Reviewed-by Marcel Apfelbaum <[email protected]>
Quoted 33 lines
--- hw/i386/pc_q35.c | 4 ++-- hw/pci/pcie_port.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)hw/i386/pc_q35.c +2
-2@@ -243,8 +243,8 @@ static void pc_q35_init(MachineState *machine) NULL);if (acpi_pcihp) { -object_register_sugar_prop (TYPE_PCIE_SLOT ,"enable-native-hotplug" , -"false" , true); +object_register_sugar_prop (TYPE_PCIE_SLOT ,"native-hotplug" , +"false" , true); }/* irq lines */ hw/pci/pcie_port.c +1
-1@@ -148,7 +148,7 @@ static Property pcie_slot_props[] = {DEFINE_PROP_UINT8 ("chassis" , PCIESlot, chassis,0 ),DEFINE_PROP_UINT16 ("slot" , PCIESlot, slot,0 ),DEFINE_PROP_BOOL ("hotplug" , PCIESlot, hotplug, true), -DEFINE_PROP_BOOL ("enable-native-hotplug" , PCIESlot, native_hotplug, true), +DEFINE_PROP_BOOL ("native-hotplug" , PCIESlot, native_hotplug, true), DEFINE_PROP_END_OF_LIST() };
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Quoted 6 lines · Julia Suvorova
The patch set consists of two parts:
patches 1-4: introduce new feature
'acpi-pci-hotplug-with-bridge-support' on Q35
patches 5-7: make the feature default along with changes in ACPI tablesWith the feature disabled Q35 falls back to the native hot-plug.
OK I had to drop this because of issues on mips and friends. Note it's not just a build failure: the API acpi_get_i386_pci_host can not be stubbed out cleanly - we need to return a pci bus.
Quoted 87 lines
Pros
* no racy behavior during boot (see110c477c2ed)
* eject is possible - according to PCIe spec, attention button press should lead to power off, and then the adapter should be removed manually. As there is no power down state exists in QEMU, we cannot distinguish between an eject and a power down request.
* no delay during deleting - after the actual power off software must wait at least 1 second before indicating about it. This case is quite important for users, it even has its own bug:
https://bugzilla.redhat.com/show_bug.cgi?id=1594168
* no timer-based behavior - in addition to the previous example, the attention button has a 5-second waiting period, during which the operation can be canceled with a second press. While this looks fine for manual button control, automation will result in the need to queue or drop events, and the software receiving events in all sort of unspecified combinations of attention/power indicator states, which is racy and uppredictable.
* fixes or reduces the likelihood of the bugs:
* https://bugzilla.redhat.com/show_bug.cgi?id=1833187
* https://bugzilla.redhat.com/show_bug.cgi?id=1657077
* https://bugzilla.redhat.com/show_bug.cgi?id=1669931
* https://bugzilla.redhat.com/show_bug.cgi?id=1678290Cons:
* no access to possible features presented in slot capabilities (this is only surprise removal AFAIK)v5:
* make sugar property onTYPE_PCIE_SLOT
instead of oldTYPE_MACHINEproperty [Igor]
* minor style changes
v4:
* regain per-port control over hot-plug
* rebased over acpi-index changes
* set property on machine type to
make pci code more generic [Igor, Michael]v3:
* drop change of_OSCto allow SHPC on hotplugged bridges
* use 'acpi-root-pci-hotplug'
* add migration states [Igor]
* minor style changesv2:
* new ioport range for acpiphp [Gerd]
* dropfind_pci_host()[Igor]
* explain magic numbers in_OSC[Igor]
* dropbuild_q35_pci_hotplug()wrapper [Igor]Julia Suvorova (7):
hw/acpi/pcihp: Enhanceacpi_pcihp_disable_root_bus()to support Q35 hw/i386/acpi-build: Add ACPI PCI hot-plug methods to Q35 hw/acpi/ich9: Enable ACPI PCI hot-plug
hw/pci/pcie: Do not set HPC flag if acpihp is used
bios-tables-test: Allow changes in DSDT ACPI tables hw/acpi/ich9: Set ACPI PCI hot-plug as default on Q35
bios-tables-test: Update golden binarieshw/i386/acpi-build.h | 5 +++ include/hw/acpi/ich9.h | 5 +++ include/hw/acpi/pcihp.h | 3 +- include/hw/pci/pcie_port.h | 5 ++- hw/acpi/ich9.c | 67 ++++++++++++++++++++++++++++++ hw/acpi/pcihp.c | 22 +++++++--- hw/acpi/piix4.c | 4 +- hw/core/machine.c | 1 - hw/i386/acpi-build.c | 32 ++++++++------ hw/i386/pc.c | 1 + hw/i386/pc_q35.c | 11 +++++ hw/pci/pcie.c | 8 +++- hw/pci/pcie_port.c | 1 + tests/data/acpi/q35/DSDT | Bin 7859 -> 8289 bytes tests/data/acpi/q35/DSDT.acpihmat | Bin 9184 -> 9614 bytes tests/data/acpi/q35/DSDT.bridge | Bin 7877 -> 11003 bytes tests/data/acpi/q35/DSDT.cphp | Bin 8323 -> 8753 bytes tests/data/acpi/q35/DSDT.dimmpxm | Bin 9513 -> 9943 bytes tests/data/acpi/q35/DSDT.ipmibt | Bin 7934 -> 8364 bytes tests/data/acpi/q35/DSDT.memhp | Bin 9218 -> 9648 bytes tests/data/acpi/q35/DSDT.mmio64 | Bin 8990 -> 9419 bytes tests/data/acpi/q35/DSDT.nohpet | Bin 7717 -> 8147 bytes tests/data/acpi/q35/DSDT.numamem | Bin 7865 -> 8295 bytes tests/data/acpi/q35/DSDT.tis | Bin 8465 -> 8894 bytes 24 files changed, 143 insertions(+), 22 deletions(-)Signature · 1 line
2.30.2
Hi Julia,
Quoted 6 lines · Julia Suvorova
The patch set consists of two parts:
patches 1-4: introduce new feature
'acpi-pci-hotplug-with-bridge-support' on Q35
patches 5-7: make the feature default along with changes in ACPI tables
I have tested the patches and I noticed 2 issues:
1. The changes allow to hotplug a device into the pcie.0 bus (device_add e1000)
- The device can be seen using info qtree but is not visible in guest.
pcie.0 bus should not support hotplug at all.
Before the series we get:
Error: Bus 'pcie.0' does not support hotplugging
2. The devices hotplugged into a pcie-root-port are not allocated IO space:
device_add e1000,id=e1,bus=rp1
In dmesg I see:
[ 24.699178] pci 0000:01:00.0: BAR 1: no space for [io size
0x0040]
[ 24.699753] pci 0000:01:00.0: BAR 1: failed to assign [io size0x0040]
And in lspci I see:
I/O ports at <unassigned> [disabled]
Before the series:
I/O ports at 1000 [size=64]
Could you please check?
Thanks,
Marcel