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),
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH 09/12] sb_edac: enable multiple PCI id tables to be used
Date: Wed, 30 Oct 2013 12:27:03 -0400 [thread overview]
Message-ID: <1383150426-24730-10-git-send-email-arozansk@redhat.com> (raw)
In-Reply-To: <1383150426-24730-1-git-send-email-arozansk@redhat.com>
This is needed to allow separated PCI id tables for Sandy Bridge and Ivy
Bridge.
Signed-off-by: Aristeu Rozanski <arozansk@redhat.com>
---
drivers/edac/sb_edac.c | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
index bf305a2..3e07c28 100644
--- a/drivers/edac/sb_edac.c
+++ b/drivers/edac/sb_edac.c
@@ -1088,12 +1088,6 @@ static void sbridge_put_all_devices(void)
}
}
-/*
- * sbridge_get_all_devices Find and perform 'get' operation on the MCH's
- * device/functions we want to reference for this driver
- *
- * Need to 'get' device 16 func 1 and func 2
- */
static int sbridge_get_onedevice(struct pci_dev **prev,
u8 *num_mc,
const struct pci_id_table *table,
@@ -1195,11 +1189,21 @@ static int sbridge_get_onedevice(struct pci_dev **prev,
return 0;
}
-static int sbridge_get_all_devices(u8 *num_mc)
+/*
+ * sbridge_get_all_devices - Find and perform 'get' operation on the MCH's
+ * device/functions we want to reference for this driver.
+ * Need to 'get' device 16 func 1 and func 2.
+ * @num_mc: pointer to the memory controllers count, to be incremented in case
+ * of success.
+ * @table: model specific table
+ *
+ * returns 0 in case of success or error code
+ */
+static int sbridge_get_all_devices(u8 *num_mc,
+ const struct pci_id_table *table)
{
int i, rc;
struct pci_dev *pdev = NULL;
- const struct pci_id_table *table = pci_dev_descr_sbridge_table;
while (table && table->descr) {
for (i = 0; i < table->n_devs; i++) {
@@ -1719,7 +1723,7 @@ static int sbridge_probe(struct pci_dev *pdev, const struct pci_device_id *id)
}
probed++;
- rc = sbridge_get_all_devices(&num_mc);
+ rc = sbridge_get_all_devices(&num_mc, pci_dev_descr_sbridge_table);
if (unlikely(rc < 0))
goto fail0;
mc = 0;
--
1.7.1
next prev parent reply other threads:[~2013-10-30 16:27 UTC|newest]
Thread overview: 19+ 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 ` [PATCH 01/12] sb_edac: move PCI IDs to pci_ids.h Aristeu Rozanski
2013-10-30 16:40 ` 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
2013-10-30 16:26 ` [PATCH 02/12] sb_edac: make RANK_CFG_A value part of sbridge_info Aristeu Rozanski
2013-10-30 16:26 ` [PATCH 03/12] sb_edac: isolate TOLM retrieval Aristeu Rozanski
2013-10-30 16:26 ` [PATCH 04/12] sb_edac: rename pci_br Aristeu Rozanski
2013-10-30 16:26 ` [PATCH 05/12] sb_edac: isolate TOHM retrieval Aristeu Rozanski
2013-10-30 16:27 ` [PATCH 06/12] sb_edac: allow different dram_rule arrays Aristeu Rozanski
2013-10-30 16:27 ` [PATCH 07/12] sb_edac: allow different interleave lists Aristeu Rozanski
2013-10-30 16:27 ` [PATCH 08/12] sb_edac: rework sad_pkg Aristeu Rozanski
2013-10-30 16:27 ` Aristeu Rozanski [this message]
2013-10-30 16:27 ` [PATCH 10/12] sb_edac: rename mci_bind_devs() Aristeu Rozanski
2013-10-30 16:27 ` [PATCH 11/12] sb_edac: avoid decoding the same error multiple times Aristeu Rozanski
2013-10-30 17:21 ` Mauro Carvalho Chehab
2013-10-30 16:27 ` [PATCH 12/12] sb_edac: add support for Ivy Bridge Aristeu Rozanski
2013-10-30 17:25 ` 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-10-git-send-email-arozansk@redhat.com \
--to=arozansk@redhat.com \
--cc=dougthompson@xmission.com \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@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
all inboxes | Powered by JetHome®