| Message ID | 20200409124448.12903-1-biwen.li@oss.nxp.com |
|---|---|
| State | New |
| Headers | show |
| Series | Revert "mpc85xx: ddr: Always start DDR RAM in Self Refresh mode" | expand |
>-----Original Message----- >From: Joakim Tjernlund <Joakim.Tjernlund at infinera.com> >Sent: Thursday, April 9, 2020 6:24 PM >To: Priyanka Jain <priyanka.jain at nxp.com>; Biwen Li (OSS) ><biwen.li at oss.nxp.com> >Cc: u-boot at lists.denx.de; Biwen Li <biwen.li at nxp.com>; Jiafei Pan ><jiafei.pan at nxp.com> >Subject: Re: [PATCH] Revert "mpc85xx: ddr: Always start DDR RAM in Self >Refresh mode" > >On Thu, 2020-04-09 at 20:44 +0800, Biwen Li wrote: > >This revert will bring back another bug, can you try finding out why it does >work? >May there are some minor tweaks needed ? > > Jocke The patch has impacted boot to prompt on many powerpc boards. I agree with you that we also need to have solution to the original problem reported by you. We are working on fixing of DDR errata workaround implementation issue that you reported. But I need this workaround patch to be reverted now as a quick fix for v2020.04 release which is only few days away. Thanks Priyanka >> >> From: Biwen Li <biwen.li at nxp.com> >> >> This reverts commit 2a5d5d27edfbdb0e02a7fcf05569f92c02ae44ee. >> After applied this patch, failed to boot to uboot(hang in ddr init) on >> P3041DS, P4080DS and so on. >> --- >> drivers/ddr/fsl/mpc85xx_ddr_gen3.c | 13 +++++++------ >> 1 file changed, 7 insertions(+), 6 deletions(-) >> >> diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen3.c >> b/drivers/ddr/fsl/mpc85xx_ddr_gen3.c >> index 952b296dd8..a9b085db8c 100644 >> --- a/drivers/ddr/fsl/mpc85xx_ddr_gen3.c >> +++ b/drivers/ddr/fsl/mpc85xx_ddr_gen3.c >> @@ -370,8 +370,6 @@ step2: >> debug("Setting DEBUG_3[21] to 0x%08x\n", >> in_be32(&ddr->debug[2])); >> >> #endif /* part 1 of the workaound */ >> - /* Always start in self-refresh, clear after MEM_EN */ >> - setbits_be32(&ddr->sdram_cfg_2, SDRAM_CFG2_FRC_SR); >> >> /* >> * 500 painful micro-seconds must elapse between @@ -384,6 >> +382,8 @@ step2: >> >> #ifdef CONFIG_DEEP_SLEEP >> if (is_warm_boot()) { >> + /* enter self-refresh */ >> + setbits_be32(&ddr->sdram_cfg_2, SDRAM_CFG2_FRC_SR); >> /* do board specific memory setup */ >> board_mem_sleep_setup(); >> temp_sdram_cfg = (in_be32(&ddr->sdram_cfg) | >> SDRAM_CFG_BI); @@ -395,10 +395,6 @@ step2: >> out_be32(&ddr->sdram_cfg, temp_sdram_cfg | >SDRAM_CFG_MEM_EN); >> asm volatile("sync;isync"); >> >> - /* Exit self-refresh after DDR conf as some ddr memories can fail. */ >> - clrbits_be32(&ddr->sdram_cfg_2, SDRAM_CFG2_FRC_SR); >> - asm volatile("sync;isync"); >> - >> total_gb_size_per_controller = 0; >> for (i = 0; i < CONFIG_CHIP_SELECTS_PER_CTRL; i++) { >> if (!(regs->cs[i].config & 0x80000000)) @@ -548,4 >> +544,9 @@ step2: >> clrbits_be32(&ddr->sdram_cfg, 0x2); >> } >> #endif /* CONFIG_SYS_FSL_ERRATUM_DDR111_DDR134 */ >> +#ifdef CONFIG_DEEP_SLEEP >> + if (is_warm_boot()) >> + /* exit self-refresh */ >> + clrbits_be32(&ddr->sdram_cfg_2, SDRAM_CFG2_FRC_SR); >> +#endif >> } >> -- >> 2.17.1 >>
On Fri, 2020-04-10 at 11:40 +0000, Priyanka Jain wrote: > > > -----Original Message----- > > From: Joakim Tjernlund <Joakim.Tjernlund at infinera.com> > > Sent: Thursday, April 9, 2020 6:24 PM > > To: Priyanka Jain <priyanka.jain at nxp.com>; Biwen Li (OSS) > > <biwen.li at oss.nxp.com> > > Cc: u-boot at lists.denx.de; Biwen Li <biwen.li at nxp.com>; Jiafei Pan > > <jiafei.pan at nxp.com> > > Subject: Re: [PATCH] Revert "mpc85xx: ddr: Always start DDR RAM in Self > > Refresh mode" > > > > On Thu, 2020-04-09 at 20:44 +0800, Biwen Li wrote: > > > > This revert will bring back another bug, can you try finding out why it does > > work? > > May there are some minor tweaks needed ? > > > > Jocke > The patch has impacted boot to prompt on many powerpc boards. > I agree with you that we also need to have solution to the original problem reported by you. > We are working on fixing of DDR errata workaround implementation issue that you reported. Is anyone working on the eSPI driver as well? I recall someone at NXP volunteered but cannot recall who. > > But I need this workaround patch to be reverted now as a quick fix for v2020.04 release which is only few days away. I see Jocke > > Thanks > Priyanka > > > From: Biwen Li <biwen.li at nxp.com> > > > > > > This reverts commit 2a5d5d27edfbdb0e02a7fcf05569f92c02ae44ee. > > > After applied this patch, failed to boot to uboot(hang in ddr init) on > > > P3041DS, P4080DS and so on. > > > --- > > > drivers/ddr/fsl/mpc85xx_ddr_gen3.c | 13 +++++++------ > > > 1 file changed, 7 insertions(+), 6 deletions(-) > > > > > > diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen3.c > > > b/drivers/ddr/fsl/mpc85xx_ddr_gen3.c > > > index 952b296dd8..a9b085db8c 100644 > > > --- a/drivers/ddr/fsl/mpc85xx_ddr_gen3.c > > > +++ b/drivers/ddr/fsl/mpc85xx_ddr_gen3.c > > > @@ -370,8 +370,6 @@ step2: > > > debug("Setting DEBUG_3[21] to 0x%08x\n", > > > in_be32(&ddr->debug[2])); > > > > > > #endif /* part 1 of the workaound */ > > > - /* Always start in self-refresh, clear after MEM_EN */ > > > - setbits_be32(&ddr->sdram_cfg_2, SDRAM_CFG2_FRC_SR); > > > > > > /* > > > * 500 painful micro-seconds must elapse between @@ -384,6 > > > +382,8 @@ step2: > > > > > > #ifdef CONFIG_DEEP_SLEEP > > > if (is_warm_boot()) { > > > + /* enter self-refresh */ > > > + setbits_be32(&ddr->sdram_cfg_2, SDRAM_CFG2_FRC_SR); > > > /* do board specific memory setup */ > > > board_mem_sleep_setup(); > > > temp_sdram_cfg = (in_be32(&ddr->sdram_cfg) | > > > SDRAM_CFG_BI); @@ -395,10 +395,6 @@ step2: > > > out_be32(&ddr->sdram_cfg, temp_sdram_cfg | > > SDRAM_CFG_MEM_EN); > > > asm volatile("sync;isync"); > > > > > > - /* Exit self-refresh after DDR conf as some ddr memories can fail. */ > > > - clrbits_be32(&ddr->sdram_cfg_2, SDRAM_CFG2_FRC_SR); > > > - asm volatile("sync;isync"); > > > - > > > total_gb_size_per_controller = 0; > > > for (i = 0; i < CONFIG_CHIP_SELECTS_PER_CTRL; i++) { > > > if (!(regs->cs[i].config & 0x80000000)) @@ -548,4 > > > +544,9 @@ step2: > > > clrbits_be32(&ddr->sdram_cfg, 0x2); > > > } > > > #endif /* CONFIG_SYS_FSL_ERRATUM_DDR111_DDR134 */ > > > +#ifdef CONFIG_DEEP_SLEEP > > > + if (is_warm_boot()) > > > + /* exit self-refresh */ > > > + clrbits_be32(&ddr->sdram_cfg_2, SDRAM_CFG2_FRC_SR); > > > +#endif > > > } > > > -- > > > 2.17.1 > > >
>-----Original Message----- >From: Joakim Tjernlund <Joakim.Tjernlund at infinera.com> >Sent: Friday, April 10, 2020 5:21 PM >To: Priyanka Jain <priyanka.jain at nxp.com>; Biwen Li (OSS) ><biwen.li at oss.nxp.com> >Cc: u-boot at lists.denx.de; Biwen Li <biwen.li at nxp.com>; Jiafei Pan ><jiafei.pan at nxp.com> >Subject: Re: [PATCH] Revert "mpc85xx: ddr: Always start DDR RAM in Self >Refresh mode" > >On Fri, 2020-04-10 at 11:40 +0000, Priyanka Jain wrote: >> >> > -----Original Message----- >> > From: Joakim Tjernlund <Joakim.Tjernlund at infinera.com> >> > Sent: Thursday, April 9, 2020 6:24 PM >> > To: Priyanka Jain <priyanka.jain at nxp.com>; Biwen Li (OSS) >> > <biwen.li at oss.nxp.com> >> > Cc: u-boot at lists.denx.de; Biwen Li <biwen.li at nxp.com>; Jiafei Pan >> > <jiafei.pan at nxp.com> >> > Subject: Re: [PATCH] Revert "mpc85xx: ddr: Always start DDR RAM in >> > Self Refresh mode" >> > >> > On Thu, 2020-04-09 at 20:44 +0800, Biwen Li wrote: >> > >> > This revert will bring back another bug, can you try finding out why >> > it does work? >> > May there are some minor tweaks needed ? >> > >> > Jocke >> The patch has impacted boot to prompt on many powerpc boards. >> I agree with you that we also need to have solution to the original problem >reported by you. >> We are working on fixing of DDR errata workaround implementation issue >that you reported. > >Is anyone working on the eSPI driver as well? I recall someone at NXP >volunteered but cannot recall who. > Yes, "Xiaowei Bao" is working on that. The older version is in-review on maillist. He is working on rebasing to top of tree Priyanka >> >> But I need this workaround patch to be reverted now as a quick fix for >v2020.04 release which is only few days away. > >I see > > Jocke > >> >> Thanks >> Priyanka >> > > From: Biwen Li <biwen.li at nxp.com> >> > > >> > > This reverts commit 2a5d5d27edfbdb0e02a7fcf05569f92c02ae44ee. >> > > After applied this patch, failed to boot to uboot(hang in ddr >> > > init) on P3041DS, P4080DS and so on. >> > > --- >> > > drivers/ddr/fsl/mpc85xx_ddr_gen3.c | 13 +++++++------ >> > > 1 file changed, 7 insertions(+), 6 deletions(-) >> > > >> > > diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen3.c >> > > b/drivers/ddr/fsl/mpc85xx_ddr_gen3.c >> > > index 952b296dd8..a9b085db8c 100644 >> > > --- a/drivers/ddr/fsl/mpc85xx_ddr_gen3.c >> > > +++ b/drivers/ddr/fsl/mpc85xx_ddr_gen3.c >> > > @@ -370,8 +370,6 @@ step2: >> > > debug("Setting DEBUG_3[21] to 0x%08x\n", >> > > in_be32(&ddr->debug[2])); >> > > >> > > #endif /* part 1 of the workaound */ >> > > - /* Always start in self-refresh, clear after MEM_EN */ >> > > - setbits_be32(&ddr->sdram_cfg_2, SDRAM_CFG2_FRC_SR); >> > > >> > > /* >> > > * 500 painful micro-seconds must elapse between @@ -384,6 >> > > +382,8 @@ step2: >> > > >> > > #ifdef CONFIG_DEEP_SLEEP >> > > if (is_warm_boot()) { >> > > + /* enter self-refresh */ >> > > + setbits_be32(&ddr->sdram_cfg_2, >> > > + SDRAM_CFG2_FRC_SR); >> > > /* do board specific memory setup */ >> > > board_mem_sleep_setup(); >> > > temp_sdram_cfg = (in_be32(&ddr->sdram_cfg) | >> > > SDRAM_CFG_BI); @@ -395,10 +395,6 @@ step2: >> > > out_be32(&ddr->sdram_cfg, temp_sdram_cfg | >> > SDRAM_CFG_MEM_EN); >> > > asm volatile("sync;isync"); >> > > >> > > - /* Exit self-refresh after DDR conf as some ddr memories can fail. */ >> > > - clrbits_be32(&ddr->sdram_cfg_2, SDRAM_CFG2_FRC_SR); >> > > - asm volatile("sync;isync"); >> > > - >> > > total_gb_size_per_controller = 0; >> > > for (i = 0; i < CONFIG_CHIP_SELECTS_PER_CTRL; i++) { >> > > if (!(regs->cs[i].config & 0x80000000)) @@ -548,4 >> > > +544,9 @@ step2: >> > > clrbits_be32(&ddr->sdram_cfg, 0x2); >> > > } >> > > #endif /* CONFIG_SYS_FSL_ERRATUM_DDR111_DDR134 */ >> > > +#ifdef CONFIG_DEEP_SLEEP >> > > + if (is_warm_boot()) >> > > + /* exit self-refresh */ >> > > + clrbits_be32(&ddr->sdram_cfg_2, >> > > +SDRAM_CFG2_FRC_SR); #endif >> > > } >> > > -- >> > > 2.17.1 >> > >
On Sun, 2020-04-12 at 04:22 +0000, Priyanka Jain wrote: > CAUTION: This email originated from outside of the organization. Do not click links or open attachments unless you recognize the sender and know the content is safe. > > > > -----Original Message----- > > From: Joakim Tjernlund <Joakim.Tjernlund at infinera.com> > > Sent: Friday, April 10, 2020 5:21 PM > > To: Priyanka Jain <priyanka.jain at nxp.com>; Biwen Li (OSS) > > <biwen.li at oss.nxp.com> > > Cc: u-boot at lists.denx.de; Biwen Li <biwen.li at nxp.com>; Jiafei Pan > > <jiafei.pan at nxp.com> > > Subject: Re: [PATCH] Revert "mpc85xx: ddr: Always start DDR RAM in Self > > Refresh mode" > > > > On Fri, 2020-04-10 at 11:40 +0000, Priyanka Jain wrote: > > > > -----Original Message----- > > > > From: Joakim Tjernlund <Joakim.Tjernlund at infinera.com> > > > > Sent: Thursday, April 9, 2020 6:24 PM > > > > To: Priyanka Jain <priyanka.jain at nxp.com>; Biwen Li (OSS) > > > > <biwen.li at oss.nxp.com> > > > > Cc: u-boot at lists.denx.de; Biwen Li <biwen.li at nxp.com>; Jiafei Pan > > > > <jiafei.pan at nxp.com> > > > > Subject: Re: [PATCH] Revert "mpc85xx: ddr: Always start DDR RAM in > > > > Self Refresh mode" > > > > > > > > On Thu, 2020-04-09 at 20:44 +0800, Biwen Li wrote: > > > > > > > > This revert will bring back another bug, can you try finding out why > > > > it does work? > > > > May there are some minor tweaks needed ? > > > > > > > > Jocke > > > The patch has impacted boot to prompt on many powerpc boards. > > > I agree with you that we also need to have solution to the original problem > > reported by you. > > > We are working on fixing of DDR errata workaround implementation issue > > that you reported. > > > > Is anyone working on the eSPI driver as well? I recall someone at NXP > > volunteered but cannot recall who. > > > Yes, "Xiaowei Bao" is working on that. > The older version is in-review on maillist. He is working on rebasing to top of tree > Priyanka Now upstream is removing the fsl_espi driver, what is the status? Jocke
On Thu, 28 May, 2020, 00:41 Joakim Tjernlund, <Joakim.Tjernlund at infinera.com> wrote: > On Sun, 2020-04-12 at 04:22 +0000, Priyanka Jain wrote: > > CAUTION: This email originated from outside of the organization. Do not > click links or open attachments unless you recognize the sender and know > the content is safe. > > > > > > > -----Original Message----- > > > From: Joakim Tjernlund <Joakim.Tjernlund at infinera.com> > > > Sent: Friday, April 10, 2020 5:21 PM > > > To: Priyanka Jain <priyanka.jain at nxp.com>; Biwen Li (OSS) > > > <biwen.li at oss.nxp.com> > > > Cc: u-boot at lists.denx.de; Biwen Li <biwen.li at nxp.com>; Jiafei Pan > > > <jiafei.pan at nxp.com> > > > Subject: Re: [PATCH] Revert "mpc85xx: ddr: Always start DDR RAM in Self > > > Refresh mode" > > > > > > On Fri, 2020-04-10 at 11:40 +0000, Priyanka Jain wrote: > > > > > -----Original Message----- > > > > > From: Joakim Tjernlund <Joakim.Tjernlund at infinera.com> > > > > > Sent: Thursday, April 9, 2020 6:24 PM > > > > > To: Priyanka Jain <priyanka.jain at nxp.com>; Biwen Li (OSS) > > > > > <biwen.li at oss.nxp.com> > > > > > Cc: u-boot at lists.denx.de; Biwen Li <biwen.li at nxp.com>; Jiafei Pan > > > > > <jiafei.pan at nxp.com> > > > > > Subject: Re: [PATCH] Revert "mpc85xx: ddr: Always start DDR RAM in > > > > > Self Refresh mode" > > > > > > > > > > On Thu, 2020-04-09 at 20:44 +0800, Biwen Li wrote: > > > > > > > > > > This revert will bring back another bug, can you try finding out > why > > > > > it does work? > > > > > May there are some minor tweaks needed ? > > > > > > > > > > Jocke > > > > The patch has impacted boot to prompt on many powerpc boards. > > > > I agree with you that we also need to have solution to the original > problem > > > reported by you. > > > > We are working on fixing of DDR errata workaround implementation > issue > > > that you reported. > > > > > > Is anyone working on the eSPI driver as well? I recall someone at NXP > > > volunteered but cannot recall who. > > > > > Yes, "Xiaowei Bao" is working on that. > > The older version is in-review on maillist. He is working on rebasing to > top of tree > > Priyanka > > Now upstream is removing the fsl_espi driver, what is the status? > Fyi: It's not only a driver but also an associated board too. Jagan.
diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen3.c b/drivers/ddr/fsl/mpc85xx_ddr_gen3.c index 952b296dd8..a9b085db8c 100644 --- a/drivers/ddr/fsl/mpc85xx_ddr_gen3.c +++ b/drivers/ddr/fsl/mpc85xx_ddr_gen3.c @@ -370,8 +370,6 @@ step2: debug("Setting DEBUG_3[21] to 0x%08x\n", in_be32(&ddr->debug[2])); #endif /* part 1 of the workaound */ - /* Always start in self-refresh, clear after MEM_EN */ - setbits_be32(&ddr->sdram_cfg_2, SDRAM_CFG2_FRC_SR); /* * 500 painful micro-seconds must elapse between @@ -384,6 +382,8 @@ step2: #ifdef CONFIG_DEEP_SLEEP if (is_warm_boot()) { + /* enter self-refresh */ + setbits_be32(&ddr->sdram_cfg_2, SDRAM_CFG2_FRC_SR); /* do board specific memory setup */ board_mem_sleep_setup(); temp_sdram_cfg = (in_be32(&ddr->sdram_cfg) | SDRAM_CFG_BI); @@ -395,10 +395,6 @@ step2: out_be32(&ddr->sdram_cfg, temp_sdram_cfg | SDRAM_CFG_MEM_EN); asm volatile("sync;isync"); - /* Exit self-refresh after DDR conf as some ddr memories can fail. */ - clrbits_be32(&ddr->sdram_cfg_2, SDRAM_CFG2_FRC_SR); - asm volatile("sync;isync"); - total_gb_size_per_controller = 0; for (i = 0; i < CONFIG_CHIP_SELECTS_PER_CTRL; i++) { if (!(regs->cs[i].config & 0x80000000)) @@ -548,4 +544,9 @@ step2: clrbits_be32(&ddr->sdram_cfg, 0x2); } #endif /* CONFIG_SYS_FSL_ERRATUM_DDR111_DDR134 */ +#ifdef CONFIG_DEEP_SLEEP + if (is_warm_boot()) + /* exit self-refresh */ + clrbits_be32(&ddr->sdram_cfg_2, SDRAM_CFG2_FRC_SR); +#endif }
From: Biwen Li <biwen.li at nxp.com> This reverts commit 2a5d5d27edfbdb0e02a7fcf05569f92c02ae44ee. After applied this patch, failed to boot to uboot(hang in ddr init) on P3041DS, P4080DS and so on. --- drivers/ddr/fsl/mpc85xx_ddr_gen3.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)