Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1cfebc9 authored by Yang Shi's avatar Yang Shi Committed by Linus Torvalds
Browse files

edac: add DDR3 memory type for MPC85xx EDAC 



Since some new MPC85xx SOCs support DDR3 memory now, so add DDR3 memory
type for MPC85xx EDAC.

Signed-off-by: default avatarYang Shi <yang.shi@windriver.com>
Cc: Doug Thompson <norsk5@yahoo.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c4285b47

drivers/edac/edac_core.h

+4 −0
Original line number Diff line number Diff line
@@ -150,6 +150,8 @@ enum mem_type { 
	MEM_FB_DDR2,		/* fully buffered DDR2 */

	MEM_RDDR2,		/* Registered DDR2 RAM */

	MEM_XDR,		/* Rambus XDR */

	MEM_DDR3,		/* DDR3 RAM */

	MEM_RDDR3,		/* Registered DDR3 RAM */

};



#define MEM_FLAG_EMPTY		BIT(MEM_EMPTY)
@@ -167,6 +169,8 @@ enum mem_type { 
#define MEM_FLAG_FB_DDR2        BIT(MEM_FB_DDR2)

#define MEM_FLAG_RDDR2          BIT(MEM_RDDR2)

#define MEM_FLAG_XDR            BIT(MEM_XDR)

#define MEM_FLAG_DDR3		 BIT(MEM_DDR3)

#define MEM_FLAG_RDDR3		 BIT(MEM_RDDR3)



/* chipset Error Detection and Correction capabilities and mode */

enum edac_type {

drivers/edac/edac_mc_sysfs.c

+3 −1
Original line number Diff line number Diff line
@@ -94,7 +94,9 @@ static const char *mem_types[] = { 
	[MEM_DDR2] = "Unbuffered-DDR2",

	[MEM_FB_DDR2] = "FullyBuffered-DDR2",

	[MEM_RDDR2] = "Registered-DDR2",

	[MEM_XDR] = "XDR"

	[MEM_XDR] = "XDR",

	[MEM_DDR3] = "Unbuffered-DDR3",

	[MEM_RDDR3] = "Registered-DDR3"

};



static const char *dev_types[] = {

drivers/edac/mpc85xx_edac.c

+6 −0
Original line number Diff line number Diff line
@@ -757,6 +757,9 @@ static void __devinit mpc85xx_init_csrows(struct mem_ctl_info *mci) 
		case DSC_SDTYPE_DDR2:

			mtype = MEM_RDDR2;

			break;

		case DSC_SDTYPE_DDR3:

			mtype = MEM_RDDR3;

			break;

		default:

			mtype = MEM_UNKNOWN;

			break;
@@ -769,6 +772,9 @@ static void __devinit mpc85xx_init_csrows(struct mem_ctl_info *mci) 
		case DSC_SDTYPE_DDR2:

			mtype = MEM_DDR2;

			break;

		case DSC_SDTYPE_DDR3:

			mtype = MEM_DDR3;

			break;

		default:

			mtype = MEM_UNKNOWN;

			break;

drivers/edac/mpc85xx_edac.h

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 


#define DSC_SDTYPE_DDR		0x02000000

#define DSC_SDTYPE_DDR2		0x03000000

#define DSC_SDTYPE_DDR3		0x07000000

#define DSC_X32_EN	0x00000020



/* Err_Int_En */