Re: [PATCH 09/11] PCI: xgene: Use inbound resources for setup

From: Andrew Murray <andrew.murray@arm.com>
To: Rob Herring <robh@kernel.org>
Cc: linux-pci@vger.kernel.org, Bjorn Helgaas <bhelgaas@google.com>,
	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
	Toan Le <toan@os.amperecomputing.com>,
	linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 09/11] PCI: xgene: Use inbound resources for setup
Date: Thu, 26 Sep 2019 09:39:36 +0100	[thread overview]
Message-ID: <20190926083935.GY9720@e119886-lin.cambridge.arm.com> (raw)
In-Reply-To: <20190924214630.12817-10-robh@kernel.org>

On Tue, Sep 24, 2019 at 04:46:28PM -0500, Rob Herring wrote:
> Now that the helpers provide the inbound resources in the host bridge
> 'dma_ranges' resource list, convert the Xgene host bridge to use the
> resource list to setup the inbound addresses.
> 
> Cc: Toan Le <toan@os.amperecomputing.com>
> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> Signed-off-by: Rob Herring <robh@kernel.org>

Reviewed-by: Andrew Murray <andrew.murray@arm.com>

> ---
>  drivers/pci/controller/pci-xgene.c | 32 ++++++++++--------------------
>  1 file changed, 10 insertions(+), 22 deletions(-)
> 
> diff --git a/drivers/pci/controller/pci-xgene.c b/drivers/pci/controller/pci-xgene.c
> index 11f27c42c06a..09c913b12ebc 100644
> --- a/drivers/pci/controller/pci-xgene.c
> +++ b/drivers/pci/controller/pci-xgene.c
> @@ -485,27 +485,27 @@ static int xgene_pcie_select_ib_reg(u8 *ib_reg_mask, u64 size)
>  }
>  
>  static void xgene_pcie_setup_ib_reg(struct xgene_pcie_port *port,
> -				    struct of_pci_range *range, u8 *ib_reg_mask)
> +				    struct resource_entry *entry, u8 *ib_reg_mask)
>  {
>  	void __iomem *cfg_base = port->cfg_base;
>  	struct device *dev = port->dev;
>  	void *bar_addr;
>  	u32 pim_reg;
> -	u64 cpu_addr = range->cpu_addr;
> -	u64 pci_addr = range->pci_addr;
> -	u64 size = range->size;
> +	u64 cpu_addr = entry->res->start;
> +	u64 pci_addr = cpu_addr - entry->offset;
> +	u64 size = resource_size(entry->res);
>  	u64 mask = ~(size - 1) | EN_REG;
>  	u32 flags = PCI_BASE_ADDRESS_MEM_TYPE_64;
>  	u32 bar_low;
>  	int region;
>  
> -	region = xgene_pcie_select_ib_reg(ib_reg_mask, range->size);
> +	region = xgene_pcie_select_ib_reg(ib_reg_mask, size);
>  	if (region < 0) {
>  		dev_warn(dev, "invalid pcie dma-range config\n");
>  		return;
>  	}
>  
> -	if (range->flags & IORESOURCE_PREFETCH)
> +	if (entry->res->flags & IORESOURCE_PREFETCH)
>  		flags |= PCI_BASE_ADDRESS_MEM_PREFETCH;
>  
>  	bar_low = pcie_bar_low_val((u32)cpu_addr, flags);
> @@ -536,25 +536,13 @@ static void xgene_pcie_setup_ib_reg(struct xgene_pcie_port *port,
>  
>  static int xgene_pcie_parse_map_dma_ranges(struct xgene_pcie_port *port)
>  {
> -	struct device_node *np = port->node;
> -	struct of_pci_range range;
> -	struct of_pci_range_parser parser;
> -	struct device *dev = port->dev;
> +	struct pci_host_bridge *bridge = pci_host_bridge_from_priv(port);
> +	struct resource_entry *entry;
>  	u8 ib_reg_mask = 0;
>  
> -	if (of_pci_dma_range_parser_init(&parser, np)) {
> -		dev_err(dev, "missing dma-ranges property\n");
> -		return -EINVAL;
> -	}
> -
> -	/* Get the dma-ranges from DT */
> -	for_each_of_pci_range(&parser, &range) {
> -		u64 end = range.cpu_addr + range.size - 1;
> +	resource_list_for_each_entry(entry, &bridge->dma_ranges)
> +		xgene_pcie_setup_ib_reg(port, entry, &ib_reg_mask);
>  
> -		dev_dbg(dev, "0x%08x 0x%016llx..0x%016llx -> 0x%016llx\n",
> -			range.flags, range.cpu_addr, end, range.pci_addr);
> -		xgene_pcie_setup_ib_reg(port, &range, &ib_reg_mask);
> -	}
>  	return 0;
>  }
>  
> -- 
> 2.20.1
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel