brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-09-28 07:30:26 +09:00
Code Issues Projects Releases Wiki Activity

driver/ddr/fsl: Add support for multiple DDR clocks

Browse Source 
Controller number is passed for function calls to support individual
DDR clock, depending on SoC implementation. It is backward compatible
with exising platforms. Multiple clocks have been verifyed on LS2085A
emulator.

Signed-off-by: York Sun <yorksun@freescale.com>
This commit is contained in:
York Sun 2015-01-06 13:18:50 -08:00
parent b87e6f88e9
commit 03e664d8f4
14 changed files with 190 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/ddr/fsl/arm_ddr_gen3.c
View File

@ -222,7 +222,7 @@ step2:
bus_width = 3 - ((ddr_in32(&ddr->sdram_cfg) & SDRAM_CFG_DBW_MASK) bus_width = 3 - ((ddr_in32(&ddr->sdram_cfg) & SDRAM_CFG_DBW_MASK)
>> SDRAM_CFG_DBW_SHIFT); >> SDRAM_CFG_DBW_SHIFT);
timeout = ((total_gb_size_per_controller << (6 - bus_width)) * 100 / timeout = ((total_gb_size_per_controller << (6 - bus_width)) * 100 /
(get_ddr_freq(0) >> 20)) << 1; (get_ddr_freq(ctrl_num) >> 20)) << 1;
total_gb_size_per_controller >>= 4; /* shift down to gb size */ total_gb_size_per_controller >>= 4; /* shift down to gb size */
debug("total %d GB\n", total_gb_size_per_controller); debug("total %d GB\n", total_gb_size_per_controller);
debug("Need to wait up to %d * 10ms\n", timeout); debug("Need to wait up to %d * 10ms\n", timeout);

208
drivers/ddr/fsl/ctrl_regs.c
View File

