From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35855) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YXTsI-0008HP-I0 for qemu-devel@nongnu.org; Mon, 16 Mar 2015 08:12:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YXTs9-0003Kb-Oa for qemu-devel@nongnu.org; Mon, 16 Mar 2015 08:12:02 -0400 Message-ID: <5506C881.5020406@redhat.com> Date: Mon, 16 Mar 2015 14:11:45 +0200 From: Marcel Apfelbaum MIME-Version: 1.0 References: <1426001534-7151-1-git-send-email-marcel@redhat.com> <1426001534-7151-24-git-send-email-marcel@redhat.com> <20150310174308-mutt-send-email-mst@redhat.com> In-Reply-To: <20150310174308-mutt-send-email-mst@redhat.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v5 for-2.3 23/28] hw/pxb: add map_irq func List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: kraxel@redhat.com, quintela@redhat.com, seabios@seabios.org, qemu-devel@nongnu.org, agraf@suse.de, alex.williamson@redhat.com, kevin@koconnor.net, qemu-ppc@nongnu.org, hare@suse.de, imammedo@redhat.com, amit.shah@redhat.com, pbonzini@redhat.com, leon.alrae@imgtec.com, aurelien@aurel32.net, rth@twiddle.net On 03/10/2015 06:43 PM, Michael S. Tsirkin wrote: > On Tue, Mar 10, 2015 at 05:32:09PM +0200, Marcel Apfelbaum wrote: >> The bios does not index the pxb slot number when >> it computes the IRQ because it resides on bus 0 >> and not on the current bus. >> However Qemu routes the irq through bus 0 and adds >> the pxb slot to the IRQ computation. >> >> Synchronize between bios and Qemu by canceling >> pxb's effect. >> >> Signed-off-by: Marcel Apfelbaum >> --- >> hw/pci-bridge/pci_expander_bridge.c | 20 +++++++++++++++++++- >> 1 file changed, 19 insertions(+), 1 deletion(-) >> >> diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expander_bridge.c >> index 941f3c8..87515c1 100644 >> --- a/hw/pci-bridge/pci_expander_bridge.c >> +++ b/hw/pci-bridge/pci_expander_bridge.c >> @@ -92,6 +92,24 @@ static const TypeInfo pxb_host_info = { >> .class_init = pxb_host_class_init, >> }; >> >> + >> +static int pxb_map_irq_fn(PCIDevice *pci_dev, int pin) >> +{ >> + PCIDevice *pxb = pci_dev->bus->parent_dev; >> + >> + /* >> + * The bios does not index the pxb slot number when >> + * it computes the IRQ because it resides on bus 0 >> + * and not on the current bus. >> + * However QEMU routes the irq through bus 0 and adds >> + * the pxb slot to the IRQ computation. > > I know it's QEMU but which function exactly? PXB device with is a PCI host-bridge device. Thanks, Marcel > >> + * >> + * Synchronize between bios and QEMU by canceling >> + * pxb's effect. >> + */ >> + return pin - PCI_SLOT(pxb->devfn); >> +} >> + >> static int pxb_dev_initfn(PCIDevice *dev) >> { >> PXBDev *pxb = PXB_DEV(dev); >> @@ -118,7 +136,7 @@ static int pxb_dev_initfn(PCIDevice *dev) >> bus->parent_dev = dev; >> bus->address_space_mem = dev->bus->address_space_mem; >> bus->address_space_io = dev->bus->address_space_io; >> - bus->map_irq = pci_swizzle_map_irq_fn; >> + bus->map_irq = pxb_map_irq_fn; >> >> bds = qdev_create(BUS(bus), "pci-bridge"); >> bds->id = dev_name; >> -- >> 2.1.0