Patchwork [6/6] pci bridge: implement secondary bus reset.

login
register
mail settings
Submitter Isaku Yamahata
Date Sept. 2, 2010, 9:25 a.m.
Message ID <4821b8bf2cda185d49f5261787265455503a9d2f.1283417726.git.yamahata@valinux.co.jp>
Download mbox | patch
Permalink /patch/63458/
State New
Headers show

Comments

Isaku Yamahata - Sept. 2, 2010, 9:25 a.m.
implement secondary bus reset.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
---
 hw/pci.c |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

Patch

diff --git a/hw/pci.c b/hw/pci.c
index e23ac1b..183f595 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -1626,6 +1626,9 @@  static void pci_bridge_update_mappings(PCIBus *b)
 static void pci_bridge_write_config(PCIDevice *d,
                              uint32_t address, uint32_t val, int len)
 {
+    PCIBridge *s = container_of(d, PCIBridge, dev);
+    uint16_t bridge_control = pci_get_word(d->config + PCI_BRIDGE_CONTROL);
+
     pci_default_write_config(d, address, val, len);
 
     if (/* io base/limit */
@@ -1634,10 +1637,18 @@  static void pci_bridge_write_config(PCIDevice *d,
         /* memory base/limit, prefetchable base/limit and
            io base/limit upper 16 */
         ranges_overlap(address, len, PCI_MEMORY_BASE, 20)) {
-        PCIBridge *s = container_of(d, PCIBridge, dev);
         PCIBus *secondary_bus = &s->bus;
         pci_bridge_update_mappings(secondary_bus);
     }
+
+    if (ranges_overlap(address, len, PCI_BRIDGE_CONTROL, 2)) {
+        uint16_t new = pci_get_word(d->config + PCI_BRIDGE_CONTROL);
+        if (!(bridge_control & PCI_BRIDGE_CTL_BUS_RESET) &&
+            (new & PCI_BRIDGE_CTL_BUS_RESET)) {
+            /* 0 -> 1 */
+            pci_bus_reset(&s->bus);
+        }
+    }
 }
 
 PCIBus *pci_find_bus(PCIBus *bus, int bus_num)