From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932354Ab2BJAHr (ORCPT ); Thu, 9 Feb 2012 19:07:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:28634 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758675Ab2BJABh (ORCPT ); Thu, 9 Feb 2012 19:01:37 -0500 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , Linux Edac Mailing List , Linux Kernel Mailing List Subject: [PATCH v3 10/31] i7300_edac: Convert it to report memory with the new location Date: Thu, 9 Feb 2012 22:01:09 -0200 Message-Id: <1328832090-9166-11-git-send-email-mchehab@redhat.com> In-Reply-To: <1328832090-9166-1-git-send-email-mchehab@redhat.com> References: <1328832090-9166-1-git-send-email-mchehab@redhat.com> To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On this driver, the memory controller supports only FB-DIMMs. The memory controller hierarchy here has 3 layers bellow the memory controller: - two branches; - each branch has two channels; - each channel can select up to 8 DIMM's via the FB-DIMM AMB (Advanced Memory Buffer) chip. As EDAC currently limits memory controllers to 2 hierarchy levels, on this patch, both branches and channels are grouped together. Signed-off-by: Mauro Carvalho Chehab --- drivers/edac/i7300_edac.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/drivers/edac/i7300_edac.c b/drivers/edac/i7300_edac.c index 6104dba..ddd5842 100644 --- a/drivers/edac/i7300_edac.c +++ b/drivers/edac/i7300_edac.c @@ -779,6 +779,7 @@ static int i7300_init_csrows(struct mem_ctl_info *mci) int mtr; int ch, branch, slot, channel; u32 last_page = 0, nr_pages; + struct dimm_info *dimm; pvt = mci->pvt_info; @@ -803,6 +804,10 @@ static int i7300_init_csrows(struct mem_ctl_info *mci) } /* Get the set of MTR[0-7] regs by each branch */ + dimm = mci->dimms; + mci->dimm_loc_type = DIMM_LOC_MC_CHANNEL; + mci->nr_dimms = 0; + nr_pages = 0; for (slot = 0; slot < MAX_SLOTS; slot++) { int where = mtr_regs[slot]; for (branch = 0; branch < MAX_BRANCHES; branch++) { @@ -815,6 +820,9 @@ static int i7300_init_csrows(struct mem_ctl_info *mci) dinfo = &pvt->dimm_info[slot][channel]; p_csrow = &mci->csrows[slot]; + dimm->location.mc_channel = channel; + dimm->location.mc_dimm_number = slot; + mtr = decode_mtr(pvt, slot, ch, branch, dinfo, p_csrow, &nr_pages); /* if no DIMMS on this row, continue */ @@ -828,6 +836,9 @@ static int i7300_init_csrows(struct mem_ctl_info *mci) p_csrow->last_page = last_page; rc = 0; + + mci->nr_dimms++; + dimm++; } } } -- 1.7.8