From: Yinghai Lu <yinghai.lu@xxxxxxxxxx>
Fixes PCI device detection on IBM xSeries IBM 3850 M2 / x3950 M2
when using ACPI resources (_CRS).
This is default, a manual workaround (without this patch)
would be pci=nocrs boot param.
Tested-by: garyhade@xxxxxxxxxx
CC: trenn@xxxxxxx
CC: bhelgaas@xxxxxxxxxx
Signed-off-by: Thomas Renninger <trenn@xxxxxxx>
---
drivers/pci/probe.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 7cc9e2f..1e255c8 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -651,6 +651,10 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max,
dev_dbg(&dev->dev, "scanning [bus %02x-%02x] behind bridge, pass %d\n",
secondary, subordinate, pass);
+ /* some bridge primary bus is hard wired to 0 */
+ if (!primary && (primary != bus->number) && secondary && subordinate)
+ primary = bus->number;
+
/* Check if setup is sensible at all */
if (!pass &&
(primary != bus->number || secondary <= bus->number)) {
--
1.7.6.1
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
