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

bios/sdram: switch to updated CSR accessors, and misc. cleanup 

Revert to treating SDRAM_DFII_PIX_[RD|WR]DATA CSRs as arrays
of bytes, but use the new uintX_t array accessors for improved
legibility, and to avoid unnecessary byteswapping.

Signed-off-by: Gabriel Somlo <gsomlo@gmail.com>
This commit is contained in:
Gabriel Somlo 2020-01-11 19:38:15 -05:00
parent 2c39304110
commit b073ebadf6
1 changed files with 59 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
litex/soc/software/bios/sdram.c
View File

@ -20,8 +20,6 @@
#include <hw/flags.h> #include <hw/flags.h>
#include <system.h> #include <system.h>
#include <inet.h> // for hton/ntoh (byteswap) functions
#include "sdram.h" #include "sdram.h"
// FIXME(hack): If we don't have main ram, just target the sram instead. // FIXME(hack): If we don't have main ram, just target the sram instead.
@ -63,22 +61,6 @@ __attribute__((unused)) static void cdelay(int i)
#define DFII_PIX_DATA_BYTES DFII_PIX_DATA_SIZE*CSR_DATA_BYTES #define DFII_PIX_DATA_BYTES DFII_PIX_DATA_SIZE*CSR_DATA_BYTES
#if CSR_DATA_BYTES == 1
typedef uint8_t csr_dw_t;
#define csr_dw_hton(x) (x)
#define csr_dw_ntoh(x) (x)
#elif CSR_DATA_BYTES == 2
typedef uint16_t csr_dw_t;
#define csr_dw_hton(x) htons(x)
#define csr_dw_ntoh(x) ntohs(x)
#elif CSR_DATA_BYTES == 4
typedef uint32_t csr_dw_t;
#define csr_dw_hton(x) htonl(x)
#define csr_dw_ntoh(x) ntohl(x)
#else
#error Unsupported CSR data width
#endif
void sdrsw(void) void sdrsw(void)
{ {
sdram_dfii_control_write(DFII_CONTROL_CKE|DFII_CONTROL_ODT|DFII_CONTROL_RESET_N); sdram_dfii_control_write(DFII_CONTROL_CKE|DFII_CONTROL_ODT|DFII_CONTROL_RESET_N);
@ -120,8 +102,7 @@ void sdrrdbuf(int dq)
{ {
int i, p; int i, p;
int first_byte, step; int first_byte, step;
csr_dw_t buf[DFII_PIX_DATA_SIZE]; unsigned char buf[DFII_PIX_DATA_BYTES];
unsigned char *buf_bytes = (unsigned char *)&(buf[0]);
if(dq < 0) { if(dq < 0) {
first_byte = 0; first_byte = 0;
@ -132,10 +113,10 @@ void sdrrdbuf(int dq)
} }
for(p=0;p<DFII_NPHASES;p++) { for(p=0;p<DFII_NPHASES;p++) {
for(i=0;i<DFII_PIX_DATA_SIZE;i++) csr_rd_buf_uint8(sdram_dfii_pix_rddata_addr[p],
buf[i] = csr_dw_ntoh(MMPTR(sdram_dfii_pix_rddata_addr[p]+DFII_ADDR_SHIFT*i)); buf, DFII_PIX_DATA_BYTES);
for(i=first_byte;i<DFII_PIX_DATA_BYTES;i+=step) for(i=first_byte;i<DFII_PIX_DATA_BYTES;i+=step)
printf("%02x", buf_bytes[i]); printf("%02x", buf[i]);
} }
printf("\n"); printf("\n");
} }
@ -178,9 +159,9 @@ void sdrrderr(char *count)
char *c; char *c;
int _count; int _count;
int i, j, p; int i, j, p;
csr_dw_t prev_data[DFII_NPHASES][DFII_PIX_DATA_SIZE]; unsigned char prev_data[DFII_NPHASES][DFII_PIX_DATA_BYTES];
csr_dw_t err_data[DFII_NPHASES][DFII_PIX_DATA_SIZE]; unsigned char errs[DFII_NPHASES][DFII_PIX_DATA_BYTES];
unsigned char *errs = (unsigned char *)&(err_data[0][0]); unsigned char new_data[DFII_PIX_DATA_BYTES];
if(*count == 0) { if(*count == 0) {
printf("sdrrderr <count>\n"); printf("sdrrderr <count>\n");
@ -193,32 +174,35 @@ void sdrrderr(char *count)
} }
for(p=0;p<DFII_NPHASES;p++) for(p=0;p<DFII_NPHASES;p++)
for(i=0;i<DFII_PIX_DATA_SIZE;i++) for(i=0;i<DFII_PIX_DATA_BYTES;i++)
err_data[p][i] = 0; errs[p][i] = 0;
for(addr=0;addr<16;addr++) { for(addr=0;addr<16;addr++) {
sdram_dfii_pird_address_write(addr*8); sdram_dfii_pird_address_write(addr*8);
sdram_dfii_pird_baddress_write(0); sdram_dfii_pird_baddress_write(0);
command_prd(DFII_COMMAND_CAS|DFII_COMMAND_CS|DFII_COMMAND_RDDATA); command_prd(DFII_COMMAND_CAS|DFII_COMMAND_CS|DFII_COMMAND_RDDATA);
cdelay(15); cdelay(15);
for(p=0;p<DFII_NPHASES;p++) for(p=0;p<DFII_NPHASES;p++)
for(i=0;i<DFII_PIX_DATA_SIZE;i++) csr_rd_buf_uint8(sdram_dfii_pix_rddata_addr[p],
prev_data[p][i] = csr_dw_ntoh(MMPTR(sdram_dfii_pix_rddata_addr[p]+DFII_ADDR_SHIFT*i)); prev_data[p], DFII_PIX_DATA_BYTES);
for(j=0;j<_count;j++) { for(j=0;j<_count;j++) {
command_prd(DFII_COMMAND_CAS|DFII_COMMAND_CS|DFII_COMMAND_RDDATA); command_prd(DFII_COMMAND_CAS|DFII_COMMAND_CS|DFII_COMMAND_RDDATA);
cdelay(15); cdelay(15);
for(p=0;p<DFII_NPHASES;p++) for(p=0;p<DFII_NPHASES;p++) {
for(i=0;i<DFII_PIX_DATA_SIZE;i++) { csr_rd_buf_uint8(sdram_dfii_pix_rddata_addr[p],
csr_dw_t new_data = csr_dw_ntoh(MMPTR(sdram_dfii_pix_rddata_addr[p]+DFII_ADDR_SHIFT*i)); new_data, DFII_PIX_DATA_BYTES);
for(i=0;i<DFII_PIX_DATA_BYTES;i++) {
err_data[p][i] |= prev_data[p][i] ^ new_data; errs[p][i] |= prev_data[p][i] ^ new_data[i];
prev_data[p][i] = new_data; prev_data[p][i] = new_data[i];
} }
}
} }
} }
for(i=0;i<DFII_NPHASES*DFII_PIX_DATA_BYTES;i++) for(p=0;p<DFII_NPHASES;p++)
printf("%02x", errs[i]); for(i=0;i<DFII_PIX_DATA_BYTES;i++)
printf("%02x", errs[p][i]);
printf("\n"); printf("\n");
for(p=0;p<DFII_NPHASES;p++) for(p=0;p<DFII_NPHASES;p++)
for(i=0;i<DFII_PIX_DATA_BYTES;i++) for(i=0;i<DFII_PIX_DATA_BYTES;i++)
@ -231,8 +215,7 @@ void sdrwr(char *startaddr)
int i, p; int i, p;
char *c; char *c;
unsigned int addr; unsigned int addr;
csr_dw_t buf[DFII_PIX_DATA_SIZE]; unsigned char buf[DFII_PIX_DATA_BYTES];
unsigned char *buf_bytes = (unsigned char *)&(buf[0]);
if(*startaddr == 0) { if(*startaddr == 0) {
printf("sdrwr <address>\n"); printf("sdrwr <address>\n");
@ -246,9 +229,9 @@ void sdrwr(char *startaddr)
for(p=0;p<DFII_NPHASES;p++) { for(p=0;p<DFII_NPHASES;p++) {
for(i=0;i<DFII_PIX_DATA_BYTES;i++) for(i=0;i<DFII_PIX_DATA_BYTES;i++)
buf_bytes[i] = 0x10*p + i; buf[i] = 0x10*p + i;
for(i=0;i<DFII_PIX_DATA_SIZE;i++) csr_wr_buf_uint8(sdram_dfii_pix_wrdata_addr[p],
MMPTR(sdram_dfii_pix_wrdata_addr[p]+DFII_ADDR_SHIFT*i) = csr_dw_hton(buf[i]); buf, DFII_PIX_DATA_BYTES);
} }
sdram_dfii_piwr_address_write(addr); sdram_dfii_piwr_address_write(addr);
@ -324,7 +307,7 @@ static void write_delay_inc(int module) {
int write_level(void) int write_level(void)
{ {
int i, j, k, l; int i, j, k;
int err_ddrphy_wdly; int err_ddrphy_wdly;
@ -336,8 +319,7 @@ int write_level(void)
int delays[NBMODULES]; int delays[NBMODULES];
csr_dw_t buf[DFII_PIX_DATA_SIZE]; unsigned char buf[DFII_PIX_DATA_BYTES];
unsigned char *buf_bytes = (unsigned char *)&(buf[0]);
int ok; int ok;
@ -364,9 +346,9 @@ int write_level(void)
for (k=0; k<128; k++) { for (k=0; k<128; k++) {
ddrphy_wlevel_strobe_write(1); ddrphy_wlevel_strobe_write(1);
cdelay(10); cdelay(10);
for (l=0;l<DFII_PIX_DATA_SIZE;l++) csr_rd_buf_uint8(sdram_dfii_pix_rddata_addr[0],
buf[l] = csr_dw_ntoh(MMPTR(sdram_dfii_pix_rddata_addr[0]+DFII_ADDR_SHIFT*l)); buf, DFII_PIX_DATA_BYTES);
if (buf_bytes[NBMODULES-1-i] != 0) if (buf[NBMODULES-1-i] != 0)
one_count++; one_count++;
else else
zero_count++; zero_count++;
@ -478,16 +460,15 @@ static void read_bitslip_inc(char m)
static int read_level_scan(int module, int bitslip) static int read_level_scan(int module, int bitslip)
{ {
unsigned int prv; unsigned int prv;
csr_dw_t prs[DFII_NPHASES][DFII_PIX_DATA_SIZE]; unsigned char prs[DFII_NPHASES][DFII_PIX_DATA_BYTES];
csr_dw_t tst[DFII_PIX_DATA_SIZE]; unsigned char tst[DFII_PIX_DATA_BYTES];
unsigned char *prs_bytes, *tst_bytes; int p, i;
int p, i, j;
int score; int score;
/* Generate pseudo-random sequence */ /* Generate pseudo-random sequence */
prv = 42; prv = 42;
for(p=0;p<DFII_NPHASES;p++) for(p=0;p<DFII_NPHASES;p++)
for(i=0;i<DFII_PIX_DATA_SIZE;i++) { for(i=0;i<DFII_PIX_DATA_BYTES;i++) {
prv = 1664525*prv + 1013904223; prv = 1664525*prv + 1013904223;
prs[p][i] = prv; prs[p][i] = prv;
} }
@ -500,8 +481,8 @@ static int read_level_scan(int module, int bitslip)
/* Write test pattern */ /* Write test pattern */
for(p=0;p<DFII_NPHASES;p++) for(p=0;p<DFII_NPHASES;p++)
for(i=0;i<DFII_PIX_DATA_SIZE;i++) csr_wr_buf_uint8(sdram_dfii_pix_wrdata_addr[p],
MMPTR(sdram_dfii_pix_wrdata_addr[p]+DFII_ADDR_SHIFT*i) = csr_dw_hton(prs[p][i]); prs[p], DFII_PIX_DATA_BYTES);
sdram_dfii_piwr_address_write(0); sdram_dfii_piwr_address_write(0);
sdram_dfii_piwr_baddress_write(0); sdram_dfii_piwr_baddress_write(0);
command_pwr(DFII_COMMAND_CAS|DFII_COMMAND_WE|DFII_COMMAND_CS|DFII_COMMAND_WRDATA); command_pwr(DFII_COMMAND_CAS|DFII_COMMAND_WE|DFII_COMMAND_CS|DFII_COMMAND_WRDATA);
@ -513,11 +494,11 @@ static int read_level_scan(int module, int bitslip)
printf("m%d, b%d: |", module, bitslip); printf("m%d, b%d: |", module, bitslip);
read_delay_rst(module); read_delay_rst(module);
for(j=0; j<ERR_DDRPHY_DELAY;j++) { for(i=0;i<ERR_DDRPHY_DELAY;i++) {
int working = 1; int working = 1;
int show = 1; int show = 1;
#ifdef USDDRPHY #ifdef USDDRPHY
show = (j%16 == 0); show = (i%16 == 0);
#endif #endif
#ifdef ECP5DDRPHY #ifdef ECP5DDRPHY
ddrphy_burstdet_clr_write(1); ddrphy_burstdet_clr_write(1);
@ -526,13 +507,11 @@ static int read_level_scan(int module, int bitslip)
cdelay(15); cdelay(15);
for(p=0;p<DFII_NPHASES;p++) { for(p=0;p<DFII_NPHASES;p++) {
/* read back test pattern */ /* read back test pattern */
for(i=0;i<DFII_PIX_DATA_SIZE;i++) csr_rd_buf_uint8(sdram_dfii_pix_rddata_addr[p],
tst[i] = csr_dw_ntoh(MMPTR(sdram_dfii_pix_rddata_addr[p]+DFII_ADDR_SHIFT*i)); tst, DFII_PIX_DATA_BYTES);
prs_bytes = (unsigned char *)&(prs[p][0]);
tst_bytes = (unsigned char *)&(tst[0]);
/* verify bytes matching current 'module' */ /* verify bytes matching current 'module' */
if (prs_bytes[ NBMODULES-1-module] != tst_bytes[ NBMODULES-1-module] || if (prs[p][ NBMODULES-1-module] != tst[ NBMODULES-1-module] ||
prs_bytes[2*NBMODULES-1-module] != tst_bytes[2*NBMODULES-1-module]) prs[p][2*NBMODULES-1-module] != tst[2*NBMODULES-1-module])
working = 0; working = 0;
} }
#ifdef ECP5DDRPHY #ifdef ECP5DDRPHY
@ -558,10 +537,9 @@ static int read_level_scan(int module, int bitslip)
static void read_level(int module) static void read_level(int module)
{ {
unsigned int prv; unsigned int prv;
csr_dw_t prs[DFII_NPHASES][DFII_PIX_DATA_SIZE]; unsigned char prs[DFII_NPHASES][DFII_PIX_DATA_BYTES];
csr_dw_t tst[DFII_PIX_DATA_SIZE]; unsigned char tst[DFII_PIX_DATA_BYTES];
unsigned char *prs_bytes, *tst_bytes; int p, i;
int p, i, j;
int working; int working;
int delay, delay_min, delay_max; int delay, delay_min, delay_max;
@ -570,7 +548,7 @@ static void read_level(int module)
/* Generate pseudo-random sequence */ /* Generate pseudo-random sequence */
prv = 42; prv = 42;
for(p=0;p<DFII_NPHASES;p++) for(p=0;p<DFII_NPHASES;p++)
for(i=0;i<DFII_PIX_DATA_SIZE;i++) { for(i=0;i<DFII_PIX_DATA_BYTES;i++) {
prv = 1664525*prv + 1013904223; prv = 1664525*prv + 1013904223;
prs[p][i] = prv; prs[p][i] = prv;
} }
@ -583,8 +561,8 @@ static void read_level(int module)
/* Write test pattern */ /* Write test pattern */
for(p=0;p<DFII_NPHASES;p++) for(p=0;p<DFII_NPHASES;p++)
for(i=0;i<DFII_PIX_DATA_SIZE;i++) csr_wr_buf_uint8(sdram_dfii_pix_wrdata_addr[p],
MMPTR(sdram_dfii_pix_wrdata_addr[p]+DFII_ADDR_SHIFT*i) = csr_dw_hton(prs[p][i]); prs[p], DFII_PIX_DATA_BYTES);
sdram_dfii_piwr_address_write(0); sdram_dfii_piwr_address_write(0);
sdram_dfii_piwr_baddress_write(0); sdram_dfii_piwr_baddress_write(0);
command_pwr(DFII_COMMAND_CAS|DFII_COMMAND_WE|DFII_COMMAND_CS|DFII_COMMAND_WRDATA); command_pwr(DFII_COMMAND_CAS|DFII_COMMAND_WE|DFII_COMMAND_CS|DFII_COMMAND_WRDATA);
@ -605,13 +583,11 @@ static void read_level(int module)
working = 1; working = 1;
for(p=0;p<DFII_NPHASES;p++) { for(p=0;p<DFII_NPHASES;p++) {
/* read back test pattern */ /* read back test pattern */
for(i=0;i<DFII_PIX_DATA_SIZE;i++) csr_rd_buf_uint8(sdram_dfii_pix_rddata_addr[p],
tst[i] = csr_dw_ntoh(MMPTR(sdram_dfii_pix_rddata_addr[p]+DFII_ADDR_SHIFT*i)); tst, DFII_PIX_DATA_BYTES);
prs_bytes = (unsigned char *)&(prs[p][0]);
tst_bytes = (unsigned char *)&(tst[0]);
/* verify bytes matching current 'module' */ /* verify bytes matching current 'module' */
if (prs_bytes[ NBMODULES-1-module] != tst_bytes[ NBMODULES-1-module] || if (prs[p][ NBMODULES-1-module] != tst[ NBMODULES-1-module] ||
prs_bytes[2*NBMODULES-1-module] != tst_bytes[2*NBMODULES-1-module]) prs[p][2*NBMODULES-1-module] != tst[2*NBMODULES-1-module])
working = 0; working = 0;
} }
#ifdef ECP5DDRPHY #ifdef ECP5DDRPHY
@ -629,7 +605,7 @@ static void read_level(int module)
/* Get a bit further into the working zone */ /* Get a bit further into the working zone */
#ifdef USDDRPHY #ifdef USDDRPHY
for(j=0;j<16;j++) { for(i=0;i<16;i++) {
delay += 1; delay += 1;
read_delay_inc(module); read_delay_inc(module);
} }
@ -648,13 +624,11 @@ static void read_level(int module)
working = 1; working = 1;
for(p=0;p<DFII_NPHASES;p++) { for(p=0;p<DFII_NPHASES;p++) {
/* read back test pattern */ /* read back test pattern */
for(i=0;i<DFII_PIX_DATA_SIZE;i++) csr_rd_buf_uint8(sdram_dfii_pix_rddata_addr[p],
tst[i] = csr_dw_ntoh(MMPTR(sdram_dfii_pix_rddata_addr[p]+DFII_ADDR_SHIFT*i)); tst, DFII_PIX_DATA_BYTES);
prs_bytes = (unsigned char *)&(prs[p][0]);
tst_bytes = (unsigned char *)&(tst[0]);
/* verify bytes matching current 'module' */ /* verify bytes matching current 'module' */
if (prs_bytes[ NBMODULES-1-module] != tst_bytes[ NBMODULES-1-module] || if (prs[p][ NBMODULES-1-module] != tst[ NBMODULES-1-module] ||
prs_bytes[2*NBMODULES-1-module] != tst_bytes[2*NBMODULES-1-module]) prs[p][2*NBMODULES-1-module] != tst[2*NBMODULES-1-module])
working = 0; working = 0;
} }
#ifdef ECP5DDRPHY #ifdef ECP5DDRPHY
@ -677,7 +651,7 @@ static void read_level(int module)
/* Set delay to the middle */ /* Set delay to the middle */
read_delay_rst(module); read_delay_rst(module);
for(j=0;j<(delay_min+delay_max)/2;j++) for(i=0;i<(delay_min+delay_max)/2;i++)
read_delay_inc(module); read_delay_inc(module);
/* Precharge */ /* Precharge */