From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.5 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BD18EC4743C for ; Wed, 23 Jun 2021 10:48:10 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 27F6C60FD8 for ; Wed, 23 Jun 2021 10:48:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 27F6C60FD8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:39936 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lw0QT-00053i-1v for qemu-devel@archiver.kernel.org; Wed, 23 Jun 2021 06:48:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lw0PN-0004Ne-A4 for qemu-devel@nongnu.org; Wed, 23 Jun 2021 06:47:01 -0400 Received: from mail-ot1-x32e.google.com ([2607:f8b0:4864:20::32e]:42813) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lw0PK-0005HK-Mw for qemu-devel@nongnu.org; Wed, 23 Jun 2021 06:47:01 -0400 Received: by mail-ot1-x32e.google.com with SMTP id w23-20020a9d5a970000b02903d0ef989477so1459358oth.9 for ; Wed, 23 Jun 2021 03:46:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=OeYYZg3A7hVTHhOBR2iTOfd92tdwBojBYmkTtp2jQj0=; b=KERvxJXJ2hGcHO47OCRA/2/aY0EaYTZLU6/BNK+aT3MDFvv507ra3qEp917l/R2F7Z jpwBNmZ7XpSPQAdoCVG6XoiP1GtXIJlIn+IZw8zn8qaaIy2vne1Azj+NostNvVfs0z1x z3I5IhaWVpu2KmkVUDQVeX0C9jnN6zWbw1NSq00yE/1Njmm4bGvuK/BVLBTy2sNMaraJ po6RMwTyo/FBNJiUAW7LRE8qwhk8ZQQzMO+IUh6PGz+x+ScJ+CYeA+EuiyLq6yRukEXH V+8y+1ZTAjNQKl3YDeFp5EZ+nbLRFfKfYTglmNX6Sj1DBUpmc9BEaH/UMUJNf6WfhRz1 h7dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=OeYYZg3A7hVTHhOBR2iTOfd92tdwBojBYmkTtp2jQj0=; b=HhY6WzFBxlJMn4IfXJJkZGjdlOJURCk/b6NfAWBQn30VZViwVa6vv0Dr//+VC3g9Po ecIvnzOAfoAkBVE1WQhADUvKbC0ObnFL3eQwqGzAwICuBGp72aLzxSWpTFcTAHEgTBex D7Uqtynvq/jfpRqjHxTXkHNQW0lPNcKZip1ivhIye71JZMMC8kfatcElO+I1Ya7KNrHn ffhUbZR1EC9PQix7aYYxuAJ5/oDdRw9JVne7aDZ+huBqb+ETw+XEYJ+jAqAWFKIky1l9 BAdD7saONOEgWVtNY0tsylBP3FwHonayPFdJijlmQWVleJe2j/uojC2O7Bul1VhbOiel tHYg== X-Gm-Message-State: AOAM5301FEXed1+VQxtJezSIm/RwhEriRPGcDgmWNwp0/h0kNHgnz4xN RE/GyFSh91HBdapjm9PcP6WlV6v2RajKqRhea1Q= X-Google-Smtp-Source: ABdhPJzhUAJ2tN7i/FUIkoCFxeVbNObJuO369KbG10CkAKgZlZKj8+FXqIHSQECtZPgeX/rjgpcfqcJYJ8fmrdmRKvc= X-Received: by 2002:a9d:2f61:: with SMTP id h88mr7110564otb.190.1624445217027; Wed, 23 Jun 2021 03:46:57 -0700 (PDT) MIME-Version: 1.0 References: <20210617190739.3673064-1-jusual@redhat.com> <20210617190739.3673064-4-jusual@redhat.com> In-Reply-To: <20210617190739.3673064-4-jusual@redhat.com> From: Marcel Apfelbaum Date: Wed, 23 Jun 2021 13:46:45 +0300 Message-ID: Subject: Re: [PATCH v5 3/7] hw/acpi/ich9: Enable ACPI PCI hot-plug To: Julia Suvorova Content-Type: multipart/alternative; boundary="0000000000001e3a4a05c56ca095" Received-SPF: pass client-ip=2607:f8b0:4864:20::32e; envelope-from=marcel.apfelbaum@gmail.com; helo=mail-ot1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Igor Mammedov , qemu devel list , Eduardo Habkost , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --0000000000001e3a4a05c56ca095 Content-Type: text/plain; charset="UTF-8" On Thu, Jun 17, 2021 at 10:08 PM Julia Suvorova wrote: > Add acpi_pcihp to ich9_pm as part of > 'acpi-pci-hotplug-with-bridge-support' option. Set default to false. > > Signed-off-by: Julia Suvorova > Reviewed-by: Igor Mammedov > --- > 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(-) > > diff --git a/hw/i386/acpi-build.h b/hw/i386/acpi-build.h > index 487ec7710f..0dce155c8c 100644 > --- a/hw/i386/acpi-build.h > +++ b/hw/i386/acpi-build.h > @@ -10,5 +10,6 @@ extern const struct AcpiGenericAddress > x86_nvdimm_acpi_dsmio; > #define ACPI_PCIHP_BNMR_BASE 0x10 > > void acpi_setup(void); > +Object *acpi_get_i386_pci_host(void); > > #endif > diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h > index 596120d97f..a329ce43ab 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" > @@ -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; > diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c > index 4daa79ec8d..bcbd567cb0 100644 > --- a/hw/acpi/ich9.c > +++ b/hw/acpi/ich9.c > @@ -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; > > + 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; > @@ -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))); > diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c > index a55992ed9f..5355618608 100644 > --- a/hw/acpi/pcihp.c > +++ b/hw/acpi/pcihp.c > @@ -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); > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index 67753638e4..aa973aa746 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -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; > > -- > 2.30.2 > > Reviewed-by: Marcel Apfelbaum Thanks, Marcel --0000000000001e3a4a05c56ca095 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable



