From: Bjorn Helgaas <bhelgaas@google.com>
To: Liviu Dudau <Liviu.Dudau@arm.com>
Cc: Arnd Bergmann <arnd@arndb.de>, Rob Herring <robh+dt@kernel.org>,
Jason Gunthorpe <jgunthorpe@obsidianresearch.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Catalin Marinas <Catalin.Marinas@arm.com>,
Will Deacon <Will.Deacon@arm.com>,
Russell King <linux@arm.linux.org.uk>,
linux-pci <linux-pci@vger.kernel.org>,
Linus Walleij <linus.walleij@linaro.org>,
Tanmay Inamdar <tinamdar@apm.com>,
Grant Likely <grant.likely@secretlab.ca>,
Sinan Kaya <okaya@codeaurora.org>,
Jingoo Han <jg1.han@samsung.com>,
Kukjin Kim <kgene.kim@samsung.com>,
Suravee Suthikulanit <suravee.suthikulpanit@amd.com>,
linux-arch <linux-arch@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
Device Tree ML <devicetree@vger.kernel.org>,
LAKML <linux-arm-kernel@lists.infradead.org>,
"grant.likely@linaro.org" <grant.likely@linaro.org>,
Robert Richter <rrichter@cavium.com>
Subject: Re: [PATCH v12 09/12] OF: PCI: Add support for parsing PCI host bridge resources from DT
Date: Wed, 24 Sep 2014 11:31:09 -0600 [thread overview]
Message-ID: <20140924173109.GA20416@google.com> (raw)
In-Reply-To: <20140924164304.GF1994@e106497-lin.cambridge.arm.com>
On Wed, Sep 24, 2014 at 05:43:04PM +0100, Liviu Dudau wrote:
> Provide a function to parse the PCI DT ranges that can be used to
> create a pci_host_bridge structure together with its associated
> bus.
>
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Grant Likely <grant.likely@linaro.org>
> Cc: Rob Herring <robh+dt@kernel.org>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
> [make io_base parameter optional]
> Signed-off-by: Robert Richter <rrichter@cavium.com>
> ---
> Hi Bjorn,
>
> I have fixed the compilation error that this patch was triggering. I
> have validated that the patch applies to your pci/host-generic branch
> as well as to my series.
I applied this to pci/host-generic along with the following patches and
pushed the branch, thanks!
Bjorn
> drivers/of/of_pci.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++++
> include/linux/of_pci.h | 6 +++
> 2 files changed, 123 insertions(+)
>
> diff --git a/drivers/of/of_pci.c b/drivers/of/of_pci.c
> index 82d172f..3cad1af 100644
> --- a/drivers/of/of_pci.c
> +++ b/drivers/of/of_pci.c
> @@ -1,7 +1,9 @@
> #include <linux/kernel.h>
> #include <linux/export.h>
> #include <linux/of.h>
> +#include <linux/of_address.h>
> #include <linux/of_pci.h>
> +#include <linux/slab.h>
>
> static inline int __of_pci_pci_compare(struct device_node *node,
> unsigned int data)
> @@ -114,6 +116,121 @@ int of_get_pci_domain_nr(struct device_node *node)
> }
> EXPORT_SYMBOL_GPL(of_get_pci_domain_nr);
>
> +#if defined(CONFIG_OF_ADDRESS)
> +/**
> + * of_pci_get_host_bridge_resources - Parse PCI host bridge resources from DT
> + * @dev: device node of the host bridge having the range property
> + * @busno: bus number associated with the bridge root bus
> + * @bus_max: maximum number of busses for this bridge
> + * @resources: list where the range of resources will be added after DT parsing
> + * @io_base: pointer to a variable that will contain on return the physical
> + * address for the start of the I/O range. Can be NULL if the caller doesn't
> + * expect IO ranges to be present in the device tree.
> + *
> + * It is the callers job to free the @resources list.
> + *
> + * This function will parse the "ranges" property of a PCI host bridge device
> + * node and setup the resource mapping based on its content. It is expected
> + * that the property conforms with the Power ePAPR document.
> + *
> + * It returns zero if the range parsing has been successful or a standard error
> + * value if it failed.
> + */
> +int of_pci_get_host_bridge_resources(struct device_node *dev,
> + unsigned char busno, unsigned char bus_max,
> + struct list_head *resources, resource_size_t *io_base)
> +{
> + struct resource *res;
> + struct resource *bus_range;
> + struct of_pci_range range;
> + struct of_pci_range_parser parser;
> + char range_type[4];
> + int err;
> +
> + if (io_base)
> + *io_base = (resource_size_t)OF_BAD_ADDR;
> +
> + bus_range = kzalloc(sizeof(*bus_range), GFP_KERNEL);
> + if (!bus_range)
> + return -ENOMEM;
> +
> + pr_info("PCI host bridge %s ranges:\n", dev->full_name);
> +
> + err = of_pci_parse_bus_range(dev, bus_range);
> + if (err) {
> + bus_range->start = busno;
> + bus_range->end = bus_max;
> + bus_range->flags = IORESOURCE_BUS;
> + pr_info(" No bus range found for %s, using %pR\n",
> + dev->full_name, bus_range);
> + } else {
> + if (bus_range->end > bus_range->start + bus_max)
> + bus_range->end = bus_range->start + bus_max;
> + }
> + pci_add_resource(resources, bus_range);
> +
> + /* Check for ranges property */
> + err = of_pci_range_parser_init(&parser, dev);
> + if (err)
> + goto parse_failed;
> +
> + pr_debug("Parsing ranges property...\n");
> + for_each_of_pci_range(&parser, &range) {
> + /* Read next ranges element */
> + if ((range.flags & IORESOURCE_TYPE_BITS) == IORESOURCE_IO)
> + snprintf(range_type, 4, " IO");
> + else if ((range.flags & IORESOURCE_TYPE_BITS) == IORESOURCE_MEM)
> + snprintf(range_type, 4, "MEM");
> + else
> + snprintf(range_type, 4, "err");
> + pr_info(" %s %#010llx..%#010llx -> %#010llx\n", range_type,
> + range.cpu_addr, range.cpu_addr + range.size - 1,
> + range.pci_addr);
> +
> + /*
> + * If we failed translation or got a zero-sized region
> + * then skip this range
> + */
> + if (range.cpu_addr == OF_BAD_ADDR || range.size == 0)
> + continue;
> +
> + res = kzalloc(sizeof(struct resource), GFP_KERNEL);
> + if (!res) {
> + err = -ENOMEM;
> + goto parse_failed;
> + }
> +
> + err = of_pci_range_to_resource(&range, dev, res);
> + if (err)
> + goto conversion_failed;
> +
> + if (resource_type(res) == IORESOURCE_IO) {
> + if (!io_base) {
> + pr_err("I/O range found for %s. Please provide an io_base pointer to save CPU base address\n",
> + dev->full_name);
> + err = -EINVAL;
> + goto conversion_failed;
> + }
> + if (*io_base != (resource_size_t)OF_BAD_ADDR)
> + pr_warn("More than one I/O resource converted for %s. CPU base address for old range lost!\n",
> + dev->full_name);
> + *io_base = range.cpu_addr;
> + }
> +
> + pci_add_resource_offset(resources, res, res->start - range.pci_addr);
> + }
> +
> + return 0;
> +
> +conversion_failed:
> + kfree(res);
> +parse_failed:
> + pci_free_resource_list(resources);
> + return err;
> +}
> +EXPORT_SYMBOL_GPL(of_pci_get_host_bridge_resources);
> +#endif /* CONFIG_OF_ADDRESS */
> +
> #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 71062e9..1fd207e 100644
> --- a/include/linux/of_pci.h
> +++ b/include/linux/of_pci.h
> @@ -52,6 +52,12 @@ of_get_pci_domain_nr(struct device_node *node)
> }
> #endif
>
> +#if defined(CONFIG_OF_ADDRESS)
> +int of_pci_get_host_bridge_resources(struct device_node *dev,
> + unsigned char busno, unsigned char bus_max,
> + struct list_head *resources, resource_size_t *io_base);
> +#endif
> +
> #if defined(CONFIG_OF) && defined(CONFIG_PCI_MSI)
> int of_pci_msi_chip_add(struct msi_chip *chip);
> void of_pci_msi_chip_remove(struct msi_chip *chip);
> --
> 2.1.0
>
>
next prev parent reply other threads:[~2014-09-24 17:31 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-23 19:01 [PATCH v12 00/12] Support for creating generic PCI host bridges from DT Liviu Dudau
2014-09-23 19:01 ` [PATCH v12 01/12] Fix ioport_map() for !CONFIG_GENERIC_IOMAP cases Liviu Dudau
2014-09-23 19:01 ` [PATCH v12 02/12] PCI: Introduce helper functions to deal with PCI I/O ranges Liviu Dudau
2014-09-23 19:01 ` [PATCH v12 03/12] ARM: Define PCI_IOBASE as the base of virtual PCI IO space Liviu Dudau
2014-09-23 19:01 ` [PATCH v12 04/12] PCI: OF: Move of_pci_range_to_resources() into address.c Liviu Dudau
2014-09-23 19:01 ` [PATCH v12 05/12] PCI: OF: Fix the conversion of IO ranges into IO resources Liviu Dudau
2014-09-24 0:22 ` Bjorn Helgaas
2014-09-24 1:12 ` Liviu Dudau
2014-09-24 1:16 ` Bjorn Helgaas
2014-09-24 9:20 ` Robert Richter
2014-09-24 10:14 ` Andrew Murray
2014-09-23 19:01 ` [PATCH v12 06/12] PCI: Create pci_host_bridge before its associated bus in pci_create_root_bus Liviu Dudau
2014-09-25 18:15 ` Yinghai Lu
2014-09-25 19:59 ` Bjorn Helgaas
2014-09-26 14:58 ` Liviu Dudau
2014-09-26 16:17 ` Bjorn Helgaas
2014-09-23 19:01 ` [PATCH v12 07/12] PCI: Introduce generic domain handling for PCI busses Liviu Dudau
2014-09-23 19:01 ` [PATCH v12 08/12] PCI: OF: Introduce helper function for retrieving PCI domain numbers Liviu Dudau
2014-09-26 18:20 ` Rob Herring
2014-09-26 21:20 ` liviu
2014-09-26 21:53 ` Rob Herring
2014-09-26 22:47 ` Liviu Dudau
2014-09-27 20:18 ` Bjorn Helgaas
2014-09-23 19:01 ` [PATCH v12 09/12] OF: PCI: Add support for parsing PCI host bridge resources from DT Liviu Dudau
2014-09-24 16:43 ` Liviu Dudau
2014-09-24 17:31 ` Bjorn Helgaas [this message]
2014-09-24 17:53 ` Liviu Dudau
2014-09-24 18:01 ` Will Deacon
2014-09-25 8:54 ` Liviu Dudau
2014-09-25 9:04 ` Will Deacon
2014-09-23 19:01 ` [PATCH v12 10/12] PCI: Assign unassigned bus resources in pci_scan_root_bus() Liviu Dudau
2014-09-24 1:18 ` Liviu Dudau
2014-09-24 1:41 ` Bjorn Helgaas
2014-09-24 1:48 ` Liviu Dudau
2014-09-28 21:16 ` Suravee Suthikulpanit
2014-09-29 18:18 ` Arnd Bergmann
2014-09-23 19:01 ` [PATCH v12 11/12] PCI: Introduce pci_remap_iospace() for remapping PCI I/O bus resources into CPU space Liviu Dudau
2014-09-23 19:01 ` [PATCH v12 12/12] arm64: Add architectural support for PCIe Liviu Dudau
2014-09-23 21:54 ` [PATCH v12 00/12] Support for creating generic PCI host bridges from DT Bjorn Helgaas
2014-09-23 22:48 ` Liviu Dudau
2014-09-23 23:00 ` Bjorn Helgaas
2014-09-24 13:30 ` Rob Herring
2014-09-24 14:23 ` Liviu Dudau
2014-09-24 15:38 ` Bjorn Helgaas
2014-09-23 22:49 ` Liviu Dudau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140924173109.GA20416@google.com \
--to=bhelgaas@google.com \
--cc=Catalin.Marinas@arm.com \
--cc=Liviu.Dudau@arm.com \
--cc=Will.Deacon@arm.com \
--cc=arnd@arndb.de \
--cc=benh@kernel.crashing.org \
--cc=devicetree@vger.kernel.org \
--cc=grant.likely@linaro.org \
--cc=grant.likely@secretlab.ca \
--cc=jg1.han@samsung.com \
--cc=jgunthorpe@obsidianresearch.com \
--cc=kgene.kim@samsung.com \
--cc=linus.walleij@linaro.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=okaya@codeaurora.org \
--cc=robh+dt@kernel.org \
--cc=rrichter@cavium.com \
--cc=suravee.suthikulpanit@amd.com \
--cc=tinamdar@apm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).