From patchwork Fri Jun 8 12:47:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 163777 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4DFF0B6FAC for ; Fri, 8 Jun 2012 22:48:14 +1000 (EST) Received: from localhost ([::1]:49422 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Scybs-0003rt-8T for incoming@patchwork.ozlabs.org; Fri, 08 Jun 2012 08:48:12 -0400 Received: from eggs.gnu.org ([208.118.235.92]:45169) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Scybk-0003rm-Cb for qemu-devel@nongnu.org; Fri, 08 Jun 2012 08:48:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Scybi-0007kH-AY for qemu-devel@nongnu.org; Fri, 08 Jun 2012 08:48:03 -0400 Received: from david.siemens.de ([192.35.17.14]:33411) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Scybi-0007k2-13 for qemu-devel@nongnu.org; Fri, 08 Jun 2012 08:48:02 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by david.siemens.de (8.13.6/8.13.6) with ESMTP id q58Clx0D025873; Fri, 8 Jun 2012 14:47:59 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id q58Clx2X020213; Fri, 8 Jun 2012 14:47:59 +0200 Message-ID: <4FD1F47F.1020805@siemens.com> Date: Fri, 08 Jun 2012 14:47:59 +0200 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: "Michael S. Tsirkin" , qemu-devel References: <73f236cab517fc5b2c2ba332e9efe2acbe727151.1338799936.git.jan.kiszka@siemens.com> In-Reply-To: <73f236cab517fc5b2c2ba332e9efe2acbe727151.1338799936.git.jan.kiszka@siemens.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 192.35.17.14 Cc: Alex Williamson Subject: [Qemu-devel] [PATCH v2 06/13] pci: Add INTx routing notifier X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This per-device notifier shall be triggered by any interrupt router along the path of a device's legacy interrupt signal on routing changes. For simplicity reasons and as this is a slow path anyway, no further details on the routing changes are provided. Instead, the callback is expected to use pci_device_route_intx_to_irq to check the effect of the change. Will be used by KVM PCI device assignment and VFIO. Acked-by: Alex Williamson Signed-off-by: Jan Kiszka --- v2: Fixed the commit log to mention pci_device_route_intx_to_irq. hw/pci.c | 19 +++++++++++++++++++ hw/pci.h | 7 +++++++ hw/pci_bridge.c | 8 ++++++++ hw/piix_pci.c | 2 ++ 4 files changed, 36 insertions(+), 0 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index fb56090..12f29f0 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -1108,6 +1108,25 @@ PCIINTxRoute pci_device_route_intx_to_irq(PCIDevice *dev, int pin) return bus->route_intx_to_irq(bus->irq_opaque, dev->host_intx_pin[pin]); } +void pci_bus_fire_intx_routing_notifier(PCIBus *bus) +{ + PCIDevice *dev; + int i; + + for (i = 0; i < ARRAY_SIZE(bus->devices); ++i) { + dev = bus->devices[i]; + if (dev && dev->intx_routing_notifier) { + dev->intx_routing_notifier(dev); + } + } +} + +void pci_device_set_intx_routing_notifier(PCIDevice *dev, + INTxRoutingNotifier notifier) +{ + dev->intx_routing_notifier = notifier; +} + /***********************************************************/ /* monitor info on PCI */ diff --git a/hw/pci.h b/hw/pci.h index 85f5c93..647d91d 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -182,6 +182,7 @@ typedef struct PCIDeviceClass { const char *romfile; } PCIDeviceClass; +typedef void (*INTxRoutingNotifier)(PCIDevice *dev); typedef int (*MSIVectorUseNotifier)(PCIDevice *dev, unsigned int vector, MSIMessage msg); typedef void (*MSIVectorReleaseNotifier)(PCIDevice *dev, unsigned int vector); @@ -261,6 +262,9 @@ struct PCIDevice { MemoryRegion rom; uint32_t rom_bar; + /* INTx routing notifier */ + INTxRoutingNotifier intx_routing_notifier; + /* MSI-X notifiers */ MSIVectorUseNotifier msix_vector_use_notifier; MSIVectorReleaseNotifier msix_vector_release_notifier; @@ -323,6 +327,9 @@ PCIBus *pci_register_bus(DeviceState *parent, const char *name, MemoryRegion *address_space_io, uint8_t devfn_min, int nirq); PCIINTxRoute pci_device_route_intx_to_irq(PCIDevice *dev, int pin); +void pci_bus_fire_intx_routing_notifier(PCIBus *bus); +void pci_device_set_intx_routing_notifier(PCIDevice *dev, + INTxRoutingNotifier notifier); void pci_device_reset(PCIDevice *dev); void pci_bus_reset(PCIBus *bus); diff --git a/hw/pci_bridge.c b/hw/pci_bridge.c index 7d13a85..9ace0b7 100644 --- a/hw/pci_bridge.c +++ b/hw/pci_bridge.c @@ -298,6 +298,13 @@ void pci_bridge_reset(DeviceState *qdev) pci_bridge_reset_reg(dev); } +static void pci_bridge_intx_routing_update(PCIDevice *dev) +{ + PCIBridge *br = DO_UPCAST(PCIBridge, dev, dev); + + pci_bus_fire_intx_routing_notifier(&br->sec_bus); +} + /* default qdev initialization function for PCI-to-PCI bridge */ int pci_bridge_initfn(PCIDevice *dev) { @@ -333,6 +340,7 @@ int pci_bridge_initfn(PCIDevice *dev) sec_bus->address_space_io = &br->address_space_io; memory_region_init(&br->address_space_io, "pci_bridge_io", 65536); pci_bridge_region_init(br); + pci_device_set_intx_routing_notifier(dev, pci_bridge_intx_routing_update); QLIST_INIT(&sec_bus->child); QLIST_INSERT_HEAD(&parent->child, sec_bus, sibling); return 0; diff --git a/hw/piix_pci.c b/hw/piix_pci.c index 347177f..8fd21f3 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -422,6 +422,8 @@ static void piix3_write_config(PCIDevice *dev, if (ranges_overlap(address, len, PIIX_PIRQC, 4)) { PIIX3State *piix3 = DO_UPCAST(PIIX3State, dev, dev); int pic_irq; + + pci_bus_fire_intx_routing_notifier(piix3->dev.bus); piix3_update_irq_levels(piix3); for (pic_irq = 0; pic_irq < PIIX_NUM_PIC_IRQS; pic_irq++) { piix3_set_irq_pic(piix3, pic_irq);