Re: [PATCH v3 19/25] PCI: of: Add inbound resource parsing to helpers

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, Oct 30, 2019 at 12:49:59PM +0000, Robin Murphy wrote:
> On 30/10/2019 11:48, Lorenzo Pieralisi wrote:
> > [+Cc Robin]
> > 
> > On Wed, Oct 30, 2019 at 12:14:54PM +0530, Srinath Mannam wrote:
> > > Hi Lorenzo,
> > > 
> > > Thanks for the details.
> > > Based on Robin's comment in the old patch, I thought dma_ranges list
> > > will be in sorted order.
> > > https://lore.kernel.org/lkml/741a4210-251c-9c00-d4a7-bc7ebf8cd57b@xxxxxxx/
> > > 
> > > Now, another patch is required to sort the list before reserving in
> > > iova_reserve_pci_windows() function.
> > > 
> > > Regards,
> > > Srinath.
> > 
> > Don't top-post please.
> > 
> > https://en.wikipedia.org/wiki/Posting_style#Top-posting
> > 
> > Yes, the dma_ranges list must be sorted somehow I reckon
> > iova_reserve_pci_windows() is where it should be done (since that's
> > where the requirement is) or it can be done in
> > devm_of_pci_get_host_bridge_resources().
> > 
> > Thoughts ?
> 
> Right, strictly it's only iova_reserve_pci_windows() that needs the list
> sorted, it just worked out that maintaining the list in sorted order by
> construction took a fair bit less code than explicitly sorting it. In terms
> of preserving that behaviour in a slightly more generalised fashion I
> suppose we could add something like:
> 
> void pci_add_resource_offset_sorted(struct list_head *resources,
> 				struct resource *res,
> 				resource_size_t offset)
> {
> 	struct resource_entry *entry;
> 
> 	resource_list_for_each_entry(entry, resources)
> 		if (entry->res.start > res.start)
> 			break;
> 	
> 	pci_add_resource_offset(&entry->node, res, offset);
> }
> 
> but if you'd rather add a specific resource_list_sort() or even just
> open-code it in iommu-dma, I don't have any real preference. The "least code
> necessary" approach definitely made sense when individual drivers were
> expected to build their own lists, but once it gets generalised then having
> a sensible and robust API becomes a more important consideration.

I think that open coding it in iommu-dma is fine, @RobH would you be
able to add this to the series please ? I think it should be added to
prevent any regressions, we can't rely on dma-ranges entries order in DT
files.

Thanks !
Lorenzo


