Provide a better infrastructure for printk's inside the driver:
- use edac_dbg() for debug messages;
- standardize the usage of pr_info();
- provide warning about the risk of relying on this
driver.
While here, changes the size of a fake memory to 1 page. This is
as good or as bad as 1000 pages, but it is easier for userspace to
detect, as I don't expect that any machine implementing GHES would
provide just 1 page available ;)
Signed-off-by: Mauro Carvalho Chehab <mche...@redhat.com>
---
drivers/edac/ghes_edac.c | 28 +++++++++++++++++++++-------
1 file changed, 21 insertions(+), 7 deletions(-)
diff --git a/drivers/edac/ghes_edac.c b/drivers/edac/ghes_edac.c
index 97a0d53..48d6cd9 100644
--- a/drivers/edac/ghes_edac.c
+++ b/drivers/edac/ghes_edac.c
@@ -80,7 +80,8 @@ static void ghes_edac_dmidecode(const struct dmi_header *dh,
void *arg)
dimm_fill->count, 0, 0);
if (entry->size == 0xffff) {
- pr_info(GHES_PFX "Can't get dimm size\n");
+ pr_info(GHES_PFX "Can't get DIMM%i size\n",
+ dimm_fill->count);
dimm->nr_pages = MiB_TO_PAGES(32);/* Unknown */
} else if (entry->size == 0x7fff) {
dimm->nr_pages = MiB_TO_PAGES(entry->extended_size);
@@ -145,11 +146,11 @@ static void ghes_edac_dmidecode(const struct dmi_header
*dh, void *arg)
*/
if (dimm->nr_pages) {
- pr_info(GHES_PFX "DIMM%i: %s size = %d MB%s\n",
+ edac_dbg(1, "DIMM%i: %s size = %d MB%s\n",
dimm_fill->count, memory_type[dimm->mtype],
PAGES_TO_MiB(dimm->nr_pages),
(dimm->edac_mode != EDAC_NONE)? "(ECC)" : "");
- pr_info (GHES_PFX "\ttype %d, detail 0x%02x, width
%d(total %d)\n",
+ edac_dbg(2, "\ttype %d, detail 0x%02x, width %d(total
%d)\n",
entry->memory_type, entry->type_detail,
entry->total_width, entry->data_width);
}
@@ -191,6 +192,7 @@ void ghes_edac_report_mem_error(struct ghes *ghes, int sev,
mem_err->node, mem_err->card, mem_err->module,
mem_err->bank, mem_err->device, mem_err->row, mem_err->column,
mem_err->bit_pos);
+ edac_dbg(3, "error at location %s\n", location);
edac_raw_mc_handle_error(type, ghes->mci, grain, 1, 0, 0, 0,
page, offset, 0,
@@ -224,8 +226,6 @@ int ghes_edac_register(struct ghes *ghes, struct device
*dev)
* to avoid duplicated memory controller numbers
*/
mutex_lock(&ghes_edac_lock);
- pr_info("ghes_edac#%d: allocating space for %d dimms\n",
- ghes_edac_mc_num, num_dimm);
mci = edac_mc_alloc(ghes_edac_mc_num, ARRAY_SIZE(layers), layers, 0);
if (!mci) {
pr_info(GHES_PFX "Can't allocate memory for EDAC data\n");
@@ -244,6 +244,21 @@ int ghes_edac_register(struct ghes *ghes, struct device
*dev)
mci->ctl_name = "ghes_edac";
mci->dev_name = "ghes";
+ if (!ghes_edac_mc_num) {
+ if (!fake) {
+ pr_info(GHES_PFX "This EDAC driver relies on BIOS to
enumerate memory and get error reports.\n");
+ pr_info(GHES_PFX "Unfortunately, not all BIOSes reflect
the memory layout correctly.\n");
+ pr_info(GHES_PFX "So, the end result of using this
driver varies from vendor to vendor.\n");
+ pr_info(GHES_PFX "If you find incorrect reports, please
ask your vendor to fix its BIOS.\n");
+ pr_info(GHES_PFX "This system has %d DIMM sockets.\n",
+ num_dimm);
+ } else {
+ pr_info(GHES_PFX "This system has a very crappy BIOS:
It doesn't even list the DIMMS.\n");
+ pr_info(GHES_PFX "Its SMBIOS info is wrong. It is
doubtful that the error report would\n");
+ pr_info(GHES_PFX "work on such system. Use this driver
with caution\n");
+ }
+ }
+
if (!fake) {
/*
* Fill DIMM info from DMI for the memory controller #0
@@ -262,8 +277,7 @@ int ghes_edac_register(struct ghes *ghes, struct device
*dev)
struct dimm_info *dimm = EDAC_DIMM_PTR(mci->layers, mci->dimms,
mci->n_layers, 0, 0, 0);
- pr_info(GHES_PFX "Crappy BIOS detected. Faking DIMM EDAC
data\n");
- dimm->nr_pages = 1000;
+ dimm->nr_pages = 1;
dimm->grain = 128;
dimm->mtype = MEM_UNKNOWN;
dimm->dtype = DEV_UNKNOWN;
--
1.8.1.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
