2 files changed, 12 insertions, 1 deletions

diff --git a/drivers/edac/ghes_edac.c b/drivers/edac/ghes_edac.c
index 0ad797b9db65..d5a98a45c062 100644
--- a/drivers/edac/ghes_edac.c
+++ b/drivers/edac/ghes_edac.c
@@ -314,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)
@@ -322,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';
 
diff --git a/include/linux/edac.h b/include/linux/edac.h
index 5c6d7fbaf89e..dbdffe8d4469 100644
--- a/include/linux/edac.h
+++ b/include/linux/edac.h
@@ -51,7 +51,7 @@ static inline void opstate_init(void)
 #define EDAC_MC_LABEL_LEN       31
 
 /* Maximum size of the location string */
-#define LOCATION_SIZE 80
+#define LOCATION_SIZE 256
 
 /* Defines the maximum number of labels that can be reported */
 #define EDAC_MAX_LABELS         8