[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/6] pci: make pci reset use qdev reset frame work.
From: |
Isaku Yamahata |
Subject: |
[Qemu-devel] [PATCH 4/6] pci: make pci reset use qdev reset frame work. |
Date: |
Thu, 2 Sep 2010 18:25:07 +0900 |
make pci reset use qdev reset frame work.
Signed-off-by: Isaku Yamahata <address@hidden>
---
hw/pci.c | 38 ++++++++++++++++++++++++++++++++++----
hw/pci.h | 2 ++
2 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/hw/pci.c b/hw/pci.c
index 655fead..4c99390 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -62,6 +62,7 @@ struct PCIBus {
static char *pcibus_get_dev_path(DeviceState *dev);
static int pcibus_add_dev(BusState *qbus, DeviceState *qdev);
static int pcibus_del_dev(BusState *qbus, DeviceState *qdev);
+static int pcibus_reset(BusState *qbus);
static struct BusInfo pci_bus_info = {
.name = "PCI",
@@ -69,6 +70,7 @@ static struct BusInfo pci_bus_info = {
.get_dev_path = pcibus_get_dev_path,
.add_dev = pcibus_add_dev,
.del_dev = pcibus_del_dev,
+ .reset = pcibus_reset,
.props = (Property[]) {
DEFINE_PROP_PCI_DEVFN("addr", PCIDevice, devfn, -1),
DEFINE_PROP_STRING("romfile", PCIDevice, romfile),
@@ -153,7 +155,7 @@ static void pci_update_irq_status(PCIDevice *dev)
}
}
-static void pci_device_reset(PCIDevice *dev)
+void pci_device_reset_default(PCIDevice *dev)
{
int r;
@@ -181,9 +183,29 @@ static void pci_device_reset(PCIDevice *dev)
pci_update_mappings(dev);
}
-static void pci_bus_reset(void *opaque)
+static void pci_device_reset(PCIDevice *dev)
+{
+ if (!dev->qdev.info) {
+ /* not all pci devices haven't been qdev'fied yet
+ TODO: remove this when all pci devices are qdev'fied. */
+ pci_device_reset_default(dev);
+ } else {
+ /*
+ * TODO:
+ * each device should know what to do on RST#.
+ * move pci_device_reset_default() into each callback.
+ */
+ qdev_reset_all(&dev->qdev);
+ pci_device_reset_default(dev);
+ }
+}
+
+/*
+ * Trigger pci bus reset under a given bus.
+ * This functions emulates RST#.
+ */
+static void pci_bus_reset(PCIBus *bus)
{
- PCIBus *bus = opaque;
int i;
for (i = 0; i < bus->nirq; i++) {
@@ -196,6 +218,15 @@ static void pci_bus_reset(void *opaque)
}
}
+static int pcibus_reset(BusState *qbus)
+{
+ pci_bus_reset(DO_UPCAST(PCIBus, qbus, qbus));
+
+ /* topology traverse is done by pci_bus_reset().
+ Tell qbus/qdev walker not to traverse the tree */
+ return 1;
+}
+
static void pci_host_bus_register(int domain, PCIBus *bus)
{
struct PCIHostBus *host;
@@ -250,7 +281,6 @@ void pci_bus_new_inplace(PCIBus *bus, DeviceState *parent,
pci_host_bus_register(0, bus); /* for now only pci domain 0 is supported */
vmstate_register(NULL, -1, &vmstate_pcibus, bus);
- qemu_register_reset(pci_bus_reset, bus);
}
PCIBus *pci_bus_new(DeviceState *parent, const char *name, int devfn_min)
diff --git a/hw/pci.h b/hw/pci.h
index 51ba8b6..8e72d78 100644
--- a/hw/pci.h
+++ b/hw/pci.h
@@ -214,6 +214,8 @@ PCIBus *pci_register_bus(DeviceState *parent, const char
*name,
pci_set_irq_fn set_irq, pci_map_irq_fn map_irq,
void *irq_opaque, int devfn_min, int nirq);
+void pci_device_reset_default(PCIDevice *dev);
+
void pci_bus_set_mem_base(PCIBus *bus, target_phys_addr_t base);
PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model,
--
1.7.1.1
- [Qemu-devel] [PATCH 0/6 v3] introduce qbus reset callback and pci bus reset clean up, Isaku Yamahata, 2010/09/02
- [Qemu-devel] [PATCH 6/6] pci bridge: implement secondary bus reset., Isaku Yamahata, 2010/09/02
- [Qemu-devel] [PATCH 5/6] pci: teach pci devices that have reset callback how to reset common registers., Isaku Yamahata, 2010/09/02
- [Qemu-devel] [PATCH 3/6] qdev: introduce a helper function which triggers reset from a given device., Isaku Yamahata, 2010/09/02
- [Qemu-devel] [PATCH 2/6] qdev: introduce reset call back for qbus level., Isaku Yamahata, 2010/09/02
- [Qemu-devel] [PATCH 4/6] pci: make pci reset use qdev reset frame work.,
Isaku Yamahata <=
- [Qemu-devel] [PATCH 1/6] qdev: Make qbus_walk_children() call busfn for root bus., Isaku Yamahata, 2010/09/02
- [Qemu-devel] Re: [PATCH 0/6 v3] introduce qbus reset callback and pci bus reset clean up, Anthony Liguori, 2010/09/02