EDAC: Add new memory type for non-volatile DIMMs

There are now non-volatile versions of DIMMs. Add a new entry to "enum
mem_type" and a new string in edac_mem_types[].

Signed-off-by: Tony Luck <tony.luck@intel.com>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Aristeu Rozanski <aris@redhat.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Jean Delvare <jdelvare@suse.com>
Cc: Len Brown <lenb@kernel.org>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Qiuxu Zhuo <qiuxu.zhuo@intel.com>
Cc: linux-acpi@vger.kernel.org
Cc: linux-edac <linux-edac@vger.kernel.org>
Cc: linux-nvdimm@lists.01.org
Link: http://lkml.kernel.org/r/20180312182430.10335-3-tony.luck@intel.com
Signed-off-by: Borislav Petkov <bp@suse.de>

diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 1f61b73..3bb82e5 100644 (file)
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -214,7 +214,8 @@ const char * const edac_mem_types[] = {
        [MEM_RDDR3]     = "Registered-DDR3",
        [MEM_LRDDR3]    = "Load-Reduced-DDR3-RAM",
        [MEM_DDR4]      = "Unbuffered-DDR4",
-       [MEM_RDDR4]     = "Registered-DDR4"
+       [MEM_RDDR4]     = "Registered-DDR4",
+       [MEM_NVDIMM]    = "Non-volatile-RAM",
 };
 EXPORT_SYMBOL_GPL(edac_mem_types);
 

diff --git a/include/linux/edac.h b/include/linux/edac.h
index cd75c17..bffb978 100644 (file)
--- a/include/linux/edac.h
+++ b/include/linux/edac.h
@@ -186,6 +186,7 @@ static inline char *mc_event_error_type(const unsigned int err_type)
  * @MEM_RDDR4:         Registered DDR4 RAM
  *                     This is a variant of the DDR4 memories.
  * @MEM_LRDDR4:                Load-Reduced DDR4 memory.
+ * @MEM_NVDIMM:                Non-volatile RAM
  */
 enum mem_type {
        MEM_EMPTY = 0,
@@ -209,6 +210,7 @@ enum mem_type {
        MEM_DDR4,
        MEM_RDDR4,
        MEM_LRDDR4,
+       MEM_NVDIMM,
 };
 
 #define MEM_FLAG_EMPTY         BIT(MEM_EMPTY)
@@ -231,6 +233,7 @@ enum mem_type {
 #define MEM_FLAG_DDR4           BIT(MEM_DDR4)
 #define MEM_FLAG_RDDR4          BIT(MEM_RDDR4)
 #define MEM_FLAG_LRDDR4         BIT(MEM_LRDDR4)
+#define MEM_FLAG_NVDIMM         BIT(MEM_NVDIMM)
 
 /**
  * enum edac-type - Error Detection and Correction capabilities and mode