Subject: Re: [PATCH 10/11] PCI: iproc: Use inbound resources for setup

From: Andrew Murray <[email-masked]>
Date: Thu, 26 Sep 2019 09:39:47 +0100

On Tue, Sep 24, 2019 at 04:46:29PM -0500, Rob Herring wrote:
> Now that the helpers provide the inbound resources in the host bridge
> 'dma_ranges' resource list, convert Broadcom iProc host bridge to use
> the resource list to setup the inbound addresses.
> 
> Cc: Lorenzo Pieralisi <[email-masked]>
> Cc: Bjorn Helgaas <[email-masked]>
> Cc: Ray Jui <[email-masked]>
> Cc: Scott Branden <[email-masked]>
> Cc: [email-masked]
> Signed-off-by: Rob Herring <[email-masked]>

Reviewed-by: Andrew Murray <[email-masked]>

> ---
>  drivers/pci/controller/pcie-iproc.c | 63 ++++-------------------------
>  1 file changed, 8 insertions(+), 55 deletions(-)
> 
> diff --git a/drivers/pci/controller/pcie-iproc.c b/drivers/pci/controller/pcie-iproc.c
> index 2d457bfdaf66..9ed181050308 100644
> --- a/drivers/pci/controller/pcie-iproc.c
> +++ b/drivers/pci/controller/pcie-iproc.c
> @@ -1122,15 +1122,15 @@ static int iproc_pcie_ib_write(struct iproc_pcie *pcie, int region_idx,
>  }
>  
>  static int iproc_pcie_setup_ib(struct iproc_pcie *pcie,
> -			       struct of_pci_range *range,
> +			       struct resource_entry *entry,
>  			       enum iproc_pcie_ib_map_type type)
>  {
>  	struct device *dev = pcie->dev;
>  	struct iproc_pcie_ib *ib = &pcie->ib;
>  	int ret;
>  	unsigned int region_idx, size_idx;
> -	u64 axi_addr = range->cpu_addr, pci_addr = range->pci_addr;
> -	resource_size_t size = range->size;
> +	u64 axi_addr = entry->res->start, pci_addr = entry->res->start - entry->offset;
> +	resource_size_t size = resource_size(entry->res);
>  
>  	/* iterate through all IARR mapping regions */
>  	for (region_idx = 0; region_idx < ib->nr_regions; region_idx++) {
> @@ -1182,66 +1182,19 @@ static int iproc_pcie_setup_ib(struct iproc_pcie *pcie,
>  	return ret;
>  }
>  
> -static int iproc_pcie_add_dma_range(struct device *dev,
> -				    struct list_head *resources,
> -				    struct of_pci_range *range)
> -{
> -	struct resource *res;
> -	struct resource_entry *entry, *tmp;
> -	struct list_head *head = resources;
> -
> -	res = devm_kzalloc(dev, sizeof(struct resource), GFP_KERNEL);
> -	if (!res)
> -		return -ENOMEM;
> -
> -	resource_list_for_each_entry(tmp, resources) {
> -		if (tmp->res->start < range->cpu_addr)
> -			head = &tmp->node;
> -	}
> -
> -	res->start = range->cpu_addr;
> -	res->end = res->start + range->size - 1;
> -
> -	entry = resource_list_create_entry(res, 0);
> -	if (!entry)
> -		return -ENOMEM;
> -
> -	entry->offset = res->start - range->cpu_addr;
> -	resource_list_add(entry, head);
> -
> -	return 0;
> -}
> -
>  static int iproc_pcie_map_dma_ranges(struct iproc_pcie *pcie)
>  {
>  	struct pci_host_bridge *host = pci_host_bridge_from_priv(pcie);
> -	struct of_pci_range range;
> -	struct of_pci_range_parser parser;
> -	int ret;
> -	LIST_HEAD(resources);
> +	struct resource_entry *entry;
> +	int ret = 0;
>  
> -	/* Get the dma-ranges from DT */
> -	ret = of_pci_dma_range_parser_init(&parser, pcie->dev->of_node);
> -	if (ret)
> -		return ret;
> -
> -	for_each_of_pci_range(&parser, &range) {
> -		ret = iproc_pcie_add_dma_range(pcie->dev,
> -					       &resources,
> -					       &range);
> -		if (ret)
> -			goto out;
> +	resource_list_for_each_entry(entry, &host->dma_ranges) {
>  		/* Each range entry corresponds to an inbound mapping region */
> -		ret = iproc_pcie_setup_ib(pcie, &range, IPROC_PCIE_IB_MAP_MEM);
> +		ret = iproc_pcie_setup_ib(pcie, entry, IPROC_PCIE_IB_MAP_MEM);
>  		if (ret)
> -			goto out;
> +			break;
>  	}
>  
> -	list_splice_init(&resources, &host->dma_ranges);
> -
> -	return 0;
> -out:
> -	pci_free_resource_list(&resources);
>  	return ret;
>  }
>  
> -- 
> 2.20.1
> 

_______________________________________________
linux-arm-kernel mailing list
[email-masked]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel