From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Thu, 18 Oct 2018 11:42:51 +0000 (+0200)
Subject: bios/sdram: s7ddrphy now has bitslip in fabric, show scan for each module/bitslip... 
X-Git-Tag: 24jan2021_ls180~1560
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ab6a530a2403e30c1e142a583a7b3b555ee1e246;p=litex.git

bios/sdram: s7ddrphy now has bitslip in fabric, show scan for each module/bitslip and remove silent mode
---

diff --git a/litex/soc/software/bios/main.c b/litex/soc/software/bios/main.c
index e3db0ac0..95f1785e 100644
--- a/litex/soc/software/bios/main.c
+++ b/litex/soc/software/bios/main.c
@@ -403,7 +403,7 @@ static void do_command(char *c)
 	else if(strcmp(token, "sdrwlon") == 0) sdrwlon();
 	else if(strcmp(token, "sdrwloff") == 0) sdrwloff();
 #endif
-	else if(strcmp(token, "sdrlevel") == 0) sdrlevel(0);
+	else if(strcmp(token, "sdrlevel") == 0) sdrlevel();
 #endif
 	else if(strcmp(token, "memtest") == 0) memtest();
 	else if(strcmp(token, "sdrinit") == 0) sdrinit();
diff --git a/litex/soc/software/bios/sdram.c b/litex/soc/software/bios/sdram.c
index b640a387..87aa3acb 100644
--- a/litex/soc/software/bios/sdram.c
+++ b/litex/soc/software/bios/sdram.c
@@ -245,7 +245,7 @@ int write_level(void)
 
     int ok;
 
-	err_ddrphy_wdly = ERR_DDRPHY_DELAY - ddrphy_half_sys8x_taps_read();
+	err_ddrphy_wdly = ERR_DDRPHY_DELAY - ddrphy_half_sys8x_taps_read() - 1;
 
 	printf("Write leveling:\n");
 
@@ -324,17 +324,10 @@ int write_level(void)
 static void read_bitslip_inc(char m)
 {
 		ddrphy_dly_sel_write(1 << m);
-#ifdef KUSDDRPHY
-		ddrphy_rdly_dq_bitslip_write(1);
-#else
-		/* 7-series SERDES in DDR mode needs 3 pulses for 1 bitslip */
-		ddrphy_rdly_dq_bitslip_write(1);
 		ddrphy_rdly_dq_bitslip_write(1);
-		ddrphy_rdly_dq_bitslip_write(1);
-#endif
 }
 
-static int read_level_scan(int module, int silent)
+static int read_level_scan(int module, int bitslip)
 {
 	unsigned int prv;
 	unsigned char prs[DFII_NPHASES*DFII_PIX_DATA_SIZE];
@@ -367,8 +360,7 @@ static int read_level_scan(int module, int silent)
 	sdram_dfii_pird_baddress_write(0);
 	score = 0;
 
-	if (!silent)
-		printf("m%d: |", module);
+	printf("m%d, b%d: |", module, bitslip);
 	ddrphy_dly_sel_write(1 << module);
 	ddrphy_rdly_dq_rst_write(1);
 	for(j=0; j<ERR_DDRPHY_DELAY;j++) {
@@ -382,13 +374,11 @@ static int read_level_scan(int module, int silent)
 			if(MMPTR(sdram_dfii_pix_rddata_addr[p]+4*(2*NBMODULES-module-1)) != prs[DFII_PIX_DATA_SIZE*p+2*NBMODULES-module-1])
 				working = 0;
 		}
-		if (!silent)
-			printf("%d", working);
+		printf("%d", working);
 		score += working;
 		ddrphy_rdly_dq_inc_write(1);
 	}
-	if (!silent)
-		printf("|");
+	printf("| ");
 
 	/* Precharge */
 	sdram_dfii_pi0_address_write(0);
@@ -672,7 +662,7 @@ int memtest(void)
 }
 
 #ifdef CSR_DDRPHY_BASE
-int sdrlevel(int silent)
+int sdrlevel(void)
 {
 	int i, j;
 	int bitslip;
@@ -700,7 +690,9 @@ int sdrlevel(int silent)
 		best_bitslip = 0;
 		for(bitslip=0; bitslip<ERR_DDRPHY_BITSLIP; bitslip++) {
 			/* compute score */
-			score = read_level_scan(i, silent);
+			score = read_level_scan(i, bitslip);
+			read_level(i);
+			printf("\n");
 			if (score > best_score) {
 				best_bitslip = bitslip;
 				best_score = score;
@@ -713,13 +705,12 @@ int sdrlevel(int silent)
 		}
 
 		/* select best read window */
+		printf("best: m%d, b%d ", i, best_bitslip);
 		ddrphy_rdly_dq_bitslip_rst_write(1);
 		for (j=0; j<best_bitslip; j++)
 			read_bitslip_inc(i);
 
-		/* show scan and do leveling */
-		read_level_scan(i, 0);
-		printf(" bitslip:%d ", best_bitslip);
+		/* re-do leveling on best read window*/
 		read_level(i);
 		printf("\n");
 	}
@@ -737,7 +728,7 @@ int sdrinit(void)
 #if CSR_DDRPHY_EN_VTC_ADDR
 	ddrphy_en_vtc_write(0);
 #endif
-	sdrlevel(1);
+	sdrlevel();
 #if CSR_DDRPHY_EN_VTC_ADDR
 	ddrphy_en_vtc_write(1);
 #endif
diff --git a/litex/soc/software/bios/sdram.h b/litex/soc/software/bios/sdram.h
index 8b1f998c..93034a54 100644
--- a/litex/soc/software/bios/sdram.h
+++ b/litex/soc/software/bios/sdram.h
@@ -20,7 +20,7 @@ int write_level(void);
 #ifdef CSR_DDRPHY_BASE
 void sdrwlon(void);
 void sdrwloff(void);
-int sdrlevel(int silent);
+int sdrlevel(void);
 #endif
 
 int memtest_silent(void);