leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PCI: mediatek: Use devm_of_pci_get_host_bridge_resources() to parse DT

Browse Source 
Use the devm_of_pci_get_host_bridge_resources() API in place of the PCI OF
DT parser.

Signed-off-by: Honghui Zhang <honghui.zhang@mediatek.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: Ryder Lee <ryder.lee@mediatek.com>
This commit is contained in:
Honghui Zhang
2018-11-30 11:33:00 +08:00
committed by Lorenzo Pieralisi
parent 651022382c
commit 0c0f2f93e7
1 changed files with 27 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
drivers/pci/controller/pcie-mediatek.c
View File

@@ -197,29 +197,20 @@ struct mtk_pcie_port {
* @dev: pointer to PCIe device * @dev: pointer to PCIe device
* @base: IO mapped register base * @base: IO mapped register base
* @free_ck: free-run reference clock * @free_ck: free-run reference clock
* @io: IO resource
* @pio: PIO resource
* @mem: non-prefetchable memory resource * @mem: non-prefetchable memory resource
* @busn: bus range
* @offset: IO / Memory offset
* @ports: pointer to PCIe port information * @ports: pointer to PCIe port information
* @soc: pointer to SoC-dependent operations * @soc: pointer to SoC-dependent operations
* @busnr: root bus number
*/ */
struct mtk_pcie { struct mtk_pcie {
struct device *dev; struct device *dev;
void __iomem *base; void __iomem *base;
struct clk *free_ck; struct clk *free_ck;
struct resource io;
struct resource pio;
struct resource mem; struct resource mem;
struct resource busn;
struct {
resource_size_t mem;
resource_size_t io;
} offset;
struct list_head ports; struct list_head ports;
const struct mtk_pcie_soc *soc; const struct mtk_pcie_soc *soc;
unsigned int busnr;
}; };
static void mtk_pcie_subsys_powerdown(struct mtk_pcie *pcie) static void mtk_pcie_subsys_powerdown(struct mtk_pcie *pcie)
@@ -1045,55 +1036,43 @@ static int mtk_pcie_setup(struct mtk_pcie *pcie)
{ {
struct device *dev = pcie->dev; struct device *dev = pcie->dev;
struct device_node *node = dev->of_node, *child; 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 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; int err;
if (of_pci_range_parser_init(&parser, node)) { err = devm_of_pci_get_host_bridge_resources(dev, 0, 0xff,
dev_err(dev, "missing \"ranges\" property\n"); windows, &io_base);
return -EINVAL; if (err)
} return err;
for_each_of_pci_range(&parser, &range) { err = devm_request_pci_bus_resources(dev, windows);
err = of_pci_range_to_resource(&range, node, &res);
if (err < 0) if (err < 0)
return err; 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: case IORESOURCE_IO:
pcie->offset.io = res.start - range.pci_addr; err = devm_pci_remap_iospace(dev, win->res, io_base);
if (err) {
memcpy(&pcie->pio, &res, sizeof(res)); dev_warn(dev, "error %d: failed to map resource %pR\n",
pcie->pio.name = node->full_name; err, win->res);
resource_list_destroy_entry(win);
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));
break; break;
case IORESOURCE_MEM: case IORESOURCE_MEM:
pcie->offset.mem = res.start - range.pci_addr; memcpy(&pcie->mem, win->res, sizeof(*win->res));
memcpy(&pcie->mem, &res, sizeof(res));
pcie->mem.name = "non-prefetchable"; pcie->mem.name = "non-prefetchable";
break; break;
case IORESOURCE_BUS:
pcie->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) { for_each_available_child_of_node(node, child) {
int slot; int slot;
@@ -1125,28 +1104,6 @@ static int mtk_pcie_setup(struct mtk_pcie *pcie)
return 0; 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)
return err;
return 0;
}
static int mtk_pcie_probe(struct platform_device *pdev) static int mtk_pcie_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
@@ -1169,11 +1126,7 @@ static int mtk_pcie_probe(struct platform_device *pdev)
if (err) if (err)
return err; return err;
err = mtk_pcie_request_resources(pcie); host->busnr = pcie->busnr;
if (err)
goto put_resources;
host->busnr = pcie->busn.start;
host->dev.parent = pcie->dev; host->dev.parent = pcie->dev;
host->ops = pcie->soc->ops; host->ops = pcie->soc->ops;
host->map_irq = of_irq_parse_and_map_pci; host->map_irq = of_irq_parse_and_map_pci;