]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
PCI: aardvark: Size bridges before resources allocation
authorZachary Zhang <zhangzg@marvell.com>
Fri, 29 Jun 2018 09:16:19 +0000 (11:16 +0200)
committerLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Fri, 6 Jul 2018 12:08:04 +0000 (13:08 +0100)
The PCIE I/O and MEM resource allocation mechanism is that root bus
goes through the following steps:

1. Check PCI bridges' range and computes I/O and Mem base/limits.

2. Sort all subordinate devices I/O and MEM resource requirements and
   allocate the resources and writes/updates subordinate devices'
   requirements to PCI bridges I/O and Mem MEM/limits registers.

Currently, PCI Aardvark driver only handles the second step and lacks
the first step, so there is an I/O and MEM resource allocation failure
when using a PCI switch. This commit fixes that by sizing bridges
before doing the resource allocation.

Fixes: 8c39d710363c1 ("PCI: aardvark: Add Aardvark PCI host controller
driver")
Signed-off-by: Zachary Zhang <zhangzg@marvell.com>
[Thomas: edit commit log.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: <stable@vger.kernel.org>
drivers/pci/controller/pci-aardvark.c

index c9c72595bd2037a375dc8351377f257fd260a805..10543ed7b500a0a55cad5f2630cb2a67f52d606e 100644 (file)
@@ -906,6 +906,7 @@ static int advk_pcie_probe(struct platform_device *pdev)
 
        bus = bridge->bus;
 
+       pci_bus_size_bridges(bus);
        pci_bus_assign_resources(bus);
 
        list_for_each_entry(child, &bus->children, node)