Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2344519imu; Thu, 29 Nov 2018 03:35:13 -0800 (PST) X-Google-Smtp-Source: AFSGD/Vlkm1GxIZNTYLpWSiMKiaGGYVLvuyMly31FoB0dJoDz2TRwf21vMvh77bYgAxPAodgx+y3 X-Received: by 2002:a63:801:: with SMTP id 1mr895082pgi.275.1543491313680; Thu, 29 Nov 2018 03:35:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543491313; cv=none; d=google.com; s=arc-20160816; b=dnyZTTT4qEBgUvFIsXPyNjg4wDhLknKnVcJ+H9eQ5LEJdkkdh1aLqCA25DgVigemPr ExHbkvgQHJJ8fPsS8pWeyk/74PqICgo6+rVs+QX/Qu31A2boUdGbm3XyVLVMDT4c2x3/ ty1YgTQ8EDe5SXLTv+4GAUqF+Qd3o2mtiRzYV4G2uWh7MZPmVUeVa0HUbNuSv6xx089w OCx67KqPZ5X2qhy31/SmEyGcneZQpNFC306aKYXMDgoWA4wzq4B01TOgJunlnnQ1sC6H X+0n9KyVFaceeEB4SXfl9uOcFPb2rTjuuT+sYD9QFMJ9+XRvyFZhMPvMbL3FaDOxufrX FpXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date; bh=KwZ9lJsIKnLxKTbp0Xc2OiUyUEpDYTFuqEY4egKUp/g=; b=SifGH0BoXbpBJx1He3AOpbMKsBwwTUxsP86uZOUc45csVs1/rB5eXMDCjhogNyyw8L cB3ryUKrIGo6wFdHQwZ1MH8hwdbHQqdgp3izYYeN5FhuT/sZMSqC0WfA5AGvI7/PSCWm 543WsGGHERlkQbwyrZc1CBp/Yy6j3nC90GKCKVUEb2sZTzeDrLEPhUCV4iRw+0TM98DT DaatZQrnLdOb5sgzAotNxxyWWDc4RXqNKMq3OKB39zwE287zBWc/P1iVDAYrLVeGiF9o +tgvCAKZ38t4gVjNCwC6l+/nYdOYMAAWx7H0mdAwr5kzT+Tde5Zu0T0u0kA6yCVOhMpd PJfA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v19si1957950pfa.80.2018.11.29.03.34.57; Thu, 29 Nov 2018 03:35:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727350AbeK2Wif (ORCPT + 99 others); Thu, 29 Nov 2018 17:38:35 -0500 Received: from foss.arm.com ([217.140.101.70]:60882 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726870AbeK2Wif (ORCPT ); Thu, 29 Nov 2018 17:38:35 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8C58EA78; Thu, 29 Nov 2018 03:33:31 -0800 (PST) Received: from e107981-ln.cambridge.arm.com (e107981-ln.cambridge.arm.com [10.1.197.40]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id BE3983F5AF; Thu, 29 Nov 2018 03:33:29 -0800 (PST) Date: Thu, 29 Nov 2018 11:33:24 +0000 From: Lorenzo Pieralisi To: honghui.zhang@mediatek.com Cc: bhelgaas@google.com, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, ryder.lee@mediatek.com, devicetree@vger.kernel.org, youlin.pei@mediatek.com, jianjun.wang@mediatek.com Subject: Re: [PATCH v2] PCI: mediatek: Use devm_of_pci_get_host_bridge_resources() to parse DT Message-ID: <20181129113324.GA27228@e107981-ln.cambridge.arm.com> References: <1541645815-30340-1-git-send-email-honghui.zhang@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1541645815-30340-1-git-send-email-honghui.zhang@mediatek.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Nov 08, 2018 at 10:56:55AM +0800, honghui.zhang@mediatek.com wrote: > From: Honghui Zhang > > Use the devm_of_pci_get_host_bridge_resources() API in place of the PCI OF > DT parser. > > Signed-off-by: Honghui Zhang > --- > drivers/pci/controller/pcie-mediatek.c | 98 +++++++++------------------------- > 1 file changed, 24 insertions(+), 74 deletions(-) > > diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c > index 2a1f97c..0590a93 100644 > --- a/drivers/pci/controller/pcie-mediatek.c > +++ b/drivers/pci/controller/pcie-mediatek.c > @@ -197,11 +197,7 @@ struct mtk_pcie_port { > * @dev: pointer to PCIe device > * @base: IO mapped register base > * @free_ck: free-run reference clock > - * @io: IO resource > - * @pio: PIO resource > * @mem: non-prefetchable memory resource > - * @busn: bus range > - * @offset: IO / Memory offset > * @ports: pointer to PCIe port information > * @soc: pointer to SoC-dependent operations > */ > @@ -210,14 +206,7 @@ struct mtk_pcie { > void __iomem *base; > struct clk *free_ck; > > - struct resource io; > - struct resource pio; > struct resource mem; > - struct resource busn; > - struct { > - resource_size_t mem; > - resource_size_t io; > - } offset; > struct list_head ports; > const struct mtk_pcie_soc *soc; > }; > @@ -1045,55 +1034,43 @@ static int mtk_pcie_setup(struct mtk_pcie *pcie) > { > struct device *dev = pcie->dev; > struct device_node *node = dev->of_node, *child; > - struct of_pci_range_parser parser; > - struct of_pci_range range; > - struct resource res; > struct mtk_pcie_port *port, *tmp; > + struct pci_host_bridge *host = pci_host_bridge_from_priv(pcie); > + struct list_head *windows = &host->windows; > + struct resource_entry *win, *tmp_win; > + resource_size_t io_base; > int err; > > - if (of_pci_range_parser_init(&parser, node)) { > - dev_err(dev, "missing \"ranges\" property\n"); > - return -EINVAL; > - } > + err = devm_of_pci_get_host_bridge_resources(dev, 0, 0xff, > + windows, &io_base); > + if (err) > + return err; > > - for_each_of_pci_range(&parser, &range) { > - err = of_pci_range_to_resource(&range, node, &res); > - if (err < 0) > - return err; > + err = devm_request_pci_bus_resources(dev, windows); > + if (err < 0) > + return err; > > - switch (res.flags & IORESOURCE_TYPE_BITS) { > + /* Get the I/O and memory ranges from DT */ > + resource_list_for_each_entry_safe(win, tmp_win, windows) { > + switch (resource_type(win->res)) { > case IORESOURCE_IO: > - pcie->offset.io = res.start - range.pci_addr; > - > - memcpy(&pcie->pio, &res, sizeof(res)); > - pcie->pio.name = node->full_name; > - > - pcie->io.start = range.cpu_addr; > - pcie->io.end = range.cpu_addr + range.size - 1; > - pcie->io.flags = IORESOURCE_MEM; > - pcie->io.name = "I/O"; > - > - memcpy(&res, &pcie->io, sizeof(res)); > + err = devm_pci_remap_iospace(dev, win->res, io_base); > + if (err) { > + dev_warn(dev, "error %d: failed to map resource %pR\n", > + err, win->res); > + resource_list_destroy_entry(win); > + } > break; > - > case IORESOURCE_MEM: > - pcie->offset.mem = res.start - range.pci_addr; > - > - memcpy(&pcie->mem, &res, sizeof(res)); > + memcpy(&pcie->mem, win->res, sizeof(*win->res)); > pcie->mem.name = "non-prefetchable"; > break; > + case IORESOURCE_BUS: > + host->busnr = win->res->start; > + break; > } > } > > - err = of_pci_parse_bus_range(node, &pcie->busn); > - if (err < 0) { > - dev_err(dev, "failed to parse bus ranges property: %d\n", err); > - pcie->busn.name = node->name; > - pcie->busn.start = 0; > - pcie->busn.end = 0xff; > - pcie->busn.flags = IORESOURCE_BUS; > - } > - > for_each_available_child_of_node(node, child) { > int slot; > > @@ -1125,28 +1102,6 @@ static int mtk_pcie_setup(struct mtk_pcie *pcie) > return 0; > } > > -static int mtk_pcie_request_resources(struct mtk_pcie *pcie) > -{ > - struct pci_host_bridge *host = pci_host_bridge_from_priv(pcie); > - struct list_head *windows = &host->windows; > - struct device *dev = pcie->dev; > - int err; > - > - pci_add_resource_offset(windows, &pcie->pio, pcie->offset.io); > - pci_add_resource_offset(windows, &pcie->mem, pcie->offset.mem); > - pci_add_resource(windows, &pcie->busn); > - > - err = devm_request_pci_bus_resources(dev, windows); > - if (err < 0) > - return err; > - > - err = devm_pci_remap_iospace(dev, &pcie->pio, pcie->io.start); > - if (err < 0) > - return err; > - > - return 0; > -} > - > static int mtk_pcie_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > @@ -1169,11 +1124,6 @@ static int mtk_pcie_probe(struct platform_device *pdev) > if (err) > return err; > > - err = mtk_pcie_request_resources(pcie); > - if (err) > - goto put_resources; > - > - host->busnr = pcie->busn.start; > host->dev.parent = pcie->dev; > host->ops = pcie->soc->ops; > host->map_irq = of_irq_parse_and_map_pci; I would prefer having all the host initialization carried out in a single function. I appreciate you may need to reintroduce a temporary busnumber value or reshuffle the code to do that, sorry for asking to change it again but I do not want to see the struct pci_host_bridge variables initialization scattered around, it is confusing. Thanks, Lorenzo