[v2,08/11] pci: introduce pci bus pre reset

Commit Message

Cao jin March 7, 2016, 3:23 a.m. UTC

From: Chen Fan <[e-mail]>

in order to distinguish a hot reset with a normal reset. we add this
pre reset call back to notice that we should do a hot reset for all devices.

Signed-off-by: Chen Fan <[e-mail]>
---
 hw/core/qdev.c           |  4 ++--
 hw/pci/pci.c             | 11 +++++++++++
 hw/pci/pci_bridge.c      |  5 ++++-
 include/hw/pci/pci_bus.h |  5 +++++
 include/hw/qdev-core.h   |  3 +++
 5 files changed, 25 insertions(+), 3 deletions(-)

Patch

diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index 779de2b..e36fa07 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -304,14 +304,14 @@  void qdev_unplug(DeviceState *dev, Error **errp)
     }
 }
 
-static int qdev_reset_one(DeviceState *dev, void *opaque)
+int qdev_reset_one(DeviceState *dev, void *opaque)
 {
     device_reset(dev);
 
     return 0;
 }
 
-static int qbus_reset_one(BusState *bus, void *opaque)
+int qbus_reset_one(BusState *bus, void *opaque)
 {
     BusClass *bc = BUS_GET_CLASS(bus);
     if (bc->reset) {
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 72650c5..7c79767 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -257,6 +257,15 @@  void pci_device_reset(PCIDevice *dev)
     pci_do_device_reset(dev);
 }
 
+int pcibus_pre_reset(BusState *qbus, void *opaque)
+{
+    PCIBus *pci_bus = DO_UPCAST(PCIBus, qbus, qbus);
+
+    pci_bus->in_hot_reset = true;
+
+    return 0;
+}
+
 /*
  * Trigger pci bus reset under a given bus.
  * Called via qbus_reset_all on RST# assert, after the devices
@@ -276,6 +285,8 @@  static void pcibus_reset(BusState *qbus)
     for (i = 0; i < bus->nirq; i++) {
         assert(bus->irq_count[i] == 0);
     }
+
+    bus->in_hot_reset = false;
 }
 
 static void pci_host_bus_register(PCIBus *bus, DeviceState *parent)
diff --git a/hw/pci/pci_bridge.c b/hw/pci/pci_bridge.c
index 7eab9d5..6c35171 100644
--- a/hw/pci/pci_bridge.c
+++ b/hw/pci/pci_bridge.c
@@ -269,7 +269,10 @@  void pci_bridge_write_config(PCIDevice *d,
     newctl = pci_get_word(d->config + PCI_BRIDGE_CONTROL);
     if (~oldctl & newctl & PCI_BRIDGE_CTL_BUS_RESET) {
         /* Trigger hot reset on 0->1 transition. */
-        qbus_reset_all(&s->sec_bus.qbus);
+        qbus_walk_children(&s->sec_bus.qbus, NULL,
+                           pcibus_pre_reset,
+                           qdev_reset_one,
+                           qbus_reset_one, &s->sec_bus.qbus);
     }
 }
 
diff --git a/include/hw/pci/pci_bus.h b/include/hw/pci/pci_bus.h
index 403fec6..1a87179 100644
--- a/include/hw/pci/pci_bus.h
+++ b/include/hw/pci/pci_bus.h
@@ -39,8 +39,13 @@  struct PCIBus {
        Keep a count of the number of devices with raised IRQs.  */
     int nirq;
     int *irq_count;
+
+    /* The bus need to do a hot reset */
+    bool in_hot_reset;
 };
 
+int pcibus_pre_reset(BusState *qbus, void *opaque);
+
 typedef struct PCIBridgeWindows PCIBridgeWindows;
 
 /*
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index abcdee8..3d71c17 100644
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -401,4 +401,7 @@  static inline bool qbus_is_hotpluggable(BusState *bus)
 void device_listener_register(DeviceListener *listener);
 void device_listener_unregister(DeviceListener *listener);
 
+int qdev_reset_one(DeviceState *dev, void *opaque);
+int qbus_reset_one(BusState *bus, void *opaque);
+
 #endif