On Thu, Jun 17, 2021 at 10:08 PM Julia Suvorova <jusual@redhat.com> wrote:
=
Add acpi_pcihp to i= ch9_pm as part of
'acpi-pci-hotplug-with-bridge-support' option. Set default to false= .

Signed-off-by: Julia Suvorova <jusual@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
---
=C2=A0hw/i386/acpi-build.h=C2=A0 =C2=A0|=C2=A0 1 +
=C2=A0include/hw/acpi/ich9.h |=C2=A0 3 ++
=C2=A0hw/acpi/ich9.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| 67 ++++++++++++++++= ++++++++++++++++++++++++++
=C2=A0hw/acpi/pcihp.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 5 +++-
=C2=A0hw/i386/acpi-build.c=C2=A0 =C2=A0|=C2=A0 2 +-
=C2=A05 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/hw/i386/acpi-build.h b/hw/i386/acpi-build.h
index 487ec7710f..0dce155c8c 100644
--- a/hw/i386/acpi-build.h
+++ b/hw/i386/acpi-build.h
@@ -10,5 +10,6 @@ extern const struct AcpiGenericAddress x86_nvdimm_acpi_ds= mio;
=C2=A0#define ACPI_PCIHP_BNMR_BASE 0x10

=C2=A0void acpi_setup(void);
+Object *acpi_get_i386_pci_host(void);

