Commit 1278998f authored Dec 26, 2012 by Myron Stowe Committed by Bjorn Helgaas Dec 26, 2012

PCI: Work around Stratus ftServer broken PCIe hierarchy (fix DMI check)



Commit 284f5f9d 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+

parent faa48a50

arch/x86/pci/common.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -434,7 +434,8 @@ static const struct dmi_system_id __devinitconst pciprobe_dmi_table[] = {
	.callback = set_scan_all,		.callback = set_scan_all,
	.ident = "Stratus/NEC ftServer",		.ident = "Stratus/NEC ftServer",
	.matches = {		.matches = {
	DMI_MATCH(DMI_SYS_VENDOR, "ftServer"),		DMI_MATCH(DMI_SYS_VENDOR, "Stratus"),
			DMI_MATCH(DMI_PRODUCT_NAME, "ftServer"),
	},		},
	},		},
	{}		{}