| From 1278998f8ff6d66044ed00b581bbf14aacaba215 Mon Sep 17 00:00:00 2001 |
| From: Myron Stowe <myron.stowe@redhat.com> |
| Date: Wed, 26 Dec 2012 10:39:23 -0700 |
| Subject: PCI: Work around Stratus ftServer broken PCIe hierarchy (fix DMI check) |
| |
| From: Myron Stowe <myron.stowe@redhat.com> |
| |
| commit 1278998f8ff6d66044ed00b581bbf14aacaba215 upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/x86/pci/common.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/arch/x86/pci/common.c |
| +++ b/arch/x86/pci/common.c |
| @@ -433,7 +433,8 @@ static const struct dmi_system_id __devi |
| .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"), |
| }, |
| }, |
| {} |
