From patchwork Fri Jan 30 19:45:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Richardson, Charlotte" X-Patchwork-Id: 435011 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3F6CE1401D0 for ; Sat, 31 Jan 2015 06:53:58 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753948AbbA3Tx4 (ORCPT ); Fri, 30 Jan 2015 14:53:56 -0500 Received: from p02c12o142.mxlogic.net ([208.65.145.75]:58327 "EHLO p02c12o142.mxlogic.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753785AbbA3Txz convert rfc822-to-8bit (ORCPT ); Fri, 30 Jan 2015 14:53:55 -0500 X-Greylist: delayed 496 seconds by postgrey-1.27 at vger.kernel.org; Fri, 30 Jan 2015 14:53:55 EST Received: from unknown [134.111.1.18] (EHLO mailhub5.stratus.com) by p02c12o142.mxlogic.net(mxl_mta-8.2.0-3) with ESMTP id 351ebc45.2ad00ec1d940.40277.00-498.115978.p02c12o142.mxlogic.net (envelope-from ); Fri, 30 Jan 2015 12:53:55 -0700 (MST) X-MXL-Hash: 54cbe15309011ae0-26463a9292d9a7d11ff204d7f0d2df0a0e961694 Received: from unknown [134.111.1.18] (EHLO mailhub5.stratus.com) by p02c12o142.mxlogic.net(mxl_mta-8.2.0-3) with ESMTP id c5fdbc45.0.34236.00-361.98556.p02c12o142.mxlogic.net (envelope-from ); Fri, 30 Jan 2015 12:45:37 -0700 (MST) X-MXL-Hash: 54cbdf617fff441f-503c5439848a3f012a004e6b4ae78f1c860225a4 Received: from EXHQ1.corp.stratus.com (exhq1.corp.stratus.com [134.111.200.125]) by mailhub5.stratus.com (8.12.11/8.12.11) with ESMTP id t0UJiRLe009512; Fri, 30 Jan 2015 14:44:27 -0500 Received: from EXHQ1.corp.stratus.com ([fe80::f549:7ff7:c168:7547]) by EXHQ1.corp.stratus.com ([fe80::f549:7ff7:c168:7547%16]) with mapi id 14.03.0181.006; Fri, 30 Jan 2015 14:45:03 -0500 From: "Richardson, Charlotte" To: "'linux-pci@vger.kernel.org'" CC: "'stable@vger.kernel.org'" , "Lawrence, Joe" , "'myron.stowe@redhat.com'" Subject: [PATCH] PCI: Add NEC ftServer variants to PCIe DMI check Thread-Topic: [PATCH] PCI: Add NEC ftServer variants to PCIe DMI check Thread-Index: AdA8xNJi2Kd+k4SJTVS+bHjOlR3hUg== Date: Fri, 30 Jan 2015 19:45:02 +0000 Message-ID: <48F2A65D5838B34AA5C81AB195ED2D5F932489A2@EXHQ1.corp.stratus.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [134.111.199.84] MIME-Version: 1.0 X-AnalysisOut: [v=2.1 cv=A414PsmG c=1 sm=1 tr=0 a=o2bo05G+d1rlxuoNbFVhCw==] X-AnalysisOut: [:117 a=o2bo05G+d1rlxuoNbFVhCw==:17 a=RKodGToWgPkA:10 a=BLc] X-AnalysisOut: [eEmwcHowA:10 a=kj9zAlcOel0A:10 a=xqWC_Br6kY4A:10 a=uelBKuK] X-AnalysisOut: [pAAAA:8 a=YlVTAMxIAAAA:8 a=YNv0rlydsVwA:10 a=VwQbUJbxAAAA:] X-AnalysisOut: [8 a=20KFwNOVAAAA:8 a=6B7DgprpT8X5s88D9XsA:9 a=CjuIK1q_8ugA] X-AnalysisOut: [:10] X-Spam: [F=0.5000000000; CM=0.500; MH=0.500(2015013010); S=0.200(2014051901)] X-MAIL-FROM: X-SOURCE-IP: [134.111.1.18] Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Hi, Myron - commit 1278998f8ff6 missed the NEC variants of the ftServers. We'll need this in RHEL7/6, but can you shepherd this patch upstream first? Thanks! /Charlotte -->8-- From 64a19253432e87b2293d3b8ee323e8b8ac63395d Mon Sep 17 00:00:00 2001 From: Charlotte Richardson Date: Fri, 30 Jan 2015 12:58:31 -0500 Subject: [PATCH] PCI: Add NEC ftServer variants to PCIe DMI check. NEC OEMs the same platforms as Stratus does, which have multiple devices on some PCIe buses under downstream ports. Signed-off-by: Charlotte Richardson Fixes: 1278998f8ff6 ("PCI: Work around Stratus ftServer broken PCIe hierarchy (fix DMI check)") Cc: Cc: Myron Stowe --- arch/x86/pci/common.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 7b20bcc..2fb3847 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c @@ -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"), + }, + }, {} };