diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-09-24 14:53:52 (GMT) |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-09-24 17:16:12 (GMT) |
| commit | e6649cc62949f1ed473bf1131fa425cfe72d3f64 (patch) | |
| tree | bb24bcc207278c3c34b27f7e7e6ab82886a7f40e | |
| parent | 1aa4a7b6b082adbfa704988dd098bc96b8837d5a (diff) | |
| download | linux-e6649cc62949f1ed473bf1131fa425cfe72d3f64.tar.xz | |
i7300_edac: Properly initialize per-csrow memory size
Due to the current edac-core limits, we cannot represent a per-channel
memory size, for FB-DIMM drivers. So, we need to sum-up all values
for each slot, in order to properly represent the total amount of
memory found by the i7300 driver.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/edac/i7300_edac.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/drivers/edac/i7300_edac.c b/drivers/edac/i7300_edac.c index 38d9cb8..05523b5 100644 --- a/drivers/edac/i7300_edac.c +++ b/drivers/edac/i7300_edac.c @@ -617,7 +617,7 @@ static int decode_mtr(struct i7300_pvt *pvt, int slot, int ch, int branch, struct i7300_dimm_info *dinfo, struct csrow_info *p_csrow, - u32 *last_page) + u32 *nr_pages) { int mtr, ans, addrBits, channel; @@ -649,6 +649,7 @@ static int decode_mtr(struct i7300_pvt *pvt, addrBits -= 3; /* 8 bits per bytes */ dinfo->megabytes = 1 << addrBits; + *nr_pages = dinfo->megabytes << 8; debugf2("\t\tWIDTH: x%d\n", MTR_DRAM_WIDTH(mtr)); @@ -662,12 +663,8 @@ static int decode_mtr(struct i7300_pvt *pvt, debugf2("\t\tSIZE: %d MB\n", dinfo->megabytes); 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; /* @@ -780,7 +777,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; + u32 last_page = 0, nr_pages; pvt = mci->pvt_info; @@ -818,11 +815,17 @@ 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, &last_page); + dinfo, p_csrow, &nr_pages); /* if no DIMMS on this row, continue */ if (!MTR_DIMMS_PRESENT(mtr)) continue; + /* Update per_csrow memory count */ + p_csrow->nr_pages += nr_pages; + p_csrow->first_page = last_page; + last_page += nr_pages; + p_csrow->last_page = last_page; + rc = 0; } } |