From patchwork Tue Jan 14 16:55:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 310806 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 385F32C0078 for ; Wed, 15 Jan 2014 04:07:14 +1100 (EST) Received: from localhost ([::1]:49549 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W37SK-0005F2-5E for incoming@patchwork.ozlabs.org; Tue, 14 Jan 2014 12:07:12 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45192) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W37MV-00084T-V5 for qemu-devel@nongnu.org; Tue, 14 Jan 2014 12:01:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W37MP-0006Vp-Ns for qemu-devel@nongnu.org; Tue, 14 Jan 2014 12:01:11 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33669) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W37MP-0006Vj-FN for qemu-devel@nongnu.org; Tue, 14 Jan 2014 12:01:05 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s0EH0vm2013186 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 14 Jan 2014 12:01:02 -0500 Received: from dell-pet610-01.lab.eng.brq.redhat.com (dell-pet610-01.lab.eng.brq.redhat.com [10.34.42.20]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id s0EH0I6H022745; Tue, 14 Jan 2014 12:00:55 -0500 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Tue, 14 Jan 2014 17:55:51 +0100 Message-Id: <1389718554-2387-7-git-send-email-imammedo@redhat.com> In-Reply-To: <1389718554-2387-1-git-send-email-imammedo@redhat.com> References: <1389718554-2387-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: peter.crosthwaite@xilinx.com, marcel.a@redhat.com, mst@redhat.com, aliguori@amazon.com, pbonzini@redhat.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH 6/9] acpi/piix4pm: convert ACPI PCI hotplug to use hotplug-handler API X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Split piix4_device_hotplug() into hotplug/unplug callbacks and register them as "hotplug-handler" interface implementation of PIIX4_PM device. Replace pci_bus_hotplug() wiring with setting link on PCI BUS "hotplug-handler" property to PIIX4_PM device. Signed-off-by: Igor Mammedov --- v2: * use error_abort to make error handling less verbose --- hw/acpi/piix4.c | 68 ++++++++++++++++++++++++++++-------------------------- 1 files changed, 35 insertions(+), 33 deletions(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index c292753..20b1ea3 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -30,6 +30,8 @@ #include "hw/nvram/fw_cfg.h" #include "exec/address-spaces.h" #include "hw/acpi/piix4.h" +#include "qapi/qmp/qerror.h" +#include "hw/hotplug.h" //#define DEBUG @@ -107,7 +109,7 @@ typedef struct PIIX4PMState { OBJECT_CHECK(PIIX4PMState, (obj), TYPE_PIIX4_PM) static void piix4_acpi_system_hot_add_init(MemoryRegion *parent, - PCIBus *bus, PIIX4PMState *s); + BusState *bus, PIIX4PMState *s); #define ACPI_ENABLE 0xf1 #define ACPI_DISABLE 0xf0 @@ -459,7 +461,7 @@ static int piix4_pm_initfn(PCIDevice *dev) qemu_add_machine_init_done_notifier(&s->machine_ready); qemu_register_reset(piix4_reset, s); - piix4_acpi_system_hot_add_init(pci_address_space_io(dev), dev->bus, s); + piix4_acpi_system_hot_add_init(pci_address_space_io(dev), BUS(dev->bus), s); piix4_pm_add_propeties(s); return 0; @@ -645,11 +647,8 @@ static void piix4_cpu_added_req(Notifier *n, void *opaque) piix4_cpu_hotplug_req(s, CPU(opaque), PLUG); } -static int piix4_device_hotplug(DeviceState *qdev, PCIDevice *dev, - PCIHotplugState state); - static void piix4_acpi_system_hot_add_init(MemoryRegion *parent, - PCIBus *bus, PIIX4PMState *s) + BusState *bus, PIIX4PMState *s) { CPUState *cpu; @@ -661,7 +660,9 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion *parent, "acpi-pci-hotplug", PCI_HOTPLUG_SIZE); memory_region_add_subregion(parent, PCI_HOTPLUG_ADDR, &s->io_pci); - pci_bus_hotplug(bus, piix4_device_hotplug, DEVICE(s)); + object_property_set_link(OBJECT(bus), OBJECT(s), + QDEV_HOTPLUG_HANDLER_PROPERTY, &error_abort); + bus->allow_hotplug = 1; CPU_FOREACH(cpu) { CPUClass *cc = CPU_GET_CLASS(cpu); @@ -677,41 +678,35 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion *parent, qemu_register_cpu_added_notifier(&s->cpu_added_notifier); } -static void enable_device(PIIX4PMState *s, int slot) +static void piix4_pci_device_hotplug_cb(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) { - s->ar.gpe.sts[0] |= PIIX4_PCI_HOTPLUG_STATUS; - s->pci0_slot_device_present |= (1U << slot); -} - -static void disable_device(PIIX4PMState *s, int slot) -{ - s->ar.gpe.sts[0] |= PIIX4_PCI_HOTPLUG_STATUS; - s->pci0_status.down |= (1U << slot); -} - -static int piix4_device_hotplug(DeviceState *qdev, PCIDevice *dev, - PCIHotplugState state) -{ - int slot = PCI_SLOT(dev->devfn); - PIIX4PMState *s = PIIX4_PM(qdev); + PCIDevice *pci_dev = PCI_DEVICE(dev); + int slot = PCI_SLOT(pci_dev->devfn); + PIIX4PMState *s = PIIX4_PM(hotplug_dev); + s->pci0_slot_device_present |= (1U << slot); /* Don't send event when device is enabled during qemu machine creation: * it is present on boot, no hotplug event is necessary. We do send an * event when the device is disabled later. */ - if (state == PCI_COLDPLUG_ENABLED) { - s->pci0_slot_device_present |= (1U << slot); - return 0; - } - - if (state == PCI_HOTPLUG_ENABLED) { - enable_device(s, slot); - } else { - disable_device(s, slot); + if (!dev->hotplugged) { + return; } + s->ar.gpe.sts[0] |= PIIX4_PCI_HOTPLUG_STATUS; acpi_update_sci(&s->ar, s->irq); +} - return 0; +static void piix4_pci_device_hot_unplug_cb(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) +{ + PCIDevice *pci_dev = PCI_DEVICE(dev); + int slot = PCI_SLOT(pci_dev->devfn); + PIIX4PMState *s = PIIX4_PM(hotplug_dev); + + s->pci0_status.down |= (1U << slot); + s->ar.gpe.sts[0] |= PIIX4_PCI_HOTPLUG_STATUS; + acpi_update_sci(&s->ar, s->irq); } static Property piix4_pm_properties[] = { @@ -726,6 +721,7 @@ static void piix4_pm_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); + HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(klass); k->init = piix4_pm_initfn; k->config_write = pm_write_config; @@ -742,6 +738,8 @@ static void piix4_pm_class_init(ObjectClass *klass, void *data) */ dc->cannot_instantiate_with_device_add_yet = true; dc->hotpluggable = false; + hc->plug = piix4_pci_device_hotplug_cb; + hc->unplug = piix4_pci_device_hot_unplug_cb; } static const TypeInfo piix4_pm_info = { @@ -749,6 +747,10 @@ static const TypeInfo piix4_pm_info = { .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PIIX4PMState), .class_init = piix4_pm_class_init, + .interfaces = (InterfaceInfo[]) { + { TYPE_HOTPLUG_HANDLER }, + { } + } }; static void piix4_pm_register_types(void)