Skip to contentSkip to conversation

FAILED: patch "[PATCH] PCI: aardvark: Size bridges before resources allocation" failed to apply to 4.14-stable tree

PATCH [email protected] 1 participant 1 message Aug 23, 2018

Subsystems (4)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 91a2968e245d6ba616db37001fa1a043078b1a65 Mon Sep 17 00:00:00 2001

From: Zachary Zhang <[email protected]>
Date: Fri, 29 Jun 2018 11:16:19 +0200
Subject: [PATCH] PCI: aardvark: Size bridges before resources allocation

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")

drivers/pci/controller/pci-aardvark.c +1 -0
index c9c72595bd20..10543ed7b500 100644
@@ -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)