=C2=A0#endif
diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h
index 596120d97f..a329ce43ab 100644
--- a/include/hw/acpi/ich9.h
+++ b/include/hw/acpi/ich9.h
@@ -24,6 +24,7 @@
=C2=A0#include "hw/acpi/acpi.h"
=C2=A0#include "hw/acpi/cpu_hotplug.h"
=C2=A0#include "hw/acpi/cpu.h"
+#include "hw/acpi/pcihp.h"
=C2=A0#include "hw/acpi/memory_hotplug.h"
=C2=A0#include "hw/acpi/acpi_dev_interface.h"
=C2=A0#include "hw/acpi/tco.h"
@@ -55,6 +56,8 @@ typedef struct ICH9LPCPMRegs {
=C2=A0 =C2=A0 =C2=A0AcpiCpuHotplug gpe_cpu;
=C2=A0 =C2=A0 =C2=A0CPUHotplugState cpuhp_state;

+=C2=A0 =C2=A0 bool use_acpi_hotplug_bridge;
+=C2=A0 =C2=A0 AcpiPciHpState acpi_pci_hotplug;
=C2=A0 =C2=A0 =C2=A0MemHotplugState acpi_memory_hotplug;

=C2=A0 =C2=A0 =C2=A0uint8_t disable_s3;
diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
index 4daa79ec8d..bcbd567cb0 100644
--- a/hw/acpi/ich9.c
+++ b/hw/acpi/ich9.c
@@ -217,6 +217,26 @@ static const VMStateDescription vmstate_cpuhp_state = =3D {
=C2=A0 =C2=A0 =C2=A0}
=C2=A0};

+static bool vmstate_test_use_pcihp(void *opaque)
+{
+=C2=A0 =C2=A0 ICH9LPCPMRegs *s =3D opaque;
+
+=C2=A0 =C2=A0 return s->use_acpi_hotplug_bridge;
+}
+
+static const VMStateDescription vmstate_pcihp_state =3D {
+=C2=A0 =C2=A0 .name =3D "ich9_pm/pcihp",
+=C2=A0 =C2=A0 .version_id =3D 1,
+=C2=A0 =C2=A0 .minimum_version_id =3D 1,
+=C2=A0 =C2=A0 .needed =3D vmstate_test_use_pcihp,
+=C2=A0 =C2=A0 .fields=C2=A0 =C2=A0 =C2=A0 =3D (VMStateField[]) {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 VMSTATE_PCI_HOTPLUG(acpi_pci_hotplug,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 ICH9LPCPMRegs,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 NULL, NULL),
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 VMSTATE_END_OF_LIST()
+=C2=A0 =C2=A0 }
+};
+
=C2=A0const VMStateDescription vmstate_ich9_pm =3D {
=C2=A0 =C2=A0 =C2=A0.name =3D "ich9_pm",
=C2=A0 =C2=A0 =C2=A0.version_id =3D 1,
@@ -238,6 +258,7 @@ const VMStateDescription vmstate_ich9_pm =3D {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&vmstate_memhp_state,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&vmstate_tco_io_state,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&vmstate_cpuhp_state,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 &vmstate_pcihp_state,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0NULL
=C2=A0 =C2=A0 =C2=A0}
=C2=A0};
@@ -259,6 +280,7 @@ static void pm_reset(void *opaque)
=C2=A0 =C2=A0 =C2=A0}
=C2=A0 =C2=A0 =C2=A0pm->smi_en_wmask =3D ~0;

+=C2=A0 =C2=A0 acpi_pcihp_reset(&pm->acpi_pci_hotplug, true);
=C2=A0 =C2=A0 =C2=A0acpi_update_sci(&pm->acpi_regs, pm->irq);
=C2=A0}

@@ -297,6 +319,18 @@ void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *p= m,
=C2=A0 =C2=A0 =C2=A0pm->enable_tco =3D true;
=C2=A0 =C2=A0 =C2=A0acpi_pm_tco_init(&pm->tco_regs, &pm->io);=

+=C2=A0 =C2=A0 if (pm->use_acpi_hotplug_bridge) {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 acpi_pcihp_init(OBJECT(lpc_pci),
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 &pm->acpi_pci_hotplug,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 pci_get_bus(lpc_pci),
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 pci_address_space_io(lpc_pci),
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 true,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 ACPI_PCIHP_ADDR_ICH9);
+
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 qbus_set_hotplug_handler(BUS(pci_get_bus(lpc_p= ci)),
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0OBJECT(lpc_pci));
+=C2=A0 =C2=A0 }
+
=C2=A0 =C2=A0 =C2=A0pm->irq =3D sci_irq;
=C2=A0 =C2=A0 =C2=A0qemu_register_reset(pm_reset, pm);
=C2=A0 =C2=A0 =C2=A0pm->powerdown_notifier.notify =3D pm_powerdown_req;<= br> @@ -368,6 +402,20 @@ static void ich9_pm_set_enable_tco(Object *obj, bool v= alue, Error **errp)
=C2=A0 =C2=A0 =C2=A0s->pm.enable_tco =3D value;
=C2=A0}

