[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <1331122278-28458-6-git-send-email-mchehab@redhat.com>
Date: Wed, 7 Mar 2012 09:11:17 -0300
From: Mauro Carvalho Chehab <mchehab@...hat.com>
To: unlisted-recipients:; (no To-header on input)
Cc: Mauro Carvalho Chehab <mchehab@...hat.com>,
Linux Edac Mailing List <linux-edac@...r.kernel.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: [PATCH 5/6] edac: Call the sysfs nodes as "rank" instead of "dimm" if chip select is used
The minimum hierarchy unit for csrows-based MC's is rank, and not dimm.
There are a few possible fixes here:
1) add a per-rank location at the dimm struct, and don't create one
dimm_info entry per rank;
2) Convert the drivers to internally convert ranks into dimm's;
3) rename "dimm" with "rank";
A few drivers do (2) internally: some of them have per-dimm registers,
instead of per-rank ones; a few others have some routines to translate
between the two representations of the memory. Those drivers report the
memories via a DIMM slot and a channel.
While no better solution is done, let's do (2) for the drivers that work
with csrows/channel layers to represent a rank.
Signed-off-by: Mauro Carvalho Chehab <mchehab@...hat.com>
---
drivers/edac/edac_mc_sysfs.c | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
index 5b48528..dd934c2 100644
--- a/drivers/edac/edac_mc_sysfs.c
+++ b/drivers/edac/edac_mc_sysfs.c
@@ -567,10 +567,12 @@ static struct kobj_type ktype_dimm = {
};
/* Create a CSROW object under specifed edac_mc_device */
static int edac_create_dimm_object(struct mem_ctl_info *mci,
- struct dimm_info *dimm, int index)
+ struct dimm_info *dimm, int index,
+ bool is_rank)
{
struct kobject *kobj_mci = &mci->edac_mci_kobj;
struct kobject *kobj;
+ const char *nodename;
int err;
/* generate ..../edac/mc/mc<id>/dimm<index> */
@@ -585,8 +587,12 @@ static int edac_create_dimm_object(struct mem_ctl_info *mci,
}
/* Instanstiate the dimm object */
+ if (!is_rank)
+ nodename = "dimm%d";
+ else
+ nodename = "rank%d";
err = kobject_init_and_add(&dimm->kobj, &ktype_dimm, kobj_mci,
- "dimm%d", index);
+ nodename, index);
if (err)
goto err_release_top_kobj;
@@ -1338,6 +1344,7 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
int err;
struct csrow_info *csrow;
struct kobject *kobj_mci = &mci->edac_mci_kobj;
+ bool is_rank = false;
debugf0("%s() idx=%d\n", __func__, mci->mc_idx);
@@ -1386,6 +1393,13 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
}
}
+ for (i = 0; i < mci->n_layers; i++) {
+ if (mci->layers[i].type == EDAC_MC_LAYER_CHIP_SELECT) {
+ is_rank = true;
+ break;
+ }
+ }
+
/*
* Make directories for each DIMM object under the mc<id> kobject
*/
@@ -1406,7 +1420,7 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
printk(KERN_CONT "\n");
}
#endif
- err = edac_create_dimm_object(mci, dimm, j);
+ err = edac_create_dimm_object(mci, dimm, j, is_rank);
if (err) {
debugf1("%s() failure: create dimm %d obj\n",
__func__, j);
--
1.7.8
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists