diff options
| author |   Myron Stowe <myron.stowe@redhat.com> | 2012-12-26 10:39:23 -0700 |
|---|---|---|
| committer |   Bjorn Helgaas <bhelgaas@google.com> | 2012-12-26 10:39:23 -0700 |
| commit | 1278998f8ff6d66044ed00b581bbf14aacaba215 (patch) | |
| tree | 624a50cde8213ea2659d803e6df397696f267dd9 /arch/x86 | |
| parent | PCI: Remove spurious error for sriov_numvfs store and simplify flow (diff) | |
| download | linux-dev-1278998f8ff6d66044ed00b581bbf14aacaba215.tar.xz linux-dev-1278998f8ff6d66044ed00b581bbf14aacaba215.zip | |
PCI: Work around Stratus ftServer broken PCIe hierarchy (fix DMI check)
Commit 284f5f9 was intended to disable the "only_one_child()" optimization
on Stratus ftServer systems, but its DMI check is wrong. It looks for
DMI_SYS_VENDOR that contains "ftServer", when it should look for
DMI_SYS_VENDOR containing "Stratus" and DMI_PRODUCT_NAME containing
"ftServer".
Tested on Stratus ftServer 6400.
Reported-by: Fadeeva Marina <astarta@rat.ru>
Reference: https://bugzilla.kernel.org/show_bug.cgi?id=51331
Signed-off-by: Myron Stowe <myron.stowe@redhat.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: stable@vger.kernel.org # v3.5+
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/pci/common.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 1b1dda90a945..412e1286d1fc 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c @@ -434,7 +434,8 @@ static const struct dmi_system_id __devinitconst pciprobe_dmi_table[] = { .callback = set_scan_all, .ident = "Stratus/NEC ftServer", .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "ftServer"), + DMI_MATCH(DMI_SYS_VENDOR, "Stratus"), + DMI_MATCH(DMI_PRODUCT_NAME, "ftServer"), }, }, {} |