> Robin.
> 
> > 
> > Lorenzo
> > 
> > > On Tue, Oct 29, 2019 at 11:04 PM Lorenzo Pieralisi
> > > <lorenzo.pieralisi@xxxxxxx> wrote:
> > > > 
> > > > On Tue, Oct 29, 2019 at 09:26:51PM +0530, Srinath Mannam wrote:
> > > > > Hi Lorenzo,
> > > > > 
> > > > > All changes are looks good to me.
> > > > > I have one doubt regarding, resources added in the
> > > > > "bridge->dma_ranges" list are expected to be in sorted order which are
> > > > > used in "iova_reserve_pci_windows". Please correct me if I missed any
> > > > > patch specific to this.
> > > > 
> > > > No I don't think so, it is just that we need to decide which piece of
> > > > code should sort that list, whether in this patchset or by patching the
> > > > kernel in iova_reserve_pci_windows().
> > > > 
> > > > I tend to think the sorting should be done in iova_reserve_pci_windows()
> > > > because that's where the requirement is.
> > > > 
> > > > Lorenzo
> > > > 
> > > > > Regards,
> > > > > Srinath.
> > > > > 
> > > > > On Tue, Oct 29, 2019 at 4:37 PM Lorenzo Pieralisi
> > > > > <lorenzo.pieralisi@xxxxxxx> wrote:
> > > > > > 
> > > > > > On Mon, Oct 28, 2019 at 11:32:50AM -0500, Rob Herring wrote:
> > > > > > > Extend devm_of_pci_get_host_bridge_resources() and
> > > > > > > pci_parse_request_of_pci_ranges() helpers to also parse the inbound
> > > > > > > addresses from DT 'dma-ranges' and populate a resource list with the
> > > > > > > translated addresses. This will help ensure 'dma-ranges' is always
> > > > > > > parsed in a consistent way.
> > > > > > > 
> > > > > > > Cc: Jingoo Han <jingoohan1@xxxxxxxxx>
> > > > > > > Cc: Gustavo Pimentel <gustavo.pimentel@xxxxxxxxxxxx>
> > > > > > > Cc: Lorenzo Pieralisi <lorenzo.pieralisi@xxxxxxx>
> > > > > > > Cc: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
> > > > > > > Cc: Thomas Petazzoni <thomas.petazzoni@xxxxxxxxxxx>
> > > > > > > Cc: Will Deacon <will@xxxxxxxxxx>
> > > > > > > Cc: Linus Walleij <linus.walleij@xxxxxxxxxx>
> > > > > > > Cc: Toan Le <toan@xxxxxxxxxxxxxxxxxxxxxx>
> > > > > > > Cc: Ley Foon Tan <lftan@xxxxxxxxxx>
> > > > > > > Cc: Tom Joseph <tjoseph@xxxxxxxxxxx>
> > > > > > > Cc: Ray Jui <rjui@xxxxxxxxxxxx>
> > > > > > > Cc: Scott Branden <sbranden@xxxxxxxxxxxx>
> > > > > > > Cc: bcm-kernel-feedback-list@xxxxxxxxxxxx
> > > > > > > Cc: Ryder Lee <ryder.lee@xxxxxxxxxxxx>
> > > > > > > Cc: Karthikeyan Mitran <m.karthikeyan@xxxxxxxxxxxxxx>
> > > > > > > Cc: Hou Zhiqiang <Zhiqiang.Hou@xxxxxxx>
> > > > > > > Cc: Simon Horman <horms@xxxxxxxxxxxx>
> > > > > > > Cc: Shawn Lin <shawn.lin@xxxxxxxxxxxxxx>
> > > > > > > Cc: Heiko Stuebner <heiko@xxxxxxxxx>
> > > > > > > Cc: Michal Simek <michal.simek@xxxxxxxxxx>
> > > > > > > Cc: rfi@xxxxxxxxxxxxxxxxxxxxxx
> > > > > > > Cc: linux-mediatek@xxxxxxxxxxxxxxxxxxx
> > > > > > > Cc: linux-renesas-soc@xxxxxxxxxxxxxxx
> > > > > > > Cc: linux-rockchip@xxxxxxxxxxxxxxxxxxx
> > > > > > > Tested-by: Thomas Petazzoni <thomas.petazzoni@xxxxxxxxxxx> # for AArdvark
> > > > > > > Reviewed-by: Andrew Murray <andrew.murray@xxxxxxx>
> > > > > > > Acked-by: Gustavo Pimentel <gustavo.pimentel@xxxxxxxxxxxx>
> > > > > > > Signed-off-by: Rob Herring <robh@xxxxxxxxxx>
> > > > > > > ---
> > > > > > > v2:
> > > > > > >   - Fix crash in INIT_LIST_HEAD when ib_resources is NULL
> > > > > > > ---
> > > > > > >   .../pci/controller/dwc/pcie-designware-host.c |  3 +-
> > > > > > >   drivers/pci/controller/pci-aardvark.c         |  2 +-
> > > > > > >   drivers/pci/controller/pci-ftpci100.c         |  3 +-
> > > > > > >   drivers/pci/controller/pci-host-common.c      |  2 +-
> > > > > > >   drivers/pci/controller/pci-v3-semi.c          |  3 +-
> > > > > > >   drivers/pci/controller/pci-versatile.c        |  3 +-
> > > > > > >   drivers/pci/controller/pci-xgene.c            |  3 +-
> > > > > > >   drivers/pci/controller/pcie-altera.c          |  2 +-
> > > > > > >   drivers/pci/controller/pcie-cadence-host.c    |  2 +-
> > > > > > >   drivers/pci/controller/pcie-iproc-platform.c  |  3 +-
> > > > > > >   drivers/pci/controller/pcie-mediatek.c        |  2 +-
> > > > > > >   drivers/pci/controller/pcie-mobiveil.c        |  3 +-
> > > > > > >   drivers/pci/controller/pcie-rcar.c            |  3 +-
> > > > > > >   drivers/pci/controller/pcie-rockchip-host.c   |  3 +-
> > > > > > >   drivers/pci/controller/pcie-xilinx-nwl.c      |  3 +-
> > > > > > >   drivers/pci/controller/pcie-xilinx.c          |  3 +-
> > > > > > >   drivers/pci/of.c                              | 45 ++++++++++++++++++-
> > > > > > >   drivers/pci/pci.h                             |  8 +++-
> > > > > > >   include/linux/pci.h                           |  9 ++--
> > > > > > >   19 files changed, 82 insertions(+), 23 deletions(-)
> > > > > > 
> > > > > > Hi Bjorn,
> > > > > > 
> > > > > > please let me know if you are OK with this patch, the series is
> > > > > > ready to go upstream IMO.
> > > > > > 
> > > > > > Thanks,
> > > > > > Lorenzo
> > > > > > 
> > > > > > > diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c
> > > > > > > index aeec8b65eb97..f7b1d80c4a0a 100644
> > > > > > > --- a/drivers/pci/controller/dwc/pcie-designware-host.c
> > > > > > > +++ b/drivers/pci/controller/dwc/pcie-designware-host.c
> > > > > > > @@ -342,7 +342,8 @@ int dw_pcie_host_init(struct pcie_port *pp)
> > > > > > >        if (!bridge)
> > > > > > >                return -ENOMEM;
> > > > > > > 
> > > > > > > -     ret = pci_parse_request_of_pci_ranges(dev, &bridge->windows, NULL);
> > > > > > > +     ret = pci_parse_request_of_pci_ranges(dev, &bridge->windows,
> > > > > > > +                                           &bridge->dma_ranges, NULL);
> > > > > > >        if (ret)
> > > > > > >                return ret;
> > > > > > > 
> > > > > > > diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
> > > > > > > index 9cbeba507f0c..b34eaa2cd762 100644
> > > > > > > --- a/drivers/pci/controller/pci-aardvark.c
> > > > > > > +++ b/drivers/pci/controller/pci-aardvark.c
> > > > > > > @@ -939,7 +939,7 @@ static int advk_pcie_probe(struct platform_device *pdev)
> > > > > > >        }
> > > > > > > 
> > > > > > >        ret = pci_parse_request_of_pci_ranges(dev, &bridge->windows,
> > > > > > > -                                           &bus);
> > > > > > > +                                           &bridge->dma_ranges, &bus);
> > > > > > >        if (ret) {
> > > > > > >                dev_err(dev, "Failed to parse resources\n");
> > > > > > >                return ret;
> > > > > > > diff --git a/drivers/pci/controller/pci-ftpci100.c b/drivers/pci/controller/pci-ftpci100.c
> > > > > > > index 75603348b88a..66288b94e92d 100644
> > > > > > > --- a/drivers/pci/controller/pci-ftpci100.c
> > > > > > > +++ b/drivers/pci/controller/pci-ftpci100.c
> > > > > > > @@ -477,7 +477,8 @@ static int faraday_pci_probe(struct platform_device *pdev)
> > > > > > >        if (IS_ERR(p->base))
> > > > > > >                return PTR_ERR(p->base);
> > > > > > > 
> > > > > > > -     ret = pci_parse_request_of_pci_ranges(dev, &host->windows, NULL);
> > > > > > > +     ret = pci_parse_request_of_pci_ranges(dev, &host->windows,
> > > > > > > +                                           &host->dma_ranges, NULL);
> > > > > > >        if (ret)
> > > > > > >                return ret;
> > > > > > > 
> > > > > > > diff --git a/drivers/pci/controller/pci-host-common.c b/drivers/pci/controller/pci-host-common.c
> > > > > > > index c8cb9c5188a4..250a3fc80ec6 100644
> > > > > > > --- a/drivers/pci/controller/pci-host-common.c
> > > > > > > +++ b/drivers/pci/controller/pci-host-common.c
> > > > > > > @@ -27,7 +27,7 @@ static struct pci_config_window *gen_pci_init(struct device *dev,
> > > > > > >        struct pci_config_window *cfg;
> > > > > > > 
> > > > > > >        /* Parse our PCI ranges and request their resources */
> > > > > > > -     err = pci_parse_request_of_pci_ranges(dev, resources, &bus_range);
> > > > > > > +     err = pci_parse_request_of_pci_ranges(dev, resources, NULL, &bus_range);
> > > > > > >        if (err)
> > > > > > >                return ERR_PTR(err);
> > > > > > > 
> > > > > > > diff --git a/drivers/pci/controller/pci-v3-semi.c b/drivers/pci/controller/pci-v3-semi.c
> > > > > > > index 96677520f6c1..2209c7671115 100644
> > > > > > > --- a/drivers/pci/controller/pci-v3-semi.c
> > > > > > > +++ b/drivers/pci/controller/pci-v3-semi.c
> > > > > > > @@ -776,7 +776,8 @@ static int v3_pci_probe(struct platform_device *pdev)
> > > > > > >        if (IS_ERR(v3->config_base))
> > > > > > >                return PTR_ERR(v3->config_base);
> > > > > > > 
> > > > > > > -     ret = pci_parse_request_of_pci_ranges(dev, &host->windows, NULL);
> > > > > > > +     ret = pci_parse_request_of_pci_ranges(dev, &host->windows,
> > > > > > > +                                           &host->dma_ranges, NULL);
> > > > > > >        if (ret)
> > > > > > >                return ret;
> > > > > > > 
> > > > > > > diff --git a/drivers/pci/controller/pci-versatile.c b/drivers/pci/controller/pci-versatile.c
> > > > > > > index eae1b859990b..b911359b6d81 100644
> > > > > > > --- a/drivers/pci/controller/pci-versatile.c
> > > > > > > +++ b/drivers/pci/controller/pci-versatile.c
> > > > > > > @@ -92,7 +92,8 @@ static int versatile_pci_probe(struct platform_device *pdev)
> > > > > > >        if (IS_ERR(versatile_cfg_base[1]))
> > > > > > >                return PTR_ERR(versatile_cfg_base[1]);
> > > > > > > 
> > > > > > > -     ret = pci_parse_request_of_pci_ranges(dev, &bridge->windows, NULL);
> > > > > > > +     ret = pci_parse_request_of_pci_ranges(dev, &bridge->windows,
> > > > > > > +                                           NULL, NULL);
> > > > > > >        if (ret)
> > > > > > >                return ret;
> > > > > > > 
> > > > > > > diff --git a/drivers/pci/controller/pci-xgene.c b/drivers/pci/controller/pci-xgene.c
> > > > > > > index 7d0f0395a479..9408269d943d 100644
> > > > > > > --- a/drivers/pci/controller/pci-xgene.c
> > > > > > > +++ b/drivers/pci/controller/pci-xgene.c
> > > > > > > @@ -627,7 +627,8 @@ static int xgene_pcie_probe(struct platform_device *pdev)
> > > > > > >        if (ret)
> > > > > > >                return ret;
> > > > > > > 
> > > > > > > -     ret = pci_parse_request_of_pci_ranges(dev, &bridge->windows, NULL);
> > > > > > > +     ret = pci_parse_request_of_pci_ranges(dev, &bridge->windows,
> > > > > > > +                                           &bridge->dma_ranges, NULL);
> > > > > > >        if (ret)
> > > > > > >                return ret;
> > > > > > > 
> > > > > > > diff --git a/drivers/pci/controller/pcie-altera.c b/drivers/pci/controller/pcie-altera.c
> > > > > > > index ba025efeae28..b447c3e4abad 100644
> > > > > > > --- a/drivers/pci/controller/pcie-altera.c
> > > > > > > +++ b/drivers/pci/controller/pcie-altera.c
> > > > > > > @@ -800,7 +800,7 @@ static int altera_pcie_probe(struct platform_device *pdev)
> > > > > > >        }
> > > > > > > 
> > > > > > >        ret = pci_parse_request_of_pci_ranges(dev, &bridge->windows,
> > > > > > > -                                           NULL);
> > > > > > > +                                           &bridge->dma_ranges, NULL);
> > > > > > >        if (ret) {
> > > > > > >                dev_err(dev, "Failed add resources\n");
> > > > > > >                return ret;
> > > > > > > diff --git a/drivers/pci/controller/pcie-cadence-host.c b/drivers/pci/controller/pcie-cadence-host.c
> > > > > > > index 97e251090b4f..a8f7a6284c3e 100644
> > > > > > > --- a/drivers/pci/controller/pcie-cadence-host.c
> > > > > > > +++ b/drivers/pci/controller/pcie-cadence-host.c
> > > > > > > @@ -211,7 +211,7 @@ static int cdns_pcie_host_init(struct device *dev,
> > > > > > >        int err;
> > > > > > > 
> > > > > > >        /* Parse our PCI ranges and request their resources */
> > > > > > > -     err = pci_parse_request_of_pci_ranges(dev, resources, &bus_range);
> > > > > > > +     err = pci_parse_request_of_pci_ranges(dev, resources, NULL, &bus_range);
> > > > > > >        if (err)
> > > > > > >                return err;
> > > > > > > 
> > > > > > > diff --git a/drivers/pci/controller/pcie-iproc-platform.c b/drivers/pci/controller/pcie-iproc-platform.c
> > > > > > > index 375d815f7301..ff0a81a632a1 100644
> > > > > > > --- a/drivers/pci/controller/pcie-iproc-platform.c
> > > > > > > +++ b/drivers/pci/controller/pcie-iproc-platform.c
> > > > > > > @@ -95,7 +95,8 @@ static int iproc_pcie_pltfm_probe(struct platform_device *pdev)
> > > > > > >        if (IS_ERR(pcie->phy))
> > > > > > >                return PTR_ERR(pcie->phy);
> > > > > > > 
> > > > > > > -     ret = pci_parse_request_of_pci_ranges(dev, &bridge->windows, NULL);
> > > > > > > +     ret = pci_parse_request_of_pci_ranges(dev, &bridge->windows,
> > > > > > > +                                           &bridge->dma_ranges, NULL);
> > > > > > >        if (ret) {
> > > > > > >                dev_err(dev, "unable to get PCI host bridge resources\n");
> > > > > > >                return ret;
> > > > > > > diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c
> > > > > > > index d9206a3cd56b..cb982891b22b 100644
> > > > > > > --- a/drivers/pci/controller/pcie-mediatek.c
> > > > > > > +++ b/drivers/pci/controller/pcie-mediatek.c
> > > > > > > @@ -1034,7 +1034,7 @@ static int mtk_pcie_setup(struct mtk_pcie *pcie)
> > > > > > >        int err;
> > > > > > > 
> > > > > > >        err = pci_parse_request_of_pci_ranges(dev, windows,
> > > > > > > -                                           &bus);
> > > > > > > +                                           &host->dma_ranges, &bus);
> > > > > > >        if (err)
> > > > > > >                return err;
> > > > > > > 
> > > > > > > diff --git a/drivers/pci/controller/pcie-mobiveil.c b/drivers/pci/controller/pcie-mobiveil.c
> > > > > > > index 4eab8624ce4d..257ba49c177c 100644
> > > > > > > --- a/drivers/pci/controller/pcie-mobiveil.c
> > > > > > > +++ b/drivers/pci/controller/pcie-mobiveil.c
> > > > > > > @@ -875,7 +875,8 @@ static int mobiveil_pcie_probe(struct platform_device *pdev)
> > > > > > >        }
> > > > > > > 
> > > > > > >        /* parse the host bridge base addresses from the device tree file */
> > > > > > > -     ret = pci_parse_request_of_pci_ranges(dev, &bridge->windows, NULL);
> > > > > > > +     ret = pci_parse_request_of_pci_ranges(dev, &bridge->windows,
> > > > > > > +                                           &bridge->dma_ranges, NULL);
> > > > > > >        if (ret) {
> > > > > > >                dev_err(dev, "Getting bridge resources failed\n");
> > > > > > >                return ret;
> > > > > > > diff --git a/drivers/pci/controller/pcie-rcar.c b/drivers/pci/controller/pcie-rcar.c
> > > > > > > index f6a669a9af41..b8d6e86a5539 100644
> > > > > > > --- a/drivers/pci/controller/pcie-rcar.c
> > > > > > > +++ b/drivers/pci/controller/pcie-rcar.c
> > > > > > > @@ -1138,7 +1138,8 @@ static int rcar_pcie_probe(struct platform_device *pdev)
> > > > > > >        pcie->dev = dev;
> > > > > > >        platform_set_drvdata(pdev, pcie);
> > > > > > > 
> > > > > > > -     err = pci_parse_request_of_pci_ranges(dev, &pcie->resources, NULL);
> > > > > > > +     err = pci_parse_request_of_pci_ranges(dev, &pcie->resources,
> > > > > > > +                                           &bridge->dma_ranges, NULL);
> > > > > > >        if (err)
> > > > > > >                goto err_free_bridge;
> > > > > > > 
> > > > > > > diff --git a/drivers/pci/controller/pcie-rockchip-host.c b/drivers/pci/controller/pcie-rockchip-host.c
> > > > > > > index f375e55ea02e..ee83f8494ee9 100644
> > > > > > > --- a/drivers/pci/controller/pcie-rockchip-host.c
> > > > > > > +++ b/drivers/pci/controller/pcie-rockchip-host.c
> > > > > > > @@ -1004,7 +1004,8 @@ static int rockchip_pcie_probe(struct platform_device *pdev)
> > > > > > >        if (err < 0)
> > > > > > >                goto err_deinit_port;
> > > > > > > 
> > > > > > > -     err = pci_parse_request_of_pci_ranges(dev, &bridge->windows, &bus_res);
> > > > > > > +     err = pci_parse_request_of_pci_ranges(dev, &bridge->windows,
> > > > > > > +                                           &bridge->dma_ranges, &bus_res);
> > > > > > >        if (err)
> > > > > > >                goto err_remove_irq_domain;
> > > > > > > 
> > > > > > > diff --git a/drivers/pci/controller/pcie-xilinx-nwl.c b/drivers/pci/controller/pcie-xilinx-nwl.c
> > > > > > > index e135a4b60489..9bd1427f2fd6 100644
> > > > > > > --- a/drivers/pci/controller/pcie-xilinx-nwl.c
> > > > > > > +++ b/drivers/pci/controller/pcie-xilinx-nwl.c
> > > > > > > @@ -843,7 +843,8 @@ static int nwl_pcie_probe(struct platform_device *pdev)
> > > > > > >                return err;
> > > > > > >        }
> > > > > > > 
> > > > > > > -     err = pci_parse_request_of_pci_ranges(dev, &bridge->windows, NULL);
> > > > > > > +     err = pci_parse_request_of_pci_ranges(dev, &bridge->windows,
> > > > > > > +                                           &bridge->dma_ranges, NULL);
> > > > > > >        if (err) {
> > > > > > >                dev_err(dev, "Getting bridge resources failed\n");
> > > > > > >                return err;
> > > > > > > diff --git a/drivers/pci/controller/pcie-xilinx.c b/drivers/pci/controller/pcie-xilinx.c
> > > > > > > index 257702288787..98e55297815b 100644
> > > > > > > --- a/drivers/pci/controller/pcie-xilinx.c
> > > > > > > +++ b/drivers/pci/controller/pcie-xilinx.c
> > > > > > > @@ -645,7 +645,8 @@ static int xilinx_pcie_probe(struct platform_device *pdev)
> > > > > > >                return err;
> > > > > > >        }
> > > > > > > 
> > > > > > > -     err = pci_parse_request_of_pci_ranges(dev, &bridge->windows, NULL);
> > > > > > > +     err = pci_parse_request_of_pci_ranges(dev, &bridge->windows,
> > > > > > > +                                           &bridge->dma_ranges, NULL);
> > > > > > >        if (err) {
> > > > > > >                dev_err(dev, "Getting bridge resources failed\n");
> > > > > > >                return err;
> > > > > > > diff --git a/drivers/pci/of.c b/drivers/pci/of.c
> > > > > > > index f3da49a31db4..0b1e4623dfcf 100644
> > > > > > > --- a/drivers/pci/of.c
> > > > > > > +++ b/drivers/pci/of.c
> > > > > > > @@ -257,7 +257,9 @@ EXPORT_SYMBOL_GPL(of_pci_check_probe_only);
> > > > > > >    */
> > > > > > >   int devm_of_pci_get_host_bridge_resources(struct device *dev,
> > > > > > >                        unsigned char busno, unsigned char bus_max,
> > > > > > > -                     struct list_head *resources, resource_size_t *io_base)
> > > > > > > +                     struct list_head *resources,
> > > > > > > +                     struct list_head *ib_resources,
> > > > > > > +                     resource_size_t *io_base)
> > > > > > >   {
> > > > > > >        struct device_node *dev_node = dev->of_node;
> > > > > > >        struct resource *res, tmp_res;
> > > > > > > @@ -340,6 +342,42 @@ int devm_of_pci_get_host_bridge_resources(struct device *dev,
> > > > > > >                pci_add_resource_offset(resources, res, res->start - range.pci_addr);
> > > > > > >        }
> > > > > > > 
> > > > > > > +     /* Check for dma-ranges property */
> > > > > > > +     if (!ib_resources)
> > > > > > > +             return 0;
> > > > > > > +     err = of_pci_dma_range_parser_init(&parser, dev_node);
> > > > > > > +     if (err)
> > > > > > > +             return 0;
> > > > > > > +
> > > > > > > +     dev_dbg(dev, "Parsing dma-ranges property...\n");
> > > > > > > +     for_each_of_pci_range(&parser, &range) {
> > > > > > > +             /*
> > > > > > > +              * If we failed translation or got a zero-sized region
> > > > > > > +              * then skip this range
> > > > > > > +              */
> > > > > > > +             if (((range.flags & IORESOURCE_TYPE_BITS) != IORESOURCE_MEM) ||
> > > > > > > +                 range.cpu_addr == OF_BAD_ADDR || range.size == 0)
> > > > > > > +                     continue;
> > > > > > > +
> > > > > > > +             dev_info(dev, "IB MEM %#010llx..%#010llx -> %#010llx\n",
> > > > > > > +                      range.cpu_addr,
> > > > > > > +                      range.cpu_addr + range.size - 1, range.pci_addr);
> > > > > > > +
> > > > > > > +
> > > > > > > +             err = of_pci_range_to_resource(&range, dev_node, &tmp_res);
> > > > > > > +             if (err)
> > > > > > > +                     continue;
> > > > > > > +
> > > > > > > +             res = devm_kmemdup(dev, &tmp_res, sizeof(tmp_res), GFP_KERNEL);
> > > > > > > +             if (!res) {
> > > > > > > +                     err = -ENOMEM;
> > > > > > > +                     goto failed;
> > > > > > > +             }
> > > > > > > +
> > > > > > > +             pci_add_resource_offset(ib_resources, res,
> > > > > > > +                                     res->start - range.pci_addr);
> > > > > > > +     }
> > > > > > > +
> > > > > > >        return 0;
> > > > > > > 
> > > > > > >   failed:
> > > > > > > @@ -482,6 +520,7 @@ EXPORT_SYMBOL_GPL(of_irq_parse_and_map_pci);
> > > > > > > 
> > > > > > >   int pci_parse_request_of_pci_ranges(struct device *dev,
> > > > > > >                                    struct list_head *resources,
> > > > > > > +                                 struct list_head *ib_resources,
> > > > > > >                                    struct resource **bus_range)
> > > > > > >   {
> > > > > > >        int err, res_valid = 0;
> > > > > > > @@ -489,8 +528,10 @@ int pci_parse_request_of_pci_ranges(struct device *dev,
> > > > > > >        struct resource_entry *win, *tmp;
> > > > > > > 
> > > > > > >        INIT_LIST_HEAD(resources);
> > > > > > > +     if (ib_resources)
> > > > > > > +             INIT_LIST_HEAD(ib_resources);
> > > > > > >        err = devm_of_pci_get_host_bridge_resources(dev, 0, 0xff, resources,
> > > > > > > -                                                 &iobase);
> > > > > > > +                                                 ib_resources, &iobase);
> > > > > > >        if (err)
> > > > > > >                return err;
> > > > > > > 
> > > > > > > diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
> > > > > > > index 3f6947ee3324..6692c4fe4290 100644
> > > > > > > --- a/drivers/pci/pci.h
> > > > > > > +++ b/drivers/pci/pci.h
> > > > > > > @@ -633,11 +633,15 @@ static inline void pci_release_bus_of_node(struct pci_bus *bus) { }
> > > > > > >   #if defined(CONFIG_OF_ADDRESS)
> > > > > > >   int devm_of_pci_get_host_bridge_resources(struct device *dev,
> > > > > > >                        unsigned char busno, unsigned char bus_max,
> > > > > > > -                     struct list_head *resources, resource_size_t *io_base);
> > > > > > > +                     struct list_head *resources,
> > > > > > > +                     struct list_head *ib_resources,
> > > > > > > +                     resource_size_t *io_base);
> > > > > > >   #else
> > > > > > >   static inline int devm_of_pci_get_host_bridge_resources(struct device *dev,
> > > > > > >                        unsigned char busno, unsigned char bus_max,
> > > > > > > -                     struct list_head *resources, resource_size_t *io_base)
> > > > > > > +                     struct list_head *resources,
> > > > > > > +                     struct list_head *ib_resources,
> > > > > > > +                     resource_size_t *io_base)
> > > > > > >   {
> > > > > > >        return -EINVAL;
> > > > > > >   }
> > > > > > > diff --git a/include/linux/pci.h b/include/linux/pci.h
> > > > > > > index f9088c89a534..5cb94916eaa1 100644
> > > > > > > --- a/include/linux/pci.h
> > > > > > > +++ b/include/linux/pci.h
> > > > > > > @@ -2278,6 +2278,7 @@ struct irq_domain;
> > > > > > >   struct irq_domain *pci_host_bridge_of_msi_domain(struct pci_bus *bus);
> > > > > > >   int pci_parse_request_of_pci_ranges(struct device *dev,
> > > > > > >                                    struct list_head *resources,
> > > > > > > +                                 struct list_head *ib_resources,
> > > > > > >                                    struct resource **bus_range);
> > > > > > > 
> > > > > > >   /* Arch may override this (weak) */
> > > > > > > @@ -2286,9 +2287,11 @@ struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus);
> > > > > > >   #else        /* CONFIG_OF */
> > > > > > >   static inline struct irq_domain *
> > > > > > >   pci_host_bridge_of_msi_domain(struct pci_bus *bus) { return NULL; }
> > > > > > > -static inline int pci_parse_request_of_pci_ranges(struct device *dev,
> > > > > > > -                                               struct list_head *resources,
> > > > > > > -                                               struct resource **bus_range)
> > > > > > > +static inline int
> > > > > > > +pci_parse_request_of_pci_ranges(struct device *dev,
> > > > > > > +                             struct list_head *resources,
> > > > > > > +                             struct list_head *ib_resources,
> > > > > > > +                             struct resource **bus_range)
> > > > > > >   {
> > > > > > >        return -EINVAL;
> > > > > > >   }
> > > > > > > --
> > > > > > > 2.20.1
> > > > > > > 



[Index of Archives]     [DMA Engine]     [Linux Coverity]     [Linux USB]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Greybus]

  Powered by Linux