75 lines
2.5 KiB
Diff
75 lines
2.5 KiB
Diff
From: Rob Herring <robh@kernel.org>
|
|
Date: Tue, 3 Aug 2021 15:56:56 -0600
|
|
Subject: [PATCH] PCI: iproc: Fix BCMA probe resource handling
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
In commit 7ef1c871da16 ("PCI: iproc: Use
|
|
pci_parse_request_of_pci_ranges()"), calling
|
|
devm_request_pci_bus_resources() was dropped from the common iProc
|
|
probe code, but is still needed for BCMA bus probing. Without it, there
|
|
will be lots of warnings like this:
|
|
|
|
pci 0000:00:00.0: BAR 8: no space for [mem size 0x00c00000]
|
|
pci 0000:00:00.0: BAR 8: failed to assign [mem size 0x00c00000]
|
|
|
|
Add back calling devm_request_pci_bus_resources() and adding the
|
|
resources to pci_host_bridge.windows for BCMA bus probe.
|
|
|
|
Fixes: 7ef1c871da16 ("PCI: iproc: Use pci_parse_request_of_pci_ranges()")
|
|
Reported-by: Rafał Miłecki <zajec5@gmail.com>
|
|
Cc: Srinath Mannam <srinath.mannam@broadcom.com>
|
|
Cc: Roman Bacik <roman.bacik@broadcom.com>
|
|
Cc: Bharat Gooty <bharat.gooty@broadcom.com>
|
|
Cc: Abhishek Shah <abhishek.shah@broadcom.com>
|
|
Cc: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
|
|
Cc: Ray Jui <ray.jui@broadcom.com>
|
|
Cc: Florian Fainelli <f.fainelli@gmail.com>
|
|
Cc: BCM Kernel Feedback <bcm-kernel-feedback-list@broadcom.com>
|
|
Cc: Scott Branden <sbranden@broadcom.com>
|
|
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
|
|
Cc: "Krzysztof Wilczyński" <kw@linux.com>
|
|
Cc: Bjorn Helgaas <bhelgaas@google.com>
|
|
Signed-off-by: Rob Herring <robh@kernel.org>
|
|
---
|
|
drivers/pci/controller/pcie-iproc-bcma.c | 16 ++++++----------
|
|
1 file changed, 6 insertions(+), 10 deletions(-)
|
|
|
|
--- a/drivers/pci/controller/pcie-iproc-bcma.c
|
|
+++ b/drivers/pci/controller/pcie-iproc-bcma.c
|
|
@@ -35,7 +35,6 @@ static int iproc_pcie_bcma_probe(struct
|
|
{
|
|
struct device *dev = &bdev->dev;
|
|
struct iproc_pcie *pcie;
|
|
- LIST_HEAD(resources);
|
|
struct pci_host_bridge *bridge;
|
|
int ret;
|
|
|
|
@@ -60,19 +59,16 @@ static int iproc_pcie_bcma_probe(struct
|
|
pcie->mem.end = bdev->addr_s[0] + SZ_128M - 1;
|
|
pcie->mem.name = "PCIe MEM space";
|
|
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;
|
|
|
|
- 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);
|
|
- return 0;
|
|
+
|
|
+ return iproc_pcie_setup(pcie, &bridge->windows);
|
|
}
|
|
|
|
static void iproc_pcie_bcma_remove(struct bcma_device *bdev)
|