From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5975C47E48 for ; Thu, 26 Sep 2019 08:47:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 96D3A222BE for ; Thu, 26 Sep 2019 08:47:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728175AbfIZIrW (ORCPT ); Thu, 26 Sep 2019 04:47:22 -0400 Received: from foss.arm.com ([217.140.110.172]:42546 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726215AbfIZIrV (ORCPT ); Thu, 26 Sep 2019 04:47:21 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 54BD91000; Thu, 26 Sep 2019 01:47:21 -0700 (PDT) Received: from localhost (unknown [10.37.6.20]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C621C3F67D; Thu, 26 Sep 2019 01:47:20 -0700 (PDT) Date: Thu, 26 Sep 2019 09:47:19 +0100 From: Andrew Murray To: Rob Herring Cc: linux-pci@vger.kernel.org, Bjorn Helgaas , Lorenzo Pieralisi , linux-arm-kernel@lists.infradead.org, Simon Horman Subject: Re: [PATCH 11/11] PCI: rcar: Use inbound resources for setup Message-ID: <20190926084718.GA9720@e119886-lin.cambridge.arm.com> References: <20190924214630.12817-1-robh@kernel.org> <20190924214630.12817-12-robh@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190924214630.12817-12-robh@kernel.org> User-Agent: Mutt/1.10.1+81 (426a6c1) (2018-08-26) Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org On Tue, Sep 24, 2019 at 04:46:30PM -0500, Rob Herring wrote: > Now that the helpers provide the inbound resources in the host bridge > 'dma_ranges' resource list, convert Renesas R-Car PCIe host bridge to > use the resource list to setup the inbound addresses. > > Cc: Simon Horman > Cc: Lorenzo Pieralisi > Cc: Bjorn Helgaas > Signed-off-by: Rob Herring > --- > drivers/pci/controller/pcie-rcar.c | 45 +++++++++++------------------- > 1 file changed, 16 insertions(+), 29 deletions(-) > > diff --git a/drivers/pci/controller/pcie-rcar.c b/drivers/pci/controller/pcie-rcar.c > index b8d6e86a5539..453c931aaf77 100644 > --- a/drivers/pci/controller/pcie-rcar.c > +++ b/drivers/pci/controller/pcie-rcar.c > @@ -1014,16 +1014,16 @@ static int rcar_pcie_get_resources(struct rcar_pcie *pcie) > } > > static int rcar_pcie_inbound_ranges(struct rcar_pcie *pcie, > - struct of_pci_range *range, > + struct resource_entry *entry, > int *index) > { > - u64 restype = range->flags; > - u64 cpu_addr = range->cpu_addr; > - u64 cpu_end = range->cpu_addr + range->size; > - u64 pci_addr = range->pci_addr; > + u64 restype = entry->res->flags; > + u64 cpu_addr = entry->res->start; > + u64 cpu_end = entry->res->end; > + u64 pci_addr = entry->res->start - entry->offset; > u32 flags = LAM_64BIT | LAR_ENABLE; > u64 mask; > - u64 size; > + u64 size = resource_size(entry->res); > int idx = *index; > > if (restype & IORESOURCE_PREFETCH) > @@ -1037,9 +1037,7 @@ static int rcar_pcie_inbound_ranges(struct rcar_pcie *pcie, > unsigned long nr_zeros = __ffs64(cpu_addr); > u64 alignment = 1ULL << nr_zeros; > > - size = min(range->size, alignment); > - } else { > - size = range->size; > + size = min(size, alignment); > } AFAICT the (if cpu_addr > 0) is here because the result of __ffs64 is undefined if no bits are set (according to the comment). However by removing the else statement we no longer guarantee that nr_zeros is defined. > /* Hardware supports max 4GiB inbound region */ > size = min(size, 1ULL << 32); > @@ -1078,30 +1076,19 @@ static int rcar_pcie_inbound_ranges(struct rcar_pcie *pcie, > return 0; > } > > -static int rcar_pcie_parse_map_dma_ranges(struct rcar_pcie *pcie, > - struct device_node *np) > +static int rcar_pcie_parse_map_dma_ranges(struct rcar_pcie *pcie) > { > - struct of_pci_range range; > - struct of_pci_range_parser parser; > - int index = 0; > - int err; > - > - if (of_pci_dma_range_parser_init(&parser, np)) > - return -EINVAL; > - > - /* Get the dma-ranges from DT */ > - for_each_of_pci_range(&parser, &range) { > - u64 end = range.cpu_addr + range.size - 1; > - > - dev_dbg(pcie->dev, "0x%08x 0x%016llx..0x%016llx -> 0x%016llx\n", > - range.flags, range.cpu_addr, end, range.pci_addr); > + struct pci_host_bridge *bridge = pci_host_bridge_from_priv(pcie); > + struct resource_entry *entry; > + int index = 0, err = 0; > > - err = rcar_pcie_inbound_ranges(pcie, &range, &index); > + resource_list_for_each_entry(entry, &bridge->dma_ranges) { > + err = rcar_pcie_inbound_ranges(pcie, entry, &index); > if (err) > - return err; > + break; > } > > - return 0; > + return err; > } > > static const struct of_device_id rcar_pcie_of_match[] = { > @@ -1162,7 +1149,7 @@ static int rcar_pcie_probe(struct platform_device *pdev) > goto err_unmap_msi_irqs; > } > > - err = rcar_pcie_parse_map_dma_ranges(pcie, dev->of_node); > + err = rcar_pcie_parse_map_dma_ranges(pcie); > if (err) > goto err_clk_disable; > > -- > 2.20.1 >