diff options
| author | Tanmay Inamdar <tinamdar@apm.com> | 2014-05-23 20:54:28 +0800 |
|---|---|---|
| committer | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2015-01-27 09:54:59 +0000 |
| commit | 1572e6825565af3c3ea2230f1d52f20bd0e23b8b (patch) | |
| tree | 86c506c428d04ed7e33e596f47cd145bd76c8c1f /drivers/pci/host/pci-xgene.c | |
| parent | 470825c878693ff4fc65a0b36bc55d94e7803fe6 (diff) | |
| download | linux-1572e6825565af3c3ea2230f1d52f20bd0e23b8b.tar.gz | |
UBUNTU: SAUCE: Add MSI/MSI-X driver for APM PCI bus
BugLink: http://launchpad.net/bugs/1318977
Signed-off-by: Tanmay Inamdar <tinamdar@apm.com>
Signed-off-by: Ike Panhc <ike.pan@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Brad Figg <brad.figg@canonical.com>
Conflicts:
drivers/pci/host/Kconfig
drivers/pci/host/pci-xgene.c
Conflicts:
arch/arm64/kernel/Makefile
drivers/pci/host/Makefile
Diffstat (limited to 'drivers/pci/host/pci-xgene.c')
| -rw-r--r-- | drivers/pci/host/pci-xgene.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/pci/host/pci-xgene.c b/drivers/pci/host/pci-xgene.c index b1d0596457c5..998e15bad2ef 100644 --- a/drivers/pci/host/pci-xgene.c +++ b/drivers/pci/host/pci-xgene.c @@ -529,7 +529,7 @@ static int pci_dma_range_parser_init(struct of_pci_range_parser *parser, parser->pna = of_n_addr_cells(node); parser->np = parser->pna + na + ns; - parser->range = of_get_property(node, "dma-ranges", &rlen); + parser->range = of_get_property(node, "ib-ranges", &rlen); if (!parser->range) return -ENOENT; parser->end = parser->range + rlen / sizeof(__be32); @@ -546,14 +546,13 @@ static int xgene_pcie_parse_map_dma_ranges(struct xgene_pcie_port *port) u8 ib_reg_mask = 0; if (pci_dma_range_parser_init(&parser, np)) { - dev_err(dev, "missing dma-ranges property\n"); + dev_err(dev, "missing ib-ranges property\n"); return -EINVAL; } - /* Get the dma-ranges from DT */ + /* Get the ib-ranges from DT */ for_each_of_pci_range(&parser, &range) { u64 end = range.cpu_addr + range.size - 1; - dev_dbg(port->dev, "0x%08x 0x%016llx..0x%016llx -> 0x%016llx\n", range.flags, range.cpu_addr, end, range.pci_addr); xgene_pcie_setup_ib_reg(port, &range, &ib_reg_mask); |