From patchwork Thu Jun 29 21:56:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandr Bezzubikov X-Patchwork-Id: 9818055 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D707F602B1 for ; Thu, 29 Jun 2017 22:00:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CC82A2845C for ; Thu, 29 Jun 2017 22:00:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BFCF92847A; Thu, 29 Jun 2017 22:00:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2FD922845C for ; Thu, 29 Jun 2017 22:00:40 +0000 (UTC) Received: from localhost ([::1]:41418 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQhUN-0000Ic-Bp for patchwork-qemu-devel@patchwork.kernel.org; Thu, 29 Jun 2017 18:00:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34446) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQhQN-0005mN-6X for qemu-devel@nongnu.org; Thu, 29 Jun 2017 17:56:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dQhQM-0000TT-5E for qemu-devel@nongnu.org; Thu, 29 Jun 2017 17:56:31 -0400 Received: from mail-lf0-x241.google.com ([2a00:1450:4010:c07::241]:34533) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dQhQL-0000Sq-R4 for qemu-devel@nongnu.org; Thu, 29 Jun 2017 17:56:30 -0400 Received: by mail-lf0-x241.google.com with SMTP id g21so8706656lfk.1 for ; Thu, 29 Jun 2017 14:56:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=uFjJKpQNWCaWQ1CY4kult0NemvR5k8CQ0JRIcWV7F+g=; b=HW6tZRgpCejObgeDm3IIeFrm0n75QdHREzUImi53aZYTTH8WDl4E5kDj1oTiBMwAbN qklBBcSXtdBQfpbTCv0lDBLOeis/z/490z3FsLc8rXe79lE4NCLn+QoTe4LNuIf/zny/ fLcEiKCh8ie/qeraFLCYdsm7sIyNQpMf6wt7HkQhdIBDy+4vG+Wx2mHjWJ7My8V/Mx+d oxwr4U4/UXjpVeGZJvbLyQ2+tuUobaAVUw8EAMUDVcMpEjYVfl5Ll4Zj4Y+ZKLNUVQwK BT7hObBa0NNfRWAY4/IsDcidHlmVlL+I3ETqbVAmGKzSs37amID41onzE/wyGROFQMeI X8Og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=uFjJKpQNWCaWQ1CY4kult0NemvR5k8CQ0JRIcWV7F+g=; b=jsErBCB61vGkn+DYxXYfujNoDcPy/2gIrhEgXy1uDOMpwacYfKgaI4vVKDUFFWLSyr lTAeryIM2O5tpAGmBClrOPCIqY9eTEnk+Iq9rPHsRmCmPH8F0vX6WlPdUDdEm+Fx8Mgr mgxyw9zwer5Xh2E/7S+lVveygW8f98Jck/w5LojtHgxn9crDMyUw3WCK/u+W32qMbFjx daLASxoy5Qepu9Dl1Xx54XUQfVPiD9mUulvBEp/txDEY1iEOZZ5AcKUE3J6GUPhUf6PB qOVMwS6FUMBzub9wsdv/BdSdmPKWYfm4Z2bbqHmCAQvo2yp+oCT6mFD09UZ1sjZqM0ZW X5JA== X-Gm-Message-State: AKS2vOxCIMLC9xB6uEtenaQJayp5F+yHv2FMs1tFfqlb5Fi1kc8LRuQI j77UwsqGl3AXGVGWE24= X-Received: by 10.25.211.16 with SMTP id k16mr5964472lfg.45.1498773388232; Thu, 29 Jun 2017 14:56:28 -0700 (PDT) Received: from localhost.localdomain (broadband-5-228-183-39.moscow.rt.ru. [5.228.183.39]) by smtp.gmail.com with ESMTPSA id l69sm1532906lfl.10.2017.06.29.14.56.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 29 Jun 2017 14:56:27 -0700 (PDT) From: Aleksandr Bezzubikov To: qemu-devel@nongnu.org Date: Fri, 30 Jun 2017 00:56:02 +0300 Message-Id: <1498773362-18675-7-git-send-email-zuban32s@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1498773362-18675-1-git-send-email-zuban32s@gmail.com> References: <1498773362-18675-1-git-send-email-zuban32s@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4010:c07::241 Subject: [Qemu-devel] [PATCH RFC 6/6] hw/ich9: enable acpi pci hotplug X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ehabkost@redhat.com, mst@redhat.com, Aleksandr Bezzubikov , pbonzini@redhat.com, marcel@redhat.com, imammedo@redhat.com, rth@twiddle.net Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Aleksandr Bezzubikov --- hw/acpi/ich9.c | 31 +++++++++++++++++++++++++++++++ hw/isa/lpc_ich9.c | 12 ++++++++++++ include/hw/acpi/ich9.h | 4 ++++ include/hw/i386/pc.h | 7 ++++++- 4 files changed, 53 insertions(+), 1 deletion(-) diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index 5c279bb..25339eb 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -258,6 +258,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); } @@ -301,6 +302,10 @@ void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm, pm->powerdown_notifier.notify = pm_powerdown_req; qemu_register_powerdown_notifier(&pm->powerdown_notifier); + acpi_pcihp_init(OBJECT(lpc_pci), &pm->acpi_pci_hotplug, lpc_pci->bus, + pci_address_space_io(lpc_pci), + pm->use_acpi_pci_hotplug); + legacy_acpi_cpu_hotplug_init(pci_address_space_io(lpc_pci), OBJECT(lpc_pci), &pm->gpe_cpu, ICH9_CPU_HOTPLUG_IO_BASE); @@ -335,6 +340,21 @@ static void ich9_pm_set_memory_hotplug_support(Object *obj, bool value, s->pm.acpi_memory_hotplug.is_enabled = value; } +static bool ich9_pm_get_acpi_pci_hotplug_support(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_support(Object *obj, bool value, + Error **errp) +{ + ICH9LPCState *s = ICH9_LPC_DEVICE(obj); + + s->pm.use_acpi_pci_hotplug = value; +} + static bool ich9_pm_get_cpu_hotplug_legacy(Object *obj, Error **errp) { ICH9LPCState *s = ICH9_LPC_DEVICE(obj); @@ -446,6 +466,7 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp) { static const uint32_t gpe0_len = ICH9_PMIO_GPE0_LEN; pm->acpi_memory_hotplug.is_enabled = true; + pm->use_acpi_pci_hotplug = true; pm->cpu_hotplug_legacy = true; pm->disable_s3 = 0; pm->disable_s4 = 0; @@ -462,6 +483,10 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp) ich9_pm_get_memory_hotplug_support, ich9_pm_set_memory_hotplug_support, NULL); + object_property_add_bool(obj, "acpi-pci-hotplug-with-bridge-support", + ich9_pm_get_acpi_pci_hotplug_support, + ich9_pm_set_acpi_pci_hotplug_support, + NULL); object_property_add_bool(obj, "cpu-hotplug-legacy", ich9_pm_get_cpu_hotplug_legacy, ich9_pm_set_cpu_hotplug_legacy, @@ -497,6 +522,9 @@ void ich9_pm_device_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, acpi_memory_plug_cb(hotplug_dev, &lpc->pm.acpi_memory_hotplug, 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 if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { if (lpc->pm.cpu_hotplug_legacy) { legacy_acpi_cpu_plug_cb(hotplug_dev, &lpc->pm.gpe_cpu, dev, errp); @@ -519,6 +547,9 @@ void ich9_pm_device_unplug_request_cb(HotplugHandler *hotplug_dev, acpi_memory_unplug_request_cb(hotplug_dev, &lpc->pm.acpi_memory_hotplug, 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 if (object_dynamic_cast(OBJECT(dev), TYPE_CPU) && !lpc->pm.cpu_hotplug_legacy) { acpi_cpu_unplug_request_cb(hotplug_dev, &lpc->pm.cpuhp_state, diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index e2215dc..13574d0 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -33,6 +33,7 @@ #include "hw/hw.h" #include "qapi/visitor.h" #include "qemu/range.h" +#include "qapi/error.h" #include "hw/isa/isa.h" #include "hw/sysbus.h" #include "hw/i386/pc.h" @@ -574,6 +575,15 @@ static const MemoryRegionOps rcrb_mmio_ops = { .endianness = DEVICE_LITTLE_ENDIAN, }; +static void ich9_update_bus_hotplug(PCIBus *pci_bus, void *opaque) +{ + ICH9LPCState *s = opaque; + + if (!pci_bus_is_express(pci_bus)) { + qbus_set_hotplug_handler(BUS(pci_bus), DEVICE(s), &error_abort); + } +} + static void ich9_lpc_machine_ready(Notifier *n, void *opaque) { ICH9LPCState *s = container_of(n, ICH9LPCState, machine_ready); @@ -597,6 +607,8 @@ static void ich9_lpc_machine_ready(Notifier *n, void *opaque) /* floppy */ pci_conf[0x82] |= 0x08; } + + pci_for_each_bus(s->d.bus, ich9_update_bus_hotplug, s); } /* reset control */ diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h index a352c94..e1df363 100644 --- a/include/hw/acpi/ich9.h +++ b/include/hw/acpi/ich9.h @@ -22,6 +22,7 @@ #define HW_ACPI_ICH9_H #include "hw/acpi/acpi.h" +#include "hw/acpi/pcihp.h" #include "hw/acpi/cpu_hotplug.h" #include "hw/acpi/cpu.h" #include "hw/acpi/memory_hotplug.h" @@ -55,6 +56,9 @@ typedef struct ICH9LPCPMRegs { MemHotplugState acpi_memory_hotplug; + AcpiPciHpState acpi_pci_hotplug; + bool use_acpi_pci_hotplug; + uint8_t disable_s3; uint8_t disable_s4; uint8_t s4_val; diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index e447f5d..0d4e8b2 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -464,7 +464,12 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); }, #define PC_COMPAT_2_5 \ - HW_COMPAT_2_5 + HW_COMPAT_2_5 \ + {\ + .driver = "ICH9-LPC",\ + .property = "acpi-pci-hotplug-with-bridge-support",\ + .value = "off",\ + }, /* Helper for setting model-id for CPU models that changed model-id * depending on QEMU versions up to QEMU 2.4.