125 lines
4.8 KiB
Diff
125 lines
4.8 KiB
Diff
From 2bbc164594e03b4ab2b436433c7757990801ef49 Mon Sep 17 00:00:00 2001
|
|
From: Cornelia Huck <cohuck@redhat.com>
|
|
Date: Wed, 17 Apr 2019 13:57:32 +0100
|
|
Subject: [PATCH 15/24] s390x/pci: Move some hotplug checks to the pre_plug
|
|
handler
|
|
|
|
RH-Author: Cornelia Huck <cohuck@redhat.com>
|
|
Message-id: <20190417135741.25297-16-cohuck@redhat.com>
|
|
Patchwork-id: 85797
|
|
O-Subject: [RHEL-8.1.0 qemu-kvm PATCH v2 15/24] s390x/pci: Move some hotplug checks to the pre_plug handler
|
|
Bugzilla: 1699070
|
|
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
|
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
RH-Acked-by: Jens Freimann <jfreimann@redhat.com>
|
|
|
|
From: David Hildenbrand <david@redhat.com>
|
|
|
|
Let's move most of the checks to the new pre_plug handler. As a PCI
|
|
bridge is just a PCI device, we can simplify the code.
|
|
|
|
Notes: We cannot yet move the MSIX check or device ID creation +
|
|
zPCI device creation to the pre_plug handler as both parts are not
|
|
fixed before actual device realization (and therefore after pre_plug and
|
|
before plug). Once that part is factored out, we can move these parts to
|
|
the pre_plug handler, too and therefore remove all possible errors from
|
|
the plug handler.
|
|
|
|
Reviewed-by: Collin Walling <walling@linux.ibm.com>
|
|
Signed-off-by: David Hildenbrand <david@redhat.com>
|
|
Message-Id: <20190114103110.10909-3-david@redhat.com>
|
|
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
|
(cherry picked from commit 6069bcdeaceebb91f43bc4762e3f63eee48cd390)
|
|
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
hw/s390x/s390-pci-bus.c | 41 +++++++++++++++++++++++++----------------
|
|
1 file changed, 25 insertions(+), 16 deletions(-)
|
|
|
|
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
|
|
index f1b3334..e3f576a 100644
|
|
--- a/hw/s390x/s390-pci-bus.c
|
|
+++ b/hw/s390x/s390-pci-bus.c
|
|
@@ -822,11 +822,31 @@ static bool s390_pci_alloc_idx(S390pciState *s, S390PCIBusDevice *pbdev)
|
|
}
|
|
|
|
pbdev->idx = idx;
|
|
- s->next_idx = (idx + 1) & FH_MASK_INDEX;
|
|
-
|
|
return true;
|
|
}
|
|
|
|
+static void s390_pcihost_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
|
+ Error **errp)
|
|
+{
|
|
+ S390pciState *s = S390_PCI_HOST_BRIDGE(hotplug_dev);
|
|
+
|
|
+ if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
|
|
+ PCIDevice *pdev = PCI_DEVICE(dev);
|
|
+
|
|
+ if (pdev->cap_present & QEMU_PCI_CAP_MULTIFUNCTION) {
|
|
+ error_setg(errp, "multifunction not supported in s390");
|
|
+ return;
|
|
+ }
|
|
+ } else if (object_dynamic_cast(OBJECT(dev), TYPE_S390_PCI_DEVICE)) {
|
|
+ S390PCIBusDevice *pbdev = S390_PCI_DEVICE(dev);
|
|
+
|
|
+ if (!s390_pci_alloc_idx(s, pbdev)) {
|
|
+ error_setg(errp, "no slot for plugging zpci device");
|
|
+ return;
|
|
+ }
|
|
+ }
|
|
+}
|
|
+
|
|
static void s390_pcihost_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
|
Error **errp)
|
|
{
|
|
@@ -839,11 +859,6 @@ static void s390_pcihost_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
|
PCIBridge *pb = PCI_BRIDGE(dev);
|
|
PCIDevice *pdev = PCI_DEVICE(dev);
|
|
|
|
- if (pdev->cap_present & QEMU_PCI_CAP_MULTIFUNCTION) {
|
|
- error_setg(errp, "multifunction not supported in s390");
|
|
- return;
|
|
- }
|
|
-
|
|
pci_bridge_map_irq(pb, dev->id, s390_pci_map_irq);
|
|
pci_setup_iommu(&pb->sec_bus, s390_pci_dma_iommu, s);
|
|
|
|
@@ -863,11 +878,6 @@ static void s390_pcihost_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
|
} else if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
|
|
pdev = PCI_DEVICE(dev);
|
|
|
|
- if (pdev->cap_present & QEMU_PCI_CAP_MULTIFUNCTION) {
|
|
- error_setg(errp, "multifunction not supported in s390");
|
|
- return;
|
|
- }
|
|
-
|
|
if (!dev->id) {
|
|
/* In the case the PCI device does not define an id */
|
|
/* we generate one based on the PCI address */
|
|
@@ -909,10 +919,8 @@ static void s390_pcihost_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
|
} else if (object_dynamic_cast(OBJECT(dev), TYPE_S390_PCI_DEVICE)) {
|
|
pbdev = S390_PCI_DEVICE(dev);
|
|
|
|
- if (!s390_pci_alloc_idx(s, pbdev)) {
|
|
- error_setg(errp, "no slot for plugging zpci device");
|
|
- return;
|
|
- }
|
|
+ /* the allocated idx is actually getting used */
|
|
+ s->next_idx = (pbdev->idx + 1) & FH_MASK_INDEX;
|
|
pbdev->fh = pbdev->idx;
|
|
QTAILQ_INSERT_TAIL(&s->zpci_devs, pbdev, link);
|
|
g_hash_table_insert(s->zpci_table, &pbdev->idx, pbdev);
|
|
@@ -1052,6 +1060,7 @@ static void s390_pcihost_class_init(ObjectClass *klass, void *data)
|
|
|
|
dc->reset = s390_pcihost_reset;
|
|
dc->realize = s390_pcihost_realize;
|
|
+ hc->pre_plug = s390_pcihost_pre_plug;
|
|
hc->plug = s390_pcihost_plug;
|
|
hc->unplug = s390_pcihost_unplug;
|
|
msi_nonbroken = true;
|
|
--
|
|
1.8.3.1
|
|
|