[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v12 09/15] pci: add bus reset_notifiers callbacks fo
From: |
Chen Hanxiao |
Subject: |
[Qemu-devel] [PATCH v12 09/15] pci: add bus reset_notifiers callbacks for host bus reset |
Date: |
Thu, 16 Jul 2015 12:00:47 +0800 |
From: Chen Fan <address@hidden>
Particularly, For vfio devices, Once need to recovery devices
by bus reset such as AER, we always need to reset the host bus
to recovery the devices under the bus, so we need to add pci bus
callbacks to specify to do host bus reset.
Signed-off-by: Chen Fan <address@hidden>
Signed-off-by: Chen Hanxiao <address@hidden>
---
hw/pci/pci.c | 16 ++++++++++++++++
hw/pci/pci_bridge.c | 6 ++++++
include/hw/pci/pci.h | 4 ++++
include/hw/pci/pci_bus.h | 2 ++
4 files changed, 28 insertions(+)
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 442f822..2784eee 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -75,11 +75,27 @@ static const VMStateDescription vmstate_pcibus = {
}
};
+void pci_bus_add_reset_notifier(PCIBus *bus, Notifier *notify)
+{
+ notifier_list_add(&bus->reset_notifiers, notify);
+}
+
+void pci_bus_remove_reset_notifier(Notifier *notify)
+{
+ notifier_remove(notify);
+}
+
+void pci_bus_run_reset_notifier(PCIBus *bus, void *opaque)
+{
+ notifier_list_notify(&bus->reset_notifiers, opaque);
+}
+
static void pci_bus_realize(BusState *qbus, Error **errp)
{
PCIBus *bus = PCI_BUS(qbus);
vmstate_register(NULL, -1, &vmstate_pcibus, bus);
+ notifier_list_init(&bus->reset_notifiers);
}
static void pci_bus_unrealize(BusState *qbus, Error **errp)
diff --git a/hw/pci/pci_bridge.c b/hw/pci/pci_bridge.c
index 40c97b1..a8e3f57 100644
--- a/hw/pci/pci_bridge.c
+++ b/hw/pci/pci_bridge.c
@@ -267,6 +267,12 @@ void pci_bridge_write_config(PCIDevice *d,
newctl = pci_get_word(d->config + PCI_BRIDGE_CONTROL);
if (~oldctl & newctl & PCI_BRIDGE_CTL_BUS_RESET) {
+ /*
+ * Notify all vfio-pci devices under the bus
+ * to do physical bus reset.
+ */
+ pci_for_each_bus(&s->sec_bus,
+ pci_bus_run_reset_notifier, d);
/* Trigger hot reset on 0->1 transition. */
qbus_reset_all(&s->sec_bus.qbus);
}
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index 551cb3d..fee04ff 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -7,6 +7,7 @@
#include "exec/memory.h"
#include "sysemu/dma.h"
#include "qapi/error.h"
+#include "qemu/notify.h"
/* PCI includes legacy ISA access. */
#include "hw/isa/isa.h"
@@ -381,6 +382,9 @@ void pci_bus_fire_intx_routing_notifier(PCIBus *bus);
void pci_device_set_intx_routing_notifier(PCIDevice *dev,
PCIINTxRoutingNotifier notifier);
void pci_device_reset(PCIDevice *dev);
+void pci_bus_add_reset_notifier(PCIBus *bus, Notifier *notify);
+void pci_bus_remove_reset_notifier(Notifier *notify);
+void pci_bus_run_reset_notifier(PCIBus *bus, void *opaque);
PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus,
const char *default_model,
diff --git a/include/hw/pci/pci_bus.h b/include/hw/pci/pci_bus.h
index 403fec6..a529890 100644
--- a/include/hw/pci/pci_bus.h
+++ b/include/hw/pci/pci_bus.h
@@ -39,6 +39,8 @@ struct PCIBus {
Keep a count of the number of devices with raised IRQs. */
int nirq;
int *irq_count;
+
+ NotifierList reset_notifiers;
};
typedef struct PCIBridgeWindows PCIBridgeWindows;
--
2.1.0
- [Qemu-devel] [PATCH v12 00/15] vfio-pci: pass the aer error to guest, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 02/15] vfio: squeeze out vfio_pci_do_hot_reset for support bus reset, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 04/15] vfio: make the 4 bytes aligned for capability size, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 03/15] pcie: modify the capability size assert, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 05/15] vfio: add pcie extanded capability support, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 06/15] aer: impove pcie_aer_init to support vfio device, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 08/15] vfio: add check host bus reset is support or not, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 07/15] vfio: add aer support for vfio device, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 09/15] pci: add bus reset_notifiers callbacks for host bus reset,
Chen Hanxiao <=
- [Qemu-devel] [PATCH v12 11/15] vfio: modify vfio_pci_hot_reset to support bus reset, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 13/15] pcie_aer: expose pcie_aer_msg() interface, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 10/15] vfio: add sec_bus_reset notifier to notify physical bus reset is needed, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 14/15] vfio-pci: pass the aer error to guest, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 12/15] vfio: do hot bus reset when do virtual secondary bus reset, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 15/15] vfio: add 'aer' property to expose aercap, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 01/15] vfio: extract vfio_get_hot_reset_info as a single function, Chen Hanxiao, 2015/07/16
- Re: [Qemu-devel] [PATCH v12 00/15] vfio-pci: pass the aer error to guest, Alex Williamson, 2015/07/16