From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53825) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z24Rk-00019V-6G for qemu-devel@nongnu.org; Mon, 08 Jun 2015 17:19:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z24Rg-0005ZQ-GU for qemu-devel@nongnu.org; Mon, 08 Jun 2015 17:19:04 -0400 Received: from omzsmtpe04.verizonbusiness.com ([199.249.25.207]:10911) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z24Rg-0005ZD-9h for qemu-devel@nongnu.org; Mon, 08 Jun 2015 17:19:00 -0400 From: Don Slutz Date: Mon, 8 Jun 2015 17:18:50 -0400 Message-Id: <1433798332-5830-3-git-send-email-dslutz@verizon.com> In-Reply-To: <1433798332-5830-1-git-send-email-dslutz@verizon.com> References: <1433798332-5830-1-git-send-email-dslutz@verizon.com> Subject: [Qemu-devel] [PATCH v2 2/4] Extend device listener interface for PCI to PCI bridges List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, xen-devel@lists.xen.org Cc: Paul Durrant , Don Slutz , Don Slutz , Stefano Stabellini , "Michael S. Tsirkin" The commit 707ff80021ccd7a68f4b3d2c44eebf87efbb41c4 assumed that a PCI device has a static address. This is not true for PCI devices that are on the secondary bus of a PCI to PCI bridge. BIOS and/or guest OS can change the secondary bus number to a new value at any time. Extend the device listener interface to be called when ever the secondary bus number is set to a new value. This new interface is called for all PCI devices that are on the secondary bridge. Signed-off-by: Don Slutz CC: Don Slutz --- hw/core/qdev.c | 7 +++++++ hw/pci/pci_bridge.c | 18 ++++++++++++++++++ include/hw/qdev-core.h | 3 +++ 3 files changed, 28 insertions(+) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index b0f0f84..7728ee7 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -239,6 +239,13 @@ void device_listener_unregister(DeviceListener *listener) QTAILQ_REMOVE(&device_listeners, listener, link); } +void device_listener_change_pci_bus_num(PCIBus *b, PCIDevice *d, void *opaque) +{ + uint8_t oldbus = GPOINTER_TO_INT(opaque); + + DEVICE_LISTENER_CALL(change_pci_bus_num, Forward, d, oldbus); +} + static void device_realize(DeviceState *dev, Error **errp) { DeviceClass *dc = DEVICE_GET_CLASS(dev); diff --git a/hw/pci/pci_bridge.c b/hw/pci/pci_bridge.c index 40c97b1..742c4d8 100644 --- a/hw/pci/pci_bridge.c +++ b/hw/pci/pci_bridge.c @@ -248,6 +248,7 @@ void pci_bridge_write_config(PCIDevice *d, PCIBridge *s = PCI_BRIDGE(d); uint16_t oldctl = pci_get_word(d->config + PCI_BRIDGE_CONTROL); uint16_t newctl; + uint8_t oldbus = pci_get_byte(d->config + PCI_SECONDARY_BUS); pci_default_write_config(d, address, val, len); @@ -265,6 +266,14 @@ void pci_bridge_write_config(PCIDevice *d, pci_bridge_update_mappings(s); } + if (oldbus != pci_get_byte(d->config + PCI_SECONDARY_BUS)) { + PCIBus *sec_bus = pci_bridge_get_sec_bus(s); + + pci_for_each_device(sec_bus, pci_bus_num(sec_bus), + device_listener_change_pci_bus_num, + GINT_TO_POINTER(oldbus)); + } + newctl = pci_get_word(d->config + PCI_BRIDGE_CONTROL); if (~oldctl & newctl & PCI_BRIDGE_CTL_BUS_RESET) { /* Trigger hot reset on 0->1 transition. */ @@ -297,6 +306,7 @@ void pci_bridge_reset(DeviceState *qdev) { PCIDevice *dev = PCI_DEVICE(qdev); uint8_t *conf = dev->config; + uint8_t oldbus = conf[PCI_SECONDARY_BUS]; conf[PCI_PRIMARY_BUS] = 0; conf[PCI_SECONDARY_BUS] = 0; @@ -329,6 +339,14 @@ void pci_bridge_reset(DeviceState *qdev) pci_set_long(conf + PCI_PREF_LIMIT_UPPER32, 0); pci_set_word(conf + PCI_BRIDGE_CONTROL, 0); + + if (oldbus) { + PCIBus *sec_bus = pci_bridge_get_sec_bus(PCI_BRIDGE(dev)); + + pci_for_each_device(sec_bus, pci_bus_num(sec_bus), + device_listener_change_pci_bus_num, + GINT_TO_POINTER(oldbus)); + } } /* default qdev initialization function for PCI-to-PCI bridge */ diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index d4be92f..154b4c1 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -168,6 +168,8 @@ struct DeviceState { struct DeviceListener { void (*realize)(DeviceListener *listener, DeviceState *dev); void (*unrealize)(DeviceListener *listener, DeviceState *dev); + void (*change_pci_bus_num)(DeviceListener *listener, PCIDevice *d, + uint8_t oldbus); QTAILQ_ENTRY(DeviceListener) link; }; @@ -387,5 +389,6 @@ static inline bool qbus_is_hotpluggable(BusState *bus) void device_listener_register(DeviceListener *listener); void device_listener_unregister(DeviceListener *listener); +void device_listener_change_pci_bus_num(PCIBus *b, PCIDevice *d, void *opaque); #endif -- 1.8.4