| Message ID | 1299091841-14594-1-git-send-email-yorksun@freescale.com |
|---|---|
| State | Superseded |
| Delegated to: | Kumar Gala |
| Headers | show |
York Sun wrote: > + switch (wrrec_mclk) { /* DDR_SDRAM_MODE doesn't support 9,11,13,15 */ > + case 9: > + wrrec_mclk = 10; > + break; > + case 11: > + wrrec_mclk = 12; > + break; > + case 13: > + wrrec_mclk = 14; > + break; > + case 16: 15? > + wrrec_mclk = 16; > + break; > + } How about something simpler: if (wrrec_mclk & 1) wrrec_mclk++;
On Wed, 2011-03-02 at 13:31 -0600, Timur Tabi wrote: > York Sun wrote: > > + switch (wrrec_mclk) { /* DDR_SDRAM_MODE doesn't support 9,11,13,15 */ > > + case 9: > > + wrrec_mclk = 10; > > + break; > > + case 11: > > + wrrec_mclk = 12; > > + break; > > + case 13: > > + wrrec_mclk = 14; > > + break; > > + case 16: > > 15? Nice catch. Thank you. I will submit a fixed version. > > + wrrec_mclk = 16; > > + break; > > + } > > How about something simpler: > > if (wrrec_mclk & 1) > wrrec_mclk++; > Only 9, 11, 13, 15 need to round up. York
York Sun wrote: >> > if (wrrec_mclk & 1) >> > wrrec_mclk++; >> > > Only 9, 11, 13, 15 need to round up. What are all the possible values for wrrec_mclk?
On Wed, 2011-03-02 at 13:46 -0600, Timur Tabi wrote: > York Sun wrote: > >> > if (wrrec_mclk & 1) > >> > wrrec_mclk++; > >> > > > Only 9, 11, 13, 15 need to round up. > > What are all the possible values for wrrec_mclk? > There is no limitation on register timing_cfg_1[wrrec_mclk]. It can be any value. The limitation comes from JEDEC spec on mode register MR0. The write recovery for autoprecharge is within the values of 5, 6, 7, 8, 10, 12, 14, 16. York
York Sun wrote: > On Wed, 2011-03-02 at 13:46 -0600, Timur Tabi wrote: >> York Sun wrote: >>>>> if (wrrec_mclk & 1) >>>>> wrrec_mclk++; >>>>> >>> Only 9, 11, 13, 15 need to round up. >> >> What are all the possible values for wrrec_mclk? >> > > There is no limitation on register timing_cfg_1[wrrec_mclk]. It can be > any value. The limitation comes from JEDEC spec on mode register MR0. > The write recovery for autoprecharge is within the values of 5, 6, 7, 8, > 10, 12, 14, 16. My point is that we can do something like this: if (wrrec_mclk > 8 && wrrec_mclk < 16 && wrrec_mclk & 1) wrrec_mclk++; But we can simplify this if I can know what all possible values are.
diff --git a/arch/powerpc/cpu/mpc8xxx/ddr/ctrl_regs.c b/arch/powerpc/cpu/mpc8xxx/ddr/ctrl_regs.c index 41bad35..52bbe76 100644 --- a/arch/powerpc/cpu/mpc8xxx/ddr/ctrl_regs.c +++ b/arch/powerpc/cpu/mpc8xxx/ddr/ctrl_regs.c @@ -371,6 +371,21 @@ static void set_timing_cfg_1(fsl_ddr_cfg_regs_t *ddr, refrec_ctrl = picos_to_mclk(common_dimm->tRFC_ps) - 8; wrrec_mclk = picos_to_mclk(common_dimm->tWR_ps); + + switch (wrrec_mclk) { /* DDR_SDRAM_MODE doesn't support 9,11,13,15 */ + case 9: + wrrec_mclk = 10; + break; + case 11: + wrrec_mclk = 12; + break; + case 13: + wrrec_mclk = 14; + break; + case 16: + wrrec_mclk = 16; + break; + } if (popts->OTF_burst_chop_en) wrrec_mclk += 2; @@ -854,12 +869,17 @@ static void set_ddr_sdram_mode(fsl_ddr_cfg_regs_t *ddr, */ dll_on = 1; wr_mclk = (common_dimm->tWR_ps + mclk_ps - 1) / mclk_ps; - if (wr_mclk >= 12) - wr = 6; + if (wr_mclk >= 15) + wr = 0; /* 16 cycles */ + else if (wr_mclk >= 13) + wr = 7; /* 14 cycles */ + else if (wr_mclk >= 11) + wr = 6; /* 12 cycles */ else if (wr_mclk >= 9) - wr = 5; + wr = 5; /* 10 cycles */ else - wr = wr_mclk - 4; + wr = wr_mclk - 4; /* 5~8 cycles */ + dll_rst = 0; /* dll no reset */ mode = 0; /* normal mode */
The write recovery time of both registers should match. Since mode register doesn't support cycles of 9,11,13,15, we should use next higher number for both registers. Signed-off-by: York Sun <yorksun@freescale.com> --- arch/powerpc/cpu/mpc8xxx/ddr/ctrl_regs.c | 28 ++++++++++++++++++++++++---- 1 files changed, 24 insertions(+), 4 deletions(-)