From: Rob Herring <robh@kernel.org>
To: Andrew Murray <andrew.murray@arm.com>,
Bjorn Helgaas <bhelgaas@google.com>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
bcm-kernel-feedback-list@broadcom.com,
Gustavo Pimentel <gustavo.pimentel@synopsys.com>,
Heiko Stuebner <heiko@sntech.de>,
Hou Zhiqiang <Zhiqiang.Hou@nxp.com>,
Jingoo Han <jingoohan1@gmail.com>,
Karthikeyan Mitran <m.karthikeyan@mobiveil.co.in>,
Ley Foon Tan <lftan@altera.com>,
Linus Walleij <linus.walleij@linaro.org>,
linux-mediatek@lists.infradead.org,
linux-renesas-soc@vger.kernel.org,
linux-rockchip@lists.infradead.org,
Matthias Brugger <matthias.bgg@gmail.com>,
Michal Simek <michal.simek@xilinx.com>,
Ray Jui <rjui@broadcom.com>,
rfi@lists.rocketboards.org, Ryder Lee <ryder.lee@mediatek.com>,
Scott Branden <sbranden@broadcom.com>,
Shawn Lin <shawn.lin@rock-chips.com>,
Simon Horman <horms@verge.net.au>,
Srinath Mannam <srinath.mannam@broadcom.com>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
Toan Le <toan@os.amperecomputing.com>,
Tom Joseph <tjoseph@cadence.com>, Will Deacon <will@kernel.org>
Subject: [PATCH v2 08/25] PCI: mediatek: Use pci_parse_request_of_pci_ranges()
Date: Wed, 16 Oct 2019 15:06:30 -0500 [thread overview]
Message-ID: <20191016200647.32050-9-robh@kernel.org> (raw)
In-Reply-To: <20191016200647.32050-1-robh@kernel.org>
Convert Mediatek host bridge to use the common
pci_parse_request_of_pci_ranges().
Cc: Ryder Lee <ryder.lee@mediatek.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: linux-mediatek@lists.infradead.org
Reviewed-by: Andrew Murray <andrew.murray@arm.com>
Signed-off-by: Rob Herring <robh@kernel.org>
---
v2:
- Use resource_list_get_entry_of_type
---
drivers/pci/controller/pcie-mediatek.c | 43 ++++++++------------------
1 file changed, 13 insertions(+), 30 deletions(-)
diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c
index 626a7c352dfd..df19beb2b2f1 100644
--- a/drivers/pci/controller/pcie-mediatek.c
+++ b/drivers/pci/controller/pcie-mediatek.c
@@ -216,7 +216,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;
@@ -661,11 +660,19 @@ 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;
+ entry = resource_list_get_entry_of_type(&host->windows, IORESOURCE_MEM);
+ if (entry)
+ mem = entry->res;
+ 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);
@@ -1023,39 +1030,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;
--
2.20.1
next prev parent reply other threads:[~2019-10-16 20:07 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-16 20:06 [PATCH v2 00/25] PCI host resource consolidation Rob Herring
2019-10-16 20:06 ` [PATCH v2 01/25] resource: Add a resource_list_get_entry_of_type helper Rob Herring
2019-10-17 7:25 ` Christoph Hellwig
2019-10-18 12:14 ` Andrew Murray
2019-10-16 20:06 ` [PATCH v2 02/25] PCI: Export pci_parse_request_of_pci_ranges() Rob Herring
2019-10-18 12:06 ` Andrew Murray
2019-10-16 20:06 ` [PATCH v2 03/25] PCI: aardvark: Use pci_parse_request_of_pci_ranges() Rob Herring
2019-10-16 20:06 ` [PATCH v2 04/25] PCI: altera: " Rob Herring
2019-10-18 12:09 ` Andrew Murray
2019-10-16 20:06 ` [PATCH v2 05/25] PCI: dwc: " Rob Herring
2019-10-18 12:35 ` Andrew Murray
2019-10-20 21:39 ` Rob Herring
2019-10-16 20:06 ` [PATCH v2 06/25] PCI: faraday: Use pci_parse_request_of_pci_ranges Rob Herring
2019-10-18 12:57 ` Andrew Murray
2019-10-16 20:06 ` [PATCH v2 07/25] PCI: iproc: Use pci_parse_request_of_pci_ranges() Rob Herring
2019-10-18 13:00 ` Andrew Murray
2019-10-16 20:06 ` Rob Herring [this message]
2019-10-16 20:06 ` [PATCH v2 09/25] PCI: mobiveil: " Rob Herring
2019-10-18 15:41 ` Andrew Murray
2019-10-16 20:06 ` [PATCH v2 10/25] PCI: rockchip: " Rob Herring
2019-10-18 15:51 ` Andrew Murray
2019-10-20 21:36 ` Rob Herring
2019-10-16 20:06 ` [PATCH v2 11/25] PCI: rockchip: Drop storing driver private outbound resource data Rob Herring
2019-10-17 7:26 ` Christoph Hellwig
2019-10-17 12:24 ` Rob Herring
2019-10-16 20:06 ` [PATCH v2 12/25] PCI: v3-semi: Use pci_parse_request_of_pci_ranges() Rob Herring
2019-10-21 0:38 ` Linus Walleij
2019-10-16 20:06 ` [PATCH v2 13/25] PCI: xgene: " Rob Herring
2019-10-16 20:06 ` [PATCH v2 14/25] PCI: xilinx: " Rob Herring
2019-10-16 20:06 ` [PATCH v2 15/25] PCI: xilinx-nwl: " Rob Herring
2019-10-16 20:06 ` [PATCH v2 16/25] PCI: versatile: " Rob Herring
2019-10-21 0:39 ` Linus Walleij
2019-10-16 20:06 ` [PATCH v2 17/25] PCI: versatile: Remove usage of PHYS_OFFSET Rob Herring
2019-10-21 0:40 ` Linus Walleij
2019-10-16 20:06 ` [PATCH v2 18/25] PCI: versatile: Enable COMPILE_TEST Rob Herring
2019-10-21 0:41 ` Linus Walleij
2019-10-16 20:06 ` [PATCH v2 19/25] PCI: of: Add inbound resource parsing to helpers Rob Herring
2019-10-16 20:06 ` [PATCH v2 20/25] PCI: ftpci100: Use inbound resources for setup Rob Herring
2019-10-21 0:41 ` Linus Walleij
2019-10-16 20:06 ` [PATCH v2 21/25] PCI: v3-semi: " Rob Herring
2019-10-16 20:06 ` [PATCH v2 22/25] PCI: xgene: " Rob Herring
2019-10-16 20:06 ` [PATCH v2 23/25] PCI: iproc: " Rob Herring
2019-10-16 20:06 ` [PATCH v2 24/25] PCI: rcar: " Rob Herring
2019-10-16 20:06 ` [PATCH v2 25/25] PCI: Make devm_of_pci_get_host_bridge_resources() static Rob Herring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191016200647.32050-9-robh@kernel.org \
--to=robh@kernel.org \
--cc=Zhiqiang.Hou@nxp.com \
--cc=andrew.murray@arm.com \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=bhelgaas@google.com \
--cc=gustavo.pimentel@synopsys.com \
--cc=heiko@sntech.de \
--cc=horms@verge.net.au \
--cc=jingoohan1@gmail.com \
--cc=lftan@altera.com \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=m.karthikeyan@mobiveil.co.in \
--cc=matthias.bgg@gmail.com \
--cc=michal.simek@xilinx.com \
--cc=rfi@lists.rocketboards.org \
--cc=rjui@broadcom.com \
--cc=ryder.lee@mediatek.com \
--cc=sbranden@broadcom.com \
--cc=shawn.lin@rock-chips.com \
--cc=srinath.mannam@broadcom.com \
--cc=thomas.petazzoni@bootlin.com \
--cc=tjoseph@cadence.com \
--cc=toan@os.amperecomputing.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).