From e28e808c244ce1d57146c92a270ce4d08c9967cc Mon Sep 17 00:00:00 2001
From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Tue, 15 Sep 2020 17:22:58 +0200
Subject: [PATCH] software/liblitedram: allow forced write leveling delays,
 improve delay printf when failing.

---
 litex/soc/software/liblitedram/sdram.c | 20 +++++++++++++++++---
 litex/soc/software/liblitedram/sdram.h |  2 ++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/litex/soc/software/liblitedram/sdram.c b/litex/soc/software/liblitedram/sdram.c
index 206187f13..bda139dcd 100644
--- a/litex/soc/software/liblitedram/sdram.c
+++ b/litex/soc/software/liblitedram/sdram.c
@@ -337,16 +337,27 @@ static int write_level_scan(int *delays, int loops, int show)
 		/* rst delay */
 		write_delay_rst(i);
 
+		/* use forced delay if configured */
+		if (sdrwl_delays[i] >= 0) {
+			delays[i] = sdrwl_delays[i];
+
+			/* configure write delay */
+			for(j=0; j<delays[i]; j++)
+				write_delay_inc(i);
 		/* succeed only if the start of a 1s window has been found */
-		if (one_window_best_count > 0 && one_window_best_start > 0) {
+		} else if (one_window_best_count > 0 && one_window_best_start > 0) {
 			delays[i] = one_window_best_start;
 
 			/* configure write delay */
 			for(j=0; j<delays[i]; j++)
 				write_delay_inc(i);
 		}
-		if (show)
-			printf(" delay: %02d\n", delays[i]);
+		if (show) {
+			if (delays[i] == -1)
+				printf(" delay: -\n");
+			else
+				printf(" delay: %02d\n", delays[i]);
+		}
 	}
 
 	sdrwloff();
@@ -847,6 +858,9 @@ void sdrcal(void)
 
 int sdrinit(void)
 {
+	int i;
+	for (i=0; i<16; i++) sdrwl_delays[i] = -1; /* disabled forced delays */
+
 	printf("Initializing DRAM @0x%08x...\n", MAIN_RAM_BASE);
 
 #if CSR_DDRPHY_RST_ADDR
diff --git a/litex/soc/software/liblitedram/sdram.h b/litex/soc/software/liblitedram/sdram.h
index ac1b1fb16..0077f4be8 100644
--- a/litex/soc/software/liblitedram/sdram.h
+++ b/litex/soc/software/liblitedram/sdram.h
@@ -31,6 +31,8 @@ void sdrwr(unsigned int addr);
 /* Write Leveling                                                        */
 /*-----------------------------------------------------------------------*/
 
+int sdrwl_delays[16];
+
 void sdrwlon(void);
 void sdrwloff(void);
 int write_level(void);