Merge branch 'next' of git://git.denx.de/u-boot-video
[platform/kernel/u-boot.git] / drivers / ddr / fsl / ctrl_regs.c
index 8367c95..c0ee858 100644 (file)
@@ -5,17 +5,21 @@
  */
 
 /*
- * Generic driver for Freescale DDR/DDR2/DDR3 memory controller.
+ * Generic driver for Freescale DDR/DDR2/DDR3/DDR4 memory controller.
  * Based on code from spd_sdram.c
  * Author: James Yang [at freescale.com]
  */
 
 #include <common.h>
 #include <fsl_ddr_sdram.h>
-
+#include <fsl_errata.h>
 #include <fsl_ddr.h>
 #include <fsl_immap.h>
 #include <asm/io.h>
+#if defined(CONFIG_FSL_LSCH2) || defined(CONFIG_FSL_LSCH3) || \
+       defined(CONFIG_ARM)
+#include <asm/arch/clock.h>
+#endif
 
 /*
  * Determine Rtt value.
@@ -317,7 +321,24 @@ static void set_timing_cfg_0(const unsigned int ctrl_num,
 
        /* for faster clock, need more time for data setup */
        trwt_mclk = (data_rate/1000000 > 1900) ? 3 : 2;
-       twrt_mclk = 1;
+
+       /*
+        * for single quad-rank DIMM and two-slot DIMMs
+        * to avoid ODT overlap
+        */
+       switch (avoid_odt_overlap(dimm_params)) {
+       case 2:
+               twrt_mclk = 2;
+               twwt_mclk = 2;
+               trrt_mclk = 2;
+               break;
+       default:
+               twrt_mclk = 1;
+               twwt_mclk = 1;
+               trrt_mclk = 0;
+               break;
+       }
+
        act_pd_exit_mclk = picos_to_mclk(ctrl_num, txp);
        pre_pd_exit_mclk = act_pd_exit_mclk;
        /*
@@ -692,7 +713,7 @@ static void set_timing_cfg_2(const unsigned int ctrl_num,
                | ((add_lat_mclk & 0xf) << 28)
                | ((cpo & 0x1f) << 23)
                | ((wr_lat & 0xf) << 19)
-               | ((wr_lat & 0x10) << 14)
+               | (((wr_lat & 0x10) >> 4) << 18)
                | ((rd_to_pre & RD_TO_PRE_MASK) << RD_TO_PRE_SHIFT)
                | ((wr_data_delay & WR_DATA_DELAY_MASK) << WR_DATA_DELAY_SHIFT)
                | ((cke_pls & 0x7) << 6)
@@ -858,7 +879,7 @@ static void set_ddr_sdram_cfg_2(const unsigned int ctrl_num,
                        break;
                }
        }
-
+       sr_ie = popts->self_refresh_interrupt_en;
        num_pr = 1;     /* Make this configurable */
 
        /*
@@ -878,11 +899,15 @@ static void set_ddr_sdram_cfg_2(const unsigned int ctrl_num,
        slow = get_ddr_freq(ctrl_num) < 1249000000;
 #endif
 
-       if (popts->registered_dimm_en) {
+       if (popts->registered_dimm_en)
                rcw_en = 1;
-               ap_en = popts->ap_en;
-       } else {
+
+       /* DDR4 can have address parity for UDIMM and discrete */
+       if ((CONFIG_FSL_SDRAM_TYPE != SDRAM_TYPE_DDR4) &&
+           (!popts->registered_dimm_en)) {
                ap_en = 0;
+       } else {
+               ap_en = popts->ap_en;
        }
 
        x4_en = popts->x4_en ? 1 : 0;
