target/linux/generic/backport-5.10/840-0002-PCI-iproc-Fix-BCMA-probe-resource-handling.patch

   1 From: Rob Herring <robh@kernel.org>
   2 Date: Tue, 3 Aug 2021 15:56:56 -0600
   3 Subject: [PATCH] PCI: iproc: Fix BCMA probe resource handling
   4 MIME-Version: 1.0
   5 Content-Type: text/plain; charset=UTF-8
   6 Content-Transfer-Encoding: 8bit
   7
   8 In commit 7ef1c871da16 ("PCI: iproc: Use
   9 pci_parse_request_of_pci_ranges()"), calling
  10 devm_request_pci_bus_resources() was dropped from the common iProc
  11 probe code, but is still needed for BCMA bus probing. Without it, there
  12 will be lots of warnings like this:
  13
  14 pci 0000:00:00.0: BAR 8: no space for [mem size 0x00c00000]
  15 pci 0000:00:00.0: BAR 8: failed to assign [mem size 0x00c00000]
  16
  17 Add back calling devm_request_pci_bus_resources() and adding the
  18 resources to pci_host_bridge.windows for BCMA bus probe.
  19
  20 Fixes: 7ef1c871da16 ("PCI: iproc: Use pci_parse_request_of_pci_ranges()")
  21 Reported-by: Rafał Miłecki <zajec5@gmail.com>
  22 Cc: Srinath Mannam <srinath.mannam@broadcom.com>
  23 Cc: Roman Bacik <roman.bacik@broadcom.com>
  24 Cc: Bharat Gooty <bharat.gooty@broadcom.com>
  25 Cc: Abhishek Shah <abhishek.shah@broadcom.com>
  26 Cc: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
  27 Cc: Ray Jui <ray.jui@broadcom.com>
  28 Cc: Florian Fainelli <f.fainelli@gmail.com>
  29 Cc: BCM Kernel Feedback <bcm-kernel-feedback-list@broadcom.com>
  30 Cc: Scott Branden <sbranden@broadcom.com>
  31 Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
  32 Cc: "Krzysztof Wilczyński" <kw@linux.com>
  33 Cc: Bjorn Helgaas <bhelgaas@google.com>
  34 Signed-off-by: Rob Herring <robh@kernel.org>
  35 ---
  36  drivers/pci/controller/pcie-iproc-bcma.c | 16 ++++++----------
  37  1 file changed, 6 insertions(+), 10 deletions(-)
  38
  39 --- a/drivers/pci/controller/pcie-iproc-bcma.c
  40 +++ b/drivers/pci/controller/pcie-iproc-bcma.c
  41 @@ -35,7 +35,6 @@ static int iproc_pcie_bcma_probe(struct
  42  {
  43         struct device *dev = &bdev->dev;
  44         struct iproc_pcie *pcie;
  45 -       LIST_HEAD(resources);
  46         struct pci_host_bridge *bridge;
  47         int ret;
  48
  49 @@ -60,19 +59,16 @@ static int iproc_pcie_bcma_probe(struct
  50         pcie->mem.end = bdev->addr_s[0] + SZ_128M - 1;
  51         pcie->mem.name = "PCIe MEM space";
  52         pcie->mem.flags = IORESOURCE_MEM;
  53 -       pci_add_resource(&resources, &pcie->mem);
  54 +       pci_add_resource(&bridge->windows, &pcie->mem);
  55 +       ret = devm_request_pci_bus_resources(dev, &bridge->windows);
  56 +       if (ret)
  57 +               return ret;
  58
  59         pcie->map_irq = iproc_pcie_bcma_map_irq;
  60
  61 -       ret = iproc_pcie_setup(pcie, &resources);
  62 -       if (ret) {
  63 -               dev_err(dev, "PCIe controller setup failed\n");
  64 -               pci_free_resource_list(&resources);
  65 -               return ret;
  66 -       }
  67 -
  68         bcma_set_drvdata(bdev, pcie);
  69 -       return 0;
  70 +
  71 +       return iproc_pcie_setup(pcie, &bridge->windows);
  72  }
  73
  74  static void iproc_pcie_bcma_remove(struct bcma_device *bdev)