Commit 42dcb705 authored Feb 02, 2015 by Charlotte Richardson Committed by Greg Kroah-Hartman Feb 11, 2015

PCI: Add NEC variants to Stratus ftServer PCIe DMI check

commit 51ac3d2f0c505ca36ffc9715ffd518d756589ef8 upstream.

NEC OEMs the same platforms as Stratus does, which have multiple devices on
some PCIe buses under downstream ports.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=51331


Fixes: 1278998f ("PCI: Work around Stratus ftServer broken PCIe hierarchy (fix DMI check)")
Signed-off-by: Charlotte Richardson <charlotte.richardson@stratus.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: Myron Stowe <myron.stowe@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 0df05be2

arch/x86/pci/common.c

+16 −0

Original line number	Diff line number	Diff line
		@@ -448,6 +448,22 @@ static const struct dmi_system_id pciprobe_dmi_table[] __initconst = {
		DMI_MATCH(DMI_PRODUCT_NAME, "ftServer"),
		},
		},
		{
		.callback = set_scan_all,
		.ident = "Stratus/NEC ftServer",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "NEC"),
		DMI_MATCH(DMI_PRODUCT_NAME, "Express5800/R32"),
		},
		},
		{
		.callback = set_scan_all,
		.ident = "Stratus/NEC ftServer",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "NEC"),
		DMI_MATCH(DMI_PRODUCT_NAME, "Express5800/R31"),
		},
		},
		{}
		};