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=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED autolearn=unavailable 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 BAACAC65BAE for ; Fri, 30 Nov 2018 02:31:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8614B213A2 for ; Fri, 30 Nov 2018 02:31:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8614B213A2 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727291AbeK3Niw (ORCPT ); Fri, 30 Nov 2018 08:38:52 -0500 Received: from mailgw02.mediatek.com ([1.203.163.81]:17198 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726161AbeK3Niw (ORCPT ); Fri, 30 Nov 2018 08:38:52 -0500 X-UUID: e502bc003ce848efb427af08f1479f7f-20181130 X-UUID: e502bc003ce848efb427af08f1479f7f-20181130 Received: from mtkcas32.mediatek.inc [(172.27.4.250)] by mailgw02.mediatek.com (envelope-from ) (mailgw01.mediatek.com ESMTP with TLS) with ESMTP id 1413464676; Fri, 30 Nov 2018 10:31:01 +0800 Received: from MTKCAS32.mediatek.inc (172.27.4.184) by MTKMBS31DR.mediatek.inc (172.27.6.102) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Fri, 30 Nov 2018 10:30:59 +0800 Received: from [10.17.3.153] (10.17.3.153) by MTKCAS32.mediatek.inc (172.27.4.170) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Fri, 30 Nov 2018 10:30:59 +0800 Message-ID: <1543545059.3753.4.camel@mhfsdcap03> Subject: Re: [PATCH v2] PCI: mediatek: Use devm_of_pci_get_host_bridge_resources() to parse DT From: Honghui Zhang To: Lorenzo Pieralisi CC: , , , , , , , , Date: Fri, 30 Nov 2018 10:30:59 +0800 In-Reply-To: <20181129113324.GA27228@e107981-ln.cambridge.arm.com> References: <1541645815-30340-1-git-send-email-honghui.zhang@mediatek.com> <20181129113324.GA27228@e107981-ln.cambridge.arm.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.3-0ubuntu6 Content-Transfer-Encoding: 7bit MIME-Version: 1.0 X-MTK: N Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 2018-11-29 at 11:33 +0000, Lorenzo Pieralisi wrote: > 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. > Okay, I will change it in the next version, and I will ask Ryder for review internally and if it's OK with him I will add his ack directly in the next version. Thanks. > Thanks, > Lorenzo From mboxrd@z Thu Jan 1 00:00:00 1970 From: Honghui Zhang Subject: Re: [PATCH v2] PCI: mediatek: Use devm_of_pci_get_host_bridge_resources() to parse DT Date: Fri, 30 Nov 2018 10:30:59 +0800 Message-ID: <1543545059.3753.4.camel@mhfsdcap03> References: <1541645815-30340-1-git-send-email-honghui.zhang@mediatek.com> <20181129113324.GA27228@e107981-ln.cambridge.arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20181129113324.GA27228@e107981-ln.cambridge.arm.com> Sender: linux-kernel-owner@vger.kernel.org To: Lorenzo Pieralisi 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 List-Id: devicetree@vger.kernel.org On Thu, 2018-11-29 at 11:33 +0000, Lorenzo Pieralisi wrote: > 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. > Okay, I will change it in the next version, and I will ask Ryder for review internally and if it's OK with him I will add his ack directly in the next version. Thanks. > Thanks, > Lorenzo 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.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED autolearn=unavailable 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 2601BC04EB9 for ; Fri, 30 Nov 2018 02:31:40 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E42352081C for ; Fri, 30 Nov 2018 02:31:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="O+BthmHJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E42352081C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=i9KBeR8DwQwCttTE5ZRcgxemJs41YXYi9azzmx5e2gw=; b=O+BthmHJIPtySf eDMzICj/zjzox72yp3OaVVpxfL5VnWzW8pehOWQgZpZd7jfEza6iNTmjbEFtsTP1Q1KR6y1u2Lg0W ITDWVo7qb893zxctTrCIPnMaLZvjazBAozMzb1xPFIVPlp/N1oiZ1IwhpSd19UFeSBCau7P3sfP8w BT88QenbyRKn6rQ5NpGDNjpddXuiEkmFSvI4+723B+/guiuf2ATruVluHtPmyHaEXooUb4cEKsD/1 7YaImBhrLS9st0V4FLwQVRS1Uu6px/d3VJpUZmxLKL3Smr+8t60PNaljO1Dg7C55xCMaLkR3iKBxh +5fgXYnKWUyu/1QuV64Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gSYaY-00074i-OD; Fri, 30 Nov 2018 02:31:30 +0000 Received: from [1.203.163.81] (helo=mailgw02.mediatek.com) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gSYaU-00073M-Mg; Fri, 30 Nov 2018 02:31:29 +0000 X-UUID: e502bc003ce848efb427af08f1479f7f-20181130 X-UUID: e502bc003ce848efb427af08f1479f7f-20181130 Received: from mtkcas32.mediatek.inc [(172.27.4.250)] by mailgw02.mediatek.com (envelope-from ) (mailgw01.mediatek.com ESMTP with TLS) with ESMTP id 1413464676; Fri, 30 Nov 2018 10:31:01 +0800 Received: from MTKCAS32.mediatek.inc (172.27.4.184) by MTKMBS31DR.mediatek.inc (172.27.6.102) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Fri, 30 Nov 2018 10:30:59 +0800 Received: from [10.17.3.153] (10.17.3.153) by MTKCAS32.mediatek.inc (172.27.4.170) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Fri, 30 Nov 2018 10:30:59 +0800 Message-ID: <1543545059.3753.4.camel@mhfsdcap03> Subject: Re: [PATCH v2] PCI: mediatek: Use devm_of_pci_get_host_bridge_resources() to parse DT From: Honghui Zhang To: Lorenzo Pieralisi Date: Fri, 30 Nov 2018 10:30:59 +0800 In-Reply-To: <20181129113324.GA27228@e107981-ln.cambridge.arm.com> References: <1541645815-30340-1-git-send-email-honghui.zhang@mediatek.com> <20181129113324.GA27228@e107981-ln.cambridge.arm.com> X-Mailer: Evolution 3.2.3-0ubuntu6 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181129_183127_211113_9C747357 X-CRM114-Status: GOOD ( 19.96 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: youlin.pei@mediatek.com, devicetree@vger.kernel.org, ryder.lee@mediatek.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, jianjun.wang@mediatek.com, linux-mediatek@lists.infradead.org, bhelgaas@google.com, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, 2018-11-29 at 11:33 +0000, Lorenzo Pieralisi wrote: > 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. > Okay, I will change it in the next version, and I will ask Ryder for review internally and if it's OK with him I will add his ack directly in the next version. Thanks. > Thanks, > Lorenzo _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel