From ed71d0c46408c9fdf4df93ddc4d0610f0b039696 Mon Sep 17 00:00:00 2001

From: Cornelia Huck <cohuck@redhat.com>

Date: Wed, 17 Apr 2019 13:57:39 +0100

Subject: [PATCH 22/24] s390x/pci: Unplug remaining requested devices on

 pcihost reset

RH-Author: Cornelia Huck <cohuck@redhat.com>

Message-id: <20190417135741.25297-23-cohuck@redhat.com>

Patchwork-id: 85805

O-Subject: [RHEL-8.1.0 qemu-kvm PATCH v2 22/24] s390x/pci: Unplug remaining requested devices on pcihost reset

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>

When resetting the guest we should unplug and remove all devices that

are still pending.

With this patch, the requested device will be unplugged on reboot

(S390_RESET_EXTERNAL and S390_RESET_REIPL, which reset the pcihost bridge

via qemu_devices_reset()).

This approach is similar to what's done for acpi PCI hotplug in

acpi_pcihp_reset() -> acpi_pcihp_update() ->

acpi_pcihp_update_hotplug_bus() -> acpi_pcihp_eject_slot().

s390_pci_generate_plug_event()'s will still be generated, I guess this

is not an issue. The same thing would happen right now when unplugging

a device just before starting the guest.

Signed-off-by: David Hildenbrand <david@redhat.com>

Message-Id: <20190130155733.32742-7-david@redhat.com>

Reviewed-by: Collin Walling <walling@linux.ibm.com>

Signed-off-by: Cornelia Huck <cohuck@redhat.com>

(cherry picked from commit 2313a88fe68cb970532ba1641ffc35c848daae86)

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 | 15 +++++++++++++++

 1 file changed, 15 insertions(+)

diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c

index 1ba7873..383b3e7 100644

--- a/hw/s390x/s390-pci-bus.c

+++ b/hw/s390x/s390-pci-bus.c

@@ -1097,6 +1097,21 @@ static void s390_pcihost_reset(DeviceState *dev)

 {

     S390pciState *s = S390_PCI_HOST_BRIDGE(dev);

     PCIBus *bus = s->parent_obj.bus;

+    S390PCIBusDevice *pbdev, *next;

+

+    /* Process all pending unplug requests */

+    QTAILQ_FOREACH_SAFE(pbdev, &s->zpci_devs, link, next) {

+        if (pbdev->unplug_requested) {

+            if (pbdev->summary_ind) {

+                pci_dereg_irqs(pbdev);

+            }

+            if (pbdev->iommu->enabled) {

+                pci_dereg_ioat(pbdev->iommu);

+            }

+            pbdev->state = ZPCI_FS_STANDBY;

+            s390_pci_perform_unplug(pbdev);

+        }

+    }

     /*

      * When resetting a PCI bridge, the assigned numbers are set to 0. So

-- 

1.8.3.1