+static bool ich9_pm_get_acpi_pci_hotplug(Object *obj, Error **errp)
+{
+=C2=A0 =C2=A0 ICH9LPCState *s =3D ICH9_LPC_DEVICE(obj);
+
+=C2=A0 =C2=A0 return s->pm.use_acpi_hotplug_bridge;
+}
+
+static void ich9_pm_set_acpi_pci_hotplug(Object *obj, bool value, Error **= errp)
+{
+=C2=A0 =C2=A0 ICH9LPCState *s =3D ICH9_LPC_DEVICE(obj);
+
+=C2=A0 =C2=A0 s->pm.use_acpi_hotplug_bridge =3D value;
+}
+
=C2=A0void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm)
=C2=A0{
=C2=A0 =C2=A0 =C2=A0static const uint32_t gpe0_len =3D ICH9_PMIO_GPE0_LEN;<= br> @@ -376,6 +424,7 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs = *pm)
=C2=A0 =C2=A0 =C2=A0pm->disable_s3 =3D 0;
=C2=A0 =C2=A0 =C2=A0pm->disable_s4 =3D 0;
=C2=A0 =C2=A0 =C2=A0pm->s4_val =3D 2;
+=C2=A0 =C2=A0 pm->use_acpi_hotplug_bridge =3D false;

=C2=A0 =C2=A0 =C2=A0object_property_add_uint32_ptr(obj, ACPI_PM_PROP_PM_IO_= BASE,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 &pm->pm_io_base= , OBJ_PROP_FLAG_READ);
@@ -399,6 +448,9 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs = *pm)
=C2=A0 =C2=A0 =C2=A0object_property_add_bool(obj, ACPI_PM_PROP_TCO_ENABLED,=
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ich9_pm_get_enable_tco,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ich9_pm_set_enable_tco);
+=C2=A0 =C2=A0 object_property_add_bool(obj, "acpi-pci-hotplug-with-br= idge-support",
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ich9_pm_get_acpi_pci_hotplug,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ich9_pm_set_acpi_pci_hotplug);
=C2=A0}

