summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2017-02-21 15:15:54 -0600
committerBjorn Helgaas <bhelgaas@google.com>2017-02-21 15:15:54 -0600
commitf08bf55e690ebdac28402955ef953e11ff478668 (patch)
treee42ae70f6868643e1b0f04d98c2f6c48654c4226 /drivers/pci
parentb98a7f7509ed7a031ed750be11b72b7ca1c95513 (diff)
parent70bc1b684b49781c882fec44023b37b7b45fe359 (diff)
downloadlinux-stable-f08bf55e690ebdac28402955ef953e11ff478668.tar.gz
linux-stable-f08bf55e690ebdac28402955ef953e11ff478668.tar.bz2
linux-stable-f08bf55e690ebdac28402955ef953e11ff478668.zip
Merge branch 'pci/host-versatile' into next
* pci/host-versatile: PCI: versatile: Configure PCIe MPS settings
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/host/pci-versatile.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pci/host/pci-versatile.c b/drivers/pci/host/pci-versatile.c
index b7dc07002f13..5ebee7d37ff5 100644
--- a/drivers/pci/host/pci-versatile.c
+++ b/drivers/pci/host/pci-versatile.c
@@ -124,7 +124,7 @@ static int versatile_pci_probe(struct platform_device *pdev)
int ret, i, myslot = -1;
u32 val;
void __iomem *local_pci_cfg_base;
- struct pci_bus *bus;
+ struct pci_bus *bus, *child;
LIST_HEAD(pci_res);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -204,6 +204,8 @@ static int versatile_pci_probe(struct platform_device *pdev)
pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci);
pci_assign_unassigned_bus_resources(bus);
+ list_for_each_entry(child, &bus->children, node)
+ pcie_bus_configure_settings(child);
pci_bus_add_devices(bus);
return 0;