From patchwork Wed Oct 30 16:26:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "'arozansk@redhat.com'" X-Patchwork-Id: 3115511 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0A6249F2B7 for ; Wed, 30 Oct 2013 16:28:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D2872201F4 for ; Wed, 30 Oct 2013 16:28:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 299292015E for ; Wed, 30 Oct 2013 16:28:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753318Ab3J3Q1f (ORCPT ); Wed, 30 Oct 2013 12:27:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40387 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752895Ab3J3Q1d (ORCPT ); Wed, 30 Oct 2013 12:27:33 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r9UGRR1T008117 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 30 Oct 2013 12:27:27 -0400 Received: from napanee.usersys.redhat.com ([10.18.17.112]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r9UGRQKF012749; Wed, 30 Oct 2013 12:27:26 -0400 Received: by napanee.usersys.redhat.com (Postfix, from userid 500) id 4EAEE350061C; Wed, 30 Oct 2013 12:27:26 -0400 (EDT) From: Aristeu Rozanski To: linux-edac@vger.kernel.org Cc: tony.luck@intel.com, Aristeu Rozanski , Mauro Carvalho Chehab (maintainer:EDAC-SBRIDGE), Doug Thompson (supporter:EDAC-CORE), Bjorn Helgaas (supporter:PCI SUBSYSTEM), linux-kernel@vger.kernel.org (open list), linux-pci@vger.kernel.org (open list:PCI SUBSYSTEM) Subject: [PATCH 01/12] sb_edac: move PCI IDs to pci_ids.h Date: Wed, 30 Oct 2013 12:26:55 -0400 Message-Id: <1383150426-24730-2-git-send-email-arozansk@redhat.com> In-Reply-To: <1383150426-24730-1-git-send-email-arozansk@redhat.com> References: <1383150426-24730-1-git-send-email-arozansk@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP According to the comment, it should be done before submitting upstream. Signed-off-by: Aristeu Rozanski --- drivers/edac/sb_edac.c | 21 ++------------------- include/linux/pci_ids.h | 11 +++++++++++ 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c index e04462b..4cdd948 100644 --- a/drivers/edac/sb_edac.c +++ b/drivers/edac/sb_edac.c @@ -57,26 +57,9 @@ static int probed; */ /* - * FIXME: For now, let's order by device function, as it makes - * easier for driver's development process. This table should be - * moved to pci_id.h when submitted upstream + * Currently, unused, but will be needed in the future + * implementations, as they hold the error counters */ -#define PCI_DEVICE_ID_INTEL_SBRIDGE_SAD0 0x3cf4 /* 12.6 */ -#define PCI_DEVICE_ID_INTEL_SBRIDGE_SAD1 0x3cf6 /* 12.7 */ -#define PCI_DEVICE_ID_INTEL_SBRIDGE_BR 0x3cf5 /* 13.6 */ -#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_HA0 0x3ca0 /* 14.0 */ -#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TA 0x3ca8 /* 15.0 */ -#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_RAS 0x3c71 /* 15.1 */ -#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD0 0x3caa /* 15.2 */ -#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD1 0x3cab /* 15.3 */ -#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD2 0x3cac /* 15.4 */ -#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD3 0x3cad /* 15.5 */ -#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_DDRIO 0x3cb8 /* 17.0 */ - - /* - * Currently, unused, but will be needed in the future - * implementations, as they hold the error counters - */ #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_ERR0 0x3c72 /* 16.2 */ #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_ERR1 0x3c73 /* 16.3 */ #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_ERR2 0x3c76 /* 16.6 */ diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 97fbecd..d7d4757 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2812,7 +2812,18 @@ #define PCI_DEVICE_ID_INTEL_UNC_R2PCIE 0x3c43 #define PCI_DEVICE_ID_INTEL_UNC_R3QPI0 0x3c44 #define PCI_DEVICE_ID_INTEL_UNC_R3QPI1 0x3c45 +#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_RAS 0x3c71 +#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_HA0 0x3ca0 +#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TA 0x3ca8 +#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD0 0x3caa +#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD1 0x3cab +#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD2 0x3cac +#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD3 0x3cad +#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_DDRIO 0x3cb8 #define PCI_DEVICE_ID_INTEL_JAKETOWN_UBOX 0x3ce0 +#define PCI_DEVICE_ID_INTEL_SBRIDGE_SAD0 0x3cf4 +#define PCI_DEVICE_ID_INTEL_SBRIDGE_BR 0x3cf5 +#define PCI_DEVICE_ID_INTEL_SBRIDGE_SAD1 0x3cf6 #define PCI_DEVICE_ID_INTEL_IOAT_SNB 0x402f #define PCI_DEVICE_ID_INTEL_5100_16 0x65f0 #define PCI_DEVICE_ID_INTEL_5100_19 0x65f3