=C2=A0void ich9_pm_device_pre_plug_cb(HotplugHandler *hotplug_dev, DeviceSt= ate *dev,
@@ -406,6 +458,11 @@ void ich9_pm_device_pre_plug_cb(HotplugHandler *hotplu= g_dev, DeviceState *dev,
=C2=A0{
=C2=A0 =C2=A0 =C2=A0ICH9LPCState *lpc =3D ICH9_LPC_DEVICE(hotplug_dev);

+=C2=A0 =C2=A0 if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 acpi_pcihp_device_pre_plug_cb(hotplug_dev, dev= , errp);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 return;
+=C2=A0 =C2=A0 }
+
=C2=A0 =C2=A0 =C2=A0if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM) &= ;&
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0!lpc->pm.acpi_memory_hotplug.is_enable= d) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0error_setg(errp,
@@ -441,6 +498,9 @@ void ich9_pm_device_plug_cb(HotplugHandler *hotplug_dev= , DeviceState *dev,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0} else {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0acpi_cpu_plug_cb(hotplug_de= v, &lpc->pm.cpuhp_state, dev, errp);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}
+=C2=A0 =C2=A0 } else if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)= ) {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 acpi_pcihp_device_plug_cb(hotplug_dev, &lp= c->pm.acpi_pci_hotplug,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 dev, errp);
=C2=A0 =C2=A0 =C2=A0} else {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0error_setg(errp, "acpi: device plug = request for not supported device"
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "= ; type: %s", object_get_typename(OBJECT(dev)));
@@ -473,6 +533,10 @@ void ich9_pm_device_unplug_request_cb(HotplugHandler *= hotplug_dev,

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0acpi_cpu_unplug_request_cb(hotplug_dev, &= amp;lpc->pm.cpuhp_state,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 dev, errp);
+=C2=A0 =C2=A0 } else if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)= ) {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 acpi_pcihp_device_unplug_request_cb(hotplug_de= v,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 &lpc->pm.acpi_pci_hotplug,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 dev, errp);
=C2=A0 =C2=A0 =C2=A0} else {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0error_setg(errp, "acpi: device unplu= g request for not supported device"
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "= ; type: %s", object_get_typename(OBJECT(dev)));
@@ -490,6 +554,9 @@ void ich9_pm_device_unplug_cb(HotplugHandler *hotplug_d= ev, DeviceState *dev,
=C2=A0 =C2=A0 =C2=A0} else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU) &= amp;&
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 !lpc->pm.cpu_hot= plug_legacy) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0acpi_cpu_unplug_cb(&lpc->pm.cpuhp_= state, dev, errp);
+=C2=A0 =C2=A0 } else if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)= ) {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 acpi_pcihp_device_unplug_cb(hotplug_dev, &= lpc->pm.acpi_pci_hotplug,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 dev, errp);
=C2=A0 =C2=A0 =C2=A0} else {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0error_setg(errp, "acpi: device unplu= g for not supported device"
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "= ; type: %s", object_get_typename(OBJECT(dev)));
diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c
index a55992ed9f..5355618608 100644
--- a/hw/acpi/pcihp.c
+++ b/hw/acpi/pcihp.c
@@ -30,6 +30,8 @@
=C2=A0#include "hw/pci-host/i440fx.h"
=C2=A0#include "hw/pci/pci.h"
=C2=A0#include "hw/pci/pci_bridge.h"
+#include "hw/pci/pci_host.h"
+#include "hw/i386/acpi-build.h"
=C2=A0#include "hw/acpi/acpi.h"
=C2=A0#include "hw/pci/pci_bus.h"
=C2=A0#include "migration/vmstate.h"
@@ -103,6 +105,7 @@ static void *acpi_set_bsel(PCIBus *bus, void *opaque) =C2=A0static void acpi_set_pci_info(void)
=C2=A0{
=C2=A0 =C2=A0 =C2=A0static bool bsel_is_set;
+=C2=A0 =C2=A0 Object *host =3D acpi_get_i386_pci_host();
=C2=A0 =C2=A0 =C2=A0PCIBus *bus;
=C2=A0 =C2=A0 =C2=A0unsigned bsel_alloc =3D ACPI_PCIHP_BSEL_DEFAULT;

@@ -111,7 +114,7 @@ static void acpi_set_pci_info(void)
=C2=A0 =C2=A0 =C2=A0}
=C2=A0 =C2=A0 =C2=A0bsel_is_set =3D true;

-=C2=A0 =C2=A0 bus =3D find_i440fx(); /* TODO: Q35 support */
+=C2=A0 =C2=A0 bus =3D PCI_HOST_BRIDGE(host)->bus;
=C2=A0 =C2=A0 =C2=A0if (bus) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/* Scan all PCI buses. Set property to en= able acpi based hotplug. */
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0pci_for_each_bus_depth_first(bus, acpi_se= t_bsel, NULL, &bsel_alloc);
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 67753638e4..aa973aa746 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -299,7 +299,7 @@ static void acpi_get_misc_info(AcpiMiscInfo *info)
=C2=A0 * Because of the PXB hosts we cannot simply query TYPE_PCI_HOST_BRID= GE.
=C2=A0 * On i386 arch we only have two pci hosts, so we can look only for t= hem.
=C2=A0 */
-static Object *acpi_get_i386_pci_host(void)
+Object *acpi_get_i386_pci_host(void)
=C2=A0{
=C2=A0 =C2=A0 =C2=A0PCIHostState *host;

--
2.30.2


Reviewed-by: Marcel Apfelbaum <= ;marcel.apf= elbaum@gmail.com>

Thanks,
Mar= cel


=C2=A0
--0000000000001e3a4a05c56ca095--