From patchwork Wed Sep 10 13:04:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liviu Dudau X-Patchwork-Id: 4877031 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B1442C0338 for ; Wed, 10 Sep 2014 13:09:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2961D201B9 for ; Wed, 10 Sep 2014 13:09:36 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9D0212018B for ; Wed, 10 Sep 2014 13:09:34 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XRhaJ-0005OP-7F; Wed, 10 Sep 2014 13:05:19 +0000 Received: from service87.mimecast.com ([91.220.42.44]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XRha2-00042I-H4 for linux-arm-kernel@lists.infradead.org; Wed, 10 Sep 2014 13:05:04 +0000 Received: from cam-owa1.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) by service87.mimecast.com; Wed, 10 Sep 2014 14:04:35 +0100 Received: from e106497-lin.cambridge.arm.com ([10.1.255.212]) by cam-owa1.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 10 Sep 2014 14:04:33 +0100 Received: by e106497-lin.cambridge.arm.com (Postfix, from userid 1005) id 604131077BF6; Wed, 10 Sep 2014 14:04:32 +0100 (BST) Date: Wed, 10 Sep 2014 14:04:32 +0100 From: Liviu Dudau To: Rob Herring Subject: Re: [PATCH v10 07/10] OF: Introduce helper function for getting PCI domain_nr Message-ID: <20140910130432.GB27864@e106497-lin.cambridge.arm.com> References: <1410184472-17630-1-git-send-email-Liviu.Dudau@arm.com> <1410184472-17630-8-git-send-email-Liviu.Dudau@arm.com> <20140908145459.GO27864@e106497-lin.cambridge.arm.com> <20140908155931.GP27864@e106497-lin.cambridge.arm.com> MIME-Version: 1.0 In-Reply-To: <20140908155931.GP27864@e106497-lin.cambridge.arm.com> User-Agent: Mutt/1.5.22 (2013-10-16) X-OriginalArrivalTime: 10 Sep 2014 13:04:33.0624 (UTC) FILETIME=[C41CBD80:01CFCCF7] X-MC-Unique: 114091014043511901 Content-Disposition: inline X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140910_060503_088110_B3FFA65A X-CRM114-Status: GOOD ( 27.32 ) X-Spam-Score: -2.3 (--) Cc: linux-arch , Grant Likely , Kukjin Kim , Russell King , Arnd Bergmann , Device Tree ML , linux-pci , Catalin Marinas , Linus Walleij , Jingoo Han , Will Deacon , LKML , Jason Gunthorpe , "grant.likely@linaro.org" , Rob Herring , Tanmay Inamdar , Suravee Suthikulanit , Benjamin Herrenschmidt , Bjorn Helgaas , Sinan Kaya , LAKML X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 On Mon, Sep 08, 2014 at 04:59:31PM +0100, Liviu Dudau wrote: > On Mon, Sep 08, 2014 at 04:27:36PM +0100, Rob Herring wrote: > > On Mon, Sep 8, 2014 at 9:54 AM, Liviu Dudau wrote: > > > On Mon, Sep 08, 2014 at 03:27:56PM +0100, Rob Herring wrote: > > >> On Mon, Sep 8, 2014 at 8:54 AM, Liviu Dudau wrote: > > >> > Add of_pci_get_domain_nr() to retrieve the PCI domain number > > >> > of a given device from DT. If the information is not present, > > >> > the function can be requested to allocate a new domain number. > > >> > > > >> > Cc: Bjorn Helgaas > > >> > Cc: Arnd Bergmann > > >> > Cc: Grant Likely > > >> > Cc: Rob Herring > > >> > Reviewed-by: Catalin Marinas > > >> > Signed-off-by: Liviu Dudau > > >> > --- > > >> > drivers/of/of_pci.c | 34 ++++++++++++++++++++++++++++++++++ > > >> > include/linux/of_pci.h | 7 +++++++ > > >> > 2 files changed, 41 insertions(+) > > >> > > > >> > diff --git a/drivers/of/of_pci.c b/drivers/of/of_pci.c > > >> > index 8481996..a107edb 100644 > > >> > --- a/drivers/of/of_pci.c > > >> > +++ b/drivers/of/of_pci.c > > >> > @@ -89,6 +89,40 @@ int of_pci_parse_bus_range(struct device_node *node, struct resource *res) > > >> > } > > >> > EXPORT_SYMBOL_GPL(of_pci_parse_bus_range); > > >> > > > >> > +static atomic_t of_domain_nr = ATOMIC_INIT(-1); > > >> > + > > >> > +/** > > >> > + * This function will try to obtain the host bridge domain number by > > >> > + * using of_alias_get_id() call with "pci-domain" as a stem. If that > > >> > + * fails, a local allocator will be used. The local allocator can > > >> > + * be requested to return a new domain_nr if the information is missing > > >> > + * from the device tree. > > >> > + * > > >> > + * @node: device tree node with the domain information > > >> > + * @allocate_if_missing: if DT lacks information about the domain nr, > > >> > + * allocate a new number. > > >> > + * > > >> > + * Returns the associated domain number from DT, or a new domain number > > >> > + * if DT information is missing and @allocate_if_missing is true. If > > >> > + * @allocate_if_missing is false then the last allocated domain number > > >> > + * will be returned. > > >> > + */ > > >> > +int of_pci_get_domain_nr(struct device_node *node, bool allocate_if_missing) > > >> > +{ > > >> > + int domain; > > >> > + > > >> > + domain = of_alias_get_id(node, "pci-domain"); > > >> > + if (domain == -ENODEV) { > > >> > + if (allocate_if_missing) > > >> > + domain = atomic_inc_return(&of_domain_nr); > > >> > + else > > >> > + domain = atomic_read(&of_domain_nr); > > >> > > >> This function seems a bit broken to me. It is overloaded with too many > > >> different outcomes. Think about how this would work if you have > > >> multiple PCI buses and a mixture of having pci-domain aliases or not. > > >> Aren't domain numbers global? Allocation should then start outside of > > >> the range of alias ids. > > >> > > >> Rob > > >> > > > > > > Rob, > > > > > > Would this version make more sense? > > > > No. > > Hi Rob, Here is an updated version of the patch. I have implemented a separate function for getting the max domain number from the device tree and use the result as the start value + 1 for the allocator. Best regards, Liviu From 77257fceaa8fbd74d6132fcf57c3af14bd48c0ae Mon Sep 17 00:00:00 2001 From: Liviu Dudau Date: Mon, 4 Aug 2014 17:03:04 +0100 Subject: [PATCH v10 07/10] OF: Introduce helper function for getting PCI domain_nr Add of_pci_get_domain_nr() to retrieve the PCI domain number of a given device from DT. If the information is not present, the function can be requested to allocate a new domain number. Cc: Bjorn Helgaas Cc: Arnd Bergmann Cc: Grant Likely Cc: Rob Herring Reviewed-by: Catalin Marinas Signed-off-by: Liviu Dudau --- drivers/of/of_pci.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/of_pci.h | 7 ++++++ 2 files changed, 69 insertions(+) diff --git a/drivers/of/of_pci.c b/drivers/of/of_pci.c index 8481996..3560401 100644 --- a/drivers/of/of_pci.c +++ b/drivers/of/of_pci.c @@ -3,6 +3,8 @@ #include #include +#include "of_private.h" + static inline int __of_pci_pci_compare(struct device_node *node, unsigned int data) { @@ -89,6 +91,66 @@ int of_pci_parse_bus_range(struct device_node *node, struct resource *res) } EXPORT_SYMBOL_GPL(of_pci_parse_bus_range); +static atomic_t of_domain_nr = ATOMIC_INIT(-1); + +/* + * Get the maximum value for a domain number from the device tree + */ +static int of_get_max_pci_domain_nr(void) +{ + struct alias_prop *app; + int max_domain = -1; + + mutex_lock(&of_mutex); + list_for_each_entry(app, &aliases_lookup, link) { + if (strncmp(app->stem, "pci-domain", 10) != 0) + continue; + + max_domain = max(max_domain, app->id); + } + mutex_unlock(&of_mutex); + + return max_domain; +} + +/** + * This function will try to obtain the host bridge domain number by + * using of_alias_get_id() call with "pci-domain" as a stem. If that + * fails, a local allocator will be used. The local allocator can + * be requested to return a new domain_nr if the information is missing + * from the device tree. + * + * @node: device tree node with the domain information + * @allocate_if_missing: if DT lacks information about the domain nr, + * allocate a new number. + * + * Returns the associated domain number from DT, or a new domain number + * if DT information is missing and @allocate_if_missing is true. If + * @allocate_if_missing is false then the last allocated domain number + * will be returned. + */ +int of_pci_get_domain_nr(struct device_node *node, bool allocate_if_missing) +{ + int domain; + + domain = atomic_read(&of_domain_nr); + if (of_domain_nr == -1) { + /* first run, get max defined domain nr in device tree */ + domain = of_get_max_pci_domain_nr(); + /* then set the start value for allocator to be max + 1 */ + atomic_set(&of_domain_nr, domain + 1); + } + domain = of_alias_get_id(node, "pci-domain"); + if (domain == -ENODEV) { + domain = atomic_read(&of_domain_nr); + if (allocate_if_missing) + atomic_inc(&of_domain_nr); + } + + return domain; +} +EXPORT_SYMBOL_GPL(of_pci_get_domain_nr); + #ifdef CONFIG_PCI_MSI static LIST_HEAD(of_pci_msi_chip_list); diff --git a/include/linux/of_pci.h b/include/linux/of_pci.h index dde3a4a..3a3824c 100644 --- a/include/linux/of_pci.h +++ b/include/linux/of_pci.h @@ -15,6 +15,7 @@ struct device_node *of_pci_find_child_device(struct device_node *parent, int of_pci_get_devfn(struct device_node *np); int of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin); int of_pci_parse_bus_range(struct device_node *node, struct resource *res); +int of_pci_get_domain_nr(struct device_node *node, bool allocate_if_missing); #else static inline int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq) { @@ -43,6 +44,12 @@ of_pci_parse_bus_range(struct device_node *node, struct resource *res) { return -EINVAL; } + +static inline int +of_pci_get_domain_nr(struct device_node *node, bool allocate_if_missing) +{ + return -1; +} #endif #if defined(CONFIG_OF) && defined(CONFIG_PCI_MSI) -- 2.0.4