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 <[email protected]>
Cc: "Rafael J. Wysocki" <[email protected]>
Cc: Aristeu Rozanski <[email protected]>
Cc: Dan Williams <[email protected]>
Cc: Jean Delvare <[email protected]>
Cc: Len Brown <[email protected]>
Cc: Mauro Carvalho Chehab <[email protected]>
Cc: Qiuxu Zhuo <[email protected]>
Cc: [email protected]
Cc: linux-edac <[email protected]>
Cc: [email protected]
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Borislav Petkov <[email protected]>

diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 1f61b736e0756b577a9dccd0adc50031f25d3d9c..3bb82e511eca9c799c3435841cb7986f475bfc71 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 cd75c173fd00bf6945a8bfe17b280354b8e3308c..bffb97828ed67711dffb24099c26f4580e4e654e 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