@ -17,8 +17,6 @@
#include <fsl_immap.h> #include <fsl_immap.h>
#include <asm/io.h> #include <asm/io.h>
unsigned int picos_to_mclk(unsigned int picos);
/* /*
* Determine Rtt value. * Determine Rtt value.
* *
@ -78,10 +76,11 @@ static inline int fsl_ddr_get_rtt(void)
* 16 for <= 2933MT/s * 16 for <= 2933MT/s
* 18 for higher * 18 for higher
*/ */
static inline unsigned int compute_cas_write_latency(void) static inline unsigned int compute_cas_write_latency(
const unsigned int ctrl_num)
{ {
unsigned int cwl; unsigned int cwl;
const unsigned int mclk_ps = get_memory_clk_period_ps(); const unsigned int mclk_ps = get_memory_clk_period_ps(ctrl_num);
if (mclk_ps >= 1250) if (mclk_ps >= 1250)
cwl = 9; cwl = 9;
else if (mclk_ps >= 1070) else if (mclk_ps >= 1070)
@ -111,10 +110,11 @@ static inline unsigned int compute_cas_write_latency(void)
* 11 if 0.935ns > tCK >= 0.833ns * 11 if 0.935ns > tCK >= 0.833ns
* 12 if 0.833ns > tCK >= 0.75ns * 12 if 0.833ns > tCK >= 0.75ns
*/ */
static inline unsigned int compute_cas_write_latency(void) static inline unsigned int compute_cas_write_latency(
const unsigned int ctrl_num)
{ {
unsigned int cwl; unsigned int cwl;
const unsigned int mclk_ps = get_memory_clk_period_ps(); const unsigned int mclk_ps = get_memory_clk_period_ps(ctrl_num);
if (mclk_ps >= 2500) if (mclk_ps >= 2500)
cwl = 5; cwl = 5;
@ -287,7 +287,8 @@ static inline int avoid_odt_overlap(const dimm_params_t *dimm_params)
* Avoid writing for DDR I. The new PQ38 DDR controller * Avoid writing for DDR I. The new PQ38 DDR controller
* dreams up non-zero default values to be backwards compatible. * dreams up non-zero default values to be backwards compatible.
*/ */
static void set_timing_cfg_0(fsl_ddr_cfg_regs_t *ddr, static void set_timing_cfg_0(const unsigned int ctrl_num,
fsl_ddr_cfg_regs_t *ddr,
const memctl_options_t *popts, const memctl_options_t *popts,
const dimm_params_t *dimm_params) const dimm_params_t *dimm_params)
{ {
@ -306,7 +307,7 @@ static void set_timing_cfg_0(fsl_ddr_cfg_regs_t *ddr,
/* Mode register set cycle time (tMRD). */ /* Mode register set cycle time (tMRD). */
unsigned char tmrd_mclk; unsigned char tmrd_mclk;
#if defined(CONFIG_SYS_FSL_DDR4) || defined(CONFIG_SYS_FSL_DDR3) #if defined(CONFIG_SYS_FSL_DDR4) || defined(CONFIG_SYS_FSL_DDR3)
const unsigned int mclk_ps = get_memory_clk_period_ps(); const unsigned int mclk_ps = get_memory_clk_period_ps(ctrl_num);
#endif #endif
#ifdef CONFIG_SYS_FSL_DDR4 #ifdef CONFIG_SYS_FSL_DDR4
@ -314,15 +315,15 @@ static void set_timing_cfg_0(fsl_ddr_cfg_regs_t *ddr,
int txp = max((int)mclk_ps * 4, 6000); /* unit=ps */ int txp = max((int)mclk_ps * 4, 6000); /* unit=ps */
trwt_mclk = 2; trwt_mclk = 2;
twrt_mclk = 1; twrt_mclk = 1;
act_pd_exit_mclk = picos_to_mclk(txp); act_pd_exit_mclk = picos_to_mclk(ctrl_num, txp);
pre_pd_exit_mclk = act_pd_exit_mclk; pre_pd_exit_mclk = act_pd_exit_mclk;
/* /*
* MRS_CYC = max(tMRD, tMOD) * MRS_CYC = max(tMRD, tMOD)
* tMRD = 8nCK, tMOD = max(24nCK, 15ns) * tMRD = 8nCK, tMOD = max(24nCK, 15ns)
*/ */
tmrd_mclk = max(24U, picos_to_mclk(15000)); tmrd_mclk = max(24U, picos_to_mclk(ctrl_num, 15000));
#elif defined(CONFIG_SYS_FSL_DDR3) #elif defined(CONFIG_SYS_FSL_DDR3)
unsigned int data_rate = get_ddr_freq(0); unsigned int data_rate = get_ddr_freq(ctrl_num);
int txp; int txp;
unsigned int ip_rev; unsigned int ip_rev;
int odt_overlap; int odt_overlap;
@ -344,7 +345,8 @@ static void set_timing_cfg_0(fsl_ddr_cfg_regs_t *ddr,
* tMRD = 4nCK (8nCK for RDIMM) * tMRD = 4nCK (8nCK for RDIMM)
* tMOD = max(12nCK, 15ns) * tMOD = max(12nCK, 15ns)
*/ */
tmrd_mclk = max((unsigned int)12, picos_to_mclk(15000)); tmrd_mclk = max((unsigned int)12,
picos_to_mclk(ctrl_num, 15000));
} else { } else {
/* /*
* MRS_CYC = tMRD * MRS_CYC = tMRD
@ -388,7 +390,7 @@ static void set_timing_cfg_0(fsl_ddr_cfg_regs_t *ddr,
taxpd_mclk = 1; taxpd_mclk = 1;
} else { } else {
/* act_pd_exit_mclk = tXARD, see above */ /* act_pd_exit_mclk = tXARD, see above */
act_pd_exit_mclk = picos_to_mclk(txp); act_pd_exit_mclk = picos_to_mclk(ctrl_num, txp);
/* Mode register MR0[A12] is '1' - fast exit */ /* Mode register MR0[A12] is '1' - fast exit */
pre_pd_exit_mclk = act_pd_exit_mclk; pre_pd_exit_mclk = act_pd_exit_mclk;
taxpd_mclk = 1; taxpd_mclk = 1;
@ -424,11 +426,12 @@ static void set_timing_cfg_0(fsl_ddr_cfg_regs_t *ddr,
#endif /* !defined(CONFIG_SYS_FSL_DDR1) */ #endif /* !defined(CONFIG_SYS_FSL_DDR1) */
/* DDR SDRAM Timing Configuration 3 (TIMING_CFG_3) */ /* DDR SDRAM Timing Configuration 3 (TIMING_CFG_3) */
static void set_timing_cfg_3(fsl_ddr_cfg_regs_t *ddr, static void set_timing_cfg_3(const unsigned int ctrl_num,
const memctl_options_t *popts, fsl_ddr_cfg_regs_t *ddr,
const common_timing_params_t *common_dimm, const memctl_options_t *popts,
unsigned int cas_latency, const common_timing_params_t *common_dimm,
unsigned int additive_latency) unsigned int cas_latency,
unsigned int additive_latency)
{ {
/* Extended precharge to activate interval (tRP) */ /* Extended precharge to activate interval (tRP) */
unsigned int ext_pretoact = 0; unsigned int ext_pretoact = 0;
@ -447,18 +450,18 @@ static void set_timing_cfg_3(fsl_ddr_cfg_regs_t *ddr,
/* Control Adjust */ /* Control Adjust */
unsigned int cntl_adj = 0; unsigned int cntl_adj = 0;
ext_pretoact = picos_to_mclk(common_dimm->trp_ps) >> 4; ext_pretoact = picos_to_mclk(ctrl_num, common_dimm->trp_ps) >> 4;
ext_acttopre = picos_to_mclk(common_dimm->tras_ps) >> 4; ext_acttopre = picos_to_mclk(ctrl_num, common_dimm->tras_ps) >> 4;
ext_acttorw = picos_to_mclk(common_dimm->trcd_ps) >> 4; ext_acttorw = picos_to_mclk(ctrl_num, common_dimm->trcd_ps) >> 4;
ext_caslat = (2 * cas_latency - 1) >> 4; ext_caslat = (2 * cas_latency - 1) >> 4;
ext_add_lat = additive_latency >> 4; ext_add_lat = additive_latency >> 4;
#ifdef CONFIG_SYS_FSL_DDR4 #ifdef CONFIG_SYS_FSL_DDR4
ext_refrec = (picos_to_mclk(common_dimm->trfc1_ps) - 8) >> 4; ext_refrec = (picos_to_mclk(ctrl_num, common_dimm->trfc1_ps) - 8) >> 4;
#else #else
ext_refrec = (picos_to_mclk(common_dimm->trfc_ps) - 8) >> 4; ext_refrec = (picos_to_mclk(ctrl_num, common_dimm->trfc_ps) - 8) >> 4;
/* ext_wrrec only deals with 16 clock and above, or 14 with OTF */ /* ext_wrrec only deals with 16 clock and above, or 14 with OTF */
#endif #endif
ext_wrrec = (picos_to_mclk(common_dimm->twr_ps) + ext_wrrec = (picos_to_mclk(ctrl_num, common_dimm->twr_ps) +
(popts->otf_burst_chop_en ? 2 : 0)) >> 4; (popts->otf_burst_chop_en ? 2 : 0)) >> 4;
ddr->timing_cfg_3 = (0 ddr->timing_cfg_3 = (0
@ -475,10 +478,11 @@ static void set_timing_cfg_3(fsl_ddr_cfg_regs_t *ddr,
} }
/* DDR SDRAM Timing Configuration 1 (TIMING_CFG_1) */ /* DDR SDRAM Timing Configuration 1 (TIMING_CFG_1) */
static void set_timing_cfg_1(fsl_ddr_cfg_regs_t *ddr, static void set_timing_cfg_1(const unsigned int ctrl_num,
const memctl_options_t *popts, fsl_ddr_cfg_regs_t *ddr,
const common_timing_params_t *common_dimm, const memctl_options_t *popts,
unsigned int cas_latency) const common_timing_params_t *common_dimm,
unsigned int cas_latency)
{ {
/* Precharge-to-activate interval (tRP) */ /* Precharge-to-activate interval (tRP) */
unsigned char pretoact_mclk; unsigned char pretoact_mclk;
@ -510,9 +514,9 @@ static void set_timing_cfg_1(fsl_ddr_cfg_regs_t *ddr,
1, 2, 3, 4, 5, 6, 7, 8, 10, 10, 12, 12, 14, 14, 0, 0}; 1, 2, 3, 4, 5, 6, 7, 8, 10, 10, 12, 12, 14, 14, 0, 0};
#endif #endif
pretoact_mclk = picos_to_mclk(common_dimm->trp_ps); pretoact_mclk = picos_to_mclk(ctrl_num, common_dimm->trp_ps);
acttopre_mclk = picos_to_mclk(common_dimm->tras_ps); acttopre_mclk = picos_to_mclk(ctrl_num, common_dimm->tras_ps);
acttorw_mclk = picos_to_mclk(common_dimm->trcd_ps); acttorw_mclk = picos_to_mclk(ctrl_num, common_dimm->trcd_ps);
/* /*
* Translate CAS Latency to a DDR controller field value: * Translate CAS Latency to a DDR controller field value:
@ -547,19 +551,19 @@ static void set_timing_cfg_1(fsl_ddr_cfg_regs_t *ddr,
#endif #endif
#ifdef CONFIG_SYS_FSL_DDR4 #ifdef CONFIG_SYS_FSL_DDR4
refrec_ctrl = picos_to_mclk(common_dimm->trfc1_ps) - 8; refrec_ctrl = picos_to_mclk(ctrl_num, common_dimm->trfc1_ps) - 8;
wrrec_mclk = picos_to_mclk(common_dimm->twr_ps); wrrec_mclk = picos_to_mclk(ctrl_num, common_dimm->twr_ps);
acttoact_mclk = max(picos_to_mclk(common_dimm->trrds_ps), 4U); acttoact_mclk = max(picos_to_mclk(ctrl_num, common_dimm->trrds_ps), 4U);
wrtord_mclk = max(2U, picos_to_mclk(2500)); wrtord_mclk = max(2U, picos_to_mclk(ctrl_num, 2500));
if ((wrrec_mclk < 1) || (wrrec_mclk > 24)) if ((wrrec_mclk < 1) || (wrrec_mclk > 24))
printf("Error: WRREC doesn't support %d clocks\n", wrrec_mclk); printf("Error: WRREC doesn't support %d clocks\n", wrrec_mclk);
else else
wrrec_mclk = wrrec_table[wrrec_mclk - 1]; wrrec_mclk = wrrec_table[wrrec_mclk - 1];
#else #else
refrec_ctrl = picos_to_mclk(common_dimm->trfc_ps) - 8; refrec_ctrl = picos_to_mclk(ctrl_num, common_dimm->trfc_ps) - 8;
wrrec_mclk = picos_to_mclk(common_dimm->twr_ps); wrrec_mclk = picos_to_mclk(ctrl_num, common_dimm->twr_ps);
acttoact_mclk = picos_to_mclk(common_dimm->trrd_ps); acttoact_mclk = picos_to_mclk(ctrl_num, common_dimm->trrd_ps);
wrtord_mclk = picos_to_mclk(common_dimm->twtr_ps); wrtord_mclk = picos_to_mclk(ctrl_num, common_dimm->twtr_ps);
if ((wrrec_mclk < 1) || (wrrec_mclk > 16)) if ((wrrec_mclk < 1) || (wrrec_mclk > 16))
printf("Error: WRREC doesn't support %d clocks\n", wrrec_mclk); printf("Error: WRREC doesn't support %d clocks\n", wrrec_mclk);
else else
@ -602,11 +606,12 @@ static void set_timing_cfg_1(fsl_ddr_cfg_regs_t *ddr,
} }
/* DDR SDRAM Timing Configuration 2 (TIMING_CFG_2) */ /* DDR SDRAM Timing Configuration 2 (TIMING_CFG_2) */
static void set_timing_cfg_2(fsl_ddr_cfg_regs_t *ddr, static void set_timing_cfg_2(const unsigned int ctrl_num,
const memctl_options_t *popts, fsl_ddr_cfg_regs_t *ddr,
const common_timing_params_t *common_dimm, const memctl_options_t *popts,
unsigned int cas_latency, const common_timing_params_t *common_dimm,
unsigned int additive_latency) unsigned int cas_latency,
unsigned int additive_latency)
{ {
/* Additive latency */ /* Additive latency */
unsigned char add_lat_mclk; unsigned char add_lat_mclk;
@ -623,7 +628,7 @@ static void set_timing_cfg_2(fsl_ddr_cfg_regs_t *ddr,
/* Window for four activates (tFAW) */ /* Window for four activates (tFAW) */
unsigned short four_act; unsigned short four_act;
#ifdef CONFIG_SYS_FSL_DDR3 #ifdef CONFIG_SYS_FSL_DDR3
const unsigned int mclk_ps = get_memory_clk_period_ps(); const unsigned int mclk_ps = get_memory_clk_period_ps(ctrl_num);
#endif #endif
/* FIXME add check that this must be less than acttorw_mclk */ /* FIXME add check that this must be less than acttorw_mclk */
@ -641,13 +646,13 @@ static void set_timing_cfg_2(fsl_ddr_cfg_regs_t *ddr,
#elif defined(CONFIG_SYS_FSL_DDR2) #elif defined(CONFIG_SYS_FSL_DDR2)
wr_lat = cas_latency - 1; wr_lat = cas_latency - 1;
#else #else
wr_lat = compute_cas_write_latency(); wr_lat = compute_cas_write_latency(ctrl_num);
#endif #endif
#ifdef CONFIG_SYS_FSL_DDR4 #ifdef CONFIG_SYS_FSL_DDR4
rd_to_pre = picos_to_mclk(7500); rd_to_pre = picos_to_mclk(ctrl_num, 7500);
#else #else
rd_to_pre = picos_to_mclk(common_dimm->trtp_ps); rd_to_pre = picos_to_mclk(ctrl_num, common_dimm->trtp_ps);
#endif #endif
/* /*
* JEDEC has some min requirements for tRTP * JEDEC has some min requirements for tRTP
@ -665,19 +670,20 @@ static void set_timing_cfg_2(fsl_ddr_cfg_regs_t *ddr,
wr_data_delay = popts->write_data_delay; wr_data_delay = popts->write_data_delay;
#ifdef CONFIG_SYS_FSL_DDR4 #ifdef CONFIG_SYS_FSL_DDR4
cpo = 0; cpo = 0;
cke_pls = max(3U, picos_to_mclk(5000)); cke_pls = max(3U, picos_to_mclk(ctrl_num, 5000));
#elif defined(CONFIG_SYS_FSL_DDR3) #elif defined(CONFIG_SYS_FSL_DDR3)
/* /*
* cke pulse = max(3nCK, 7.5ns) for DDR3-800 * cke pulse = max(3nCK, 7.5ns) for DDR3-800
* max(3nCK, 5.625ns) for DDR3-1066, 1333 * max(3nCK, 5.625ns) for DDR3-1066, 1333
* max(3nCK, 5ns) for DDR3-1600, 1866, 2133 * max(3nCK, 5ns) for DDR3-1600, 1866, 2133
*/ */
cke_pls = max(3U, picos_to_mclk(mclk_ps > 1870 ? 7500 : cke_pls = max(3U, picos_to_mclk(ctrl_num, mclk_ps > 1870 ? 7500 :
(mclk_ps > 1245 ? 5625 : 5000))); (mclk_ps > 1245 ? 5625 : 5000)));
#else #else
cke_pls = FSL_DDR_MIN_TCKE_PULSE_WIDTH_DDR; cke_pls = FSL_DDR_MIN_TCKE_PULSE_WIDTH_DDR;
#endif #endif
four_act = picos_to_mclk(popts->tfaw_window_four_activates_ps); four_act = picos_to_mclk(ctrl_num,
popts->tfaw_window_four_activates_ps);
ddr->timing_cfg_2 = (0 ddr->timing_cfg_2 = (0
| ((add_lat_mclk & 0xf) << 28) | ((add_lat_mclk & 0xf) << 28)
@ -818,7 +824,8 @@ static void set_ddr_sdram_cfg(fsl_ddr_cfg_regs_t *ddr,
} }
/* DDR SDRAM control configuration 2 (DDR_SDRAM_CFG_2) */ /* DDR SDRAM control configuration 2 (DDR_SDRAM_CFG_2) */
static void set_ddr_sdram_cfg_2(fsl_ddr_cfg_regs_t *ddr, static void set_ddr_sdram_cfg_2(const unsigned int ctrl_num,
fsl_ddr_cfg_regs_t *ddr,
const memctl_options_t *popts, const memctl_options_t *popts,
const unsigned int unq_mrs_en) const unsigned int unq_mrs_en)
{ {
@ -865,7 +872,7 @@ static void set_ddr_sdram_cfg_2(fsl_ddr_cfg_regs_t *ddr,
#endif #endif
#if (CONFIG_SYS_FSL_DDR_VER >= FSL_DDR_VER_4_7) #if (CONFIG_SYS_FSL_DDR_VER >= FSL_DDR_VER_4_7)
slow = get_ddr_freq(0) < 1249000000; slow = get_ddr_freq(ctrl_num) < 1249000000;
#endif #endif
if (popts->registered_dimm_en) { if (popts->registered_dimm_en) {
@ -915,7 +922,8 @@ static void set_ddr_sdram_cfg_2(fsl_ddr_cfg_regs_t *ddr,
#ifdef CONFIG_SYS_FSL_DDR4 #ifdef CONFIG_SYS_FSL_DDR4
/* DDR SDRAM Mode configuration 2 (DDR_SDRAM_MODE_2) */ /* DDR SDRAM Mode configuration 2 (DDR_SDRAM_MODE_2) */
static void set_ddr_sdram_mode_2(fsl_ddr_cfg_regs_t *ddr, static void set_ddr_sdram_mode_2(const unsigned int ctrl_num,
fsl_ddr_cfg_regs_t *ddr,
const memctl_options_t *popts, const memctl_options_t *popts,
const common_timing_params_t *common_dimm, const common_timing_params_t *common_dimm,
const unsigned int unq_mrs_en) const unsigned int unq_mrs_en)
@ -926,10 +934,10 @@ static void set_ddr_sdram_mode_2(fsl_ddr_cfg_regs_t *ddr,
unsigned int wr_crc = 0; /* Disable */ unsigned int wr_crc = 0; /* Disable */
unsigned int rtt_wr = 0; /* Rtt_WR - dynamic ODT off */ unsigned int rtt_wr = 0; /* Rtt_WR - dynamic ODT off */
unsigned int srt = 0; /* self-refresh temerature, normal range */ unsigned int srt = 0; /* self-refresh temerature, normal range */
unsigned int cwl = compute_cas_write_latency() - 9; unsigned int cwl = compute_cas_write_latency(ctrl_num) - 9;
unsigned int mpr = 0; /* serial */ unsigned int mpr = 0; /* serial */
unsigned int wc_lat; unsigned int wc_lat;
const unsigned int mclk_ps = get_memory_clk_period_ps(); const unsigned int mclk_ps = get_memory_clk_period_ps(ctrl_num);
if (popts->rtt_override) if (popts->rtt_override)
rtt_wr = popts->rtt_wr_override_value; rtt_wr = popts->rtt_wr_override_value;
@ -1002,7 +1010,8 @@ static void set_ddr_sdram_mode_2(fsl_ddr_cfg_regs_t *ddr,
} }
#elif defined(CONFIG_SYS_FSL_DDR3) #elif defined(CONFIG_SYS_FSL_DDR3)
/* DDR SDRAM Mode configuration 2 (DDR_SDRAM_MODE_2) */ /* DDR SDRAM Mode configuration 2 (DDR_SDRAM_MODE_2) */
static void set_ddr_sdram_mode_2(fsl_ddr_cfg_regs_t *ddr, static void set_ddr_sdram_mode_2(const unsigned int ctrl_num,
fsl_ddr_cfg_regs_t *ddr,
const memctl_options_t *popts, const memctl_options_t *popts,
const common_timing_params_t *common_dimm, const common_timing_params_t *common_dimm,
const unsigned int unq_mrs_en) const unsigned int unq_mrs_en)
@ -1013,7 +1022,7 @@ static void set_ddr_sdram_mode_2(fsl_ddr_cfg_regs_t *ddr,
unsigned int rtt_wr = 0; /* Rtt_WR - dynamic ODT off */ unsigned int rtt_wr = 0; /* Rtt_WR - dynamic ODT off */
unsigned int srt = 0; /* self-refresh temerature, normal range */ unsigned int srt = 0; /* self-refresh temerature, normal range */
unsigned int asr = 0; /* auto self-refresh disable */ unsigned int asr = 0; /* auto self-refresh disable */
unsigned int cwl = compute_cas_write_latency() - 5; unsigned int cwl = compute_cas_write_latency(ctrl_num) - 5;
unsigned int pasr = 0; /* partial array self refresh disable */ unsigned int pasr = 0; /* partial array self refresh disable */
if (popts->rtt_override) if (popts->rtt_override)
@ -1077,7 +1086,8 @@ static void set_ddr_sdram_mode_2(fsl_ddr_cfg_regs_t *ddr,
#else /* for DDR2 and DDR1 */ #else /* for DDR2 and DDR1 */
/* DDR SDRAM Mode configuration 2 (DDR_SDRAM_MODE_2) */ /* DDR SDRAM Mode configuration 2 (DDR_SDRAM_MODE_2) */
static void set_ddr_sdram_mode_2(fsl_ddr_cfg_regs_t *ddr, static void set_ddr_sdram_mode_2(const unsigned int ctrl_num,
fsl_ddr_cfg_regs_t *ddr,
const memctl_options_t *popts, const memctl_options_t *popts,
const common_timing_params_t *common_dimm, const common_timing_params_t *common_dimm,
const unsigned int unq_mrs_en) const unsigned int unq_mrs_en)
@ -1144,7 +1154,8 @@ static void set_ddr_sdram_mode_9(fsl_ddr_cfg_regs_t *ddr,
} }
/* DDR SDRAM Mode configuration 10 (DDR_SDRAM_MODE_10) */ /* DDR SDRAM Mode configuration 10 (DDR_SDRAM_MODE_10) */
static void set_ddr_sdram_mode_10(fsl_ddr_cfg_regs_t *ddr, static void set_ddr_sdram_mode_10(const unsigned int ctrl_num,
fsl_ddr_cfg_regs_t *ddr,
const memctl_options_t *popts, const memctl_options_t *popts,
const common_timing_params_t *common_dimm, const common_timing_params_t *common_dimm,
const unsigned int unq_mrs_en) const unsigned int unq_mrs_en)
@ -1152,7 +1163,7 @@ static void set_ddr_sdram_mode_10(fsl_ddr_cfg_regs_t *ddr,
int i; int i;
unsigned short esdmode6 = 0; /* Extended SDRAM mode 6 */ unsigned short esdmode6 = 0; /* Extended SDRAM mode 6 */
unsigned short esdmode7 = 0; /* Extended SDRAM mode 7 */ unsigned short esdmode7 = 0; /* Extended SDRAM mode 7 */
unsigned int tccdl_min = picos_to_mclk(common_dimm->tccdl_ps); unsigned int tccdl_min = picos_to_mclk(ctrl_num, common_dimm->tccdl_ps);
esdmode6 = ((tccdl_min - 4) & 0x7) << 10; esdmode6 = ((tccdl_min - 4) & 0x7) << 10;
@ -1196,14 +1207,15 @@ static void set_ddr_sdram_mode_10(fsl_ddr_cfg_regs_t *ddr,
#endif #endif
/* DDR SDRAM Interval Configuration (DDR_SDRAM_INTERVAL) */ /* DDR SDRAM Interval Configuration (DDR_SDRAM_INTERVAL) */
static void set_ddr_sdram_interval(fsl_ddr_cfg_regs_t *ddr, static void set_ddr_sdram_interval(const unsigned int ctrl_num,
const memctl_options_t *popts, fsl_ddr_cfg_regs_t *ddr,
const common_timing_params_t *common_dimm) const memctl_options_t *popts,
const common_timing_params_t *common_dimm)
{ {
unsigned int refint; /* Refresh interval */ unsigned int refint; /* Refresh interval */
unsigned int bstopre; /* Precharge interval */ unsigned int bstopre; /* Precharge interval */
refint = picos_to_mclk(common_dimm->refresh_rate_ps); refint = picos_to_mclk(ctrl_num, common_dimm->refresh_rate_ps);
bstopre = popts->bstopre; bstopre = popts->bstopre;
@ -1217,7 +1229,8 @@ static void set_ddr_sdram_interval(fsl_ddr_cfg_regs_t *ddr,
#ifdef CONFIG_SYS_FSL_DDR4 #ifdef CONFIG_SYS_FSL_DDR4
/* DDR SDRAM Mode configuration set (DDR_SDRAM_MODE) */ /* DDR SDRAM Mode configuration set (DDR_SDRAM_MODE) */
static void set_ddr_sdram_mode(fsl_ddr_cfg_regs_t *ddr, static void set_ddr_sdram_mode(const unsigned int ctrl_num,
fsl_ddr_cfg_regs_t *ddr,
const memctl_options_t *popts, const memctl_options_t *popts,
const common_timing_params_t *common_dimm, const common_timing_params_t *common_dimm,
unsigned int cas_latency, unsigned int cas_latency,
@ -1292,7 +1305,7 @@ static void set_ddr_sdram_mode(fsl_ddr_cfg_regs_t *ddr,
* 1=fast exit DLL on (tXP) * 1=fast exit DLL on (tXP)
*/ */
wr_mclk = picos_to_mclk(common_dimm->twr_ps); wr_mclk = picos_to_mclk(ctrl_num, common_dimm->twr_ps);
if (wr_mclk <= 24) { if (wr_mclk <= 24) {
wr = wr_table[wr_mclk - 10]; wr = wr_table[wr_mclk - 10];
} else { } else {
@ -1387,7 +1400,8 @@ static void set_ddr_sdram_mode(fsl_ddr_cfg_regs_t *ddr,
#elif defined(CONFIG_SYS_FSL_DDR3) #elif defined(CONFIG_SYS_FSL_DDR3)
/* DDR SDRAM Mode configuration set (DDR_SDRAM_MODE) */ /* DDR SDRAM Mode configuration set (DDR_SDRAM_MODE) */
static void set_ddr_sdram_mode(fsl_ddr_cfg_regs_t *ddr, static void set_ddr_sdram_mode(const unsigned int ctrl_num,
fsl_ddr_cfg_regs_t *ddr,
const memctl_options_t *popts, const memctl_options_t *popts,
const common_timing_params_t *common_dimm, const common_timing_params_t *common_dimm,
unsigned int cas_latency, unsigned int cas_latency,
@ -1466,7 +1480,7 @@ static void set_ddr_sdram_mode(fsl_ddr_cfg_regs_t *ddr,
*/ */
dll_on = 1; dll_on = 1;
wr_mclk = picos_to_mclk(common_dimm->twr_ps); wr_mclk = picos_to_mclk(ctrl_num, common_dimm->twr_ps);
if (wr_mclk <= 16) { if (wr_mclk <= 16) {
wr = wr_table[wr_mclk - 5]; wr = wr_table[wr_mclk - 5];
} else { } else {
@ -1582,7 +1596,8 @@ static void set_ddr_sdram_mode(fsl_ddr_cfg_regs_t *ddr,
#else /* !CONFIG_SYS_FSL_DDR3 */ #else /* !CONFIG_SYS_FSL_DDR3 */
/* DDR SDRAM Mode configuration set (DDR_SDRAM_MODE) */ /* DDR SDRAM Mode configuration set (DDR_SDRAM_MODE) */
static void set_ddr_sdram_mode(fsl_ddr_cfg_regs_t *ddr, static void set_ddr_sdram_mode(const unsigned int ctrl_num,
fsl_ddr_cfg_regs_t *ddr,
const memctl_options_t *popts, const memctl_options_t *popts,
const common_timing_params_t *common_dimm, const common_timing_params_t *common_dimm,
unsigned int cas_latency, unsigned int cas_latency,
@ -1654,7 +1669,7 @@ static void set_ddr_sdram_mode(fsl_ddr_cfg_regs_t *ddr,
#if defined(CONFIG_SYS_FSL_DDR1) #if defined(CONFIG_SYS_FSL_DDR1)
wr = 0; /* Historical */ wr = 0; /* Historical */
#elif defined(CONFIG_SYS_FSL_DDR2) #elif defined(CONFIG_SYS_FSL_DDR2)
wr = picos_to_mclk(common_dimm->twr_ps); wr = picos_to_mclk(ctrl_num, common_dimm->twr_ps);
#endif #endif
dll_res = 0; dll_res = 0;
mode = 0; mode = 0;
@ -1842,15 +1857,16 @@ static void set_timing_cfg_6(fsl_ddr_cfg_regs_t *ddr)
debug("FSLDDR: timing_cfg_6 = 0x%08x\n", ddr->timing_cfg_6); debug("FSLDDR: timing_cfg_6 = 0x%08x\n", ddr->timing_cfg_6);
} }
static void set_timing_cfg_7(fsl_ddr_cfg_regs_t *ddr, static void set_timing_cfg_7(const unsigned int ctrl_num,
const common_timing_params_t *common_dimm) fsl_ddr_cfg_regs_t *ddr,
const common_timing_params_t *common_dimm)
{ {
unsigned int txpr, tcksre, tcksrx; unsigned int txpr, tcksre, tcksrx;
unsigned int cke_rst, cksre, cksrx, par_lat, cs_to_cmd; unsigned int cke_rst, cksre, cksrx, par_lat, cs_to_cmd;
txpr = max(5U, picos_to_mclk(common_dimm->trfc1_ps + 10000)); txpr = max(5U, picos_to_mclk(ctrl_num, common_dimm->trfc1_ps + 10000));
tcksre = max(5U, picos_to_mclk(10000)); tcksre = max(5U, picos_to_mclk(ctrl_num, 10000));
tcksrx = max(5U, picos_to_mclk(10000)); tcksrx = max(5U, picos_to_mclk(ctrl_num, 10000));
par_lat = 0; par_lat = 0;
cs_to_cmd = 0; cs_to_cmd = 0;
@ -1883,14 +1899,15 @@ static void set_timing_cfg_7(fsl_ddr_cfg_regs_t *ddr,
debug("FSLDDR: timing_cfg_7 = 0x%08x\n", ddr->timing_cfg_7); debug("FSLDDR: timing_cfg_7 = 0x%08x\n", ddr->timing_cfg_7);
} }
static void set_timing_cfg_8(fsl_ddr_cfg_regs_t *ddr, static void set_timing_cfg_8(const unsigned int ctrl_num,
fsl_ddr_cfg_regs_t *ddr,
const memctl_options_t *popts, const memctl_options_t *popts,
const common_timing_params_t *common_dimm, const common_timing_params_t *common_dimm,
unsigned int cas_latency) unsigned int cas_latency)
{ {
unsigned int rwt_bg, wrt_bg, rrt_bg, wwt_bg; unsigned int rwt_bg, wrt_bg, rrt_bg, wwt_bg;
unsigned int acttoact_bg, wrtord_bg, pre_all_rec; unsigned int acttoact_bg, wrtord_bg, pre_all_rec;
unsigned int tccdl = picos_to_mclk(common_dimm->tccdl_ps); unsigned int tccdl = picos_to_mclk(ctrl_num, common_dimm->tccdl_ps);
unsigned int wr_lat = ((ddr->timing_cfg_2 & 0x00780000) >> 19) + unsigned int wr_lat = ((ddr->timing_cfg_2 & 0x00780000) >> 19) +
((ddr->timing_cfg_2 & 0x00040000) >> 14); ((ddr->timing_cfg_2 & 0x00040000) >> 14);
@ -1914,8 +1931,8 @@ static void set_timing_cfg_8(fsl_ddr_cfg_regs_t *ddr,
wwt_bg = tccdl - 4; wwt_bg = tccdl - 4;
} }
acttoact_bg = picos_to_mclk(common_dimm->trrdl_ps); acttoact_bg = picos_to_mclk(ctrl_num, common_dimm->trrdl_ps);
wrtord_bg = max(4U, picos_to_mclk(7500)); wrtord_bg = max(4U, picos_to_mclk(ctrl_num, 7500));
if (popts->otf_burst_chop_en) if (popts->otf_burst_chop_en)
wrtord_bg += 2; wrtord_bg += 2;
@ -2147,7 +2164,8 @@ check_fsl_memctl_config_regs(const fsl_ddr_cfg_regs_t *ddr)
} }
unsigned int unsigned int
compute_fsl_memctl_config_regs(const memctl_options_t *popts, compute_fsl_memctl_config_regs(const unsigned int ctrl_num,
const memctl_options_t *popts,
fsl_ddr_cfg_regs_t *ddr, fsl_ddr_cfg_regs_t *ddr,
const common_timing_params_t *common_dimm, const common_timing_params_t *common_dimm,
const dimm_params_t *dimm_params, const dimm_params_t *dimm_params,
@ -2319,14 +2337,14 @@ compute_fsl_memctl_config_regs(const memctl_options_t *popts,
set_ddr_eor(ddr, popts); set_ddr_eor(ddr, popts);
#if !defined(CONFIG_SYS_FSL_DDR1) #if !defined(CONFIG_SYS_FSL_DDR1)
set_timing_cfg_0(ddr, popts, dimm_params); set_timing_cfg_0(ctrl_num, ddr, popts, dimm_params);
#endif #endif
set_timing_cfg_3(ddr, popts, common_dimm, cas_latency, set_timing_cfg_3(ctrl_num, ddr, popts, common_dimm, cas_latency,
additive_latency); additive_latency);
set_timing_cfg_1(ddr, popts, common_dimm, cas_latency); set_timing_cfg_1(ctrl_num, ddr, popts, common_dimm, cas_latency);
set_timing_cfg_2(ddr, popts, common_dimm, set_timing_cfg_2(ctrl_num, ddr, popts, common_dimm,
cas_latency, additive_latency); cas_latency, additive_latency);
set_ddr_cdr1(ddr, popts); set_ddr_cdr1(ddr, popts);
set_ddr_cdr2(ddr, popts); set_ddr_cdr2(ddr, popts);
@ -2338,15 +2356,15 @@ compute_fsl_memctl_config_regs(const memctl_options_t *popts,
if ((ip_rev > 0x40700) && (popts->cswl_override != 0)) if ((ip_rev > 0x40700) && (popts->cswl_override != 0))
ddr->debug[18] = popts->cswl_override; ddr->debug[18] = popts->cswl_override;
set_ddr_sdram_cfg_2(ddr, popts, unq_mrs_en); set_ddr_sdram_cfg_2(ctrl_num, ddr, popts, unq_mrs_en);
set_ddr_sdram_mode(ddr, popts, common_dimm, set_ddr_sdram_mode(ctrl_num, ddr, popts, common_dimm,
cas_latency, additive_latency, unq_mrs_en); cas_latency, additive_latency, unq_mrs_en);
set_ddr_sdram_mode_2(ddr, popts, common_dimm, unq_mrs_en); set_ddr_sdram_mode_2(ctrl_num, ddr, popts, common_dimm, unq_mrs_en);
#ifdef CONFIG_SYS_FSL_DDR4 #ifdef CONFIG_SYS_FSL_DDR4
set_ddr_sdram_mode_9(ddr, popts, common_dimm, unq_mrs_en); set_ddr_sdram_mode_9(ddr, popts, common_dimm, unq_mrs_en);
set_ddr_sdram_mode_10(ddr, popts, common_dimm, unq_mrs_en); set_ddr_sdram_mode_10(ctrl_num, ddr, popts, common_dimm, unq_mrs_en);
#endif #endif
set_ddr_sdram_interval(ddr, popts, common_dimm); set_ddr_sdram_interval(ctrl_num, ddr, popts, common_dimm);
set_ddr_data_init(ddr); set_ddr_data_init(ddr);
set_ddr_sdram_clk_cntl(ddr, popts); set_ddr_sdram_clk_cntl(ddr, popts);
set_ddr_init_addr(ddr); set_ddr_init_addr(ddr);
@ -2356,8 +2374,8 @@ compute_fsl_memctl_config_regs(const memctl_options_t *popts,
#ifdef CONFIG_SYS_FSL_DDR4 #ifdef CONFIG_SYS_FSL_DDR4
set_ddr_sdram_cfg_3(ddr, popts); set_ddr_sdram_cfg_3(ddr, popts);
set_timing_cfg_6(ddr); set_timing_cfg_6(ddr);
set_timing_cfg_7(ddr, common_dimm); set_timing_cfg_7(ctrl_num, ddr, common_dimm);
set_timing_cfg_8(ddr, popts, common_dimm, cas_latency); set_timing_cfg_8(ctrl_num, ddr, popts, common_dimm, cas_latency);
set_timing_cfg_9(ddr); set_timing_cfg_9(ddr);
set_ddr_dq_mapping(ddr, dimm_params); set_ddr_dq_mapping(ddr, dimm_params);
#endif #endif

18
drivers/ddr/fsl/ddr1_dimm_params.c
View File

@ -228,10 +228,10 @@ compute_derated_DDR1_CAS_latency(unsigned int mclk_ps)
* *
* FIXME: use #define for the retvals * FIXME: use #define for the retvals
*/ */
unsigned int unsigned int ddr_compute_dimm_parameters(const unsigned int ctrl_num,
ddr_compute_dimm_parameters(const ddr1_spd_eeprom_t *spd, const ddr1_spd_eeprom_t *spd,
dimm_params_t *pdimm, dimm_params_t *pdimm,
unsigned int dimm_number) unsigned int dimm_number)
{ {
unsigned int retval; unsigned int retval;
@ -311,16 +311,16 @@ ddr_compute_dimm_parameters(const ddr1_spd_eeprom_t *spd,
& ~(1 << pdimm->caslat_x_minus_1)); & ~(1 << pdimm->caslat_x_minus_1));
/* Compute CAS latencies below that defined by SPD */ /* Compute CAS latencies below that defined by SPD */
pdimm->caslat_lowest_derated pdimm->caslat_lowest_derated = compute_derated_DDR1_CAS_latency(
= compute_derated_DDR1_CAS_latency(get_memory_clk_period_ps()); get_memory_clk_period_ps(ctrl_num));
/* Compute timing parameters */ /* Compute timing parameters */
pdimm->trcd_ps = spd->trcd * 250; pdimm->trcd_ps = spd->trcd * 250;
pdimm->trp_ps = spd->trp * 250; pdimm->trp_ps = spd->trp * 250;
pdimm->tras_ps = spd->tras * 1000; pdimm->tras_ps = spd->tras * 1000;
pdimm->twr_ps = mclk_to_picos(3); pdimm->twr_ps = mclk_to_picos(ctrl_num, 3);
pdimm->twtr_ps = mclk_to_picos(1); pdimm->twtr_ps = mclk_to_picos(ctrl_num, 1);
pdimm->trfc_ps = compute_trfc_ps_from_spd(0, spd->trfc); pdimm->trfc_ps = compute_trfc_ps_from_spd(0, spd->trfc);
pdimm->trrd_ps = spd->trrd * 250; pdimm->trrd_ps = spd->trrd * 250;
@ -335,7 +335,7 @@ ddr_compute_dimm_parameters(const ddr1_spd_eeprom_t *spd,
pdimm->tdh_ps pdimm->tdh_ps
= convert_bcd_hundredths_to_cycle_time_ps(spd->data_hold); = convert_bcd_hundredths_to_cycle_time_ps(spd->data_hold);
pdimm->trtp_ps = mclk_to_picos(2); /* By the book. */ pdimm->trtp_ps = mclk_to_picos(ctrl_num, 2); /* By the book. */
pdimm->tdqsq_max_ps = spd->tdqsq * 10; pdimm->tdqsq_max_ps = spd->tdqsq * 10;
pdimm->tqhs_ps = spd->tqhs * 10; pdimm->tqhs_ps = spd->tqhs * 10;

12
drivers/ddr/fsl/ddr2_dimm_params.c
View File

@ -211,10 +211,10 @@ compute_derated_DDR2_CAS_latency(unsigned int mclk_ps)
* *
* FIXME: use #define for the retvals * FIXME: use #define for the retvals
*/ */
unsigned int unsigned int ddr_compute_dimm_parameters(const unsigned int ctrl_num,
ddr_compute_dimm_parameters(const ddr2_spd_eeprom_t *spd, const ddr2_spd_eeprom_t *spd,
dimm_params_t *pdimm, dimm_params_t *pdimm,
unsigned int dimm_number) unsigned int dimm_number)
{ {
unsigned int retval; unsigned int retval;
@ -310,8 +310,8 @@ ddr_compute_dimm_parameters(const ddr2_spd_eeprom_t *spd,
& ~(1 << pdimm->caslat_x_minus_1)); & ~(1 << pdimm->caslat_x_minus_1));
/* Compute CAS latencies below that defined by SPD */ /* Compute CAS latencies below that defined by SPD */
pdimm->caslat_lowest_derated pdimm->caslat_lowest_derated = compute_derated_DDR2_CAS_latency(
= compute_derated_DDR2_CAS_latency(get_memory_clk_period_ps()); get_memory_clk_period_ps(ctrl_num));
/* Compute timing parameters */ /* Compute timing parameters */
pdimm->trcd_ps = spd->trcd * 250; pdimm->trcd_ps = spd->trcd * 250;

8
drivers/ddr/fsl/ddr3_dimm_params.c
View File

@ -83,10 +83,10 @@ compute_ranksize(const ddr3_spd_eeprom_t *spd)
* Writes the results to the dimm_params_t structure pointed by pdimm. * Writes the results to the dimm_params_t structure pointed by pdimm.
* *
*/ */
unsigned int unsigned int ddr_compute_dimm_parameters(const unsigned int ctrl_num,
ddr_compute_dimm_parameters(const ddr3_spd_eeprom_t *spd, const ddr3_spd_eeprom_t *spd,
dimm_params_t *pdimm, dimm_params_t *pdimm,
unsigned int dimm_number) unsigned int dimm_number)
{ {
unsigned int retval; unsigned int retval;
unsigned int mtb_ps; unsigned int mtb_ps;

8
drivers/ddr/fsl/ddr4_dimm_params.c
View File

@ -119,10 +119,10 @@ compute_ranksize(const struct ddr4_spd_eeprom_s *spd)
* Writes the results to the dimm_params_t structure pointed by pdimm. * Writes the results to the dimm_params_t structure pointed by pdimm.
* *
*/ */
unsigned int unsigned int ddr_compute_dimm_parameters(const unsigned int ctrl_num,
ddr_compute_dimm_parameters(const generic_spd_eeprom_t *spd, const generic_spd_eeprom_t *spd,
dimm_params_t *pdimm, dimm_params_t *pdimm,
unsigned int dimm_number) unsigned int dimm_number)
{ {
unsigned int retval; unsigned int retval;
int i; int i;

2
drivers/ddr/fsl/fsl_ddr_gen4.c
View File

@ -287,7 +287,7 @@ step2:
bus_width = 3 - ((ddr_in32(&ddr->sdram_cfg) & SDRAM_CFG_DBW_MASK) bus_width = 3 - ((ddr_in32(&ddr->sdram_cfg) & SDRAM_CFG_DBW_MASK)
>> SDRAM_CFG_DBW_SHIFT); >> SDRAM_CFG_DBW_SHIFT);
timeout = ((total_gb_size_per_controller << (6 - bus_width)) * 100 / timeout = ((total_gb_size_per_controller << (6 - bus_width)) * 100 /
(get_ddr_freq(0) >> 20)) << 2; (get_ddr_freq(ctrl_num) >> 20)) << 2;
total_gb_size_per_controller >>= 4; /* shift down to gb size */ total_gb_size_per_controller >>= 4; /* shift down to gb size */
debug("total %d GB\n", total_gb_size_per_controller); debug("total %d GB\n", total_gb_size_per_controller);
debug("Need to wait up to %d * 10ms\n", timeout); debug("Need to wait up to %d * 10ms\n", timeout);

27
drivers/ddr/fsl/lc_common_dimm_params.c
View File

@ -13,7 +13,8 @@
#if defined(CONFIG_SYS_FSL_DDR3) || defined(CONFIG_SYS_FSL_DDR4) #if defined(CONFIG_SYS_FSL_DDR3) || defined(CONFIG_SYS_FSL_DDR4)
static unsigned int static unsigned int
compute_cas_latency(const dimm_params_t *dimm_params, compute_cas_latency(const unsigned int ctrl_num,
const dimm_params_t *dimm_params,
common_timing_params_t *outpdimm, common_timing_params_t *outpdimm,
unsigned int number_of_dimms) unsigned int number_of_dimms)
{ {
@ -22,7 +23,7 @@ compute_cas_latency(const dimm_params_t *dimm_params,
unsigned int caslat_actual; unsigned int caslat_actual;
unsigned int retry = 16; unsigned int retry = 16;
unsigned int tmp; unsigned int tmp;
const unsigned int mclk_ps = get_memory_clk_period_ps(); const unsigned int mclk_ps = get_memory_clk_period_ps(ctrl_num);
#ifdef CONFIG_SYS_FSL_DDR3 #ifdef CONFIG_SYS_FSL_DDR3
const unsigned int taamax = 20000; const unsigned int taamax = 20000;
#else #else
@ -72,12 +73,13 @@ compute_cas_latency(const dimm_params_t *dimm_params,
} }
#else /* for DDR1 and DDR2 */ #else /* for DDR1 and DDR2 */
static unsigned int static unsigned int
compute_cas_latency(const dimm_params_t *dimm_params, compute_cas_latency(const unsigned int ctrl_num,
const dimm_params_t *dimm_params,
common_timing_params_t *outpdimm, common_timing_params_t *outpdimm,
unsigned int number_of_dimms) unsigned int number_of_dimms)
{ {
int i; int i;
const unsigned int mclk_ps = get_memory_clk_period_ps(); const unsigned int mclk_ps = get_memory_clk_period_ps(ctrl_num);
unsigned int lowest_good_caslat; unsigned int lowest_good_caslat;
unsigned int not_ok; unsigned int not_ok;
unsigned int temp1, temp2; unsigned int temp1, temp2;
@ -212,7 +214,8 @@ compute_cas_latency(const dimm_params_t *dimm_params,
* by dimm_params. * by dimm_params.
*/ */
unsigned int unsigned int
compute_lowest_common_dimm_parameters(const dimm_params_t *dimm_params, compute_lowest_common_dimm_parameters(const unsigned int ctrl_num,
const dimm_params_t *dimm_params,
common_timing_params_t *outpdimm, common_timing_params_t *outpdimm,
const unsigned int number_of_dimms) const unsigned int number_of_dimms)
{ {
@ -442,7 +445,8 @@ compute_lowest_common_dimm_parameters(const dimm_params_t *dimm_params,
printf("ERROR: Mix different RDIMM detected!\n"); printf("ERROR: Mix different RDIMM detected!\n");
/* calculate cas latency for all DDR types */ /* calculate cas latency for all DDR types */
if (compute_cas_latency(dimm_params, outpdimm, number_of_dimms)) if (compute_cas_latency(ctrl_num, dimm_params,
outpdimm, number_of_dimms))
return 1; return 1;
/* Determine if all DIMMs ECC capable. */ /* Determine if all DIMMs ECC capable. */
@ -518,11 +522,12 @@ compute_lowest_common_dimm_parameters(const dimm_params_t *dimm_params,
#if defined(CONFIG_SYS_FSL_DDR2) #if defined(CONFIG_SYS_FSL_DDR2)
if ((outpdimm->lowest_common_spd_caslat < 4) && if ((outpdimm->lowest_common_spd_caslat < 4) &&
(picos_to_mclk(trcd_ps) > outpdimm->lowest_common_spd_caslat)) { (picos_to_mclk(ctrl_num, trcd_ps) >
additive_latency = picos_to_mclk(trcd_ps) - outpdimm->lowest_common_spd_caslat)) {
additive_latency = picos_to_mclk(ctrl_num, trcd_ps) -
outpdimm->lowest_common_spd_caslat; outpdimm->lowest_common_spd_caslat;
if (mclk_to_picos(additive_latency) > trcd_ps) { if (mclk_to_picos(ctrl_num, additive_latency) > trcd_ps) {
additive_latency = picos_to_mclk(trcd_ps); additive_latency = picos_to_mclk(ctrl_num, trcd_ps);
debug("setting additive_latency to %u because it was " debug("setting additive_latency to %u because it was "
" greater than tRCD_ps\n", additive_latency); " greater than tRCD_ps\n", additive_latency);
} }
@ -534,7 +539,7 @@ compute_lowest_common_dimm_parameters(const dimm_params_t *dimm_params,
* *
* AL <= tRCD(min) * AL <= tRCD(min)
*/ */
if (mclk_to_picos(additive_latency) > trcd_ps) { if (mclk_to_picos(ctrl_num, additive_latency) > trcd_ps) {
printf("Error: invalid additive latency exceeds tRCD(min).\n"); printf("Error: invalid additive latency exceeds tRCD(min).\n");
return 1; return 1;
} }

25
drivers/ddr/fsl/main.c
View File

@ -450,7 +450,8 @@ fsl_ddr_compute(fsl_ddr_info_t *pinfo, unsigned int start_step,
&(pinfo->spd_installed_dimms[i][j]); &(pinfo->spd_installed_dimms[i][j]);
dimm_params_t *pdimm = dimm_params_t *pdimm =
&(pinfo->dimm_params[i][j]); &(pinfo->dimm_params[i][j]);
retval = compute_dimm_parameters(spd, pdimm, i); retval = compute_dimm_parameters(
i, spd, pdimm, j);
#ifdef CONFIG_SYS_DDR_RAW_TIMING #ifdef CONFIG_SYS_DDR_RAW_TIMING
if (!i && !j && retval) { if (!i && !j && retval) {
printf("SPD error on controller %d! " printf("SPD error on controller %d! "
@ -507,10 +508,11 @@ fsl_ddr_compute(fsl_ddr_info_t *pinfo, unsigned int start_step,
for (i = first_ctrl; i <= last_ctrl; i++) { for (i = first_ctrl; i <= last_ctrl; i++) {
debug("Computing lowest common DIMM" debug("Computing lowest common DIMM"
" parameters for memctl=%u\n", i); " parameters for memctl=%u\n", i);
compute_lowest_common_dimm_parameters( compute_lowest_common_dimm_parameters
pinfo->dimm_params[i], (i,
&timing_params[i], pinfo->dimm_params[i],
CONFIG_DIMM_SLOTS_PER_CTLR); &timing_params[i],
CONFIG_DIMM_SLOTS_PER_CTLR);
} }
case STEP_GATHER_OPTS: case STEP_GATHER_OPTS:
@ -562,12 +564,13 @@ fsl_ddr_compute(fsl_ddr_info_t *pinfo, unsigned int start_step,
continue; continue;
} }
compute_fsl_memctl_config_regs( compute_fsl_memctl_config_regs
&pinfo->memctl_opts[i], (i,
&ddr_reg[i], &timing_params[i], &pinfo->memctl_opts[i],
pinfo->dimm_params[i], &ddr_reg[i], &timing_params[i],
dbw_capacity_adjust[i], pinfo->dimm_params[i],
size_only); dbw_capacity_adjust[i],
size_only);
} }
default: default:

4
drivers/ddr/fsl/mpc85xx_ddr_gen3.c
View File

@ -426,7 +426,7 @@ step2:
bus_width = 3 - ((ddr->sdram_cfg & SDRAM_CFG_DBW_MASK) bus_width = 3 - ((ddr->sdram_cfg & SDRAM_CFG_DBW_MASK)
>> SDRAM_CFG_DBW_SHIFT); >> SDRAM_CFG_DBW_SHIFT);
timeout = ((total_gb_size_per_controller << (6 - bus_width)) * 100 / timeout = ((total_gb_size_per_controller << (6 - bus_width)) * 100 /
(get_ddr_freq(0) >> 20)) << 1; (get_ddr_freq(ctrl_num) >> 20)) << 1;
#ifdef CONFIG_SYS_FSL_ERRATUM_DDR111_DDR134 #ifdef CONFIG_SYS_FSL_ERRATUM_DDR111_DDR134
timeout_save = timeout; timeout_save = timeout;
#endif #endif
@ -538,12 +538,14 @@ step2:
case 1: case 1:
out_be32(&ddr->cs1_bnds, regs->cs[csn].bnds); out_be32(&ddr->cs1_bnds, regs->cs[csn].bnds);
break; break;
#if CONFIG_CHIP_SELECTS_PER_CTRL > 2
case 2: case 2:
out_be32(&ddr->cs2_bnds, regs->cs[csn].bnds); out_be32(&ddr->cs2_bnds, regs->cs[csn].bnds);
break; break;
case 3: case 3:
out_be32(&ddr->cs3_bnds, regs->cs[csn].bnds); out_be32(&ddr->cs3_bnds, regs->cs[csn].bnds);
break; break;
#endif
} }
clrbits_be32(&ddr->sdram_cfg, 0x2); clrbits_be32(&ddr->sdram_cfg, 0x2);
} }

6
drivers/ddr/fsl/options.c
View File

@ -732,7 +732,7 @@ unsigned int populate_memctl_options(int all_dimms_registered,
#endif #endif
/* Global Timing Parameters. */ /* Global Timing Parameters. */
debug("mclk_ps = %u ps\n", get_memory_clk_period_ps()); debug("mclk_ps = %u ps\n", get_memory_clk_period_ps(ctrl_num));
/* Pick a caslat override. */ /* Pick a caslat override. */
popts->cas_latency_override = 0; popts->cas_latency_override = 0;
@ -785,7 +785,7 @@ unsigned int populate_memctl_options(int all_dimms_registered,
* FIXME: width, was considering looking at pdimm->primary_sdram_width * FIXME: width, was considering looking at pdimm->primary_sdram_width
*/ */
#if defined(CONFIG_SYS_FSL_DDR1) #if defined(CONFIG_SYS_FSL_DDR1)
popts->tfaw_window_four_activates_ps = mclk_to_picos(1); popts->tfaw_window_four_activates_ps = mclk_to_picos(ctrl_num, 1);
#elif defined(CONFIG_SYS_FSL_DDR2) #elif defined(CONFIG_SYS_FSL_DDR2)
/* /*
@ -1036,7 +1036,7 @@ done:
if (pdimm[0].n_ranks == 4) if (pdimm[0].n_ranks == 4)
popts->quad_rank_present = 1; popts->quad_rank_present = 1;
ddr_freq = get_ddr_freq(0) / 1000000; ddr_freq = get_ddr_freq(ctrl_num) / 1000000;
if (popts->registered_dimm_en) { if (popts->registered_dimm_en) {
popts->rcw_override = 1; popts->rcw_override = 1;
popts->rcw_1 = 0x000a5a00; popts->rcw_1 = 0x000a5a00;

12
drivers/ddr/fsl/util.c
View File

@ -43,9 +43,9 @@ u32 fsl_ddr_get_version(void)
* propagation, compute a suitably rounded mclk_ps to compute * propagation, compute a suitably rounded mclk_ps to compute
* a working memory controller configuration. * a working memory controller configuration.
*/ */
unsigned int get_memory_clk_period_ps(void) unsigned int get_memory_clk_period_ps(const unsigned int ctrl_num)
{ {
unsigned int data_rate = get_ddr_freq(0); unsigned int data_rate = get_ddr_freq(ctrl_num);
unsigned int result; unsigned int result;
/* Round to nearest 10ps, being careful about 64-bit multiply/divide */ /* Round to nearest 10ps, being careful about 64-bit multiply/divide */
@ -59,10 +59,10 @@ unsigned int get_memory_clk_period_ps(void)
} }
/* Convert picoseconds into DRAM clock cycles (rounding up if needed). */ /* Convert picoseconds into DRAM clock cycles (rounding up if needed). */
unsigned int picos_to_mclk(unsigned int picos) unsigned int picos_to_mclk(const unsigned int ctrl_num, unsigned int picos)
{ {
unsigned long long clks, clks_rem; unsigned long long clks, clks_rem;
unsigned long data_rate = get_ddr_freq(0); unsigned long data_rate = get_ddr_freq(ctrl_num);
/* Short circuit for zero picos */ /* Short circuit for zero picos */
if (!picos) if (!picos)
@ -88,9 +88,9 @@ unsigned int picos_to_mclk(unsigned int picos)
return (unsigned int) clks; return (unsigned int) clks;
} }
unsigned int mclk_to_picos(unsigned int mclk) unsigned int mclk_to_picos(const unsigned int ctrl_num, unsigned int mclk)
{ {
return get_memory_clk_period_ps() * mclk; return get_memory_clk_period_ps(ctrl_num) * mclk;
} }
#ifdef CONFIG_PPC #ifdef CONFIG_PPC

15
include/fsl_ddr.h
View File

@ -44,11 +44,12 @@ u32 fsl_ddr_get_version(void);
* to this specific DDR technology. * to this specific DDR technology.
*/ */
static __inline__ int static __inline__ int
compute_dimm_parameters(const generic_spd_eeprom_t *spd, compute_dimm_parameters(const unsigned int ctrl_num,
const generic_spd_eeprom_t *spd,
dimm_params_t *pdimm, dimm_params_t *pdimm,
unsigned int dimm_number) unsigned int dimm_number)
{ {
return ddr_compute_dimm_parameters(spd, pdimm, dimm_number); return ddr_compute_dimm_parameters(ctrl_num, spd, pdimm, dimm_number);
} }
#endif #endif
@ -92,13 +93,15 @@ fsl_ddr_compute(fsl_ddr_info_t *pinfo, unsigned int start_step,
unsigned int size_only); unsigned int size_only);
const char *step_to_string(unsigned int step); const char *step_to_string(unsigned int step);
unsigned int compute_fsl_memctl_config_regs(const memctl_options_t *popts, unsigned int compute_fsl_memctl_config_regs(const unsigned int ctrl_num,
const memctl_options_t *popts,
fsl_ddr_cfg_regs_t *ddr, fsl_ddr_cfg_regs_t *ddr,
const common_timing_params_t *common_dimm, const common_timing_params_t *common_dimm,
const dimm_params_t *dimm_parameters, const dimm_params_t *dimm_parameters,
unsigned int dbw_capacity_adjust, unsigned int dbw_capacity_adjust,
unsigned int size_only); unsigned int size_only);
unsigned int compute_lowest_common_dimm_parameters( unsigned int compute_lowest_common_dimm_parameters(
const unsigned int ctrl_num,
const dimm_params_t *dimm_params, const dimm_params_t *dimm_params,
common_timing_params_t *outpdimm, common_timing_params_t *outpdimm,
unsigned int number_of_dimms); unsigned int number_of_dimms);
@ -108,9 +111,9 @@ unsigned int populate_memctl_options(int all_dimms_registered,
unsigned int ctrl_num); unsigned int ctrl_num);
void check_interleaving_options(fsl_ddr_info_t *pinfo); void check_interleaving_options(fsl_ddr_info_t *pinfo);
unsigned int mclk_to_picos(unsigned int mclk); unsigned int mclk_to_picos(const unsigned int ctrl_num, unsigned int mclk);
unsigned int get_memory_clk_period_ps(void); unsigned int get_memory_clk_period_ps(const unsigned int ctrl_num);
unsigned int picos_to_mclk(unsigned int picos); unsigned int picos_to_mclk(const unsigned int ctrl_num, unsigned int picos);
void fsl_ddr_set_lawbar( void fsl_ddr_set_lawbar(
const common_timing_params_t *memctl_common_params, const common_timing_params_t *memctl_common_params,
unsigned int memctl_interleaved, unsigned int memctl_interleaved,

2
include/fsl_ddr_dimm_params.h
View File

@ -112,7 +112,7 @@ typedef struct dimm_params_s {
#endif #endif
} dimm_params_t; } dimm_params_t;
extern unsigned int ddr_compute_dimm_parameters( unsigned int ddr_compute_dimm_parameters(const unsigned int ctrl_num,
const generic_spd_eeprom_t *spd, const generic_spd_eeprom_t *spd,
dimm_params_t *pdimm, dimm_params_t *pdimm,
unsigned int dimm_number); unsigned int dimm_number);