Merge tag 'omap-for-v3.13/fixes-for-merge-window-take2' of git://git.kernel.org/pub...

[cascardo/linux.git] / drivers / edac / ghes_edac.c

diff --git a/drivers/edac/ghes_edac.c b/drivers/edac/ghes_edac.c
index bb53467..d5a98a4 100644 (file)
--- a/drivers/edac/ghes_edac.c
+++ b/drivers/edac/ghes_edac.c
@@ -297,15 +297,14 @@ void ghes_edac_report_mem_error(struct ghes *ghes, int sev,
        }
 
        /* Error address */
-       if (mem_err->validation_bits & CPER_MEM_VALID_PHYSICAL_ADDRESS) {
+       if (mem_err->validation_bits & CPER_MEM_VALID_PA) {
                e->page_frame_number = mem_err->physical_addr >> PAGE_SHIFT;
                e->offset_in_page = mem_err->physical_addr & ~PAGE_MASK;
        }
 
        /* Error grain */
-       if (mem_err->validation_bits & CPER_MEM_VALID_PHYSICAL_ADDRESS_MASK) {
+       if (mem_err->validation_bits & CPER_MEM_VALID_PA_MASK)
                e->grain = ~(mem_err->physical_addr_mask & ~PAGE_MASK);
-       }
 
        /* Memory error location, mapped on e->location */
        p = e->location;
@@ -315,6 +314,8 @@ void ghes_edac_report_mem_error(struct ghes *ghes, int sev,
                p += sprintf(p, "card:%d ", mem_err->card);
        if (mem_err->validation_bits & CPER_MEM_VALID_MODULE)
                p += sprintf(p, "module:%d ", mem_err->module);
+       if (mem_err->validation_bits & CPER_MEM_VALID_RANK_NUMBER)
+               p += sprintf(p, "rank:%d ", mem_err->rank);
        if (mem_err->validation_bits & CPER_MEM_VALID_BANK)
                p += sprintf(p, "bank:%d ", mem_err->bank);
        if (mem_err->validation_bits & CPER_MEM_VALID_ROW)
@@ -323,6 +324,15 @@ void ghes_edac_report_mem_error(struct ghes *ghes, int sev,
                p += sprintf(p, "col:%d ", mem_err->column);
        if (mem_err->validation_bits & CPER_MEM_VALID_BIT_POSITION)
                p += sprintf(p, "bit_pos:%d ", mem_err->bit_pos);
+       if (mem_err->validation_bits & CPER_MEM_VALID_MODULE_HANDLE) {
+               const char *bank = NULL, *device = NULL;
+               dmi_memdev_name(mem_err->mem_dev_handle, &bank, &device);
+               if (bank != NULL && device != NULL)
+                       p += sprintf(p, "DIMM location:%s %s ", bank, device);
+               else
+                       p += sprintf(p, "DIMM DMI handle: 0x%.4x ",
+                                    mem_err->mem_dev_handle);
+       }
        if (p > e->location)
                *(p - 1) = '\0';