]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
PCI: Add NEC variants to Stratus ftServer PCIe DMI check
authorCharlotte Richardson <charlotte.richardson@stratus.com>
Mon, 2 Feb 2015 15:36:23 +0000 (09:36 -0600)
committerLuis Henriques <luis.henriques@canonical.com>
Tue, 10 Feb 2015 13:38:46 +0000 (13:38 +0000)
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: 1278998f8ff6 ("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: Luis Henriques <luis.henriques@canonical.com>
arch/x86/pci/common.c

index 059a76c29739a60f7665e0f582c317d038893918..e3f365a9f31992806c3a52f7407f38066870d405 100644 (file)
@@ -448,6 +448,22 @@ static const struct dmi_system_id pciprobe_dmi_table[] = {
                        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"),
+                },
+        },
        {}
 };