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

software/libbase: add memtest_access before testing bus/addr/data to exit early if bus errors are detected.

This commit is contained in:
Florent Kermarrec 2020-12-07 14:05:13 +01:00
parent fb05fbc5cc
commit c19c343ecf
2 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
litex/soc/software/include/base/memtest.h
View File

@ -3,6 +3,7 @@
#include <stdbool.h> #include <stdbool.h>
int memtest_access(unsigned int *addr);
int memtest_bus(unsigned int *addr, unsigned long size); int memtest_bus(unsigned int *addr, unsigned long size);
int memtest_addr(unsigned int *addr, unsigned long size, int random); int memtest_addr(unsigned int *addr, unsigned long size, int random);
int memtest_data(unsigned int *addr, unsigned long size, int random); int memtest_data(unsigned int *addr, unsigned long size, int random);

36
litex/soc/software/libbase/memtest.c
View File

@ -39,6 +39,27 @@ static unsigned short seed_to_data_16(unsigned short seed, int random)
return random ? lfsr(16, seed) : seed + 1; return random ? lfsr(16, seed) : seed + 1;
} }
int memtest_access(unsigned int *addr)
{
volatile unsigned int *array = addr;
int bus_errors;
/* Get current bus errors */
bus_errors = ctrl_bus_errors_read();
/* Check bus Read/Write */
array[0] = ONEZERO;
array[1] = array[0];
array[0] = ZEROONE;
array[1] = array[0];
if (ctrl_bus_errors_read() - bus_errors) {
printf("memtest_access error @ 0x%0x, exiting memtest.\n", addr);
return 1;
}
return 0;
}
int memtest_bus(unsigned int *addr, unsigned long size) int memtest_bus(unsigned int *addr, unsigned long size)
{ {
volatile unsigned int *array = addr; volatile unsigned int *array = addr;
@ -62,13 +83,13 @@ int memtest_bus(unsigned int *addr, unsigned long size)
if(rdata != ONEZERO) { if(rdata != ONEZERO) {
errors++; errors++;
#ifdef MEMTEST_BUS_DEBUG #ifdef MEMTEST_BUS_DEBUG
printf("memtest_bus error @ 0x%0x: 0x%08x vs 0x%08x\n", i, rdata, ONEZERO); printf("memtest_bus error @ 0x%0x: 0x%08x vs 0x%08x\n", addr + i, rdata, ONEZERO);
#endif #endif
} }
} }
/* Write Zero/One pattern */ /* Write Zero/One pattern */
for(i = 0; i < size/4; i++) { for(i=0; i < size/4; i++) {
array[i] = ZEROONE; array[i] = ZEROONE;
} }
@ -77,12 +98,12 @@ int memtest_bus(unsigned int *addr, unsigned long size)
flush_l2_cache(); flush_l2_cache();
/* Read/Verify One/Zero pattern */ /* Read/Verify One/Zero pattern */
for(i = 0; i < size/4; i++) { for(i=0; i<size/4; i++) {
rdata = array[i]; rdata = array[i];
if(rdata != ZEROONE) { if(rdata != ZEROONE) {
errors++; errors++;
#ifdef MEMTEST_BUS_DEBUG #ifdef MEMTEST_BUS_DEBUG
printf("memtest_bus error @ 0x%0x:: 0x%08x vs 0x%08x\n", i, rdata, ZEROONE); printf("memtest_bus error @ 0x%0x:: 0x%08x vs 0x%08x\n", addr + i, rdata, ZEROONE);
#endif #endif
} }
} }
@ -118,7 +139,7 @@ int memtest_addr(unsigned int *addr, unsigned long size, int random)
if(rdata != i) { if(rdata != i) {
errors++; errors++;
#ifdef MEMTEST_ADDR_DEBUG #ifdef MEMTEST_ADDR_DEBUG
printf("memtest_addr error @ 0x%0x: 0x%08x vs 0x%08x\n", i, rdata, i); printf("memtest_addr error @ 0x%0x: 0x%08x vs 0x%08x\n", addr + i, rdata, i);
#endif #endif
} }
} }
@ -181,7 +202,7 @@ int memtest_data(unsigned int *addr, unsigned long size, int random)
if(rdata != seed_32) { if(rdata != seed_32) {
errors++; errors++;
#ifdef MEMTEST_DATA_DEBUG #ifdef MEMTEST_DATA_DEBUG
printf("memtest_data error @%0x: 0x%08x vs 0x%08x\n", i, rdata, seed_32); printf("memtest_data error @%0x: 0x%08x vs 0x%08x\n", addr + i, rdata, seed_32);
#endif #endif
} }
if (i%0x8000 == 0) if (i%0x8000 == 0)
@ -262,6 +283,9 @@ int memtest(unsigned int *addr, unsigned long maxsize)
print_size(data_size); print_size(data_size);
printf(")...\n"); printf(")...\n");
if (memtest_access(addr))
return 0;
bus_errors = memtest_bus(addr, bus_size); bus_errors = memtest_bus(addr, bus_size);
addr_errors = memtest_addr(addr, addr_size, MEMTEST_ADDR_RANDOM); addr_errors = memtest_addr(addr, addr_size, MEMTEST_ADDR_RANDOM);
data_errors = memtest_data(addr, data_size, MEMTEST_DATA_RANDOM); data_errors = memtest_data(addr, data_size, MEMTEST_DATA_RANDOM);