diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2018-04-17 14:59:10 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2018-12-09 23:11:25 +0100 |
| commit | 7be4a9cc336091488a53a8e1dd3f68d0d821a41e (patch) | |
| tree | e3f97de06d37585bc3216e07647433e7cfbe311a | |
| parent | 1f6b90756dbd30dacef2b8bfa7f264c24e6c0eb0 (diff) | |
Revert "PCI: Do not allocate more buses than available in parent"
This reverts commit 9a4bf05126f42c2632729ab0da503021d74ed454.
With this commit the PCIe enumaration fails. A follow up commit further
addresses the issue.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
| -rw-r--r-- | drivers/pci/probe.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index a98be6db7e93..60bada90cd75 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -932,8 +932,7 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass) child = pci_add_new_bus(bus, dev, max+1); if (!child) goto out; - pci_bus_insert_busn_res(child, max+1, - bus->busn_res.end); + pci_bus_insert_busn_res(child, max+1, 0xff); } max++; buses = (buses & 0xff000000) @@ -2137,10 +2136,6 @@ unsigned int pci_scan_child_bus(struct pci_bus *bus) if (bus->self && bus->self->is_hotplug_bridge && pci_hotplug_bus_size) { if (max - bus->busn_res.start < pci_hotplug_bus_size - 1) max = bus->busn_res.start + pci_hotplug_bus_size - 1; - - /* Do not allocate more buses than we have room left */ - if (max > bus->busn_res.end) - max = bus->busn_res.end; } /* |