Merge pull request #232 from antmicro/jboc/init-mr

init: make the write leveling MR bit configurable

litedram/init.py

@@ -220,7 +220,7 @@ def get_ddr3_phy_init_sequence(phy_settings, timing_settings):
         ("ZQ Calibration", 0x0400, 0, "DFII_COMMAND_WE|DFII_COMMAND_CS", 200),
     ]
 
-    return init_sequence, mr1
+    return init_sequence, {1: mr1}
 
 # DDR4 ---------------------------------------------------------------------------------------------
 
@@ -443,7 +443,7 @@ def get_ddr4_phy_init_sequence(phy_settings, timing_settings):
         ("ZQ Calibration", 0x0400, 0, "DFII_COMMAND_WE|DFII_COMMAND_CS", 200),
     ]
 
-    return init_sequence, mr1
+    return init_sequence, {1: mr1}
 
 # Init Sequence ------------------------------------------------------------------------------------
 
@@ -568,11 +568,13 @@ const unsigned long sdram_dfii_pix_rddata_addr[SDRAM_PHY_PHASES] = {{
 """.format(sdram_dfii_pix_rddata_addr=",\n\t".join(sdram_dfii_pix_rddata_addr))
     r += "\n"
 
-    init_sequence, mr1 = get_sdram_phy_init_sequence(phy_settings, timing_settings)
+    init_sequence, mr = get_sdram_phy_init_sequence(phy_settings, timing_settings)
 
     if phy_settings.memtype in ["DDR3", "DDR4"]:
-        # The value of MR1 needs to be modified during write leveling
-        r += "#define DDRX_MR1 {}\n\n".format(mr1)
+        # The value of MR1[7] needs to be modified during write leveling
+        r += "#define DDRX_MR_WRLVL_ADDRESS {}\n".format(1)
+        r += "#define DDRX_MR_WRLVL_RESET {}\n".format(mr[1])
+        r += "#define DDRX_MR_WRLVL_BIT {}\n\n".format(7)
 
     r += "static void init_sequence(void)\n{\n"
     for comment, a, ba, cmd, delay in init_sequence:
@@ -625,10 +627,10 @@ def get_sdram_phy_py_header(phy_settings, timing_settings):
     r += "dfii_command_rddata = 0x20\n"
     r += "\n"
 
-    init_sequence, mr1 = get_sdram_phy_init_sequence(phy_settings, timing_settings)
+    init_sequence, mr = get_sdram_phy_init_sequence(phy_settings, timing_settings)
 
-    if mr1 is not None:
-        r += "ddrx_mr1 = 0x{:x}\n".format(mr1)
+    if mr is not None and 1 in mr:
+        r += "ddrx_mr1 = 0x{:x}\n".format(mr[1])
         r += "\n"
 
     r += "init_sequence = [\n"

test/reference/ddr3_init.h

@@ -70,7 +70,9 @@ const unsigned long sdram_dfii_pix_rddata_addr[SDRAM_PHY_PHASES] = {
 	CSR_SDRAM_DFII_PI3_RDDATA_ADDR
 };
 
-#define DDRX_MR1 6
+#define DDRX_MR_WRLVL_ADDRESS 1
+#define DDRX_MR_WRLVL_RESET 6
+#define DDRX_MR_WRLVL_BIT 7
 
 static void init_sequence(void)
 {

test/reference/ddr4_init.h

@@ -71,7 +71,9 @@ const unsigned long sdram_dfii_pix_rddata_addr[SDRAM_PHY_PHASES] = {
 	CSR_SDRAM_DFII_PI3_RDDATA_ADDR
 };
 
-#define DDRX_MR1 769
+#define DDRX_MR_WRLVL_ADDRESS 1
+#define DDRX_MR_WRLVL_RESET 769
+#define DDRX_MR_WRLVL_BIT 7
 
 static void init_sequence(void)
 {