i7core_edac: maps all sockets as if ther are one MC controller
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
index 69eacc1..a93ebdf 100644
--- a/drivers/edac/i7core_edac.c
+++ b/drivers/edac/i7core_edac.c
@@ -409,12 +409,12 @@
return 0;
}
-static int get_dimm_config(struct mem_ctl_info *mci, u8 socket)
+static int get_dimm_config(struct mem_ctl_info *mci, int *csrow, u8 socket)
{
struct i7core_pvt *pvt = mci->pvt_info;
struct csrow_info *csr;
struct pci_dev *pdev;
- int i, j, csrow = 0;
+ int i, j;
unsigned long last_page = 0;
enum edac_type mode;
enum mem_type mtype;
@@ -534,7 +534,7 @@
npages = size << (20 - PAGE_SHIFT);
#endif
- csr = &mci->csrows[csrow];
+ csr = &mci->csrows[*csrow];
csr->first_page = last_page + 1;
last_page += npages;
csr->last_page = last_page;
@@ -542,7 +542,7 @@
csr->page_mask = 0;
csr->grain = 8;
- csr->csrow_idx = csrow;
+ csr->csrow_idx = *csrow;
csr->nr_channels = 1;
csr->channels[0].chan_idx = i;
@@ -565,7 +565,7 @@
csr->edac_mode = mode;
csr->mtype = mtype;
- csrow++;
+ (*csrow)++;
}
pci_read_config_dword(pdev, MC_SAG_CH_0, &value[0]);
@@ -1424,6 +1424,7 @@
struct i7core_pvt *pvt;
int num_channels = 0;
int num_csrows = 0;
+ int csrow = 0;
int dev_idx = id->driver_data;
int rc, i;
u8 sockets;
@@ -1495,7 +1496,7 @@
/* Get dimm basic config */
for (i = 0; i < sockets; i++)
- get_dimm_config(mci, i);
+ get_dimm_config(mci, &csrow, i);
/* add this new MC control structure to EDAC's list of MCs */
if (unlikely(edac_mc_add_mc(mci))) {