From: Borislav Petkov <bp@suse.de>
Date: Mon, 14 Dec 2020 10:51:46 +0000 (+0100)
Subject: Merge branches 'edac-spr', 'edac-igen6' and 'edac-misc' into edac-updates-for-v5.11
X-Git-Tag: accepted/tizen/unified/20230118.172025~8350^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f84b799996e29ad3b37e83f7871e79023f29979d;p=platform%2Fkernel%2Flinux-rpi.git

Merge branches 'edac-spr', 'edac-igen6' and 'edac-misc' into edac-updates-for-v5.11

Signed-off-by: Borislav Petkov <bp@suse.de>
---

f84b799996e29ad3b37e83f7871e79023f29979d
diff --cc include/linux/edac.h
index 15e8f3d,e64b73b,8f63245,52d7487..76d3562
--- a/include/linux/edac.h
+++ b/include/linux/edac.h
@@@@@ -179,7 -180,10 -180,9 -179,7 +180,10 @@@@@ static inline char *mc_event_error_type
     * @MEM_RDDR4:		Registered DDR4 RAM
     *			This is a variant of the DDR4 memories.
     * @MEM_LRDDR4:		Load-Reduced DDR4 memory.
+  + * @MEM_LPDDR4:		Low-Power DDR4 memory.
+ ++ * @MEM_DDR5:		Unbuffered DDR5 RAM
     * @MEM_NVDIMM:		Non-volatile RAM
+  + * @MEM_WIO2:		Wide I/O 2.
     */
    enum mem_type {
    	MEM_EMPTY = 0,
@@@@@ -203,7 -208,10 -207,9 -203,7 +208,10 @@@@@
    	MEM_DDR4,
    	MEM_RDDR4,
    	MEM_LRDDR4,
+  +	MEM_LPDDR4,
+ ++	MEM_DDR5,
    	MEM_NVDIMM,
+  +	MEM_WIO2,
    };
    
    #define MEM_FLAG_EMPTY		BIT(MEM_EMPTY)
@@@@@ -226,10 -235,13 -233,12 -226,10 +235,13 @@@@@
    #define MEM_FLAG_DDR4           BIT(MEM_DDR4)
    #define MEM_FLAG_RDDR4          BIT(MEM_RDDR4)
    #define MEM_FLAG_LRDDR4         BIT(MEM_LRDDR4)
+  +#define MEM_FLAG_LPDDR4         BIT(MEM_LPDDR4)
+ ++#define MEM_FLAG_DDR5           BIT(MEM_DDR5)
    #define MEM_FLAG_NVDIMM         BIT(MEM_NVDIMM)
+  +#define MEM_FLAG_WIO2		BIT(MEM_WIO2)
    
    /**
---  * enum edac-type - Error Detection and Correction capabilities and mode
+++  * enum edac_type - Error Detection and Correction capabilities and mode
     * @EDAC_UNKNOWN:	Unknown if ECC is available
     * @EDAC_NONE:		Doesn't support ECC
     * @EDAC_RESERVED:	Reserved ECC type