From patchwork Fri Jan 18 11:37:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Murray X-Patchwork-Id: 213568 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 54F322C007C for ; Fri, 18 Jan 2013 22:37:49 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752472Ab3ARLhr (ORCPT ); Fri, 18 Jan 2013 06:37:47 -0500 Received: from service87.mimecast.com ([91.220.42.44]:42352 "EHLO service87.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751587Ab3ARLhq convert rfc822-to-8bit (ORCPT ); Fri, 18 Jan 2013 06:37:46 -0500 Received: from cam-owa2.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) by service87.mimecast.com; Fri, 18 Jan 2013 11:37:44 +0000 Received: from arm.com ([10.1.255.212]) by cam-owa2.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 18 Jan 2013 11:37:43 +0000 Date: Fri, 18 Jan 2013 11:37:42 +0000 From: Andrew Murray To: Thierry Reding Cc: Arnd Bergmann , Stephen Warren , "linux-tegra@vger.kernel.org" , Grant Likely , "rob.herring@calxeda.com" , Russell King , Bjorn Helgaas , Jason Gunthorpe , Thomas Petazzoni , "devicetree-discuss@lists.ozlabs.org" , "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "linux-pci@vger.kernel.org" Subject: [PATCH RFC 1/2] Implementation of pci_fixup_irqs for descendants of a specified bus Message-ID: <20130118113742.GA9006@arm.com> MIME-Version: 1.0 User-Agent: Mutt/1.5.20 (2009-06-14) X-OriginalArrivalTime: 18 Jan 2013 11:37:44.0010 (UTC) FILETIME=[3B16BAA0:01CDF570] X-MC-Unique: 113011811374409601 Content-Disposition: inline Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Continuing from discussion with Thierry (lkml.org/lkml/2013/1/18/107) perhaps this will be useful to fold into your patchset. --- This patch provides pci_bus_fixup_irqs which performs the same function as pci_fixup_irqs but only to descendants of the specified bus. This can reduce unnecessary fixing up of device irqs when new buses are added. Signed-off-by: Andrew Murray Signed-off-by: Liviu Dudau --- drivers/pci/setup-irq.c | 15 +++++++++++++++ include/linux/pci.h | 3 +++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/drivers/pci/setup-irq.c b/drivers/pci/setup-irq.c index eb219a1..ea91874 100644 --- a/drivers/pci/setup-irq.c +++ b/drivers/pci/setup-irq.c @@ -62,3 +62,18 @@ pci_fixup_irqs(u8 (*swizzle)(struct pci_dev *, u8 *), for_each_pci_dev(dev) pdev_fixup_irq(dev, swizzle, map_irq); } + +void __init +pci_bus_fixup_irqs(struct pci_bus *bus, + u8 (*swizzle)(struct pci_dev *, u8 *), + int (*map_irq)(const struct pci_dev *, u8, u8)) +{ + struct pci_dev *dev; + + list_for_each_entry(dev, &bus->devices, bus_list) { + pdev_fixup_irq(dev, swizzle, map_irq); + + if (dev->subordinate) + pci_bus_fixup_irqs(dev->subordinate, swizzle, map_irq); + } +} diff --git a/include/linux/pci.h b/include/linux/pci.h index 5faa831..1b3c2eb 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -953,6 +953,9 @@ void pdev_enable_device(struct pci_dev *); int pci_enable_resources(struct pci_dev *, int mask); void pci_fixup_irqs(u8 (*)(struct pci_dev *, u8 *), int (*)(const struct pci_dev *, u8, u8)); +void pci_bus_fixup_irqs(struct pci_bus *bus, + u8 (*swizzle)(struct pci_dev *, u8 *), + int (*map_irq)(const struct pci_dev *, u8, u8)); #define HAVE_PCI_REQ_REGIONS 2 int __must_check pci_request_regions(struct pci_dev *, const char *); int __must_check pci_request_regions_exclusive(struct pci_dev *, const char *);