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

soc/software/libbase: make memtest_data more configurable, add on_error callback

This commit is contained in:
Jędrzej Boczar 2021-05-17 13:42:44 +02:00
parent 13979a43b7
commit b90d0bd1f7
2 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,10 +3,22 @@
#include <stdbool.h> #include <stdbool.h>
// Called when an error is encountered. Can return non-zero to stop the memtest.
// `arg` can be used to pass arbitrary data to the callback via `memtest_config.arg`.
typedef int (*on_error_callback)(unsigned int addr, unsigned int rdata, unsigned int refdata, void *arg);
// Optional memtest configuration. If NULL, then we default to progress=1, read_only=0.
struct memtest_config {
int show_progress;
int read_only;
on_error_callback on_error;
void *arg;
};
int memtest_access(unsigned int *addr); 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, struct memtest_config *config);
void memspeed(unsigned int *addr, unsigned long size, bool read_only); void memspeed(unsigned int *addr, unsigned long size, bool read_only);
int memtest(unsigned int *addr, unsigned long maxsize); int memtest(unsigned int *addr, unsigned long maxsize);

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

@ -172,16 +172,19 @@ static void print_progress(const char * header, unsigned int offset, unsigned in
printf(" \r"); printf(" \r");
} }
int memtest_data(unsigned int *addr, unsigned long size, int random) int memtest_data(unsigned int *addr, unsigned long size, int random, struct memtest_config *config)
{ {
volatile unsigned int *array = addr; volatile unsigned int *array = addr;
int i, errors; int i, errors;
int progress;
unsigned int seed_32; unsigned int seed_32;
unsigned int rdata; unsigned int rdata;
progress = config == NULL ? 1 : config->show_progress;
errors = 0; errors = 0;
seed_32 = 1; seed_32 = 1;
if (config == NULL || !config->read_only) {
/* Write datas */ /* Write datas */
for(i=0; i<size/4; i++) { for(i=0; i<size/4; i++) {
seed_32 = seed_to_data_32(seed_32, random); seed_32 = seed_to_data_32(seed_32, random);
@ -191,6 +194,7 @@ int memtest_data(unsigned int *addr, unsigned long size, int random)
} }
print_progress(" Write:", (unsigned long)addr, 4*i); print_progress(" Write:", (unsigned long)addr, 4*i);
printf("\n"); printf("\n");
}
/* Flush caches */ /* Flush caches */
flush_cpu_dcache(); flush_cpu_dcache();
@ -203,15 +207,22 @@ int memtest_data(unsigned int *addr, unsigned long size, int random)
rdata = array[i]; rdata = array[i];
if(rdata != seed_32) { if(rdata != seed_32) {
errors++; errors++;
if (config != NULL && config->on_error != NULL) {
// call the handler, if non-zero status is returned finish now
if (config->on_error((unsigned int) (addr + i), rdata, seed_32, config->arg) != 0)
return errors;
}
#ifdef MEMTEST_DATA_DEBUG #ifdef MEMTEST_DATA_DEBUG
printf("memtest_data error @ %p: 0x%08x vs 0x%08x\n", addr + i, rdata, seed_32); printf("memtest_data error @ %p: 0x%08x vs 0x%08x\n", addr + i, rdata, seed_32);
#endif #endif
} }
if (i%0x8000 == 0) if (i%0x8000 == 0 && progress)
print_progress(" Read:", (unsigned long)addr, 4*i); print_progress(" Read:", (unsigned long)addr, 4*i);
} }
if (progress) {
print_progress(" Read:", (unsigned long)addr, 4*i); print_progress(" Read:", (unsigned long)addr, 4*i);
printf("\n"); printf("\n");
}
return errors; return errors;
} }
@ -292,7 +303,7 @@ int memtest(unsigned int *addr, unsigned long maxsize)
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, NULL);
if(bus_errors + addr_errors + data_errors != 0) { if(bus_errors + addr_errors + data_errors != 0) {
printf(" bus errors: %d/%ld\n", bus_errors, 2*bus_size/4); printf(" bus errors: %d/%ld\n", bus_errors, 2*bus_size/4);