From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io0-f177.google.com ([209.85.223.177]:36288 "EHLO mail-io0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754247AbbIKXWH (ORCPT ); Fri, 11 Sep 2015 19:22:07 -0400 From: David Daney To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Herring , Frank Rowand , Grant Likely , Bjorn Helgaas , linux-pci@vger.kernel.org, Will Deacon , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , linux-arm-kernel@lists.infradead.org Cc: David Daney Subject: [PATCH 2/6] PCI: generic: Only fixup irqs for bus we are creating. Date: Fri, 11 Sep 2015 16:21:55 -0700 Message-Id: <1442013719-5001-3-git-send-email-ddaney.cavm@gmail.com> In-Reply-To: <1442013719-5001-1-git-send-email-ddaney.cavm@gmail.com> References: <1442013719-5001-1-git-send-email-ddaney.cavm@gmail.com> Sender: linux-pci-owner@vger.kernel.org List-ID: From: David Daney Use pci_walk_bus() to restrict the fixup irq actions to only the bus being created. If we create multiple buses with pci-host-generic, or there are buses created by other drivers, we don't want to call pci_fixup_irqs() which operates on all devices, not just the devices on the bus being added. The consequence is that either the fixups are done more than once, or in some cases incorrect fixups could be applied. Signed-off-by: David Daney --- drivers/pci/host/pci-host-generic.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/pci/host/pci-host-generic.c b/drivers/pci/host/pci-host-generic.c index 265dd25..a0fb241 100644 --- a/drivers/pci/host/pci-host-generic.c +++ b/drivers/pci/host/pci-host-generic.c @@ -205,6 +205,12 @@ static int gen_pci_parse_map_cfg_windows(struct gen_pci *pci) return 0; } +static int gen_pci_fixup_irq_cb(struct pci_dev *dev, void *arg) +{ + pdev_fixup_irq(dev, pci_common_swizzle, of_irq_parse_and_map_pci); + return 0; +} + static int gen_pci_probe(struct platform_device *pdev) { int err; @@ -262,7 +268,7 @@ static int gen_pci_probe(struct platform_device *pdev) return -ENODEV; } - pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci); + pci_walk_bus(bus, gen_pci_fixup_irq_cb, NULL); if (!pci_has_flag(PCI_PROBE_ONLY)) { pci_bus_size_bridges(bus); -- 1.7.11.7