powerpc/mpc8xxx: fix workaround for errata DDR111 and DDR134

The fix for errata workaround is to avoid covering physical address
0xff000000 to 0xffffffff during the implementation.

Signed-off-by: York Sun <yorksun@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/arch/powerpc/cpu/mpc85xx/ddr-gen3.c b/arch/powerpc/cpu/mpc85xx/ddr-gen3.c
index 73b320b60ce8417f3665f8dcc5b1b97819aba162..c8c84a1f7e7124205e6d22d818e27665bf98703f 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/ddr-gen3.c
+++ b/arch/powerpc/cpu/mpc85xx/ddr-gen3.c
@@ -24,6 +24,8 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs,
 #ifdef CONFIG_SYS_FSL_ERRATUM_DDR111_DDR134
        volatile ccsr_local_ecm_t *ecm = (void *)CONFIG_SYS_MPC85xx_ECM_ADDR;
        u32 total_gb_size_per_controller;
+       unsigned int csn_bnds_backup = 0, cs_sa, cs_ea, *csn_bnds_t;
+       int csn = -1;
 #endif
 
        switch (ctrl_num) {
@@ -40,6 +42,22 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs,
 
        out_be32(&ddr->eor, regs->ddr_eor);
 
+#ifdef CONFIG_SYS_FSL_ERRATUM_DDR111_DDR134
+       for (i = 0; i < CONFIG_CHIP_SELECTS_PER_CTRL; i++) {
+               cs_sa = (regs->cs[i].bnds >> 16) & 0xfff;
+               cs_ea = regs->cs[i].bnds & 0xfff;
+               if ((cs_sa <= 0xff) && (cs_ea >= 0xff)) {
+                       csn = i;
+                       csn_bnds_backup = regs->cs[i].bnds;
+                       csn_bnds_t = (unsigned int *) &regs->cs[i].bnds;
+                       *csn_bnds_t = regs->cs[i].bnds ^ 0x0F000F00;
+                       debug("Found cs%d_bns (0x%08x) covering 0xff000000, "
+                               "change it to 0x%x\n",
+                               csn, csn_bnds_backup, regs->cs[i].bnds);
+                       break;
+               }
+       }
+#endif
        for (i = 0; i < CONFIG_CHIP_SELECTS_PER_CTRL; i++) {
                if (i == 0) {
                        out_be32(&ddr->cs0_bnds, regs->cs[i].bnds);
@@ -308,5 +326,28 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs,
        /* 10. Clear EEBACR[3] */
        clrbits_be32(&ecm->eebacr, 10000000);
        debug("Clearing EEBACR[3] to 0x%08x\n", in_be32(&ecm->eebacr));
+
+       if (csn != -1) {
+               csn_bnds_t = (unsigned int *) &regs->cs[csn].bnds;
+               *csn_bnds_t = csn_bnds_backup;
+               debug("Change cs%d_bnds back to 0x%08x\n",
+                       csn, regs->cs[csn].bnds);
+               setbits_be32(&ddr->sdram_cfg, 0x2);     /* MEM_HALT */
+               switch (csn) {
+               case 0:
+                       out_be32(&ddr->cs0_bnds, regs->cs[csn].bnds);
+                       break;
+               case 1:
+                       out_be32(&ddr->cs1_bnds, regs->cs[csn].bnds);
+                       break;
+               case 2:
+                       out_be32(&ddr->cs2_bnds, regs->cs[csn].bnds);
+                       break;
+               case 3:
+                       out_be32(&ddr->cs3_bnds, regs->cs[csn].bnds);
+                       break;
+               }
+               clrbits_be32(&ddr->sdram_cfg, 0x2);
+       }
 #endif /* CONFIG_SYS_FSL_ERRATUM_DDR111_DDR134 */
 }