diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2012-04-30 17:21:02 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-04-30 17:21:02 -0400 |
commit | 284f5f9dbac170b054c1e386ef92cbf654e91bba (patch) | |
tree | 74cacc94070d5590378c368fa7378d37319d07be /arch/x86 | |
parent | 66f75a5d028beaf67c931435fdc3e7823125730c (diff) |
PCI: work around Stratus ftServer broken PCIe hierarchy
A PCIe downstream port is a P2P bridge. Its secondary interface is
a link that should lead only to device 0 (unless ARI is enabled)[1], so
we don't probe for non-zero device numbers.
Some Stratus ftServer systems have a PCIe downstream port (02:00.0) that
leads to both an upstream port (03:00.0) and a downstream port (03:01.0),
and 03:01.0 has important devices below it:
[0000:02]-+-00.0-[03-3c]--+-00.0-[04-09]--...
\-01.0-[0a-0d]--+-[USB]
+-[NIC]
+-...
Previously, we didn't enumerate device 03:01.0, so USB and the network
didn't work. This patch adds a DMI quirk to scan all device numbers,
not just 0, below a downstream port.
Based on a patch by Prarit Bhargava.
[1] PCIe spec r3.0, sec 7.3.1
CC: Myron Stowe <mstowe@redhat.com>
CC: Don Dutile <ddutile@redhat.com>
CC: James Paradis <james.paradis@stratus.com>
CC: Matthew Wilcox <matthew.r.wilcox@intel.com>
CC: Jesse Barnes <jbarnes@virtuousgeek.org>
CC: Prarit Bhargava <prarit@redhat.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/pci/common.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 323481e06ef8..16c5d7835295 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c | |||
@@ -11,6 +11,7 @@ | |||
11 | #include <linux/dmi.h> | 11 | #include <linux/dmi.h> |
12 | #include <linux/slab.h> | 12 | #include <linux/slab.h> |
13 | 13 | ||
14 | #include <asm-generic/pci-bridge.h> | ||
14 | #include <asm/acpi.h> | 15 | #include <asm/acpi.h> |
15 | #include <asm/segment.h> | 16 | #include <asm/segment.h> |
16 | #include <asm/io.h> | 17 | #include <asm/io.h> |
@@ -229,6 +230,14 @@ static int __devinit assign_all_busses(const struct dmi_system_id *d) | |||
229 | } | 230 | } |
230 | #endif | 231 | #endif |
231 | 232 | ||
233 | static int __devinit set_scan_all(const struct dmi_system_id *d) | ||
234 | { | ||
235 | printk(KERN_INFO "PCI: %s detected, enabling pci=pcie_scan_all\n", | ||
236 | d->ident); | ||
237 | pci_add_flags(PCI_SCAN_ALL_PCIE_DEVS); | ||
238 | return 0; | ||
239 | } | ||
240 | |||
232 | static const struct dmi_system_id __devinitconst pciprobe_dmi_table[] = { | 241 | static const struct dmi_system_id __devinitconst pciprobe_dmi_table[] = { |
233 | #ifdef __i386__ | 242 | #ifdef __i386__ |
234 | /* | 243 | /* |
@@ -420,6 +429,13 @@ static const struct dmi_system_id __devinitconst pciprobe_dmi_table[] = { | |||
420 | DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL585 G2"), | 429 | DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL585 G2"), |
421 | }, | 430 | }, |
422 | }, | 431 | }, |
432 | { | ||
433 | .callback = set_scan_all, | ||
434 | .ident = "Stratus/NEC ftServer", | ||
435 | .matches = { | ||
436 | DMI_MATCH(DMI_SYS_VENDOR, "ftServer"), | ||
437 | }, | ||
438 | }, | ||
423 | {} | 439 | {} |
424 | }; | 440 | }; |
425 | 441 | ||