From patchwork Thu Jan 10 21:02:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [3.5.y.z, extended, stable] Patch "PCI: Work around Stratus ftServer broken PCIe hierarchy (fix" has been added to staging queue Date: Thu, 10 Jan 2013 11:02:51 -0000 From: Herton Ronaldo Krzesinski X-Patchwork-Id: 211152 Message-Id: <1357851771-23729-1-git-send-email-herton.krzesinski@canonical.com> To: Myron Stowe Cc: Bjorn Helgaas , kernel-team@lists.ubuntu.com, Fadeeva Marina This is a note to let you know that I have just added a patch titled PCI: Work around Stratus ftServer broken PCIe hierarchy (fix to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree which can be found at: http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 3.5.y.z tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Herton ------ >From 2ce730d08c49f20f62f566734186076903316c6d Mon Sep 17 00:00:00 2001 From: Myron Stowe Date: Wed, 26 Dec 2012 10:39:23 -0700 Subject: [PATCH] PCI: Work around Stratus ftServer broken PCIe hierarchy (fix DMI check) 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 Reference: https://bugzilla.kernel.org/show_bug.cgi?id=51331 Signed-off-by: Myron Stowe Signed-off-by: Bjorn Helgaas Signed-off-by: Herton Ronaldo Krzesinski --- arch/x86/pci/common.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 1.7.9.5 diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 0ad990a..dd3b583 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c @@ -433,7 +433,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"), }, }, {}