aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-09-26 00:22:39 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-09-26 00:22:39 -0400
commitbb36c44557a4fcbaa17c0f2776e12a05a691b432 (patch)
tree5a7e7a92f9184bbd32e79649f5239af474b537cf /arch/powerpc/kernel
parentd12b524f8b2f4e45cabe8bc1501e8b967d543111 (diff)
powerpc/pci: Don't configure PCIe settings when PCI_PROBE_ONLY is set
We don't want to configure PCI Express Max Payload Size or Max Read Request Size on systems that set that flag. The firmware will have done it for us, and under hypervisors such as pHyp we don't even see the parent switches and bridges and thus can make no assumption on what values are safe to use. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r--arch/powerpc/kernel/pci-common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 1bd47f36b25f..677ecccbe10d 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -1732,7 +1732,7 @@ void __devinit pcibios_scan_phb(struct pci_controller *hose)
1732 hose->last_busno = bus->subordinate = pci_scan_child_bus(bus); 1732 hose->last_busno = bus->subordinate = pci_scan_child_bus(bus);
1733 1733
1734 /* Configure PCI Express settings */ 1734 /* Configure PCI Express settings */
1735 if (bus) { 1735 if (bus && !pci_has_flag(PCI_PROBE_ONLY)) {
1736 struct pci_bus *child; 1736 struct pci_bus *child;
1737 list_for_each_entry(child, &bus->children, node) { 1737 list_for_each_entry(child, &bus->children, node) {
1738 struct pci_dev *self = child->self; 1738 struct pci_dev *self = child->self;