From 4d15e1f7f8e178e0c9ce49f802bcbfe642446fbf Mon Sep 17 00:00:00 2001
From: Gabriel Somlo <gsomlo@gmail.com>
Date: Mon, 9 Mar 2020 10:24:30 -0400
Subject: [PATCH] software/bios: fixup for Ultrascale SDRAM debug

Keep CSR accesses independent of csr_data_width and csr_alignment.

Signed-off-by: Gabriel Somlo <gsomlo@gmail.com>
---
 litex/soc/software/bios/sdram.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/litex/soc/software/bios/sdram.c b/litex/soc/software/bios/sdram.c
index 5c9ec680..7654caaf 100644
--- a/litex/soc/software/bios/sdram.c
+++ b/litex/soc/software/bios/sdram.c
@@ -1063,6 +1063,7 @@ static void sdrmproff(void)
 void sdrmpr(void)
 {
 	int module, phase;
+	unsigned char buf[DFII_PIX_DATA_BYTES];
 	printf("Read SDRAM MPR...\n");
 
 	/* rst phy */
@@ -1084,8 +1085,10 @@ void sdrmpr(void)
 	for (module=0; module < NBMODULES; module++) {
 		printf("m%d: ", module);
 		for(phase=0; phase<DFII_NPHASES; phase++) {
-			printf("%d", MMPTR(sdram_dfii_pix_rddata_addr[phase]+4*(NBMODULES-module-1)) & 0x1);
-			printf("%d", MMPTR(sdram_dfii_pix_rddata_addr[phase]+4*(2*NBMODULES-module-1)) & 0x1);
+			csr_rd_buf_uint8(sdram_dfii_pix_rddata_addr[phase],
+					 buf, DFII_PIX_DATA_BYTES);
+			printf("%d", buf[  NBMODULES-module-1] & 0x1);
+			printf("%d", buf[2*NBMODULES-module-1] & 0x1);
 		}
 		printf("\n");
 	}
-- 
2.30.2