summaryrefslogtreecommitdiff
path: root/drivers/edac/i7300_edac.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-09-24 18:29:02 +0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-09-24 21:16:12 +0400
commit1aa4a7b6b082adbfa704988dd098bc96b8837d5a (patch)
tree75b1b0febe5c3160dd028c19aaf9031d66469050 /drivers/edac/i7300_edac.c
parent3c9c92b6b5016a2e02c3438386b1c5efe7f588e4 (diff)
downloadlinux-1aa4a7b6b082adbfa704988dd098bc96b8837d5a.tar.xz
V4L/DVB: i7300_edac: better initialize page counts
It is still somewhat fake, as the pages may not be on this exact order, and may even be used in mirror mode, but this is a best guess than the other random fake values. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/edac/i7300_edac.c')
-rw-r--r--drivers/edac/i7300_edac.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/edac/i7300_edac.c b/drivers/edac/i7300_edac.c
index 38920c0b5fbb..38d9cb8fad7c 100644
--- a/drivers/edac/i7300_edac.c
+++ b/drivers/edac/i7300_edac.c
@@ -616,7 +616,8 @@ static void i7300_enable_error_reporting(struct mem_ctl_info *mci)
static int decode_mtr(struct i7300_pvt *pvt,
int slot, int ch, int branch,
struct i7300_dimm_info *dinfo,
- struct csrow_info *p_csrow)
+ struct csrow_info *p_csrow,
+ u32 *last_page)
{
int mtr, ans, addrBits, channel;
@@ -663,6 +664,11 @@ static int decode_mtr(struct i7300_pvt *pvt,
p_csrow->grain = 8;
p_csrow->nr_pages = dinfo->megabytes << 8;
p_csrow->mtype = MEM_FB_DDR2;
+ p_csrow->csrow_idx = slot;
+ p_csrow->first_page = *last_page;
+ *last_page += p_csrow->nr_pages;
+ p_csrow->last_page = *last_page;
+ p_csrow->page_mask = 0;
/*
* The type of error detection actually depends of the
@@ -774,6 +780,7 @@ static int i7300_init_csrows(struct mem_ctl_info *mci)
int rc = -ENODEV;
int mtr;
int ch, branch, slot, channel;
+ u32 last_page = 0;
pvt = mci->pvt_info;
@@ -811,18 +818,11 @@ static int i7300_init_csrows(struct mem_ctl_info *mci)
p_csrow = &mci->csrows[slot];
mtr = decode_mtr(pvt, slot, ch, branch,
- dinfo, p_csrow);
+ dinfo, p_csrow, &last_page);
/* if no DIMMS on this row, continue */
if (!MTR_DIMMS_PRESENT(mtr))
continue;
- p_csrow->csrow_idx = slot;
-
- /* FAKE OUT VALUES, FIXME */
- p_csrow->first_page = 0 + slot * 20;
- p_csrow->last_page = 9 + slot * 20;
- p_csrow->page_mask = 0xfff;
-
rc = 0;
}
}