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

Merge branch 'remotes/lorenzo/pci/iproc'

Browse Source 
- Don't fail devm_pci_alloc_host_bridge() on missing 'ranges' (Rob Herring)

- Fix BCMA probe resource handling (Rob Herring)

* remotes/lorenzo/pci/iproc:
  PCI: iproc: Fix BCMA probe resource handling
  PCI: of: Don't fail devm_pci_alloc_host_bridge() on missing 'ranges'
This commit is contained in:
Bjorn Helgaas 2021-09-02 14:56:48 -05:00
commit c1bb1449fa
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/pci/controller/pcie-iproc-bcma.c
View File

@ -35,7 +35,6 @@ static int iproc_pcie_bcma_probe(struct bcma_device *bdev)
{ {
struct device *dev = &bdev->dev; struct device *dev = &bdev->dev;
struct iproc_pcie *pcie; struct iproc_pcie *pcie;
LIST_HEAD(resources);
struct pci_host_bridge *bridge; struct pci_host_bridge *bridge;
int ret; int ret;
@ -60,19 +59,16 @@ static int iproc_pcie_bcma_probe(struct bcma_device *bdev)
pcie->mem.end = bdev->addr_s[0] + SZ_128M - 1; pcie->mem.end = bdev->addr_s[0] + SZ_128M - 1;
pcie->mem.name = "PCIe MEM space"; pcie->mem.name = "PCIe MEM space";
pcie->mem.flags = IORESOURCE_MEM; pcie->mem.flags = IORESOURCE_MEM;
pci_add_resource(&resources, &pcie->mem); pci_add_resource(&bridge->windows, &pcie->mem);
ret = devm_request_pci_bus_resources(dev, &bridge->windows);
if (ret)
return ret;
pcie->map_irq = iproc_pcie_bcma_map_irq; pcie->map_irq = iproc_pcie_bcma_map_irq;
ret = iproc_pcie_setup(pcie, &resources);
if (ret) {
dev_err(dev, "PCIe controller setup failed\n");
pci_free_resource_list(&resources);
return ret;
}
bcma_set_drvdata(bdev, pcie); bcma_set_drvdata(bdev, pcie);
return 0;
return iproc_pcie_setup(pcie, &bridge->windows);
} }
static void iproc_pcie_bcma_remove(struct bcma_device *bdev) static void iproc_pcie_bcma_remove(struct bcma_device *bdev)

2
drivers/pci/of.c
View File

@ -310,7 +310,7 @@ static int devm_of_pci_get_host_bridge_resources(struct device *dev,
/* Check for ranges property */ /* Check for ranges property */
err = of_pci_range_parser_init(&parser, dev_node); err = of_pci_range_parser_init(&parser, dev_node);
if (err) if (err)
goto failed; return 0;
dev_dbg(dev, "Parsing ranges property...\n"); dev_dbg(dev, "Parsing ranges property...\n");
for_each_of_pci_range(&parser, &range) { for_each_of_pci_range(&parser, &range) {