From patchwork Tue Sep 24 21:46:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 11159673 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D40B017D4 for ; Tue, 24 Sep 2019 21:46:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ACE1B21655 for ; Tue, 24 Sep 2019 21:46:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569361598; bh=AbCKjE5uyeTBvLhgYJXdd40Ck8F7P/Vg3O5Jw4X1SqY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=QI8/+QQ8vhDn/K45lTQA+mSu8MbedkR3GGkd0uQclC5aG6TI14kV1ZxsSQ60RULF8 aNu/2cOyRz0p6ZR8B92wWGorM/LV1m1LLbduirnKomU/yJYGdogoYeg8cDkMkH/hkE A6FSaWuDt9v7SclmyiEZnuRlOTGJPo8RKsmfN9KA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388161AbfIXVqi (ORCPT ); Tue, 24 Sep 2019 17:46:38 -0400 Received: from mail-oi1-f194.google.com ([209.85.167.194]:41525 "EHLO mail-oi1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731709AbfIXVqi (ORCPT ); Tue, 24 Sep 2019 17:46:38 -0400 Received: by mail-oi1-f194.google.com with SMTP id w17so3057387oiw.8 for ; Tue, 24 Sep 2019 14:46:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/wVIw1f2smG+KiMsq60d1sORCIiJA/kLz197I7JlBzY=; b=WNuiHIZ15rsx6rXeIOOOqQnIQVY8jSisbSsMIa4Qfxo9y1AM3bQ3unrMog23BRJ12M /AZN7Y4/ETLFNgVNJvbPCgTStrJp3yRJMiFITC/UqD59fyCJFkl33IfpQwFUXmGNzOL6 Md7L7rGA6ZXDEuMs1uvL408PfmWWJ6P6aWC/qb6elvh2k4z2TZsaXDrORx83ia0Ru3ia QHnxiXp0Fg3OwmF5k8pLQSLH1XZb92MMD2MiosuCc+BPH/wFrSCOArpgp8+6AuSL+1T2 Lfu/N5HowCq345daTj4CUYrLvh037POJaylsJmQ+EdEQyUV9Slk33P5FqwUaS82JS4Tz pvUQ== X-Gm-Message-State: APjAAAVDjx3mhFta0v3FURnhT/9EcOcCTIn0aTksDxyaEQTHw5AMF9zU v4pUFopGkgL9uaIV3YxDRpWOW7c= X-Google-Smtp-Source: APXvYqzgYNEE3gUf+o08Ng0AlLUa3mPB8wGVERLGSanOdvwRKgqozOW0fsc0NAwikm4smG7KH7Xr/Q== X-Received: by 2002:aca:5ac4:: with SMTP id o187mr1987548oib.116.1569361595731; Tue, 24 Sep 2019 14:46:35 -0700 (PDT) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id s66sm976787otb.65.2019.09.24.14.46.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Sep 2019 14:46:35 -0700 (PDT) From: Rob Herring To: linux-pci@vger.kernel.org, Bjorn Helgaas , Lorenzo Pieralisi Cc: linux-arm-kernel@lists.infradead.org, Ryder Lee , Matthias Brugger , linux-mediatek@lists.infradead.org Subject: [PATCH 03/11] PCI: mediatek: Use pci_parse_request_of_pci_ranges() Date: Tue, 24 Sep 2019 16:46:22 -0500 Message-Id: <20190924214630.12817-4-robh@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190924214630.12817-1-robh@kernel.org> References: <20190924214630.12817-1-robh@kernel.org> MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Convert Mediatek host bridge to use the common pci_parse_request_of_pci_ranges(). Cc: Ryder Lee Cc: Lorenzo Pieralisi Cc: Bjorn Helgaas Cc: Matthias Brugger Cc: linux-mediatek@lists.infradead.org Signed-off-by: Rob Herring Reviewed-by: Andrew murray --- drivers/pci/controller/pcie-mediatek.c | 47 ++++++++++---------------- 1 file changed, 17 insertions(+), 30 deletions(-) diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c index 80601e1b939e..cea4112b5309 100644 --- a/drivers/pci/controller/pcie-mediatek.c +++ b/drivers/pci/controller/pcie-mediatek.c @@ -211,7 +211,6 @@ struct mtk_pcie { void __iomem *base; struct clk *free_ck; - struct resource mem; struct list_head ports; const struct mtk_pcie_soc *soc; unsigned int busnr; @@ -658,11 +657,23 @@ static int mtk_pcie_setup_irq(struct mtk_pcie_port *port, static int mtk_pcie_startup_port_v2(struct mtk_pcie_port *port) { struct mtk_pcie *pcie = port->pcie; - struct resource *mem = &pcie->mem; + struct pci_host_bridge *host = pci_host_bridge_from_priv(pcie); + struct resource *mem = NULL; + struct resource_entry *entry; const struct mtk_pcie_soc *soc = port->pcie->soc; u32 val; int err; + resource_list_for_each_entry(entry, &host->windows) { + if (resource_type(entry->res) != IORESOURCE_MEM) + continue; + + mem = entry->res; + break; + } + if (!mem) + return -EINVAL; + /* MT7622 platforms need to enable LTSSM and ASPM from PCIe subsys */ if (pcie->base) { val = readl(pcie->base + PCIE_SYS_CFG_V2); @@ -1017,39 +1028,15 @@ static int mtk_pcie_setup(struct mtk_pcie *pcie) 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; + struct resource *bus; int err; - err = devm_of_pci_get_host_bridge_resources(dev, 0, 0xff, - windows, &io_base); + err = pci_parse_request_of_pci_ranges(dev, windows, + &bus); if (err) return err; - err = devm_request_pci_bus_resources(dev, windows); - if (err < 0) - return err; - - /* 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: - 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: - memcpy(&pcie->mem, win->res, sizeof(*win->res)); - pcie->mem.name = "non-prefetchable"; - break; - case IORESOURCE_BUS: - pcie->busnr = win->res->start; - break; - } - } + pcie->busnr = bus->start; for_each_available_child_of_node(node, child) { int slot;