From patchwork Wed Jan 28 14:51:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 5730851 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 327CDBF440 for ; Wed, 28 Jan 2015 21:29:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2AB7D2025A for ; Wed, 28 Jan 2015 21:29:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4B5CF20218 for ; Wed, 28 Jan 2015 21:29:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755214AbbA1UsJ (ORCPT ); Wed, 28 Jan 2015 15:48:09 -0500 Received: from foss-mx-na.foss.arm.com ([217.140.108.86]:45527 "EHLO foss-mx-na.foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755032AbbA1UsG (ORCPT ); Wed, 28 Jan 2015 15:48:06 -0500 Received: from foss-smtp-na-1.foss.arm.com (unknown [10.80.61.8]) by foss-mx-na.foss.arm.com (Postfix) with ESMTP id 07437388; Wed, 28 Jan 2015 08:51:28 -0600 (CST) Received: from collaborate-mta1.arm.com (highbank-bc01-b06.austin.arm.com [10.112.81.134]) by foss-smtp-na-1.foss.arm.com (Postfix) with ESMTP id 84E3C5FAC1; Wed, 28 Jan 2015 08:51:25 -0600 (CST) Received: from approximate.cambridge.arm.com (approximate.cambridge.arm.com [10.1.209.148]) by collaborate-mta1.arm.com (Postfix) with ESMTP id 43F0313F8D8; Wed, 28 Jan 2015 08:51:24 -0600 (CST) From: Marc Zyngier To: Thomas Gleixner , Jiang Liu , Bjorn Helgaas Cc: Lorenzo Pieralisi , Andre Przywara , , , Subject: [PATCH] PCI: Fix pcibios_update_irq misuse of irq number Date: Wed, 28 Jan 2015 14:51:23 +0000 Message-Id: <1422456683-797-1-git-send-email-marc.zyngier@arm.com> X-Mailer: git-send-email 2.1.4 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP pcibios_update_irq writes an irq number into the config space of a given PCI device, but ignores the fact that this number is a virtual interrupt number, which might be a very different value from what the underlying hardware is using. The obvious fix is to fetch the HW interrupt number from the corresponding irq_data structure. This is slightly complicated by the fact that this interrupt might be services by a stacked domain. This has been tested on KVM with kvmtool. Reported-by: Lorenzo Pieralisi Tested-by: Andre Przywara Signed-off-by: Marc Zyngier --- drivers/pci/setup-irq.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/pci/setup-irq.c b/drivers/pci/setup-irq.c index 4e2d595..828cbc9 100644 --- a/drivers/pci/setup-irq.c +++ b/drivers/pci/setup-irq.c @@ -15,11 +15,19 @@ #include #include #include +#include void __weak pcibios_update_irq(struct pci_dev *dev, int irq) { - dev_dbg(&dev->dev, "assigning IRQ %02d\n", irq); - pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq); + struct irq_data *d; + + d = irq_get_irq_data(irq); +#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY + while (d->parent_data) + d = d->parent_data; +#endif + dev_dbg(&dev->dev, "assigning IRQ %02ld\n", d->hwirq); + pci_write_config_byte(dev, PCI_INTERRUPT_LINE, d->hwirq); } static void pdev_fixup_irq(struct pci_dev *dev,