diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-09-26 14:22:39 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-09-26 14:22:39 +1000 |
| commit | bb36c44557a4fcbaa17c0f2776e12a05a691b432 (patch) | |
| tree | 5a7e7a92f9184bbd32e79649f5239af474b537cf /arch/powerpc | |
| parent | d12b524f8b2f4e45cabe8bc1501e8b967d543111 (diff) | |
| download | linux-3.10-bb36c44557a4fcbaa17c0f2776e12a05a691b432.tar.gz linux-3.10-bb36c44557a4fcbaa17c0f2776e12a05a691b432.tar.bz2 linux-3.10-bb36c44557a4fcbaa17c0f2776e12a05a691b432.zip | |
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')
| -rw-r--r-- | arch/powerpc/kernel/pci-common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index 1bd47f36b25..677ecccbe10 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) hose->last_busno = bus->subordinate = pci_scan_child_bus(bus); /* Configure PCI Express settings */ - if (bus) { + if (bus && !pci_has_flag(PCI_PROBE_ONLY)) { struct pci_bus *child; list_for_each_entry(child, &bus->children, node) { struct pci_dev *self = child->self; |