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

Merge pull request #916 from antmicro/jboc/memtest-config 

Make memtest_data more configurable
This commit is contained in:
enjoy-digital 2021-05-18 10:22:15 +02:00 committed by GitHub
parent 13979a43b7 33fb48584b
commit ccc2550426
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 67 additions and 19 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);

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

@ -11,6 +11,15 @@
//#define MEMTEST_DATA_DEBUG //#define MEMTEST_DATA_DEBUG
//#define MEMTEST_ADDR_DEBUG //#define MEMTEST_ADDR_DEBUG
// Limits the number of errors printed, so that we can still access bios console
#ifndef MEMTEST_DEBUG_MAX_ERRORS
#define MEMTEST_DEBUG_MAX_ERRORS 400
#endif
// Retry reading when an error occurs. Allows to spot if errors happen during read or write.
#ifndef MEMTEST_DATA_RETRIES
#define MEMTEST_DATA_RETRIES 0
#endif
#define KIB 1024 #define KIB 1024
#define MIB (KIB*1024) #define MIB (KIB*1024)
#define GIB (MIB*1024) #define GIB (MIB*1024)
@ -85,7 +94,8 @@ 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 @ %p: 0x%08x vs 0x%08x\n", addr + i, rdata, ONEZERO); if (MEMTEST_DEBUG_MAX_ERRORS < 0 || errors <= MEMTEST_DEBUG_MAX_ERRORS)
printf("memtest_bus error @ %p: 0x%08x vs 0x%08x\n", addr + i, rdata, ONEZERO);
#endif #endif
} }
} }
@ -105,7 +115,8 @@ int memtest_bus(unsigned int *addr, unsigned long size)
if(rdata != ZEROONE) { if(rdata != ZEROONE) {
errors++; errors++;
#ifdef MEMTEST_BUS_DEBUG #ifdef MEMTEST_BUS_DEBUG
printf("memtest_bus error @ %p:: 0x%08x vs 0x%08x\n", addr + i, rdata, ZEROONE); if (MEMTEST_DEBUG_MAX_ERRORS < 0 || errors <= MEMTEST_DEBUG_MAX_ERRORS)
printf("memtest_bus error @ %p:: 0x%08x vs 0x%08x\n", addr + i, rdata, ZEROONE);
#endif #endif
} }
} }
@ -141,7 +152,8 @@ 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 @ %p: 0x%08x vs 0x%08x\n", addr + i, rdata, i); if (MEMTEST_DEBUG_MAX_ERRORS < 0 || errors <= MEMTEST_DEBUG_MAX_ERRORS)
printf("memtest_addr error @ %p: 0x%08x vs 0x%08x\n", addr + i, rdata, i);
#endif #endif
} }
} }
@ -172,25 +184,30 @@ 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 j, ok_at;
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;
/* Write datas */ if (config == NULL || !config->read_only) {
for(i=0; i<size/4; i++) { /* Write datas */
seed_32 = seed_to_data_32(seed_32, random); for(i=0; i<size/4; i++) {
array[i] = seed_32; seed_32 = seed_to_data_32(seed_32, random);
if (i%0x8000 == 0) array[i] = seed_32;
print_progress(" Write:", (unsigned long)addr, 4*i); if (i%0x8000 == 0)
print_progress(" Write:", (unsigned long)addr, 4*i);
}
print_progress(" Write:", (unsigned long)addr, 4*i);
printf("\n");
} }
print_progress(" Write:", (unsigned long)addr, 4*i);
printf("\n");
/* Flush caches */ /* Flush caches */
flush_cpu_dcache(); flush_cpu_dcache();
@ -200,18 +217,37 @@ int memtest_data(unsigned int *addr, unsigned long size, int random)
seed_32 = 1; seed_32 = 1;
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);
rdata = array[i];
ok_at = -1;
for (j = 0; j < MEMTEST_DATA_RETRIES + 1; ++j) {
rdata = array[i];
if (rdata == seed_32) {
ok_at = j;
break;
}
}
if (ok_at > 0)
printf("@%p: Redeemed at %d. attempt\n", addr + i, ok_at + 1);
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); if (MEMTEST_DEBUG_MAX_ERRORS < 0 || errors <= MEMTEST_DEBUG_MAX_ERRORS)
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);
} }
print_progress(" Read:", (unsigned long)addr, 4*i); if (progress) {
printf("\n"); print_progress(" Read:", (unsigned long)addr, 4*i);
printf("\n");
}
return errors; return errors;
} }
@ -292,7 +328,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);