releases/3.14.33/pci-add-nec-variants-to-stratus-ftserver-pcie-dmi-check.patch

   1 From 51ac3d2f0c505ca36ffc9715ffd518d756589ef8 Mon Sep 17 00:00:00 2001
   2 From: Charlotte Richardson <charlotte.richardson@stratus.com>
   3 Date: Mon, 2 Feb 2015 09:36:23 -0600
   4 Subject: PCI: Add NEC variants to Stratus ftServer PCIe DMI check
   5
   6 From: Charlotte Richardson <charlotte.richardson@stratus.com>
   7
   8 commit 51ac3d2f0c505ca36ffc9715ffd518d756589ef8 upstream.
   9
  10 NEC OEMs the same platforms as Stratus does, which have multiple devices on
  11 some PCIe buses under downstream ports.
  12
  13 Link: https://bugzilla.kernel.org/show_bug.cgi?id=51331
  14 Fixes: 1278998f8ff6 ("PCI: Work around Stratus ftServer broken PCIe hierarchy (fix DMI check)")
  15 Signed-off-by: Charlotte Richardson <charlotte.richardson@stratus.com>
  16 Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
  17 CC: Myron Stowe <myron.stowe@redhat.com>
  18 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  19
  20 ---
  21  arch/x86/pci/common.c |   16 ++++++++++++++++
  22  1 file changed, 16 insertions(+)
  23
  24 --- a/arch/x86/pci/common.c
  25 +++ b/arch/x86/pci/common.c
  26 @@ -448,6 +448,22 @@ static const struct dmi_system_id pcipro
  27                         DMI_MATCH(DMI_PRODUCT_NAME, "ftServer"),
  28                 },
  29         },
  30 +        {
  31 +                .callback = set_scan_all,
  32 +                .ident = "Stratus/NEC ftServer",
  33 +                .matches = {
  34 +                        DMI_MATCH(DMI_SYS_VENDOR, "NEC"),
  35 +                        DMI_MATCH(DMI_PRODUCT_NAME, "Express5800/R32"),
  36 +                },
  37 +        },
  38 +        {
  39 +                .callback = set_scan_all,
  40 +                .ident = "Stratus/NEC ftServer",
  41 +                .matches = {
  42 +                        DMI_MATCH(DMI_SYS_VENDOR, "NEC"),
  43 +                        DMI_MATCH(DMI_PRODUCT_NAME, "Express5800/R31"),
  44 +                },
  45 +        },
  46         {}
  47  };
  48