From: Aristeu Rozanski <arozansk@redhat.com>
To: linux-edac@vger.kernel.org
Cc: tony.luck@intel.com, Aristeu Rozanski <arozansk@redhat.com>,
Mauro Carvalho Chehab <m.chehab@samsung.com>
(maintainer:EDAC-SBRIDGE),
Doug Thompson <dougthompson@xmission.com> (supporter:EDAC-CORE),
Bjorn Helgaas <bhelgaas@google.com> (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 [thread overview]
Message-ID: <1383150426-24730-2-git-send-email-arozansk@redhat.com> (raw)
In-Reply-To: <1383150426-24730-1-git-send-email-arozansk@redhat.com>
According to the comment, it should be done before submitting upstream.
Signed-off-by: Aristeu Rozanski <arozansk@redhat.com>
---
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
--
1.7.1
next parent reply other threads:[~2013-10-30 16:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1383150426-24730-1-git-send-email-arozansk@redhat.com>
2013-10-30 16:26 ` Aristeu Rozanski [this message]
2013-10-30 16:40 ` [PATCH 01/12] sb_edac: move PCI IDs to pci_ids.h Borislav Petkov
2013-10-30 17:19 ` Mauro Carvalho Chehab
2013-10-30 17:21 ` Bjorn Helgaas
2013-10-30 20:35 ` Aristeu Rozanski
2013-10-30 20:47 ` Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1383150426-24730-2-git-send-email-arozansk@redhat.com \
--to=arozansk@redhat.com \
--cc=bhelgaas@google.com \
--cc=dougthompson@xmission.com \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=m.chehab@samsung.com \
--cc=tony.luck@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).