| Message ID | 20200708224615.114077-6-jusual@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Use ACPI PCI hot-plug for q35 | expand |
On Thu, 9 Jul 2020 00:46:15 +0200 Julia Suvorova <jusual@redhat.com> wrote: > Add acpi_pcihp to ich9_pm and use ACPI PCI hot-plug by default. > > Signed-off-by: Julia Suvorova <jusual@redhat.com> > --- > include/hw/acpi/ich9.h | 3 +++ > hw/acpi/ich9.c | 45 ++++++++++++++++++++++++++++++++++++++++++ > hw/acpi/pcihp.c | 3 ++- > hw/i386/pc.c | 4 +++- > 4 files changed, 53 insertions(+), 2 deletions(-) > > diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h > index 28a53181cb..d345da6b74 100644 > --- a/include/hw/acpi/ich9.h > +++ b/include/hw/acpi/ich9.h > @@ -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" > @@ -53,6 +54,8 @@ typedef struct ICH9LPCPMRegs { > AcpiCpuHotplug gpe_cpu; > CPUHotplugState cpuhp_state; > > + bool use_acpi_pci_hotplug; a bit outdated naming, see 0affda043675c7619248a924a89bfd3781759f63, and rename it to match piix4 > + AcpiPciHpState acpi_pci_hotplug; > MemHotplugState acpi_memory_hotplug; > > uint8_t disable_s3; > diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c > index 0fdd736da4..e0291373f2 100644 > --- a/hw/acpi/ich9.c > +++ b/hw/acpi/ich9.c > @@ -265,6 +265,7 @@ static void pm_reset(void *opaque) > } > pm->smi_en_wmask = ~0; > > + acpi_pcihp_reset(&pm->acpi_pci_hotplug); > acpi_update_sci(&pm->acpi_regs, pm->irq); > } > > @@ -303,6 +304,17 @@ 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_pci_hotplug) { > + acpi_pcihp_init(OBJECT(lpc_pci), > + &pm->acpi_pci_hotplug, > + pci_get_bus(lpc_pci), > + pci_address_space_io(lpc_pci), > + true); > + qbus_set_hotplug_handler(BUS(pci_get_bus(lpc_pci)), > + OBJECT(lpc_pci), > + &error_abort); > + } > + > pm->irq = sci_irq; > qemu_register_reset(pm_reset, pm); > pm->powerdown_notifier.notify = pm_powerdown_req; > @@ -374,6 +386,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_pci_hotplug; > +} > + > +static void ich9_pm_set_acpi_pci_hotplug(Object *obj, bool value, > + Error **errp) > +{ > + ICH9LPCState *s = ICH9_LPC_DEVICE(obj); > + > + s->pm.use_acpi_pci_hotplug = value; > +} > void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm) > { > static const uint32_t gpe0_len = ICH9_PMIO_GPE0_LEN; > @@ -382,6 +408,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_pci_hotplug = true; I'm not sure about making crutch on by default though. Does linux guests work fine with native hotplug or does it have the same issues as Windows? Also you had an idea how to workaround native hotplug issues on QEMU side. Can you dump here a quick summary why it didn't work out in the end? > > object_property_add_uint32_ptr(obj, ACPI_PM_PROP_PM_IO_BASE, > &pm->pm_io_base, OBJ_PROP_FLAG_READ); > @@ -405,6 +432,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, > @@ -412,6 +442,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, > @@ -437,6 +472,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))); > @@ -457,6 +495,10 @@ void ich9_pm_device_unplug_request_cb(HotplugHandler *hotplug_dev, > !lpc->pm.cpu_hotplug_legacy) { > 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))); > @@ -474,6 +516,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))); > diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c > index 3d4ee3af72..d905d1b8f2 100644 > --- a/hw/acpi/pcihp.c > +++ b/hw/acpi/pcihp.c > @@ -110,7 +110,8 @@ static void acpi_set_pci_info(void) > } > bsel_is_set = true; > > - bus = find_i440fx(); /* TODO: Q35 support */ > + bus = find_host(); > + > 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); > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 143ac1c354..21c6eb779e 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -96,7 +96,9 @@ > #include "fw_cfg.h" > #include "trace.h" > > -GlobalProperty pc_compat_5_0[] = {}; > +GlobalProperty pc_compat_5_0[] = { > + { "ICH9-LPC", "acpi-pci-hotplug-with-bridge-support", "off" }, > +}; > const size_t pc_compat_5_0_len = G_N_ELEMENTS(pc_compat_5_0); > > GlobalProperty pc_compat_4_2[] = {
On Mon, Jul 13, 2020 at 05:17:18PM +0200, Igor Mammedov wrote: > On Thu, 9 Jul 2020 00:46:15 +0200 > Julia Suvorova <jusual@redhat.com> wrote: > > > Add acpi_pcihp to ich9_pm and use ACPI PCI hot-plug by default. > > > > Signed-off-by: Julia Suvorova <jusual@redhat.com> > > --- > > include/hw/acpi/ich9.h | 3 +++ > > hw/acpi/ich9.c | 45 ++++++++++++++++++++++++++++++++++++++++++ > > hw/acpi/pcihp.c | 3 ++- > > hw/i386/pc.c | 4 +++- > > 4 files changed, 53 insertions(+), 2 deletions(-) > > > > diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h > > index 28a53181cb..d345da6b74 100644 > > --- a/include/hw/acpi/ich9.h > > +++ b/include/hw/acpi/ich9.h > > @@ -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" > > @@ -53,6 +54,8 @@ typedef struct ICH9LPCPMRegs { > > AcpiCpuHotplug gpe_cpu; > > CPUHotplugState cpuhp_state; > > > > + bool use_acpi_pci_hotplug; > a bit outdated naming, > see 0affda043675c7619248a924a89bfd3781759f63, and rename it to match piix4 > > > + AcpiPciHpState acpi_pci_hotplug; > > MemHotplugState acpi_memory_hotplug; > > > > uint8_t disable_s3; > > diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c > > index 0fdd736da4..e0291373f2 100644 > > --- a/hw/acpi/ich9.c > > +++ b/hw/acpi/ich9.c > > @@ -265,6 +265,7 @@ static void pm_reset(void *opaque) > > } > > pm->smi_en_wmask = ~0; > > > > + acpi_pcihp_reset(&pm->acpi_pci_hotplug); > > acpi_update_sci(&pm->acpi_regs, pm->irq); > > } > > > > @@ -303,6 +304,17 @@ 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_pci_hotplug) { > > + acpi_pcihp_init(OBJECT(lpc_pci), > > + &pm->acpi_pci_hotplug, > > + pci_get_bus(lpc_pci), > > + pci_address_space_io(lpc_pci), > > + true); > > + qbus_set_hotplug_handler(BUS(pci_get_bus(lpc_pci)), > > + OBJECT(lpc_pci), > > + &error_abort); > > + } > > + > > pm->irq = sci_irq; > > qemu_register_reset(pm_reset, pm); > > pm->powerdown_notifier.notify = pm_powerdown_req; > > @@ -374,6 +386,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_pci_hotplug; > > +} > > + > > +static void ich9_pm_set_acpi_pci_hotplug(Object *obj, bool value, > > + Error **errp) > > +{ > > + ICH9LPCState *s = ICH9_LPC_DEVICE(obj); > > + > > + s->pm.use_acpi_pci_hotplug = value; > > +} > > void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm) > > { > > static const uint32_t gpe0_len = ICH9_PMIO_GPE0_LEN; > > @@ -382,6 +408,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_pci_hotplug = true; > > I'm not sure about making crutch on by default though. > > Does linux guests work fine with native hotplug or > does it have the same issues as Windows? > > Also you had an idea how to workaround native hotplug issues > on QEMU side. > Can you dump here a quick summary why it didn't work out > in the end? To help out with that a bit: I think native hotplug just does not match what management needs from QEMU. QEMU wants what ACPI calls a "VCR-style" ejection where eject happens automatically after software allows it. Native hotplug is designed with a human in the loop. Things like multi-second delay after an eject request, inability to differentiate between power down and eject, ability to power device back up after power down are all architectural in hative hotplug. Interface is also designed such that there are subtle races making it hard not to loose hotplug events are also harmless on bare-metal since a human can just press the eject button again, but with causes no end of issues for us. I agree it's a good idea to include the motivation here or in the commit log, though. > > > > > object_property_add_uint32_ptr(obj, ACPI_PM_PROP_PM_IO_BASE, > > &pm->pm_io_base, OBJ_PROP_FLAG_READ); > > @@ -405,6 +432,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, > > @@ -412,6 +442,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, > > @@ -437,6 +472,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))); > > @@ -457,6 +495,10 @@ void ich9_pm_device_unplug_request_cb(HotplugHandler *hotplug_dev, > > !lpc->pm.cpu_hotplug_legacy) { > > 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))); > > @@ -474,6 +516,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))); > > diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c > > index 3d4ee3af72..d905d1b8f2 100644 > > --- a/hw/acpi/pcihp.c > > +++ b/hw/acpi/pcihp.c > > @@ -110,7 +110,8 @@ static void acpi_set_pci_info(void) > > } > > bsel_is_set = true; > > > > - bus = find_i440fx(); /* TODO: Q35 support */ > > + bus = find_host(); > > + > > 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); > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > > index 143ac1c354..21c6eb779e 100644 > > --- a/hw/i386/pc.c > > +++ b/hw/i386/pc.c > > @@ -96,7 +96,9 @@ > > #include "fw_cfg.h" > > #include "trace.h" > > > > -GlobalProperty pc_compat_5_0[] = {}; > > +GlobalProperty pc_compat_5_0[] = { > > + { "ICH9-LPC", "acpi-pci-hotplug-with-bridge-support", "off" }, > > +}; > > const size_t pc_compat_5_0_len = G_N_ELEMENTS(pc_compat_5_0); > > > > GlobalProperty pc_compat_4_2[] = {
On Tue, 14 Jul 2020 04:54:02 -0400 "Michael S. Tsirkin" <mst@redhat.com> wrote: > On Mon, Jul 13, 2020 at 05:17:18PM +0200, Igor Mammedov wrote: > > On Thu, 9 Jul 2020 00:46:15 +0200 > > Julia Suvorova <jusual@redhat.com> wrote: > > > > > Add acpi_pcihp to ich9_pm and use ACPI PCI hot-plug by default. > > > > > > Signed-off-by: Julia Suvorova <jusual@redhat.com> > > > --- > > > include/hw/acpi/ich9.h | 3 +++ > > > hw/acpi/ich9.c | 45 ++++++++++++++++++++++++++++++++++++++++++ > > > hw/acpi/pcihp.c | 3 ++- > > > hw/i386/pc.c | 4 +++- > > > 4 files changed, 53 insertions(+), 2 deletions(-) > > > > > > diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h > > > index 28a53181cb..d345da6b74 100644 > > > --- a/include/hw/acpi/ich9.h > > > +++ b/include/hw/acpi/ich9.h > > > @@ -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" > > > @@ -53,6 +54,8 @@ typedef struct ICH9LPCPMRegs { > > > AcpiCpuHotplug gpe_cpu; > > > CPUHotplugState cpuhp_state; > > > > > > + bool use_acpi_pci_hotplug; > > a bit outdated naming, > > see 0affda043675c7619248a924a89bfd3781759f63, and rename it to match piix4 > > > > > + AcpiPciHpState acpi_pci_hotplug; > > > MemHotplugState acpi_memory_hotplug; > > > > > > uint8_t disable_s3; > > > diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c > > > index 0fdd736da4..e0291373f2 100644 > > > --- a/hw/acpi/ich9.c > > > +++ b/hw/acpi/ich9.c > > > @@ -265,6 +265,7 @@ static void pm_reset(void *opaque) > > > } > > > pm->smi_en_wmask = ~0; > > > > > > + acpi_pcihp_reset(&pm->acpi_pci_hotplug); > > > acpi_update_sci(&pm->acpi_regs, pm->irq); > > > } > > > > > > @@ -303,6 +304,17 @@ 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_pci_hotplug) { > > > + acpi_pcihp_init(OBJECT(lpc_pci), > > > + &pm->acpi_pci_hotplug, > > > + pci_get_bus(lpc_pci), > > > + pci_address_space_io(lpc_pci), > > > + true); > > > + qbus_set_hotplug_handler(BUS(pci_get_bus(lpc_pci)), > > > + OBJECT(lpc_pci), > > > + &error_abort); > > > + } > > > + > > > pm->irq = sci_irq; > > > qemu_register_reset(pm_reset, pm); > > > pm->powerdown_notifier.notify = pm_powerdown_req; > > > @@ -374,6 +386,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_pci_hotplug; > > > +} > > > + > > > +static void ich9_pm_set_acpi_pci_hotplug(Object *obj, bool value, > > > + Error **errp) > > > +{ > > > + ICH9LPCState *s = ICH9_LPC_DEVICE(obj); > > > + > > > + s->pm.use_acpi_pci_hotplug = value; > > > +} > > > void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm) > > > { > > > static const uint32_t gpe0_len = ICH9_PMIO_GPE0_LEN; > > > @@ -382,6 +408,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_pci_hotplug = true; > > > > I'm not sure about making crutch on by default though. > > > > Does linux guests work fine with native hotplug or > > does it have the same issues as Windows? > > > > Also you had an idea how to workaround native hotplug issues > > on QEMU side. > > Can you dump here a quick summary why it didn't work out > > in the end? > > To help out with that a bit: > > I think native hotplug just does not match what management needs from > QEMU. QEMU wants what ACPI calls a "VCR-style" ejection where > eject happens automatically after software allows it. > > Native hotplug is designed with a human in the loop. > > Things like multi-second delay after an eject request, > inability to differentiate between power down and eject, > ability to power device back up after power down > are all architectural in hative hotplug. > > Interface is also designed such that there are subtle races making it > hard not to loose hotplug events are also harmless on bare-metal since a > human can just press the eject button again, but with causes no end of > issues for us. that is a generic excuse for adding ACPI hotplug to q35, but what I've asked for, is to document (for history reasons) alternative ideas that were explored to make native unplug work despite spec issues. That would be also a good justification for ACPI approach showing that we've exhausted any other approach before resorting to ACPI hotplug Jilia had an idea about 'caching' unplug req and depending on cached value behave differently on power off event. Which looked to me as a thing that might solve unplug issue. > I agree it's a good idea to include the motivation here or in the commit > log, though. > > > > > > > > > object_property_add_uint32_ptr(obj, ACPI_PM_PROP_PM_IO_BASE, > > > &pm->pm_io_base, OBJ_PROP_FLAG_READ); > > > @@ -405,6 +432,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, > > > @@ -412,6 +442,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, > > > @@ -437,6 +472,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))); > > > @@ -457,6 +495,10 @@ void ich9_pm_device_unplug_request_cb(HotplugHandler *hotplug_dev, > > > !lpc->pm.cpu_hotplug_legacy) { > > > 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))); > > > @@ -474,6 +516,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))); > > > diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c > > > index 3d4ee3af72..d905d1b8f2 100644 > > > --- a/hw/acpi/pcihp.c > > > +++ b/hw/acpi/pcihp.c > > > @@ -110,7 +110,8 @@ static void acpi_set_pci_info(void) > > > } > > > bsel_is_set = true; > > > > > > - bus = find_i440fx(); /* TODO: Q35 support */ > > > + bus = find_host(); > > > + > > > 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); > > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > > > index 143ac1c354..21c6eb779e 100644 > > > --- a/hw/i386/pc.c > > > +++ b/hw/i386/pc.c > > > @@ -96,7 +96,9 @@ > > > #include "fw_cfg.h" > > > #include "trace.h" > > > > > > -GlobalProperty pc_compat_5_0[] = {}; > > > +GlobalProperty pc_compat_5_0[] = { > > > + { "ICH9-LPC", "acpi-pci-hotplug-with-bridge-support", "off" }, > > > +}; > > > const size_t pc_compat_5_0_len = G_N_ELEMENTS(pc_compat_5_0); > > > > > > GlobalProperty pc_compat_4_2[] = { >
diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h index 28a53181cb..d345da6b74 100644 --- a/include/hw/acpi/ich9.h +++ b/include/hw/acpi/ich9.h @@ -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" @@ -53,6 +54,8 @@ typedef struct ICH9LPCPMRegs { AcpiCpuHotplug gpe_cpu; CPUHotplugState cpuhp_state; + bool use_acpi_pci_hotplug; + AcpiPciHpState acpi_pci_hotplug; MemHotplugState acpi_memory_hotplug; uint8_t disable_s3; diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index 0fdd736da4..e0291373f2 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -265,6 +265,7 @@ static void pm_reset(void *opaque) } pm->smi_en_wmask = ~0; + acpi_pcihp_reset(&pm->acpi_pci_hotplug); acpi_update_sci(&pm->acpi_regs, pm->irq); } @@ -303,6 +304,17 @@ 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_pci_hotplug) { + acpi_pcihp_init(OBJECT(lpc_pci), + &pm->acpi_pci_hotplug, + pci_get_bus(lpc_pci), + pci_address_space_io(lpc_pci), + true); + qbus_set_hotplug_handler(BUS(pci_get_bus(lpc_pci)), + OBJECT(lpc_pci), + &error_abort); + } + pm->irq = sci_irq; qemu_register_reset(pm_reset, pm); pm->powerdown_notifier.notify = pm_powerdown_req; @@ -374,6 +386,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_pci_hotplug; +} + +static void ich9_pm_set_acpi_pci_hotplug(Object *obj, bool value, + Error **errp) +{ + ICH9LPCState *s = ICH9_LPC_DEVICE(obj); + + s->pm.use_acpi_pci_hotplug = value; +} void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm) { static const uint32_t gpe0_len = ICH9_PMIO_GPE0_LEN; @@ -382,6 +408,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_pci_hotplug = true; object_property_add_uint32_ptr(obj, ACPI_PM_PROP_PM_IO_BASE, &pm->pm_io_base, OBJ_PROP_FLAG_READ); @@ -405,6 +432,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, @@ -412,6 +442,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, @@ -437,6 +472,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))); @@ -457,6 +495,10 @@ void ich9_pm_device_unplug_request_cb(HotplugHandler *hotplug_dev, !lpc->pm.cpu_hotplug_legacy) { 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))); @@ -474,6 +516,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))); diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c index 3d4ee3af72..d905d1b8f2 100644 --- a/hw/acpi/pcihp.c +++ b/hw/acpi/pcihp.c @@ -110,7 +110,8 @@ static void acpi_set_pci_info(void) } bsel_is_set = true; - bus = find_i440fx(); /* TODO: Q35 support */ + bus = find_host(); + 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); diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 143ac1c354..21c6eb779e 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -96,7 +96,9 @@ #include "fw_cfg.h" #include "trace.h" -GlobalProperty pc_compat_5_0[] = {}; +GlobalProperty pc_compat_5_0[] = { + { "ICH9-LPC", "acpi-pci-hotplug-with-bridge-support", "off" }, +}; const size_t pc_compat_5_0_len = G_N_ELEMENTS(pc_compat_5_0); GlobalProperty pc_compat_4_2[] = {
Add acpi_pcihp to ich9_pm and use ACPI PCI hot-plug by default. Signed-off-by: Julia Suvorova <jusual@redhat.com> --- include/hw/acpi/ich9.h | 3 +++ hw/acpi/ich9.c | 45 ++++++++++++++++++++++++++++++++++++++++++ hw/acpi/pcihp.c | 3 ++- hw/i386/pc.c | 4 +++- 4 files changed, 53 insertions(+), 2 deletions(-)