Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

software/liblitedra/sdram: minor cleanup, use identical delay after each delay increment.

This commit is contained in:
Florent Kermarrec 2020-11-06 16:11:25 +01:00
parent d1ef64f9fd
commit 9fe3a42072
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
litex/soc/software/liblitedram/sdram.c
View File

@ -283,15 +283,15 @@ void sdram_write_leveling_rst_cmd_delay(int show) {
} }
void sdram_write_leveling_force_cmd_delay(int taps, int show) { void sdram_write_leveling_force_cmd_delay(int taps, int show) {
int i;
_sdram_write_leveling_cmd_scan = 0; _sdram_write_leveling_cmd_scan = 0;
_sdram_write_leveling_cmd_delay = taps; _sdram_write_leveling_cmd_delay = taps;
if (show) if (show)
printf("Forcing Cmd delay to %d taps\n", taps); printf("Forcing Cmd delay to %d taps\n", taps);
ddrphy_cdly_rst_write(1); ddrphy_cdly_rst_write(1);
while (taps > 0) { for (i=0; i<taps; i++) {
ddrphy_cdly_inc_write(1); ddrphy_cdly_inc_write(1);
cdelay(1000); cdelay(100);
taps--;
} }
} }
@ -331,8 +331,10 @@ static void sdram_write_leveling_rst_delay(int module) {
ddrphy_wdly_dq_rst_write(1); ddrphy_wdly_dq_rst_write(1);
ddrphy_wdly_dqs_rst_write(1); ddrphy_wdly_dqs_rst_write(1);
#ifdef SDRAM_PHY_WRITE_LEVELING_REINIT #ifdef SDRAM_PHY_WRITE_LEVELING_REINIT
for(i=0; i<ddrphy_half_sys8x_taps_read(); i++) for(i=0; i<ddrphy_half_sys8x_taps_read(); i++) {
ddrphy_wdly_dqs_inc_write(1); ddrphy_wdly_dqs_inc_write(1);
cdelay(100);
}
#endif #endif
/* unsel module */ /* unsel module */
@ -370,7 +372,6 @@ static int sdram_write_leveling_scan(int *delays, int loops, int show)
err_ddrphy_wdly = SDRAM_PHY_DELAYS - ddrphy_half_sys8x_taps_read(); err_ddrphy_wdly = SDRAM_PHY_DELAYS - ddrphy_half_sys8x_taps_read();
sdram_write_leveling_on(); sdram_write_leveling_on();
cdelay(100);
for(i=0;i<SDRAM_PHY_MODULES;i++) { for(i=0;i<SDRAM_PHY_MODULES;i++) {
if (show) if (show)
printf(" m%d: |", i); printf(" m%d: |", i);
@ -388,7 +389,7 @@ static int sdram_write_leveling_scan(int *delays, int loops, int show)
#endif #endif
for (k=0; k<loops; k++) { for (k=0; k<loops; k++) {
ddrphy_wlevel_strobe_write(1); ddrphy_wlevel_strobe_write(1);
cdelay(10); cdelay(100);
csr_rd_buf_uint8(sdram_dfii_pix_rddata_addr[0], buf, DFII_PIX_DATA_BYTES); csr_rd_buf_uint8(sdram_dfii_pix_rddata_addr[0], buf, DFII_PIX_DATA_BYTES);
if (buf[SDRAM_PHY_MODULES-1-i] != 0) if (buf[SDRAM_PHY_MODULES-1-i] != 0)
one_count++; one_count++;
@ -402,7 +403,7 @@ static int sdram_write_leveling_scan(int *delays, int loops, int show)
if (show_iter) if (show_iter)
printf("%d", taps_scan[j]); printf("%d", taps_scan[j]);
sdram_write_leveling_inc_delay(i); sdram_write_leveling_inc_delay(i);
cdelay(10); cdelay(100);
} }
if (show) if (show)
printf("|"); printf("|");
@ -482,7 +483,7 @@ static void sdram_write_leveling_find_cmd_delay(unsigned int *best_error, int *b
/* increment cdly to current value */ /* increment cdly to current value */
while (cdly_actual < cdly) { while (cdly_actual < cdly) {
ddrphy_cdly_inc_write(1); ddrphy_cdly_inc_write(1);
cdelay(10); cdelay(100);
cdly_actual++; cdly_actual++;
} }
@ -562,7 +563,7 @@ int sdram_write_leveling(void)
ddrphy_cdly_rst_write(1); ddrphy_cdly_rst_write(1);
for (int i = 0; i < best_cdly; ++i) { for (int i = 0; i < best_cdly; ++i) {
ddrphy_cdly_inc_write(1); ddrphy_cdly_inc_write(1);
cdelay(10); cdelay(100);
} }
} }
@ -793,8 +794,10 @@ static void sdram_read_leveling_module(int module)
/* Set delay to the middle */ /* Set delay to the middle */
sdram_read_leveling_rst_delay(module); sdram_read_leveling_rst_delay(module);
for(i=0;i<(delay_min+delay_max)/2;i++) for(i=0;i<(delay_min+delay_max)/2;i++) {
sdram_read_leveling_inc_delay(module); sdram_read_leveling_inc_delay(module);
cdelay(100);
}
} }
#endif /* CSR_DDRPHY_BASE */ #endif /* CSR_DDRPHY_BASE */