From: Chen Fan <chen.fan.fnst@cn.fujitsu.com>
To: qemu-devel@nongnu.org
Cc: izumi.taku@jp.fujitsu.com, alex.williamson@redhat.com
Subject: [Qemu-devel] [RFC v9 12/18] pci: add bus reset_notifiers callbacks for host bus reset
Date: Tue, 9 Jun 2015 11:37:40 +0800 [thread overview]
Message-ID: <3af2cc902653e5ee5a888a1f522a7124167f5998.1433812962.git.chen.fan.fnst@cn.fujitsu.com> (raw)
In-Reply-To: <cover.1433812962.git.chen.fan.fnst@cn.fujitsu.com>
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 <chen.fan.fnst@cn.fujitsu.com>
---
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 3423c3a..3bd954e 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -74,11 +74,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 6c2af0d..d353c9d 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"
@@ -377,6 +378,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 fabaeee..3b551d7 100644
--- a/include/hw/pci/pci_bus.h
+++ b/include/hw/pci/pci_bus.h
@@ -29,6 +29,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;
--
1.9.3
next prev parent reply other threads:[~2015-06-09 3:41 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-09 3:37 [Qemu-devel] [RFC v9 00/18] vfio-pci: pass the aer error to guest Chen Fan
2015-06-09 3:37 ` [Qemu-devel] [RFC v9 01/18] vfio: extract vfio_get_hot_reset_info as a single function Chen Fan
2015-06-09 3:37 ` [Qemu-devel] [RFC v9 02/18] vfio: squeeze out vfio_pci_do_hot_reset for support bus reset Chen Fan
2015-06-09 3:37 ` [Qemu-devel] [RFC v9 03/18] pcie: modify the capability size assert Chen Fan
2015-06-09 3:37 ` [Qemu-devel] [RFC v9 04/18] vfio: make the 4 bytes aligned for capability size Chen Fan
2015-06-09 3:37 ` [Qemu-devel] [RFC v9 05/18] vfio: add pcie extanded capability support Chen Fan
2015-06-09 21:22 ` Alex Williamson
2015-06-09 3:37 ` [Qemu-devel] [RFC v9 06/18] aer: impove pcie_aer_init to support vfio device Chen Fan
2015-06-09 3:37 ` [Qemu-devel] [RFC v9 07/18] vfio: add aer support for " Chen Fan
2015-06-09 3:37 ` [Qemu-devel] [RFC v9 08/18] vfio: improve vfio_get_group to support adding group without devices Chen Fan
2015-06-09 21:23 ` Alex Williamson
2015-06-09 3:37 ` [Qemu-devel] [RFC v9 09/18] vfio: add ref for group to support own affected groups Chen Fan
2015-06-09 21:23 ` Alex Williamson
2015-06-09 3:37 ` [Qemu-devel] [RFC v9 10/18] get all affected groups for each device support aer Chen Fan
2015-06-09 21:22 ` Alex Williamson
2015-06-09 3:37 ` [Qemu-devel] [RFC v9 11/18] vfio: add check host bus reset is support or not Chen Fan
2015-06-09 21:23 ` Alex Williamson
2015-06-09 3:37 ` Chen Fan [this message]
2015-06-09 3:37 ` [Qemu-devel] [RFC v9 13/18] vfio: add sec_bus_reset notifier to notify physical bus reset is needed Chen Fan
2015-06-09 21:23 ` Alex Williamson
2015-06-09 3:37 ` [Qemu-devel] [RFC v9 14/18] vfio: improve vfio_pci_hot_reset to support more case Chen Fan
2015-06-09 21:24 ` Alex Williamson
2015-06-16 8:10 ` Chen Fan
2015-06-16 14:08 ` Alex Williamson
2015-06-17 6:28 ` Chen Fan
2015-06-17 15:23 ` Alex Williamson
2015-06-18 10:27 ` Chen Fan
2015-06-09 3:37 ` [Qemu-devel] [RFC v9 15/18] vfio: do hot bus reset when do virtual secondary bus reset Chen Fan
2015-06-09 21:23 ` Alex Williamson
2015-06-09 3:37 ` [Qemu-devel] [RFC v9 16/18] pcie_aer: expose pcie_aer_msg() interface Chen Fan
2015-06-09 3:37 ` [Qemu-devel] [RFC v9 17/18] vfio-pci: pass the aer error to guest Chen Fan
2015-06-09 3:37 ` [Qemu-devel] [RFC v9 18/18] vfio: add 'aer' property to expose aercap Chen Fan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3af2cc902653e5ee5a888a1f522a7124167f5998.1433812962.git.chen.fan.fnst@cn.fujitsu.com \
--to=chen.fan.fnst@cn.fujitsu.com \
--cc=alex.williamson@redhat.com \
--cc=izumi.taku@jp.fujitsu.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.