From 1468b9f3ba68fd4ed509296cd2f2b49c047648d9 Mon Sep 17 00:00:00 2001
From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Thu, 13 Sep 2018 05:26:51 +0200
Subject: [PATCH] bios/sdram: show all read scans when failing.

---
 litex/soc/software/bios/main.c  |  2 +-
 litex/soc/software/bios/sdram.c | 20 ++++++++++++++------
 litex/soc/software/bios/sdram.h |  2 +-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/litex/soc/software/bios/main.c b/litex/soc/software/bios/main.c
index fa5b1533..818a069d 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();
+	else if(strcmp(token, "sdrlevel") == 0) sdrlevel(0);
 #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 a5496fc2..8146228f 100644
--- a/litex/soc/software/bios/sdram.c
+++ b/litex/soc/software/bios/sdram.c
@@ -719,7 +719,7 @@ int memtest(void)
 }
 
 #ifdef CSR_DDRPHY_BASE
-int sdrlevel(void)
+int sdrlevel(int silent)
 {
 	int delay[DFII_PIX_DATA_SIZE/2];
 	int high_skew[DFII_PIX_DATA_SIZE/2];
@@ -729,6 +729,8 @@ int sdrlevel(void)
 	int best_score;
 	int best_bitslip;
 
+	sdrsw();
+
 	for(i=0; i<DFII_PIX_DATA_SIZE/2; i++) {
 		ddrphy_dly_sel_write(1<<i);
 		ddrphy_rdly_dq_rst_write(1);
@@ -749,8 +751,10 @@ int sdrlevel(void)
 	best_score = 0;
 	best_bitslip = 0;
 	for(bitslip=0; bitslip<ERR_DDRPHY_BITSLIP; bitslip++) {
+		if (!silent)
+			printf("Read bitslip: %d\n", bitslip);
 		/* compute score */
-		score = read_level_scan(1);
+		score = read_level_scan(silent);
 		if (score > best_score) {
 			best_bitslip = bitslip;
 			best_score = score;
@@ -764,7 +768,7 @@ int sdrlevel(void)
 	}
 
 	/* select best read window */
-	printf("Read bitslip: %d\n", best_bitslip);
+	printf("Best read bitslip: %d\n", best_bitslip);
 	for(i=0; i<DFII_PIX_DATA_SIZE/2; i++) {
 		ddrphy_dly_sel_write(1<<i);
 		ddrphy_rdly_dq_bitslip_rst_write(1);
@@ -776,6 +780,8 @@ int sdrlevel(void)
     read_level_scan(0);
 	read_level();
 
+	sdrhw();
+
 	return 1;
 }
 #endif
@@ -789,14 +795,16 @@ int sdrinit(void)
 #if CSR_DDRPHY_EN_VTC_ADDR
 	ddrphy_en_vtc_write(0);
 #endif
-	sdrlevel();
+	sdrlevel(1);
 #if CSR_DDRPHY_EN_VTC_ADDR
 	ddrphy_en_vtc_write(1);
 #endif
 #endif
-	sdram_dfii_control_write(DFII_CONTROL_SEL);
-	if(!memtest())
+	if(!memtest()) {
+		/* show scans */
+		sdrlevel(0);
 		return 0;
+	}
 
 	return 1;
 }
diff --git a/litex/soc/software/bios/sdram.h b/litex/soc/software/bios/sdram.h
index c5d0984f..887c64d4 100644
--- a/litex/soc/software/bios/sdram.h
+++ b/litex/soc/software/bios/sdram.h
@@ -14,7 +14,7 @@ void sdrwr(char *startaddr);
 #ifdef CSR_DDRPHY_BASE
 void sdrwlon(void);
 void sdrwloff(void);
-int sdrlevel(void);
+int sdrlevel(int silent);
 #endif
 
 int memtest_silent(void);
-- 
2.30.2