@@ -1117,20 +1142,45 @@ static void set_ddr_sdram_mode_9(fsl_ddr_cfg_regs_t *ddr,
        unsigned short esdmode4 = 0;    /* Extended SDRAM mode 4 */
        unsigned short esdmode5;        /* Extended SDRAM mode 5 */
        int rtt_park = 0;
-
+       bool four_cs = false;
+       const unsigned int mclk_ps = get_memory_clk_period_ps(0);
+
+#if CONFIG_CHIP_SELECTS_PER_CTRL == 4
+       if ((ddr->cs[0].config & SDRAM_CS_CONFIG_EN) &&
+           (ddr->cs[1].config & SDRAM_CS_CONFIG_EN) &&
+           (ddr->cs[2].config & SDRAM_CS_CONFIG_EN) &&
+           (ddr->cs[3].config & SDRAM_CS_CONFIG_EN))
+               four_cs = true;
+#endif
        if (ddr->cs[0].config & SDRAM_CS_CONFIG_EN) {
                esdmode5 = 0x00000500;  /* Data mask enable, RTT_PARK CS0 */
-               rtt_park = 1;
+               rtt_park = four_cs ? 0 : 1;
        } else {
                esdmode5 = 0x00000400;  /* Data mask enabled */
        }
 
+       /* set command/address parity latency */
+       if (ddr->ddr_sdram_cfg_2 & SDRAM_CFG2_AP_EN) {
+               if (mclk_ps >= 935) {
+                       /* for DDR4-1600/1866/2133 */
+                       esdmode5 |= DDR_MR5_CA_PARITY_LAT_4_CLK;
+               } else if (mclk_ps >= 833) {
+                       /* for DDR4-2400 */
+                       esdmode5 |= DDR_MR5_CA_PARITY_LAT_5_CLK;
+               } else {
+                       printf("parity: mclk_ps = %d not supported\n", mclk_ps);
+               }
+       }
+
        ddr->ddr_sdram_mode_9 = (0
                                 | ((esdmode4 & 0xffff) << 16)
                                 | ((esdmode5 & 0xffff) << 0)
                                );
 
-       /* only mode_9 use 0x500, others use 0x400 */
+       /* Normally only the first enabled CS use 0x500, others use 0x400
+        * But when four chip-selects are all enabled, all mode registers
+        * need 0x500 to park.
+        */
 
        debug("FSLDDR: ddr_sdram_mode_9) = 0x%08x\n", ddr->ddr_sdram_mode_9);
        if (unq_mrs_en) {       /* unique mode registers are supported */
@@ -1138,10 +1188,24 @@ static void set_ddr_sdram_mode_9(fsl_ddr_cfg_regs_t *ddr,
                        if (!rtt_park &&
                            (ddr->cs[i].config & SDRAM_CS_CONFIG_EN)) {
                                esdmode5 |= 0x00000500; /* RTT_PARK */
-                               rtt_park = 1;
+                               rtt_park = four_cs ? 0 : 1;
                        } else {
                                esdmode5 = 0x00000400;
                        }
+
+                       if (ddr->ddr_sdram_cfg_2 & SDRAM_CFG2_AP_EN) {
+                               if (mclk_ps >= 935) {
+                                       /* for DDR4-1600/1866/2133 */
+                                       esdmode5 |= DDR_MR5_CA_PARITY_LAT_4_CLK;
+                               } else if (mclk_ps >= 833) {
+                                       /* for DDR4-2400 */
+                                       esdmode5 |= DDR_MR5_CA_PARITY_LAT_5_CLK;
+                               } else {
+                                       printf("parity: mclk_ps = %d not supported\n",
+                                              mclk_ps);
+                               }
+                       }
+
                        switch (i) {
                        case 1:
                                ddr->ddr_sdram_mode_11 = (0
@@ -1186,6 +1250,9 @@ static void set_ddr_sdram_mode_10(const unsigned int ctrl_num,
 
        esdmode6 = ((tccdl_min - 4) & 0x7) << 10;
 
+       if (popts->ddr_cdr2 & DDR_CDR2_VREF_RANGE_2)
+               esdmode6 |= 1 << 6;     /* Range 2 */
+
        ddr->ddr_sdram_mode_10 = (0
                                 | ((esdmode6 & 0xffff) << 16)
                                 | ((esdmode7 & 0xffff) << 0)
@@ -1768,14 +1835,21 @@ static void set_ddr_sdram_clk_cntl(fsl_ddr_cfg_regs_t *ddr,
        unsigned int clk_adjust;        /* Clock adjust */
        unsigned int ss_en = 0;         /* Source synchronous enable */
 
-#if defined(CONFIG_MPC8541) || defined(CONFIG_MPC8555)
+#if defined(CONFIG_ARCH_MPC8541) || defined(CONFIG_ARCH_MPC8555)
        /* Per FSL Application Note: AN2805 */
        ss_en = 1;
 #endif
-       clk_adjust = popts->clk_adjust;
+       if (fsl_ddr_get_version(0) >= 0x40701) {
+               /* clk_adjust in 5-bits on T-series and LS-series */
+               clk_adjust = (popts->clk_adjust & 0x1F) << 22;
+       } else {
+               /* clk_adjust in 4-bits on earlier MPC85xx and P-series */
+               clk_adjust = (popts->clk_adjust & 0xF) << 23;
+       }
+
        ddr->ddr_sdram_clk_cntl = (0
                                   | ((ss_en & 0x1) << 31)
-                                  | ((clk_adjust & 0xF) << 23)
+                                  | clk_adjust
                                   );
        debug("FSLDDR: clk_cntl = 0x%08x\n", ddr->ddr_sdram_clk_cntl);
 }
@@ -1808,6 +1882,7 @@ static void set_timing_cfg_4(fsl_ddr_cfg_regs_t *ddr,
        unsigned int wrt = 0; /* Write-to-read turnaround for same CS */
        unsigned int rrt = 0; /* Read-to-read turnaround for same CS */
        unsigned int wwt = 0; /* Write-to-write turnaround for same CS */
+       unsigned int trwt_mclk = 0;     /* ext_rwt */
        unsigned int dll_lock = 0; /* DDR SDRAM DLL Lock Time */
 
 #if defined(CONFIG_SYS_FSL_DDR3) || defined(CONFIG_SYS_FSL_DDR4)
@@ -1821,17 +1896,21 @@ static void set_timing_cfg_4(fsl_ddr_cfg_regs_t *ddr,
                wwt = 2;        /* BL/2 + 2 clocks */
        }
 #endif
-
 #ifdef CONFIG_SYS_FSL_DDR4
        dll_lock = 2;   /* tDLLK = 1024 clocks */
 #elif defined(CONFIG_SYS_FSL_DDR3)
        dll_lock = 1;   /* tDLLK = 512 clocks from spec */
 #endif
+
+       if (popts->trwt_override)
+               trwt_mclk = popts->trwt;
+
        ddr->timing_cfg_4 = (0
                             | ((rwt & 0xf) << 28)
                             | ((wrt & 0xf) << 24)
                             | ((rrt & 0xf) << 20)
                             | ((wwt & 0xf) << 16)
+                            | ((trwt_mclk & 0xc) << 12)
                             | (dll_lock & 0x3)
                             );
        debug("FSLDDR: timing_cfg_4 = 0x%08x\n", ddr->timing_cfg_4);
@@ -1889,12 +1968,25 @@ static void set_timing_cfg_7(const unsigned int ctrl_num,
                             const common_timing_params_t *common_dimm)
 {
        unsigned int txpr, tcksre, tcksrx;
-       unsigned int cke_rst, cksre, cksrx, par_lat, cs_to_cmd;
+       unsigned int cke_rst, cksre, cksrx, par_lat = 0, cs_to_cmd;
+       const unsigned int mclk_ps = get_memory_clk_period_ps(ctrl_num);
 
        txpr = max(5U, picos_to_mclk(ctrl_num, common_dimm->trfc1_ps + 10000));
        tcksre = max(5U, picos_to_mclk(ctrl_num, 10000));
        tcksrx = max(5U, picos_to_mclk(ctrl_num, 10000));
-       par_lat = 0;
+
+       if (ddr->ddr_sdram_cfg_2 & SDRAM_CFG2_AP_EN) {
+               if (mclk_ps >= 935) {
+                       /* parity latency 4 clocks in case of 1600/1866/2133 */
+                       par_lat = 4;
+               } else if (mclk_ps >= 833) {
+                       /* parity latency 5 clocks for DDR4-2400 */
+                       par_lat = 5;
+               } else {
+                       printf("parity: mclk_ps = %d not supported\n", mclk_ps);
+               }
+       }
+
        cs_to_cmd = 0;
 
        if (txpr <= 200)
@@ -2124,7 +2216,7 @@ static void set_ddr_wrlvl_cntl(fsl_ddr_cfg_regs_t *ddr, unsigned int wrlvl_en,
                 * Write leveling start time
                 * The value use for the DQS_ADJUST for the first sample
                 * when write leveling is enabled. It probably needs to be
-                * overriden per platform.
+                * overridden per platform.
                 */
                wrlvl_start = 0x8;
                /*
@@ -2218,6 +2310,38 @@ compute_fsl_memctl_config_regs(const unsigned int ctrl_num,
        unsigned int ip_rev = 0;
        unsigned int unq_mrs_en = 0;
        int cs_en = 1;
+#ifdef CONFIG_SYS_FSL_ERRATUM_A009942
+       unsigned int ddr_freq;
+#endif
+#if (defined(CONFIG_SYS_FSL_ERRATUM_A008378) && \
+       defined(CONFIG_SYS_FSL_DDRC_GEN4)) || \
+       defined(CONFIG_SYS_FSL_ERRATUM_A009942)
+       struct ccsr_ddr __iomem *ddrc;
+
+       switch (ctrl_num) {
+       case 0:
+               ddrc = (void *)CONFIG_SYS_FSL_DDR_ADDR;
+               break;
+#if defined(CONFIG_SYS_FSL_DDR2_ADDR) && (CONFIG_SYS_NUM_DDR_CTLRS > 1)
+       case 1:
+               ddrc = (void *)CONFIG_SYS_FSL_DDR2_ADDR;
+               break;
+#endif
+#if defined(CONFIG_SYS_FSL_DDR3_ADDR) && (CONFIG_SYS_NUM_DDR_CTLRS > 2)
+       case 2:
+               ddrc = (void *)CONFIG_SYS_FSL_DDR3_ADDR;
+               break;
+#endif
+#if defined(CONFIG_SYS_FSL_DDR4_ADDR) && (CONFIG_SYS_NUM_DDR_CTLRS > 3)
+       case 3:
+               ddrc = (void *)CONFIG_SYS_FSL_DDR4_ADDR;
+               break;
+#endif
+       default:
+               printf("%s unexpected ctrl_num = %u\n", __func__, ctrl_num);
+               return 1;
+       }
+#endif
 
        memset(ddr, 0, sizeof(fsl_ddr_cfg_regs_t));
 
@@ -2438,5 +2562,105 @@ compute_fsl_memctl_config_regs(const unsigned int ctrl_num,
                ddr->debug[2] |= 0x00000200;    /* set bit 22 */
 #endif
 
+#if defined(CONFIG_SYS_FSL_ERRATUM_A008378) && defined(CONFIG_SYS_FSL_DDRC_GEN4)
+       /* Erratum applies when accumulated ECC is used, or DBI is enabled */
+#define IS_ACC_ECC_EN(v) ((v) & 0x4)
+#define IS_DBI(v) ((((v) >> 12) & 0x3) == 0x2)
+       if (has_erratum_a008378()) {
+               if (IS_ACC_ECC_EN(ddr->ddr_sdram_cfg) ||
+                   IS_DBI(ddr->ddr_sdram_cfg_3)) {
+                       ddr->debug[28] = ddr_in32(&ddrc->debug[28]);
+                       ddr->debug[28] |= (0x9 << 20);
+               }
+       }
+#endif
+
+#ifdef CONFIG_SYS_FSL_ERRATUM_A009942
+       ddr_freq = get_ddr_freq(ctrl_num) / 1000000;
+       ddr->debug[28] |= ddr_in32(&ddrc->debug[28]);
+       ddr->debug[28] &= 0xff0fff00;
+       if (ddr_freq <= 1333)
+               ddr->debug[28] |= 0x0080006a;
+       else if (ddr_freq <= 1600)
+               ddr->debug[28] |= 0x0070006f;
+       else if (ddr_freq <= 1867)
+               ddr->debug[28] |= 0x00700076;
+       else if (ddr_freq <= 2133)
+               ddr->debug[28] |= 0x0060007b;
+       if (popts->cpo_sample)
+               ddr->debug[28] = (ddr->debug[28] & 0xffffff00) |
+                                 popts->cpo_sample;
+#endif
+
        return check_fsl_memctl_config_regs(ddr);
 }
+
+#ifdef CONFIG_SYS_FSL_ERRATUM_A009942
+/*
+ * This additional workaround of A009942 checks the condition to determine if
+ * the CPO value set by the existing A009942 workaround needs to be updated.
+ * If need, print a warning to prompt user reconfigure DDR debug_29[24:31] with
+ * expected optimal value, the optimal value is highly board dependent.
+ */
+void erratum_a009942_check_cpo(void)
+{
+       struct ccsr_ddr __iomem *ddr =
+               (struct ccsr_ddr __iomem *)(CONFIG_SYS_FSL_DDR_ADDR);
+       u32 cpo, cpo_e, cpo_o, cpo_target, cpo_optimal;
+       u32 cpo_min = ddr_in32(&ddr->debug[9]) >> 24;
+       u32 cpo_max = cpo_min;
+       u32 sdram_cfg, i, tmp, lanes, ddr_type;
+       bool update_cpo = false, has_ecc = false;
+
+       sdram_cfg = ddr_in32(&ddr->sdram_cfg);
+       if (sdram_cfg & SDRAM_CFG_32_BE)
+               lanes = 4;
+       else if (sdram_cfg & SDRAM_CFG_16_BE)
+               lanes = 2;
+       else
+               lanes = 8;
+
+       if (sdram_cfg & SDRAM_CFG_ECC_EN)
+               has_ecc = true;
+
+       /* determine the maximum and minimum CPO values */
+       for (i = 9; i < 9 + lanes / 2; i++) {
+               cpo = ddr_in32(&ddr->debug[i]);
+               cpo_e = cpo >> 24;
+               cpo_o = (cpo >> 8) & 0xff;
+               tmp = min(cpo_e, cpo_o);
+               if (tmp < cpo_min)
+                       cpo_min = tmp;
+               tmp = max(cpo_e, cpo_o);
+               if (tmp > cpo_max)
+                       cpo_max = tmp;
+       }
+
+       if (has_ecc) {
+               cpo = ddr_in32(&ddr->debug[13]);
+               cpo = cpo >> 24;
+               if (cpo < cpo_min)
+                       cpo_min = cpo;
+               if (cpo > cpo_max)
+                       cpo_max = cpo;
+       }
+
+       cpo_target = ddr_in32(&ddr->debug[28]) & 0xff;
+       cpo_optimal = ((cpo_max + cpo_min) >> 1) + 0x27;
+       debug("cpo_optimal = 0x%x, cpo_target = 0x%x\n", cpo_optimal,
+             cpo_target);
+       debug("cpo_max = 0x%x, cpo_min = 0x%x\n", cpo_max, cpo_min);
+
+       ddr_type = (sdram_cfg & SDRAM_CFG_SDRAM_TYPE_MASK) >>
+                   SDRAM_CFG_SDRAM_TYPE_SHIFT;
+       if (ddr_type == SDRAM_TYPE_DDR4)
+               update_cpo = (cpo_min + 0x3b) < cpo_target ? true : false;
+       else if (ddr_type == SDRAM_TYPE_DDR3)
+               update_cpo = (cpo_min + 0x3f) < cpo_target ? true : false;
+
+       if (update_cpo) {
+               printf("WARN: pls set popts->cpo_sample = 0x%x ", cpo_optimal);
+               printf("in <board>/ddr.c to optimize cpo\n");
+       }
+}
+#endif