From patchwork Mon Jan 26 23:25:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Murali Karicheri X-Patchwork-Id: 5712861 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6721A9F4DC for ; Mon, 26 Jan 2015 23:26:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 42171201C0 for ; Mon, 26 Jan 2015 23:26:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D1BB020145 for ; Mon, 26 Jan 2015 23:26:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756237AbbAZX0b (ORCPT ); Mon, 26 Jan 2015 18:26:31 -0500 Received: from comal.ext.ti.com ([198.47.26.152]:34050 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756212AbbAZX0a (ORCPT ); Mon, 26 Jan 2015 18:26:30 -0500 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id t0QNPbeU018276; Mon, 26 Jan 2015 17:25:37 -0600 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id t0QNPaVg011526; Mon, 26 Jan 2015 17:25:36 -0600 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.224.2; Mon, 26 Jan 2015 17:25:36 -0600 Received: from [158.218.104.233] (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id t0QNPZtB030252; Mon, 26 Jan 2015 17:25:35 -0600 Message-ID: <54C6CCF3.7080308@ti.com> Date: Mon, 26 Jan 2015 18:25:39 -0500 From: Murali Karicheri User-Agent: Mozilla/5.0 (X11; Linux i686; rv:12.0) Gecko/20120430 Thunderbird/12.0.1 MIME-Version: 1.0 To: Bjorn Helgaas CC: , , , , , Joerg Roedel , Grant Likely , Rob Herring , Will Deacon , Russell King , Arnd Bergmann , Suravee Suthikulpanit Subject: Re: [PATCH v4 4/6] of/pci: add of_pci_dma_configure() update dma configuration References: <1422052359-12384-1-git-send-email-m-karicheri2@ti.com> <1422052359-12384-5-git-send-email-m-karicheri2@ti.com> <20150123234124.GW29776@google.com> In-Reply-To: <20150123234124.GW29776@google.com> 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=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 01/23/2015 06:41 PM, Bjorn Helgaas wrote: > On Fri, Jan 23, 2015 at 05:32:37PM -0500, Murali Karicheri wrote: >> Add of_pci_dma_configure() to allow updating the dma configuration >> of the pci device using the configuration from DT of the parent of >> the root bridge device. >> >> Cc: Joerg Roedel >> Cc: Grant Likely >> Cc: Rob Herring >> Cc: Bjorn Helgaas >> Cc: Will Deacon >> Cc: Russell King >> Cc: Arnd Bergmann >> Cc: Suravee Suthikulpanit >> >> Signed-off-by: Murali Karicheri >> --- >> drivers/of/of_pci.c | 39 +++++++++++++++++++++++++++++++++++++++ >> include/linux/of_pci.h | 12 ++++++++++++ >> 2 files changed, 51 insertions(+) >> >> diff --git a/drivers/of/of_pci.c b/drivers/of/of_pci.c >> index 88471d3..34878c9 100644 >> --- a/drivers/of/of_pci.c >> +++ b/drivers/of/of_pci.c >> @@ -2,6 +2,7 @@ >> #include >> #include >> #include >> +#include >> #include >> #include >> >> @@ -229,6 +230,44 @@ parse_failed: >> return err; >> } >> EXPORT_SYMBOL_GPL(of_pci_get_host_bridge_resources); >> + >> +/** >> + * of_get_pci_root_bridge_parent - get the OF node of the root bridge's parent >> + * @dev: ptr to pci_dev struct of the pci device >> + * >> + * This function will traverse the bus up to the root bus starting with >> + * the child and return the OF node ptr to root bridge device's parent device. >> + */ >> +struct device_node *of_get_pci_root_bridge_parent(struct pci_dev *dev) > > I'm not an OF person, but this interface seems like it might be too > special-purpose. Maybe it would be enough to add > "of_get_pci_root_bridge()", and the caller could do this: > > struct device *bridge = of_get_pci_root_bridge(dev); > struct device_node *parent_np = bridge->parent->of_node; > > Also, the name "of_get_..." suggests that it increments a refcount, as > of_get_parent() does. But you aren't doing anything with the refcount. > > But I guess an "of_get_pci_root_bridge()" isn't doing anything OF-related, > so maybe we should just add a "pci_get_host_bridge(struct pci_dev *)" > to PCI instead. Bjorn, Thanks for the comment. I think adding pci_get_host_bridge() is a good idea. There is already similar function in host-bridge.c. I have added this function re-using existing function find_pci_root_bus(). See the incremental diff below after this change. Does this look good? { @@ -1823,6 +1825,7 @@ int pci_vpd_find_tag(const u8 *buf, unsigned int off, unsigned int len, u8 rdt); int pci_vpd_find_info_keyword(const u8 *buf, unsigned int off, unsigned int len, const char *kw); /* PCI <-> OF binding helpers */ #ifdef CONFIG_OF struct device_node; > > Bjorn > >> +{ >> + struct pci_bus *bus = dev->bus; >> + struct device *bridge; >> + >> + while (!pci_is_root_bus(bus)) >> + bus = bus->parent; >> + bridge = bus->bridge; >> + >> + return bridge->parent->of_node; >> +} >> +EXPORT_SYMBOL_GPL(of_get_pci_root_bridge_parent); >> + >> +/** >> + * of_pci_dma_configure - Setup DMA configuration >> + * @dev: ptr to pci_dev struct of the pci device >> + * >> + * Function to update PCI devices's DMA configuration using the same >> + * info from the OF node of root host bridge's parent. >> + */ >> +void of_pci_dma_configure(struct pci_dev *pci_dev) >> +{ >> + struct device *dev =&pci_dev->dev; >> + struct device_node *parent_np; >> + >> + parent_np = of_get_pci_root_bridge_parent(pci_dev); >> + of_dma_configure(dev, parent_np); >> +} >> +EXPORT_SYMBOL_GPL(of_pci_dma_configure); >> + >> #endif /* CONFIG_OF_ADDRESS */ >> >> #ifdef CONFIG_PCI_MSI >> diff --git a/include/linux/of_pci.h b/include/linux/of_pci.h >> index ce0e5ab..0465a2a 100644 >> --- a/include/linux/of_pci.h >> +++ b/include/linux/of_pci.h >> @@ -16,6 +16,8 @@ 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_get_pci_domain_nr(struct device_node *node); >> +struct device_node *of_get_pci_root_bridge_parent(struct pci_dev *dev); >> +void of_pci_dma_configure(struct pci_dev *pci_dev); >> #else >> static inline int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq) >> { >> @@ -50,6 +52,16 @@ of_get_pci_domain_nr(struct device_node *node) >> { >> return -1; >> } >> + >> +static inline struct device_node >> +*of_get_pci_root_bridge_parent(struct pci_dev *dev) >> +{ >> + return NULL; >> +} >> + >> +static inline void of_pci_dma_configure(struct pci_dev *pci_dev) >> +{ >> +} >> #endif >> >> #if defined(CONFIG_OF_ADDRESS) >> -- >> 1.7.9.5 >> diff --git a/drivers/of/of_pci.c b/drivers/of/of_pci.c index 34878c9..77b15b5 100644 --- a/drivers/of/of_pci.c +++ b/drivers/of/of_pci.c @@ -232,26 +232,6 @@ parse_failed: EXPORT_SYMBOL_GPL(of_pci_get_host_bridge_resources); /** - * of_get_pci_root_bridge_parent - get the OF node of the root bridge's parent - * @dev: ptr to pci_dev struct of the pci device - * - * This function will traverse the bus up to the root bus starting with - * the child and return the OF node ptr to root bridge device's parent device. - */ -struct device_node *of_get_pci_root_bridge_parent(struct pci_dev *dev) -{ - struct pci_bus *bus = dev->bus; - struct device *bridge; - - while (!pci_is_root_bus(bus)) - bus = bus->parent; - bridge = bus->bridge; - - return bridge->parent->of_node; -} -EXPORT_SYMBOL_GPL(of_get_pci_root_bridge_parent); - -/** * of_pci_dma_configure - Setup DMA configuration * @dev: ptr to pci_dev struct of the pci device * @@ -261,10 +241,9 @@ EXPORT_SYMBOL_GPL(of_get_pci_root_bridge_parent); void of_pci_dma_configure(struct pci_dev *pci_dev) { struct device *dev = &pci_dev->dev; - struct device_node *parent_np; + struct device *bridge = pci_get_host_bridge(pci_dev); - parent_np = of_get_pci_root_bridge_parent(pci_dev); - of_dma_configure(dev, parent_np); + of_dma_configure(dev, bridge->parent->of_node); } EXPORT_SYMBOL_GPL(of_pci_dma_configure); diff --git a/drivers/pci/host-bridge.c b/drivers/pci/host-bridge.c index 0e5f3c9..9803aa6 100644 --- a/drivers/pci/host-bridge.c +++ b/drivers/pci/host-bridge.c @@ -23,6 +23,13 @@ static struct pci_host_bridge *find_pci_host_bridge(struct pci_bus *bus) return to_pci_host_bridge(root_bus->bridge); } +struct device *pci_get_host_bridge(struct pci_dev *dev) +{ + struct pci_bus *root_bus = find_pci_root_bus(dev->bus); + + return root_bus->bridge; +} + void pci_set_host_bridge_release(struct pci_host_bridge *bridge, void (*release_fn)(struct pci_host_bridge *), void *release_data) diff --git a/include/linux/pci.h b/include/linux/pci.h index 9603094..5bcdfa6 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -513,6 +513,8 @@ static inline struct pci_dev *pci_upstream_bridge(struct pci_dev *dev) return dev->bus->self; } +struct device *pci_get_host_bridge(struct pci_dev *dev); + #ifdef CONFIG_PCI_MSI static inline bool pci_dev_msi_enabled(struct pci_dev *pci_dev)