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: Yang Shi <yang.shi@windriver.com>
Cc: Doug Thompson <norsk5@yahoo.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h
index 3493c6bdb8206b7f712c00cf07b355974bdd27a2..871c13b4c1489587a91a12a9503aa73ff6dd1670 100644 (file)
--- a/drivers/edac/edac_core.h
+++ b/drivers/edac/edac_core.h
@@ -150,6 +150,8 @@ enum mem_type {
        MEM_FB_DDR2,            /* fully buffered DDR2 */
        MEM_RDDR2,              /* Registered DDR2 RAM */
        MEM_XDR,                /* Rambus XDR */
        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)
 };
 
 #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_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 {
 
 /* chipset Error Detection and Correction capabilities and mode */
 enum edac_type {

diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
index ad218fe4942dfcf258273ee22f56776f3a0b23c2..e1d4ce0834813b79ba347c8f78baeaa6616f8b4e 100644 (file)
--- a/drivers/edac/edac_mc_sysfs.c
+++ b/drivers/edac/edac_mc_sysfs.c
@@ -94,7 +94,9 @@ static const char *mem_types[] = {
        [MEM_DDR2] = "Unbuffered-DDR2",
        [MEM_FB_DDR2] = "FullyBuffered-DDR2",
        [MEM_RDDR2] = "Registered-DDR2",
        [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[] = {
 };
 
 static const char *dev_types[] = {

diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c
index 7c8c2d72916f60f0ade44a323a7f01cc644e0d21..3f2ccfc6407c298be7be4260e5b09512590e0dfe 100644 (file)
--- a/drivers/edac/mpc85xx_edac.c
+++ b/drivers/edac/mpc85xx_edac.c
@@ -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_DDR2:
                        mtype = MEM_RDDR2;
                        break;

+               case DSC_SDTYPE_DDR3:
+                       mtype = MEM_RDDR3;
+                       break;

                default:
                        mtype = MEM_UNKNOWN;
                        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_DDR2:
                        mtype = MEM_DDR2;
                        break;

+               case DSC_SDTYPE_DDR3:
+                       mtype = MEM_DDR3;
+                       break;

                default:
                        mtype = MEM_UNKNOWN;
                        break;
                default:
                        mtype = MEM_UNKNOWN;
                        break;

diff --git a/drivers/edac/mpc85xx_edac.h b/drivers/edac/mpc85xx_edac.h
index 135b3539a030d4cee2eca42217564bbf4b050476..52432ee7c4b98bf96a10e605116e04c00131481e 100644 (file)
--- a/drivers/edac/mpc85xx_edac.h
+++ b/drivers/edac/mpc85xx_edac.h
@@ -53,6 +53,7 @@
 
 #define DSC_SDTYPE_DDR         0x02000000
 #define DSC_SDTYPE_DDR2                0x03000000
 
 #define DSC_SDTYPE_DDR         0x02000000
 #define DSC_SDTYPE_DDR2                0x03000000

+#define DSC_SDTYPE_DDR3                0x07000000

 #define DSC_X32_EN     0x00000020
 
 /* Err_Int_En */
 #define DSC_X32_EN     0x00000020
 
 /* Err_Int_En */