From patchwork Sun Jan 27 19:23:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 2052351 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 61375DFE86 for ; Sun, 27 Jan 2013 19:27:56 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TzXqh-0007dv-86; Sun, 27 Jan 2013 19:25:03 +0000 Received: from userp1040.oracle.com ([156.151.31.81]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TzXqN-0007a9-Rp for linux-arm-kernel@lists.infradead.org; Sun, 27 Jan 2013 19:24:46 +0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id r0RJO4Eq001945 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 27 Jan 2013 19:24:05 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r0RJO3pD020111 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 27 Jan 2013 19:24:04 GMT Received: from abhmt120.oracle.com (abhmt120.oracle.com [141.146.116.72]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id r0RJO3bN018540; Sun, 27 Jan 2013 13:24:03 -0600 Received: from linux-siqj.site (/75.36.243.194) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Sun, 27 Jan 2013 11:24:02 -0800 From: Yinghai Lu To: Bjorn Helgaas , Jiang Liu , "Rafael J. Wysocki" , Taku Izumi , Toshi Kani Subject: [PATCH v3 05/22] PCI: Add for_each_pci_host_bridge() and pci_get_next_host_bridge Date: Sun, 27 Jan 2013 11:23:32 -0800 Message-Id: <1359314629-18651-6-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1359314629-18651-1-git-send-email-yinghai@kernel.org> References: <1359314629-18651-1-git-send-email-yinghai@kernel.org> X-Source-IP: ucsinet22.oracle.com [156.151.31.94] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130127_142444_125091_8B274513 X-CRM114-Status: GOOD ( 16.99 ) X-Spam-Score: -1.2 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [156.151.31.81 listed in list.dnswl.org] 3.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list 0.0 T_FRT_FOLLOW1 BODY: ReplaceTags: Follow 0.0 T_FRT_FOLLOW2 BODY: ReplaceTags: Follow (2) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines Cc: linux-ia64@vger.kernel.org, Mauro Carvalho Chehab , David Airlie , linux-pci@vger.kernel.org, dri-devel@lists.freedesktop.org, David Howells , Paul Mackerras , sparclinux@vger.kernel.org, linux-am33-list@redhat.com, Russell King , x86@kernel.org, linux-altix@sgi.com, Doug Thompson , Matt Turner , linux-edac@vger.kernel.org, Fenghua Yu , microblaze-uclinux@itee.uq.edu.au, Ivan Kokshaysky , Yinghai Lu , linux-arm-kernel@lists.infradead.org, Richard Henderson , Michal Simek , Tony Luck , Greg Kroah-Hartman , Benjamin Herrenschmidt , linux-alpha@vger.kernel.org, Koichi Yasutake , linuxppc-dev@lists.ozlabs.org, "David S. Miller" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Now we have pci_root_buses list, and there is lots of iteration with list_of_each of it, that is not safe after we add pci root bus hotplug support after booting stage. Also pci_find_next_bus is pretty misleading name, and it is only finding next root bus instead of regular pci bus. Add pci_get_next_host_bridge and use bus_find_device in driver core to iterate host bridge and the same time get root bus. In folllowing patches will replace searching root bus with searching host_bridge. after using with that host-bridge, will need to call put device to release reference if break early from the loop. After those replacing, we even could kill pci_root_buses list. -v2: fixes compiling error when CONFIG_PCI is not defined that Fengguang Wu found. Signed-off-by: Yinghai Lu Cc: Mauro Carvalho Chehab Cc: Doug Thompson Cc: linux-edac@vger.kernel.org Cc: x86@kernel.org Cc: David Airlie Cc: dri-devel@lists.freedesktop.org Cc: "David S. Miller" Cc: sparclinux@vger.kernel.org Cc: Tony Luck Cc: Fenghua Yu Cc: linux-ia64@vger.kernel.org Cc: linux-altix@sgi.com Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Matt Turner Cc: linux-alpha@vger.kernel.org Cc: Russell King Cc: linux-arm-kernel@lists.infradead.org Cc: David Howells Cc: Michal Simek Cc: microblaze-uclinux@itee.uq.edu.au Cc: Koichi Yasutake Cc: linux-am33-list@redhat.com Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: linuxppc-dev@lists.ozlabs.org --- drivers/pci/search.c | 24 ++++++++++++++++++++++++ include/linux/pci.h | 9 +++++++++ 2 files changed, 33 insertions(+) diff --git a/drivers/pci/search.c b/drivers/pci/search.c index d0627fa..db0c3a9 100644 --- a/drivers/pci/search.c +++ b/drivers/pci/search.c @@ -178,6 +178,30 @@ struct pci_dev *pci_get_domain_bus_and_slot(int domain, unsigned int bus, } EXPORT_SYMBOL(pci_get_domain_bus_and_slot); +static int match_pci_host_bridge(struct device *dev, void *data) +{ + return 1; +} + +struct pci_host_bridge *pci_get_next_host_bridge(struct pci_host_bridge *from) +{ + struct device *dev; + struct device *dev_start = NULL; + struct pci_host_bridge *bridge = NULL; + + WARN_ON(in_interrupt()); + if (from) + dev_start = &from->dev; + dev = bus_find_device(&pci_host_bridge_bus_type, dev_start, NULL, + match_pci_host_bridge); + if (dev) + bridge = to_pci_host_bridge(dev); + if (from) + put_device(&from->dev); + return bridge; +} +EXPORT_SYMBOL_GPL(pci_get_next_host_bridge); + static int match_pci_dev_by_id(struct device *dev, void *data) { struct pci_dev *pdev = to_pci_dev(dev); diff --git a/include/linux/pci.h b/include/linux/pci.h index 9da06ec..67879cb 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -375,6 +375,8 @@ struct pci_host_bridge { }; #define to_pci_host_bridge(n) container_of(n, struct pci_host_bridge, dev) +#define for_each_pci_host_bridge(d) while ((d = pci_get_next_host_bridge(d)) != NULL) + void pci_set_host_bridge_release(struct pci_host_bridge *bridge, void (*release_fn)(struct pci_host_bridge *), void *release_data); @@ -763,6 +765,7 @@ int pci_find_ht_capability(struct pci_dev *dev, int ht_cap); int pci_find_next_ht_capability(struct pci_dev *dev, int pos, int ht_cap); struct pci_bus *pci_find_next_bus(const struct pci_bus *from); +struct pci_host_bridge *pci_get_next_host_bridge(struct pci_host_bridge *from); struct pci_dev *pci_get_device(unsigned int vendor, unsigned int device, struct pci_dev *from); struct pci_dev *pci_get_subsys(unsigned int vendor, unsigned int device, @@ -1418,6 +1421,12 @@ static inline int pci_domain_nr(struct pci_bus *bus) static inline struct pci_dev *pci_dev_get(struct pci_dev *dev) { return NULL; } +static inline struct pci_host_bridge *pci_get_next_host_bridge( + struct pci_host_bridge *host_bridge) +{ + return NULL; +} + #define dev_is_pci(d) (false) #define dev_is_pf(d) (false) #define dev_num_vf(d) (0)